September 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ci[master]: OBS: build_srcpkg.Dockerfile: use bookworm
by pespin 07 Sep '23

07 Sep '23

Attention is currently required from: fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34331?usp=email ) Change subject: OBS: build_srcpkg.Dockerfile: use bookworm ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34331?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Iddd0295ee928fc9a47d4d206e414b78a2561d13d Gerrit-Change-Number: 34331 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 Sep 2023 13:13:04 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-sccp[master]: ss7: Drop unneeded else branch after early return
by pespin 07 Sep '23

07 Sep '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34328?usp=email ) Change subject: ss7: Drop unneeded else branch after early return ...................................................................... ss7: Drop unneeded else branch after early return Change-Id: I845be6bfbf36ec8a38697ca92420483a9d41aa6c --- M src/osmo_ss7.c 1 file changed, 11 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index d097fc9..2ba9766 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -1569,10 +1569,9 @@ LOGP(DLSS7, LOGL_NOTICE, "Default IPv6 address %s not supported: %s\n", host, gai_strerror(rc)); return false; - } else { - freeaddrinfo(result); - return true; } + freeaddrinfo(result); + return true; } /* Set default values for local and remote peer hosts if they are not yet set. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34328?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I845be6bfbf36ec8a38697ca92420483a9d41aa6c Gerrit-Change-Number: 34328 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmo-sccp[master]: ss7: Rename internal APIs to avoid exporting them in so file
by pespin 07 Sep '23

07 Sep '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34327?usp=email ) Change subject: ss7: Rename internal APIs to avoid exporting them in so file ...................................................................... ss7: Rename internal APIs to avoid exporting them in so file Change-Id: Ibb22c1dc1ec73fc574cc3d38664874114f681c37 --- M src/osmo_ss7.c M src/osmo_ss7_vty.c M src/sccp_user.c M src/ss7_internal.h 4 files changed, 16 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 440014a..d097fc9 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -1583,7 +1583,7 @@ * afterwards in order to apply the new settings. * This API is internal, hence doesn't appear in osmo_ss7.h */ -bool osmo_ss7_asp_set_default_peer_hosts(struct osmo_ss7_asp *asp) +bool ss7_asp_set_default_peer_hosts(struct osmo_ss7_asp *asp) { bool changed = false; /* If no local addr was set */ @@ -2577,7 +2577,7 @@ return osmo_stream_srv_link_set_addrs(xs->server, (const char **)xs->cfg.local.host, xs->cfg.local.host_cnt); } -bool osmo_ss7_xua_server_set_default_local_hosts(struct osmo_xua_server *oxs) +bool ss7_xua_server_set_default_local_hosts(struct osmo_xua_server *oxs) { /* If no local addr was set, or erased after _create(): */ if (!oxs->cfg.local.host_cnt) { diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index 44ba780..df4c8fc 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -2071,7 +2071,7 @@ case L_CS7_ASP_NODE: asp = vty->index; /* Make sure proper defaults values are set */ - osmo_ss7_asp_set_default_peer_hosts(asp); + ss7_asp_set_default_peer_hosts(asp); osmo_ss7_asp_restart(asp); vty->node = L_CS7_NODE; vty->index = asp->inst; @@ -2089,7 +2089,7 @@ case L_CS7_XUA_NODE: oxs = vty->index; /* If no local addr was set, or erased after _create(): */ - osmo_ss7_xua_server_set_default_local_hosts(oxs); + ss7_xua_server_set_default_local_hosts(oxs); if (osmo_ss7_xua_server_bind(oxs) < 0) vty_out(vty, "%% Unable to bind xUA server to IP(s)%s", VTY_NEWLINE); vty->node = L_CS7_NODE; diff --git a/src/sccp_user.c b/src/sccp_user.c index 382e1fe..94b6d02 100644 --- a/src/sccp_user.c +++ b/src/sccp_user.c @@ -643,7 +643,7 @@ if (default_remote_ip) osmo_ss7_asp_peer_set_hosts(&asp->cfg.remote, asp, &default_remote_ip, 1); /* Make sure proper defaults are applied if app didn't provide specific default values */ - osmo_ss7_asp_set_default_peer_hosts(asp); + ss7_asp_set_default_peer_hosts(asp); asp->simple_client_allocated = true; } diff --git a/src/ss7_internal.h b/src/ss7_internal.h index 712a6ed..f6669e2 100644 --- a/src/ss7_internal.h +++ b/src/ss7_internal.h @@ -5,8 +5,8 @@ #include <stdbool.h> #include <osmocom/sigtran/osmo_ss7.h> -bool osmo_ss7_asp_set_default_peer_hosts(struct osmo_ss7_asp *asp); -bool osmo_ss7_xua_server_set_default_local_hosts(struct osmo_xua_server *oxs); +bool ss7_asp_set_default_peer_hosts(struct osmo_ss7_asp *asp); +bool ss7_xua_server_set_default_local_hosts(struct osmo_xua_server *oxs); enum ss7_as_ctr { SS7_AS_CTR_RX_MSU_TOTAL, -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34327?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ibb22c1dc1ec73fc574cc3d38664874114f681c37 Gerrit-Change-Number: 34327 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in ...osmo_dia2gsup[master]: gsup: implement a (re-)connect the GSUP link if it fails
by lynxis lazus 07 Sep '23

07 Sep '23

Attention is currently required from: daniel, fixeria. lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34285?usp=email ) Change subject: gsup: implement a (re-)connect the GSUP link if it fails ...................................................................... Patch Set 2: (2 comments) File src/gsup_client.erl: https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34285/comment/e6702a28_… PS2, Line 99: > cosmetic: use tabs we need to use an erlang formater. But so far most of the files are mixed between tabs and spaces. https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34285/comment/e33345e5_… PS2, Line 99: Failed to > This sentence looks incomplete: "failed to ..." do what? […] Ack -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo_dia2gsup/+/34285?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo_dia2gsup Gerrit-Branch: master Gerrit-Change-Id: Id531d202ded123786d7a41dd0d7c3695af59fc2d Gerrit-Change-Number: 34285 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 Sep 2023 12:49:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[XL] Change in libosmo-sccp[master]: ss7: Split asp and xua_server into their own files
by osmith 07 Sep '23

