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

[S] Change in osmo-hnbgw[osmith/1.6.2]: Use new libosmo-sigtran APIs to access osmo_ss7_instance

by osmith

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38746?usp=email ) Change subject: Use new libosmo-sigtran APIs to access osmo_ss7_instance ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: merging this patch series too so we can release this along with osmo-bsc, osmo-msc patch releases that also make them forward compatible with new libosmo-sigtran -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38746?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: osmith/1.6.2 Gerrit-Change-Id: I3549ff3ace641f0b0574a9ddec14120299446434 Gerrit-Change-Number: 38746 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Nov 2024 13:55:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-hnbgw[osmith/1.6.2]: Use new libosmo-sigtran APIs to access osmo_ss7_instance

by osmith

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38746?usp=email ) Change subject: Use new libosmo-sigtran APIs to access osmo_ss7_instance ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38746?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: osmith/1.6.2 Gerrit-Change-Id: I3549ff3ace641f0b0574a9ddec14120299446434 Gerrit-Change-Number: 38746 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Nov 2024 13:55:20 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-hnbgw[osmith/1.6.2]: Add osmo_ss7 APIs

by osmith

osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38736?usp=email ) Change subject: Add osmo_ss7 APIs ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: merging this patch series too so we can release this along with osmo-bsc, osmo-msc patch releases that also make them forward compatible with new libosmo-sigtran -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38736?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: osmith/1.6.2 Gerrit-Change-Id: I9e53953bc56fc5920eefb0a39dbf1e0b9843e00e Gerrit-Change-Number: 38736 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Nov 2024 13:55:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-hnbgw[osmith/1.6.2]: Make compatible with private pfcp structs

by osmith

Attention is currently required from: fixeria, laforge, neels. osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/38735?usp=email ) Change subject: Make compatible with private pfcp structs ...................................................................... Patch Set 2: Code-Review+2 (1 comment) Patchset: PS2: merging this patch series too so we can release this along with osmo-bsc, osmo-msc patch releases that also make them forward compatible with new libosmo-sigtran -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/38735?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hnbgw Gerrit-Branch: osmith/1.6.2 Gerrit-Change-Id: I188e76307deadd9328430afff54dc287eda51370 Gerrit-Change-Number: 38735 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 14 Nov 2024 13:55:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

