November 2024 - gerrit-log - lists.osmocom.org

[XS] Change in osmo-cbc[master]: abis: Fix reusing link->conn while it is being destroyed

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/38978?usp=email ) Change subject: abis: Fix reusing link->conn while it is being destroyed ...................................................................... abis: Fix reusing link->conn while it is being destroyed Call to osmo_stream_cli_destroy() may end up triggering disconnect_cb(), and we don't want to attempt doing more stuff with that conn when that happens (we were even trying to reconnect() it...). Avoid it by marking the pointer as NULL immediatelly before calling e1inp_sign_link_destroy(). Change-Id: I56605766af974d86610d0958f4b82e6e4ff94502 --- M src/cbsp_link.c 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/78/38978/1 diff --git a/src/cbsp_link.c b/src/cbsp_link.c index 07fbadd..6b355df 100644 --- a/src/cbsp_link.c +++ b/src/cbsp_link.c @@ -102,6 +102,8 @@ static int cbc_cbsp_link_cli_disconnect_cb(struct osmo_stream_cli *conn) { struct cbc_cbsp_link *link = osmo_stream_cli_get_data(conn); + if (!link->conn) /* conn is being destroyed by us, we called osmo_stream_cli_destroy() */ + return 0; LOGPCC(link, LOGL_NOTICE, "Disconnected.\n"); LOGPCC(link, LOGL_NOTICE, "Reconnecting...\n"); osmo_stream_cli_reconnect(conn); @@ -364,10 +366,11 @@ return; if (link->is_client) { - osmo_stream_cli_destroy(link->cli_conn); + struct osmo_stream_cli *cli_conn = link->cli_conn; + link->cli_conn = NULL; + osmo_stream_cli_destroy(cli_conn); if (link->peer) link->peer->link.cbsp = NULL; - link->cli_conn = NULL; if (link->fi) osmo_fsm_inst_dispatch(link->fi, CBSP_LINK_E_CMD_CLOSE, NULL); } else { -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/38978?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I56605766af974d86610d0958f4b82e6e4ff94502 Gerrit-Change-Number: 38978 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months, 3 weeks

1
0
0 0

[XS] Change in osmo-cbc[master]: .gitignore: Add *~

by pespin

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-cbc/+/38973?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: .gitignore: Add *~ ...................................................................... .gitignore: Add *~ This allows getting rid of further files like install-sh~. Change-Id: Iad7ce44a2ecd90116376a458cc40f355d3883c53 --- M .gitignore 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/73/38973/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/38973?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Iad7ce44a2ecd90116376a458cc40f355d3883c53 Gerrit-Change-Number: 38973 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

6 months, 3 weeks

1
0
0 0

[XS] Change in osmo-ttcn3-hacks[master]: bsc: osmo-bsc.cfg: Listen IPA Abis and CTRL interfaces on 127.0.0.1

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38963?usp=email ) Change subject: bsc: osmo-bsc.cfg: Listen IPA Abis and CTRL interfaces on 127.0.0.1 ...................................................................... bsc: osmo-bsc.cfg: Listen IPA Abis and CTRL interfaces on 127.0.0.1 CTRL seems to bind to 127.0.0.1 by default, but IPA Abis listents to 0.0.0.0 by default, which is not needed and may create problems with concurrent instances. Change-Id: I56c8c6af16502e8f98b28902a251e190da0c0490 --- M bsc/osmo-bsc.cfg 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg index 958db6a..a03aeaf 100644 --- a/bsc/osmo-bsc.cfg +++ b/bsc/osmo-bsc.cfg @@ -45,11 +45,14 @@ line vty no login bind 127.0.0.1 +ctrl + bind 127.0.0.1 ! e1_input e1_line 0 driver ipa e1_line 0 port 0 no e1_line 0 keepalive + ipa bind 127.0.0.1 cs7 instance 0 asp asp-clnt-msc-0 2905 1905 m3ua remote-ip 127.0.0.1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38963?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I56c8c6af16502e8f98b28902a251e190da0c0490 Gerrit-Change-Number: 38963 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

6 months, 3 weeks

1
0
0 0