07 Sep '23

Attention is currently required from: fixeria, laforge, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34329?usp=email ) Change subject: ss7: Split asp and xua_server into their own files ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34329?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I3d43268459d61b0b9f9bec34bf31dc0851fa5e48 Gerrit-Change-Number: 34329 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 Sep 2023 12:45:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-sccp[master]: ss7: Rename internal APIs to avoid exporting them in so file
by osmith 07 Sep '23

07 Sep '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34327?usp=email ) Change subject: ss7: Rename internal APIs to avoid exporting them in so file ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34327?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ibb22c1dc1ec73fc574cc3d38664874114f681c37 Gerrit-Change-Number: 34327 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 Sep 2023 12:42:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-sccp[master]: ss7: Drop unneeded else branch after early return
by osmith 07 Sep '23

07 Sep '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34328?usp=email ) Change subject: ss7: Drop unneeded else branch after early return ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34328?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I845be6bfbf36ec8a38697ca92420483a9d41aa6c Gerrit-Change-Number: 34328 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 Sep 2023 12:42:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-sccp[master]: ss7: Rename internal APIs to avoid exporting them in so file
by osmith 07 Sep '23

07 Sep '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/34327?usp=email ) Change subject: ss7: Rename internal APIs to avoid exporting them in so file ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/34327?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: Ibb22c1dc1ec73fc574cc3d38664874114f681c37 Gerrit-Change-Number: 34327 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 Sep 2023 12:42:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ci[master]: lint: Add osmo_ss7_asp_rx_unknown_cb to typedefs_osmo.txt
by pespin 07 Sep '23

07 Sep '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34330?usp=email ) Change subject: lint: Add osmo_ss7_asp_rx_unknown_cb to typedefs_osmo.txt ...................................................................... lint: Add osmo_ss7_asp_rx_unknown_cb to typedefs_osmo.txt Change-Id: Ifeb2ed66f32b2c3802ea1aab4857f334c3748da3 --- M lint/checkpatch/typedefs_osmo.txt 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/lint/checkpatch/typedefs_osmo.txt b/lint/checkpatch/typedefs_osmo.txt index 1dae49a..204ba0a 100644 --- a/lint/checkpatch/typedefs_osmo.txt +++ b/lint/checkpatch/typedefs_osmo.txt @@ -2,3 +2,4 @@ A_SET_OF l1if_compl_cb ranap_message +osmo_ss7_asp_rx_unknown_cb -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34330?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ifeb2ed66f32b2c3802ea1aab4857f334c3748da3 Gerrit-Change-Number: 34330 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in pysim[master]: commands: make method verify_binary and verify_record private
by dexter 07 Sep '23