[XS] Change in osmo-msc[osmith/1.12.2]: Bump version: 1.12.1.1-c21ae → 1.12.2

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/38734?usp=email ) Change subject: Bump version: 1.12.1.1-c21ae → 1.12.2 ...................................................................... Bump version: 1.12.1.1-c21ae → 1.12.2 Change-Id: I50a9f201563d5f708a67e14967ed15742fb58847 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 42dee7b..71fa45a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +osmo-msc (1.12.2) unstable; urgency=medium + + * Make compatible with private sigtran structs + + -- Oliver Smith <osmith(a)sysmocom.de> Wed, 13 Nov 2024 13:11:47 +0100 + osmo-msc (1.12.1) unstable; urgency=medium [ Harald Welte ] -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38734?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-msc Gerrit-Branch: osmith/1.12.2 Gerrit-Change-Id: I50a9f201563d5f708a67e14967ed15742fb58847 Gerrit-Change-Number: 38734 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-msc[osmith/1.12.2]: Make compatible with private sigtran structs

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/38733?usp=email ) Change subject: Make compatible with private sigtran structs ...................................................................... Make compatible with private sigtran structs Adjust OsmoMSC to build with newer versions of libosmo-sigtran, where several structs were made private. This based on Pau's patch 9faff776 ("Use new libosmo-sigtran API osmo_ss7_as_select_asp()"). Related: OS#6617 Change-Id: I6c7d5119174de8d37d1ebe2b47793f9b89cc903c --- M configure.ac M src/libmsc/transaction.c M src/osmo-msc/msc_main.c 3 files changed, 41 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 05bea8a..ba8b198 100644 --- a/configure.ac +++ b/configure.ac @@ -226,6 +226,18 @@ AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) +# OS#6617: check if libosmo-sigtran has private structs +# We need to use grep here, can't set the includedir with AC_CHECK_DECL. +m="OS#6617: checking whether libosmo-sigtran has private structs..." +h="$($PKG_CONFIG --variable=includedir libosmo-sigtran)/osmocom/sigtran/osmo_ss7.h" +f=osmo_ss7_instance_get_primary_pc +if grep -q "$f" "$h"; then + echo "$m yes ($f in $h)" + AC_DEFINE(SIGTRAN_PRIVATE_STRUCTS, [1], ["OS#6617"]) +else + echo "$m no ($f not in $h)" +fi + dnl Generate the output AM_CONFIG_HEADER(config.h) diff --git a/src/libmsc/transaction.c b/src/libmsc/transaction.c index 7ae4c7d..000fe1c 100644 --- a/src/libmsc/transaction.c +++ b/src/libmsc/transaction.c @@ -17,6 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ +#include "config.h" #include <osmocom/msc/transaction.h> #include <osmocom/msc/gsm_data.h> @@ -124,7 +125,12 @@ struct osmo_ss7_instance *ss7 = osmo_sccp_get_ss7(trans->net->a.sri->sccp); struct osmo_lcls *lcls; +#ifdef SIGTRAN_PRIVATE_STRUCTS + const struct osmo_ss7_pc_fmt *pc_fmt = osmo_ss7_instance_get_pc_fmt(ss7); + uint8_t w = osmo_ss7_pc_width(pc_fmt); +#else uint8_t w = osmo_ss7_pc_width(&ss7->cfg.pc_fmt); +#endif if (!trans->net->lcls_permitted) { LOGP(DCC, LOGL_NOTICE, "LCLS disabled globally\n"); @@ -150,7 +156,12 @@ LOGP(DCC, LOGL_INFO, "LCLS: using %u bits (%u bytes) for node ID\n", w, w / 8); lcls->gcr.net_len = 3; + +#ifdef SIGTRAN_PRIVATE_STRUCTS + lcls->gcr.node = osmo_ss7_instance_get_primary_pc(ss7); +#else lcls->gcr.node = ss7->cfg.primary_pc; +#endif /* net id from Q.1902.3 3-5 bytes, this function gives 3 bytes exactly */ osmo_plmn_to_bcd(lcls->gcr.net, &trans->msc_a->via_cell.lai.plmn); diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index a4b2ded..65629ca 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -803,10 +803,21 @@ ret = 10; goto error; } + +#ifdef SIGTRAN_PRIVATE_STRUCTS + const struct osmo_ss7_instance *ss7; + ss7 = osmo_sccp_get_ss7(msc_network->a.sri->sccp); + OSMO_ASSERT(ss7); + LOGP(DMSC, LOGL_NOTICE, "A-interface: SCCP user %s, cs7-instance %u (%s)\n", + osmo_sccp_user_name(msc_network->a.sri->scu), + osmo_ss7_instance_get_id(ss7), + osmo_ss7_instance_get_name(ss7)); +#else LOGP(DMSC, LOGL_NOTICE, "A-interface: SCCP user %s, cs7-instance %u (%s)\n", osmo_sccp_user_name(msc_network->a.sri->scu), osmo_sccp_get_ss7(msc_network->a.sri->sccp)->cfg.id, osmo_sccp_get_ss7(msc_network->a.sri->sccp)->cfg.name); +#endif #ifdef BUILD_IU talloc_asn1_ctx = talloc_named_const(tall_msc_ctx, 0, "asn1"); @@ -823,11 +834,18 @@ /* Compatibility with legacy osmo-hnbgw that was unable to properly handle RESET messages. */ msc_network->iu.sri->ignore_missing_reset = true; +#ifdef SIGTRAN_PRIVATE_STRUCTS + LOGP(DMSC, LOGL_NOTICE, "Iu-interface: SCCP user %s, cs7-instance %u (%s)\n", + osmo_sccp_user_name(msc_network->iu.sri->scu), + osmo_ss7_instance_get_id(ss7), + osmo_ss7_instance_get_name(ss7)); +#else LOGP(DMSC, LOGL_NOTICE, "Iu-interface: SCCP user %s, cs7-instance %u (%s)\n", osmo_sccp_user_name(msc_network->iu.sri->scu), osmo_sccp_get_ss7(msc_network->iu.sri->sccp)->cfg.id, osmo_sccp_get_ss7(msc_network->iu.sri->sccp)->cfg.name); #endif +#endif /* BUILD_IU */ /* Init RRLP handlers */ msc_rrlp_init(); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38733?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-msc Gerrit-Branch: osmith/1.12.2 Gerrit-Change-Id: I6c7d5119174de8d37d1ebe2b47793f9b89cc903c Gerrit-Change-Number: 38733 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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-Reviewer: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[XS] Change in osmo-bsc[osmith/1.12.2]: Use new libosmo-sigtran API osmo_ss7_as_get_asp_protocol()

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38759?usp=email ) Change subject: Use new libosmo-sigtran API osmo_ss7_as_get_asp_protocol() ...................................................................... Use new libosmo-sigtran API osmo_ss7_as_get_asp_protocol() Depends: libosmo-sigtran.git Change-Id I6171287c9bc76db6561f8ff92c4aebe453efaa7d Change-Id: I58b9713ae247a7e28c004170dd890a78c03c39c0 (cherry picked from commit dba60c5a95a0f2809ad353144c27a449c6f2c227) --- M TODO-RELEASE M src/osmo-bsc/bsc_ctrl.c 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Verified fixeria: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index b5cd5cc..193735c 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,4 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmo-sigtran >2.0.1 Use API osmo_ss7_route_get_dest_as(), osmo_ss7_instance_get_id() +libosmo-sigtran >2.0.1 Use API osmo_ss7_route_get_dest_as(), osmo_ss7_instance_get_id(), osmo_ss7_as_get_asp_protocol() diff --git a/src/osmo-bsc/bsc_ctrl.c b/src/osmo-bsc/bsc_ctrl.c index a8224ee..06553da 100644 --- a/src/osmo-bsc/bsc_ctrl.c +++ b/src/osmo-bsc/bsc_ctrl.c @@ -672,7 +672,7 @@ } /* don't attempt to send CTRL on a non-SCCPlite AS */ - if (as->cfg.proto != OSMO_SS7_ASP_PROT_IPA) { + if (osmo_ss7_as_get_asp_protocol(as) != OSMO_SS7_ASP_PROT_IPA) { msgb_free(msg); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38759?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bsc Gerrit-Branch: osmith/1.12.2 Gerrit-Change-Id: I58b9713ae247a7e28c004170dd890a78c03c39c0 Gerrit-Change-Number: 38759 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-CC: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-bsc[osmith/1.12.2]: Use new libosmo-sigtran API osmo_ss7_as_select_asp()

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38760?usp=email ) Change subject: Use new libosmo-sigtran API osmo_ss7_as_select_asp() ...................................................................... Use new libosmo-sigtran API osmo_ss7_as_select_asp() Depends: libosmo-sigtran.git Change-Id b9f6b542bbae925e23ca7c4de27cdff59021ccb9 Change-Id: I0f2e3d6cbdf443c0194b61df7479aecf4073e19c (cherry picked from commit 9faff7766f0f091ac84463c3670e4d38ee0ff38e) --- M src/osmo-bsc/bsc_ctrl.c 1 file changed, 8 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/osmo-bsc/bsc_ctrl.c b/src/osmo-bsc/bsc_ctrl.c index 06553da..de7060b 100644 --- a/src/osmo-bsc/bsc_ctrl.c +++ b/src/osmo-bsc/bsc_ctrl.c @@ -644,26 +644,10 @@ return as; } -static int _ss7_as_send(struct osmo_ss7_as *as, struct msgb *msg) -{ - struct osmo_ss7_asp *asp; - unsigned int i; - - /* FIXME: unify with xua_as_transmit_msg() and perform proper ASP lookup */ - for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) { - asp = as->cfg.asps[i]; - if (!asp) - continue; - /* FIXME: deal with multiple ASPs per AS */ - return osmo_ss7_asp_send(asp, msg); - } - msgb_free(msg); - return -1; -} - int bsc_sccplite_msc_send(struct bsc_msc_data *msc, struct msgb *msg) { struct osmo_ss7_as *as; + struct osmo_ss7_asp *asp; as = msc_get_ss7_as(msc); if (!as) { @@ -677,7 +661,13 @@ return 0; } - return _ss7_as_send(as, msg); + asp = osmo_ss7_as_select_asp(as); + if (!asp) { + LOGP(DCTRL, LOGL_NOTICE, "No ASP found for AS, dropping message\n"); + msgb_free(msg); + return -1; + } + return osmo_ss7_asp_send(asp, msg); } /* Encode a CTRL command and send it to the given ASP -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38760?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bsc Gerrit-Branch: osmith/1.12.2 Gerrit-Change-Id: I0f2e3d6cbdf443c0194b61df7479aecf4073e19c Gerrit-Change-Number: 38760 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-CC: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

[S] Change in osmo-bsc[osmith/1.12.2]: Bump version: 1.12.1.8-e322d → 1.12.2

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38761?usp=email ) Change subject: Bump version: 1.12.1.8-e322d → 1.12.2 ...................................................................... Bump version: 1.12.1.8-e322d → 1.12.2 Change-Id: Idc930e934f0b8d1b1a3ec698517657a6d3ce8cda --- M TODO-RELEASE M debian/changelog 2 files changed, 16 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/TODO-RELEASE b/TODO-RELEASE index 193735c..0ed7189 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,4 +7,3 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmo-sigtran >2.0.1 Use API osmo_ss7_route_get_dest_as(), osmo_ss7_instance_get_id(), osmo_ss7_as_get_asp_protocol() diff --git a/debian/changelog b/debian/changelog index d0f2d5b..a05f00c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +osmo-bsc (1.12.2) unstable; urgency=medium + + [ Oliver Smith ] + * Add osmo_ss7 APIs + + [ Pau Espin Pedrol ] + * bsc_ctrl: Use new libosmo-sigtran API osmo_ss7_route_get_dest_as() + * lb: Avoid using osmo_ss7_instance private field + * Use new libosmo-sigtran API osmo_ss7_instance_get_id() + * Use new libosmo-sigtran API osmo_ss7_instances_llist_entry() + * bsc_sccplite_msc_send(): Fix msgb leak + * Use new libosmo-sigtran API osmo_ss7_as_get_asp_protocol() + * Use new libosmo-sigtran API osmo_ss7_as_select_asp() + + -- Oliver Smith <osmith(a)sysmocom.de> Wed, 13 Nov 2024 14:42:07 +0100 + osmo-bsc (1.12.1) unstable; urgency=medium [ Vadim Yanitskiy ] -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38761?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bsc Gerrit-Branch: osmith/1.12.2 Gerrit-Change-Id: Idc930e934f0b8d1b1a3ec698517657a6d3ce8cda Gerrit-Change-Number: 38761 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>

7 months, 2 weeks

1
0
0 0

[XS] Change in osmo-bsc[osmith/1.12.2]: bsc_ctrl: Use new libosmo-sigtran API osmo_ss7_route_get_dest_as()

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/38754?usp=email ) Change subject: bsc_ctrl: Use new libosmo-sigtran API osmo_ss7_route_get_dest_as() ...................................................................... bsc_ctrl: Use new libosmo-sigtran API osmo_ss7_route_get_dest_as() Use this new API instead of accessing the route struct directly. Depends: libosmo-sigtran.git Change-Id Ife63bd384d247a761e0b89505ea71c41a4a16d9b Change-Id: I198351fba4cfeba310b397c964e5306cd73189ba (cherry picked from commit a8da1040e876cadc2d41943c896683f228533092) --- M TODO-RELEASE M src/osmo-bsc/bsc_ctrl.c 2 files changed, 6 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Verified fixeria: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index 0ed7189..c073b60 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmo-sigtran >2.0.1 Use API osmo_ss7_route_get_dest_as() \ No newline at end of file diff --git a/src/osmo-bsc/bsc_ctrl.c b/src/osmo-bsc/bsc_ctrl.c index caef66e..2138c65 100644 --- a/src/osmo-bsc/bsc_ctrl.c +++ b/src/osmo-bsc/bsc_ctrl.c @@ -633,11 +633,15 @@ static struct osmo_ss7_as *msc_get_ss7_as(struct bsc_msc_data *msc) { struct osmo_ss7_route *rt; + struct osmo_ss7_as *as; struct osmo_ss7_instance *ss7 = osmo_sccp_get_ss7(msc->a.sccp); rt = osmo_ss7_route_lookup(ss7, msc->a.msc_addr.pc); if (!rt) return NULL; - return rt->dest.as; + as = osmo_ss7_route_get_dest_as(rt); + if (!as) + return NULL; + return as; } static int _ss7_as_send(struct osmo_ss7_as *as, struct msgb *msg) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/38754?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-bsc Gerrit-Branch: osmith/1.12.2 Gerrit-Change-Id: I198351fba4cfeba310b397c964e5306cd73189ba Gerrit-Change-Number: 38754 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-CC: pespin <pespin(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024