- gerrit-log - lists.osmocom.org

Change in osmo-cbc[master]: cbsp: Clean up conn closed paths
by pespin 07 Jul '22

07 Jul '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28534 ) Change subject: cbsp: Clean up conn closed paths ...................................................................... cbsp: Clean up conn closed paths Change-Id: I08d1da97f0a2d83f7f48c59bc4dbd669f4f814b3 --- M src/cbsp_server.c 1 file changed, 2 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/34/28534/1 diff --git a/src/cbsp_server.c b/src/cbsp_server.c index 215f643..4e47baf 100644 --- a/src/cbsp_server.c +++ b/src/cbsp_server.c @@ -107,7 +107,8 @@ if (client->peer) client->peer->client.cbsp = NULL; client->conn = NULL; - osmo_fsm_inst_dispatch(client->fi, CBSP_SRV_E_CMD_CLOSE, NULL); + if (client->fi) + osmo_fsm_inst_dispatch(client->fi, CBSP_SRV_E_CMD_CLOSE, NULL); return 0; } @@ -157,7 +158,6 @@ LOGPCC(client, LOGL_NOTICE, "Rejecting unknown CBSP peer %s:%d (not permitted)\n", remote_ip, remote_port); osmo_stream_srv_destroy(client->conn); - /* FIXME: further cleanup needed? or does close_cb handle everything? */ return -1; } } else { @@ -199,10 +199,7 @@ void cbsp_cbc_client_close(struct osmo_cbsp_cbc_client *client) { - if (client->fi) - osmo_fsm_inst_dispatch(client->fi, CBSP_SRV_E_CMD_CLOSE, NULL); osmo_stream_srv_destroy(client->conn); - /* FIXME: do we need to unlink/free the client? */ } /* initialize the CBC-side CBSP server */ -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28534 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I08d1da97f0a2d83f7f48c59bc4dbd669f4f814b3 Gerrit-Change-Number: 28534 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-ttcn3-hacks[master]: MGCP_Test: fix TC_dlcx_wildcarded
by dexter 07 Jul '22

07 Jul '22