07 Sep '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/34335?usp=email ) Change subject: commands: make method verify_binary and verify_record private ...................................................................... commands: make method verify_binary and verify_record private The methods verify_binary and verify_record are only used internally in class SimCardCommands, they can be both private methods. Also lets move them above the method that uses them. Related: OS#5714 Change-Id: I57c9af3d6ff45caa4378c400643b4ae1fa42ecac --- M pySim/commands.py 1 file changed, 42 insertions(+), 28 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/35/34335/1 diff --git a/pySim/commands.py b/pySim/commands.py index ab66392..477cb2b 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -188,6 +188,19 @@ chunk_offset += chunk_len return total_data, sw + def __verify_binary(self, ef, data: str, offset: int = 0): + """Verify contents of transparent EF. + + Args: + ef : string or list of strings indicating name or path of transparent EF + data : hex string of expected data + offset : byte offset in file from which to start verifying + """ + res = self.read_binary(ef, len(data) // 2, offset) + if res[0].lower() != data.lower(): + raise ValueError('Binary verification failed (expected %s, got %s)' % ( + data.lower(), res[0].lower())) + def update_binary(self, ef: Path, data: Hexstr, offset: int = 0, verify: bool = False, conserve: bool = False) -> ResTuple: """Execute UPDATE BINARY. @@ -227,22 +240,9 @@ total_data += data chunk_offset += chunk_len if verify: - self.verify_binary(ef, data, offset) + self.__verify_binary(ef, data, offset) return total_data, chunk_sw - def verify_binary(self, ef, data: str, offset: int = 0): - """Verify contents of transparent EF. - - Args: - ef : string or list of strings indicating name or path of transparent EF - data : hex string of expected data - offset : byte offset in file from which to start verifying - """ - res = self.read_binary(ef, len(data) // 2, offset) - if res[0].lower() != data.lower(): - raise ValueError('Binary verification failed (expected %s, got %s)' % ( - data.lower(), res[0].lower())) - def read_record(self, ef: Path, rec_no: int) -> ResTuple: """Execute READ RECORD. @@ -255,6 +255,19 @@ pdu = self.cla_byte + 'b2%02x04%02x' % (rec_no, rec_length) return self._tp.send_apdu_checksw(pdu) + def __verify_record(self, ef: Path, rec_no: int, data: str): + """Verify record against given data + + Args: + ef : string or list of strings indicating name or path of linear fixed EF + rec_no : record number to read + data : hex string of data to be verified + """ + res = self.read_record(ef, rec_no) + if res[0].lower() != data.lower(): + raise ValueError('Record verification failed (expected %s, got %s)' % ( + data.lower(), res[0].lower())) + def update_record(self, ef: Path, rec_no: int, data: Hexstr, force_len: bool = False, verify: bool = False, conserve: bool = False) -> ResTuple: """Execute UPDATE RECORD. @@ -294,22 +307,9 @@ pdu = (self.cla_byte + 'dc%02x04%02x' % (rec_no, rec_length)) + data res = self._tp.send_apdu_checksw(pdu) if verify: - self.verify_record(ef, rec_no, data) + self.__verify_record(ef, rec_no, data) return res - def verify_record(self, ef: Path, rec_no: int, data: str): - """Verify record against given data - - Args: - ef : string or list of strings indicating name or path of linear fixed EF - rec_no : record number to read - data : hex string of data to be verified - """ - res = self.read_record(ef, rec_no) - if res[0].lower() != data.lower(): - raise ValueError('Record verification failed (expected %s, got %s)' % ( - data.lower(), res[0].lower())) - def record_size(self, ef: Path) -> int: """Determine the record size of given file. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34335?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I57c9af3d6ff45caa4378c400643b4ae1fa42ecac Gerrit-Change-Number: 34335 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0