[XS] Change in libosmo-netif[master]: stream_cli: Assert reentrant disconnect_cb() never happens

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/38976?usp=email ) Change subject: stream_cli: Assert reentrant disconnect_cb() never happens ...................................................................... stream_cli: Assert reentrant disconnect_cb() never happens This should in fact already be guarded by early return in stream_cli_close() setting and checking for CLOSED state, but it doesn't hurt having this assert which also provides extra information to the reader. Change-Id: I9a12d76e27dce2b31a2aa993b70cbed30bdea7f2 --- M src/stream_cli.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/76/38976/1 diff --git a/src/stream_cli.c b/src/stream_cli.c index 2c1b00d..43877d3 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -203,6 +203,7 @@ * Also, if reconnect is disabled by user, notify the user that connect() failed: */ if (old_state == STREAM_CLI_STATE_CONNECTED || (old_state == STREAM_CLI_STATE_CONNECTING && cli->reconnect_timeout < 0)) { + OSMO_ASSERT(!(cli->in_cb_mask & IN_CB_MASK_DISCONNECT_CB)); cli->in_cb_mask |= IN_CB_MASK_DISCONNECT_CB; if (cli->disconnect_cb) cli->disconnect_cb(cli); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/38976?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I9a12d76e27dce2b31a2aa993b70cbed30bdea7f2 Gerrit-Change-Number: 38976 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months, 3 weeks

1
0
0 0

[XS] Change in libosmo-netif[master]: stream_cli: steal talloc ctx upon delaying free to avoid use after free

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/38975?usp=email ) Change subject: stream_cli: steal talloc ctx upon delaying free to avoid use after free ...................................................................... stream_cli: steal talloc ctx upon delaying free to avoid use after free Scenario: read_cb() [user code] osmo_stream_cli_destroy() stream_cli_close() disconnect_cb() (free is delayed because we are in cb) [user code] (frees parent struct of "cli", which would free cli) free_delayed_if_needed() called on an already freed poiter Fixes: a6af7cb9dce9d4567d355bad873c60be68896eee Related: OS#6651 Change-Id: Id7625558d4b1343d621fb51406fa7f841db864ee --- M src/stream_cli.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/75/38975/1 diff --git a/src/stream_cli.c b/src/stream_cli.c index 89681b0..2c1b00d 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -974,6 +974,11 @@ if (cli->in_cb_mask != 0) { LOGSCLI(cli, LOGL_DEBUG, "delay free() in_cb_mask=0x%02x\n", cli->in_cb_mask); cli->delay_free = true; + /* Move ptr to avoid double free if parent ctx of cli is freed + * meanwhile (eg. during user callback after calling + * osmo_stream_client_destroy() and before returning from user + * callback. */ + talloc_steal(OTC_GLOBAL, cli); } else { LOGSCLI(cli, LOGL_DEBUG, "free(destroy)\n"); talloc_free(cli); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/38975?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Id7625558d4b1343d621fb51406fa7f841db864ee Gerrit-Change-Number: 38975 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de>

6 months, 3 weeks

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/ttcn3-ns-test{,-sns}: tweak timer

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/38971?usp=email ) Change subject: jobs/ttcn3-ns-test{,-sns}: tweak timer ...................................................................... jobs/ttcn3-ns-test{,-sns}: tweak timer Since the timers were adjusted last time, ttcn3-ns-test{,-sns} started failing every other day with: python3-osmopy-utils : Depends: osmocom-nightly (= 202411222026) but it is not going to be installed The reason is that the binary packages are not ready yet at that time. Run the jobs 1h later to avoid this. Change-Id: I4f61013661d5de5382c3431650051989200fd785 --- M jobs/ttcn3-testsuites.yml 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 5ad31c8..92b7e6d 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -38,9 +38,9 @@ timer: H 03 * * * node: hdlc - ttcn3-ns-test: # ~7 min - timer: H 03 * * * + timer: H 04 * * * - ttcn3-ns-test-sns: # ~3 min - timer: H 03 * * * + timer: H 04 * * * - ttcn3-ns-test-fr: # ~10 min timer: H 04 * * * node: hdlc -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38971?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4f61013661d5de5382c3431650051989200fd785 Gerrit-Change-Number: 38971 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

6 months, 3 weeks

1
0
0 0

[XS] Change in osmo-ci[master]: jobs/ttcn3-ns-test{,-sns}: tweak timer

by osmith

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-ci/+/38971?usp=email ) Change subject: jobs/ttcn3-ns-test{,-sns}: tweak timer ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38971?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I4f61013661d5de5382c3431650051989200fd785 Gerrit-Change-Number: 38971 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Nov 2024 14:52:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 3 weeks

1
0
0 0

