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

[S] Change in osmo-msc[master]: vlr: vlr_auth_fsm: make the fsm instance private

by fixeria

Attention is currently required from: lynxis lazus. fixeria has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-msc/+/38413?usp=email ) Change subject: vlr: vlr_auth_fsm: make the fsm instance private ...................................................................... Patch Set 8: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-msc/+/38413/comment/270ba742_e9c6555c?usp… : PS8, Line 7: instance nitpick: it's not really `struct osmo_fsm_inst` that you're making private, but the FSM definition `struct osmo_fsm`. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/38413?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iec85f299cd99879475ab094998433d935e980394 Gerrit-Change-Number: 38413 Gerrit-PatchSet: 8 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 12 Nov 2024 13:47:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

7 months, 2 weeks

1
0
0 0

[M] Change in libosmo-sigtran[master]: cosmetic: osmo_ss7: Rearrange some contents

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38721?usp=email ) Change subject: cosmetic: osmo_ss7: Rearrange some contents ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38721?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I592db59e27fa7b401d1281921e38817772308c00 Gerrit-Change-Number: 38721 Gerrit-PatchSet: 5 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: Tue, 12 Nov 2024 13:47:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

[M] Change in libosmo-sigtran[master]: sigtran: Make osmo_ss7_as struct private

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38720?usp=email ) Change subject: sigtran: Make osmo_ss7_as struct private ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38720?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I8c6513e6d2c152e853270fa5b488b606a3d18b14 Gerrit-Change-Number: 38720 Gerrit-PatchSet: 5 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: Tue, 12 Nov 2024 13:47:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

[XL] Change in libosmo-sigtran[master]: sigtran: Make osmo_ss7_instance struct private

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38664?usp=email ) Change subject: sigtran: Make osmo_ss7_instance struct private ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38664?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I4562fe21535c5aa468ac0e3831d505bf08b336ec Gerrit-Change-Number: 38664 Gerrit-PatchSet: 9 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: Tue, 12 Nov 2024 13:47:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

[M] Change in libosmo-sigtran[master]: sigtran: Make osmo_ss7_asp_peer private

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38647?usp=email ) Change subject: sigtran: Make osmo_ss7_asp_peer private ...................................................................... Patch Set 9: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38647?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I6729cc599af3a799d89bc0514d223c84f2233a4b Gerrit-Change-Number: 38647 Gerrit-PatchSet: 9 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: Tue, 12 Nov 2024 13:47:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

[M] Change in libosmo-sigtran[master]: sigtran: Make osmo_ss7_asp struct private

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38645?usp=email ) Change subject: sigtran: Make osmo_ss7_asp struct private ...................................................................... Patch Set 11: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38645?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I5839b4dd04468af20d1836386dcc722e7a83ac5f Gerrit-Change-Number: 38645 Gerrit-PatchSet: 11 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: Tue, 12 Nov 2024 13:47:10 +0000 Gerrit-HasComments: No 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-38bf4 → 1.12.2

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-msc/+/38734?usp=email ) Change subject: Bump version: 1.12.1.1-38bf4 → 1.12.2 ...................................................................... Patch Set 1: Code-Review+1 -- 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: comment Gerrit-Project: osmo-msc Gerrit-Branch: osmith/1.12.2 Gerrit-Change-Id: I50a9f201563d5f708a67e14967ed15742fb58847 Gerrit-Change-Number: 38734 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Nov 2024 13:44:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 2 weeks

1
0
0 0

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

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/osmo-msc/+/38733?usp=email ) Change subject: Make compatible with private sigtran structs ...................................................................... Patch Set 1: Code-Review+1 -- 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: comment Gerrit-Project: osmo-msc Gerrit-Branch: osmith/1.12.2 Gerrit-Change-Id: I6c7d5119174de8d37d1ebe2b47793f9b89cc903c Gerrit-Change-Number: 38733 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Nov 2024 13:42:37 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

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 uploaded this change for review. ( 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, 35 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/33/38733/1 diff --git a/configure.ac b/configure.ac index 05bea8a..153f892 100644 --- a/configure.ac +++ b/configure.ac @@ -226,6 +226,12 @@ AC_MSG_RESULT([CFLAGS="$CFLAGS"]) AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"]) +# OS#6617 +AC_CHECK_DECL([osmo_ss7_instance_get_primary_pc], + [AC_DEFINE(SIGTRAN_PRIVATE_STRUCTS, [1], ["OS#6617"])], + [], + [[#include <osmocom/sigtran/osmo_ss7.h>]]) + 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: newchange Gerrit-Project: osmo-msc Gerrit-Branch: osmith/1.12.2 Gerrit-Change-Id: I6c7d5119174de8d37d1ebe2b47793f9b89cc903c Gerrit-Change-Number: 38733 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

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

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/38734?usp=email ) Change subject: Bump version: 1.12.1.1-38bf4 → 1.12.2 ...................................................................... Bump version: 1.12.1.1-38bf4 → 1.12.2 Change-Id: I50a9f201563d5f708a67e14967ed15742fb58847 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/34/38734/1 diff --git a/debian/changelog b/debian/changelog index 42dee7b..d9669d5 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> Tue, 12 Nov 2024 14:22:54 +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: newchange Gerrit-Project: osmo-msc Gerrit-Branch: osmith/1.12.2 Gerrit-Change-Id: I50a9f201563d5f708a67e14967ed15742fb58847 Gerrit-Change-Number: 38734 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

7 months, 2 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024