Attention is currently required from: pespin, daniel. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28494 ) Change subject: MGCP_Test: fix TC_dlcx_wildcarded ...................................................................... Patch Set 1: (1 comment) File mgw/MGCP_Test.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28494/comment/880db706_ef69… PS1, Line 1121: /* Query a the statsd once to ensure that intermediate results are pulled from the > I agree with Pau that the second call shouldn't be necessary. […] I think I tried f_statd_reset() already. I have tried it now again (removing the first f_statsd_expect paragraph and putting f_statsd_reset() instead. Unfortunately I still get: 13:15:56.790550 6 StatsD_Checker.ttcn:226 setverdict(fail): none -> fail reason: "Metric failed expectation { name := "TTCN3.trunk.virtual-0.common.endpoints.used", val := 30, mtype := "g", srate := omit } vs { name := "TTCN3.trunk.virtual-0.common.endpoints.used", mtype := "g", min := 0, max := 0 }", new component reason: "Metric failed expectation { name := "TTCN3.trunk.virtual-0.common.endpoints.used", val := 30, mtype := "g", srate := omit } vs { name := "TTCN3.trunk.virtual-0.common.endpoints.used", mtype := "g", min := 0, max := 0 }" (strange though is that 30 is not the maximum amount, should be 31) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28494 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I5fe18e433b32c364778b515ed37fcbcf443b3cb3 Gerrit-Change-Number: 28494 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 Jul 2022 11:22:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-cbc[master]: Improve error handling when forwarding ECBE msg to CBSP
by pespin 07 Jul '22

07 Jul '22

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28532 ) Change subject: Improve error handling when forwarding ECBE msg to CBSP ...................................................................... Improve error handling when forwarding ECBE msg to CBSP Change-Id: Ie411409b3af8f7dd6913b522ea9ed3b58736dc9f --- M src/message_handling.c M src/smscb_peer_fsm.c 2 files changed, 17 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved dexter: Looks good to me, but someone else must approve diff --git a/src/message_handling.c b/src/message_handling.c index a8c8368..41b854a 100644 --- a/src/message_handling.c +++ b/src/message_handling.c @@ -132,9 +132,16 @@ switch (peer->proto) { case CBC_PEER_PROTO_CBSP: /* skip peers without any current CBSP connection */ - if (!peer->client.cbsp) - return 0; - cbsp = cbcmsg_to_cbsp(peer, cbcmsg); + if (!peer->client.cbsp) { + LOGP(DCBSP, LOGL_NOTICE, "[%s] Tx CBSP: not connected\n", + peer->name); + return -ENOTCONN; + } + if (!(cbsp = cbcmsg_to_cbsp(peer, cbcmsg))) { + LOGP(DCBSP, LOGL_ERROR, "[%s] Tx CBSP: msg gen failed\n", + peer->name); + return -EINVAL; + } cbsp_cbc_client_tx(peer->client.cbsp, cbsp); break; default: diff --git a/src/smscb_peer_fsm.c b/src/smscb_peer_fsm.c index 510c198..cc91e39 100644 --- a/src/smscb_peer_fsm.c +++ b/src/smscb_peer_fsm.c @@ -279,13 +279,17 @@ static void smscb_p_fsm_init(struct osmo_fsm_inst *fi, uint32_t event, void *data) { struct cbc_message_peer *mp = (struct cbc_message_peer *) fi->priv; + int rc; switch (event) { case SMSCB_E_CREATE: /* send it to peer */ - peer_new_cbc_message(mp->peer, mp->cbcmsg); - /* wait for peers' response */ - osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_WRITE_ACK, 10, T_WAIT_WRITE_ACK); + rc = peer_new_cbc_message(mp->peer, mp->cbcmsg); + if (rc == 0) { + /* wait for peers' response */ + osmo_fsm_inst_state_chg(fi, SMSCB_S_WAIT_WRITE_ACK, 10, + T_WAIT_WRITE_ACK); + } break; default: OSMO_ASSERT(0); -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28532 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ie411409b3af8f7dd6913b522ea9ed3b58736dc9f Gerrit-Change-Number: 28532 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in pysim[master]: Py2 -> Py3: do not inherit classes from object
by fixeria 07 Jul '22

07 Jul '22

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/23633 ) Change subject: Py2 -> Py3: do not inherit classes from object ...................................................................... Py2 -> Py3: do not inherit classes from object https://stackoverflow.com/questions/4015417/why-do-python-classes-inherit-o… Change-Id: I15003ba591510d68f3235f71526ad5d8a456088e --- M pySim/cards.py M pySim/commands.py M pySim/filesystem.py M pySim/profile.py M pySim/transport/calypso.py 5 files changed, 8 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, approved diff --git a/pySim/cards.py b/pySim/cards.py index 18e4ef3..55965d7 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -52,7 +52,7 @@ return res -class SimCard(object): +class SimCard: name = 'SIM' diff --git a/pySim/commands.py b/pySim/commands.py index 7b50677..fa0458a 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -27,7 +27,7 @@ from pySim.exceptions import SwMatchError -class SimCardCommands(object): +class SimCardCommands: def __init__(self, transport): self._tp = transport self.cla_byte = "a0" diff --git a/pySim/filesystem.py b/pySim/filesystem.py index 7c5d49a..37c668d 100644 --- a/pySim/filesystem.py +++ b/pySim/filesystem.py @@ -49,7 +49,7 @@ # tuple: logical-and of the listed services requires this file CardFileService = Union[int, List[int], Tuple[int, ...]] -class CardFile(object): +class CardFile: """Base class for all objects in the smart card filesystem. Serve as a common ancestor to all other file types; rarely used directly. """ @@ -1230,7 +1230,7 @@ self.shell_commands = [self.ShellCommands()] -class RuntimeState(object): +class RuntimeState: """Represent the runtime state of a session with a card.""" def __init__(self, card, profile: 'CardProfile'): @@ -1648,7 +1648,7 @@ cmd_app.unregister_command_set(c) -class FileData(object): +class FileData: """Represent the runtime, on-card data.""" def __init__(self, fdesc): @@ -1676,7 +1676,7 @@ return None -class CardApplication(object): +class CardApplication: """A card application is represented by an ADF (with contained hierarchy) and optionally some SW definitions.""" diff --git a/pySim/profile.py b/pySim/profile.py index d5df083..c535bac 100644 --- a/pySim/profile.py +++ b/pySim/profile.py @@ -62,7 +62,7 @@ return _mf_select_test(scc, "a0", "0000") -class CardProfile(object): +class CardProfile: """A Card Profile describes a card, it's filesystem hierarchy, an [initial] list of applications as well as profile-specific SW and shell commands. Every card has one card profile, but there may be multiple applications within that profile.""" diff --git a/pySim/transport/calypso.py b/pySim/transport/calypso.py index 15c9e5f..e1326ac 100644 --- a/pySim/transport/calypso.py +++ b/pySim/transport/calypso.py @@ -26,7 +26,7 @@ from pySim.utils import h2b, b2h -class L1CTLMessage(object): +class L1CTLMessage: # Every (encoded) L1CTL message has the following structure: # - msg_length (2 bytes, net order) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23633 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I15003ba591510d68f3235f71526ad5d8a456088e Gerrit-Change-Number: 23633 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