[S] Change in libosmo-abis[master]: e1_input: Guard against crash by users calling reentrant e1inp_sign_l...

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38969?usp=email ) Change subject: e1_input: Guard against crash by users calling reentrant e1inp_sign_link_destroy() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38969?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ib761cece68f1d809e27194bc5cc2eb15ad2ae4eb Gerrit-Change-Number: 38969 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 28 Nov 2024 14:50:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

6 months, 3 weeks

1
0
0 0

[XS] Change in pysim[master]: pySim-shell: reset card in method equip

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38962?usp=email ) Change subject: pySim-shell: reset card in method equip ...................................................................... pySim-shell: reset card in method equip When the equip method is running, all kinds of states in pySim-shell are reset. To be sure that the card state is also reset (normally this is the case because usually init_card is called before equip), we should send an explicit reset to the card as well. Related: OS#6640 Change-Id: I622a2df2c9184841f72abd18483bfbfd00b2f464 --- M pySim-shell.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim-shell.py b/pySim-shell.py index 08f00f9..f2b3ad2 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -155,6 +155,7 @@ # When a card object and a runtime state is present, (re)equip pySim-shell with everything that is # needed to operate on cards. if self.card and self.rs: + self.rs.reset() self.lchan = self.rs.lchan[0] self._onchange_conserve_write( 'conserve_write', False, self.conserve_write) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38962?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I622a2df2c9184841f72abd18483bfbfd00b2f464 Gerrit-Change-Number: 38962 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

6 months, 3 weeks

1
0
0 0

[S] Change in pysim[master]: pySim-shell: change Prompt character to "#" after "verify_adm"

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38884?usp=email ) Change subject: pySim-shell: change Prompt character to "#" after "verify_adm" ...................................................................... pySim-shell: change Prompt character to "#" after "verify_adm" Let's change the prompt from ">" to "#" when the user gains admin privilegs using verify_adm. Related: OS#6640 Change-Id: I957b9df7b5069b6fce5bf958c94e8ffda833c77f --- M pySim-shell.py M pySim/runtime.py 2 files changed, 13 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve diff --git a/pySim-shell.py b/pySim-shell.py index f2b3ad2..d08dc21 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -219,18 +219,23 @@ self.cmd2.poutput("<- %s: %s" % (sw, resp)) def update_prompt(self): + if self.rs and self.rs.adm_verified: + prompt_char = '#' + else: + prompt_char = '>' + if self.lchan: path_str = self.lchan.selected_file.fully_qualified_path_str(not self.numeric_path) scp = self.lchan.scc.scp if scp: - self.prompt = 'pySIM-shell (%s:%02u:%s)> ' % (str(scp), self.lchan.lchan_nr, path_str) + self.prompt = 'pySIM-shell (%s:%02u:%s)%c ' % (str(scp), self.lchan.lchan_nr, path_str, prompt_char) else: - self.prompt = 'pySIM-shell (%02u:%s)> ' % (self.lchan.lchan_nr, path_str) + self.prompt = 'pySIM-shell (%02u:%s)%c ' % (self.lchan.lchan_nr, path_str, prompt_char) else: if self.card: - self.prompt = 'pySIM-shell (no card profile)> ' + self.prompt = 'pySIM-shell (no card profile)%c ' % prompt_char else: - self.prompt = 'pySIM-shell (no card)> ' + self.prompt = 'pySIM-shell (no card)%c ' % prompt_char @cmd2.with_category(CUSTOM_CATEGORY) def do_intro(self, _): @@ -855,6 +860,8 @@ self._cmd.lchan.scc.verify_chv(adm_chv_num, h2b(pin_adm)) else: raise ValueError("error: cannot authenticate, no adm-pin!") + self._cmd.rs.adm_verified = True + self._cmd.update_prompt() def do_cardinfo(self, opts): """Display information about the currently inserted card""" diff --git a/pySim/runtime.py b/pySim/runtime.py index 0ee15d0..3e48f75 100644 --- a/pySim/runtime.py +++ b/pySim/runtime.py @@ -53,6 +53,7 @@ # this is a dict of card identities which different parts of the code might populate, # typically with something like ICCID, EID, ATR, ... self.identity = {} + self.adm_verified = False # make sure the class and selection control bytes, which are specified # by the card profile are used @@ -139,6 +140,7 @@ if lchan_nr == 0: continue del self.lchan[lchan_nr] + self.adm_verified = False atr = i2h(self.card.reset()) if cmd_app: cmd_app.lchan = self.lchan[0] -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38884?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I957b9df7b5069b6fce5bf958c94e8ffda833c77f Gerrit-Change-Number: 38884 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

6 months, 3 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024