Change in osmo-msc[master]: Turn off secure_delete in sqlite
by dexter 07 Jul '22

07 Jul '22

Attention is currently required from: keith. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28341 ) Change subject: Turn off secure_delete in sqlite ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28341 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I9da6499a38096c8df2025bb9d35ec789864b7c5e Gerrit-Change-Number: 28341 Gerrit-PatchSet: 1 Gerrit-Owner: keith <keith(a)rhizomatica.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Thu, 07 Jul 2022 09:39:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-cbc[master]: Improve error handling when forwarding ECBE msg to CBSP
by dexter 07 Jul '22

07 Jul '22

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28532 ) Change subject: Improve error handling when forwarding ECBE msg to CBSP ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28532 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ie411409b3af8f7dd6913b522ea9ed3b58736dc9f Gerrit-Change-Number: 28532 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 Jul 2022 09:36:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in pysim[master]: Py2 -> Py3: do not inherit classes from object
by dexter 07 Jul '22

07 Jul '22

Attention is currently required from: fixeria. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/23633 ) Change subject: Py2 -> Py3: do not inherit classes from object ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/23633 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I15003ba591510d68f3235f71526ad5d8a456088e Gerrit-Change-Number: 23633 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 Jul 2022 09:28:28 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ci[master]: scripts/osmocom-latest-packages.sh: build osmo-python-tests
by osmith 07 Jul '22

07 Jul '22

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28533 ) Change subject: scripts/osmocom-latest-packages.sh: build osmo-python-tests ...................................................................... scripts/osmocom-latest-packages.sh: build osmo-python-tests Build the source package too, don't just checkout the sources. Related: OS#5604 Change-Id: I5b7c6b6849edbca44f45041a6e506f10933b5d43 --- M scripts/osmocom-latest-packages.sh 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/scripts/osmocom-latest-packages.sh b/scripts/osmocom-latest-packages.sh index a94c412..3efc101 100755 --- a/scripts/osmocom-latest-packages.sh +++ b/scripts/osmocom-latest-packages.sh @@ -223,6 +223,7 @@ build osmo-mgw build osmo-msc build osmo-bsc + build osmo-python-tests build simtrace2 build libosmo-dsp build osmo-sysmon -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28533 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5b7c6b6849edbca44f45041a6e506f10933b5d43 Gerrit-Change-Number: 28533 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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> Gerrit-MessageType: merged

1 0

Change in osmo-ci[master]: scripts/osmocom-latest-packages.sh: build osmo-python-tests
by fixeria 07 Jul '22

07 Jul '22

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28533 ) Change subject: scripts/osmocom-latest-packages.sh: build osmo-python-tests ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28533 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5b7c6b6849edbca44f45041a6e506f10933b5d43 Gerrit-Change-Number: 28533 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 Jul 2022 09:19:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-gsm-manuals[master]: TRXD: cosmetic: use attribute 'rotate' for 1 bit fields
by fixeria 07 Jul '22

07 Jul '22

Attention is currently required from: osmith, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22621 ) Change subject: TRXD: cosmetic: use attribute 'rotate' for 1 bit fields ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: > Okay looks like this patch was failing before, and you expected it to pass once we move away from de […] Indeed I was hoping that Debian 10 ships a more recent version of python3-{blockdiag,nwdiag}. This is sad given that 1.5.3 dates back to 2015. Letting this patch to sit WIP for several more years then. This is not critical nor urgent. Thank you Oliver! -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-manuals/+/22621 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Change-Id: I604cd85f79a8c21ef536840e017e8af399e935c7 Gerrit-Change-Number: 22621 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 Jul 2022 09:18:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

2025

2024

2023

2022

gerrit-log