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

[M] Change in osmo-hnbgw[master]: cfg: add 'hnbgw' / 'plmn MCC MNC'
by neels 05 Jun '23

05 Jun '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/33178 ) Change subject: cfg: add 'hnbgw' / 'plmn MCC MNC' ...................................................................... cfg: add 'hnbgw' / 'plmn MCC MNC' According to 3GPP TS 25.413 8.26.2.2, "The RNC shall include the Global RNC-ID IE in the RESET message." To be able to do that, osmo-hnbgw needs to know the local PLMN. Introduce explicit knowledge of the local PLMN by config, and use this configured local PLMN in places where the local PLMN was so far derived otherwise. Subsequent patches will separately add the RNC-ID to the RANAP RESET messages. Related: SYS#6441 Change-Id: If404c3859acdfba274c719c7cb7d16f97d831a2a --- M include/osmocom/hnbgw/hnbgw.h M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_l3.c M src/osmo-hnbgw/hnbgw_vty.c M tests/osmo-hnbgw.vty 5 files changed, 108 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/78/33178/1 diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h index ed3cd62..e62fc71 100644 --- a/include/osmocom/hnbgw/hnbgw.h +++ b/include/osmocom/hnbgw/hnbgw.h @@ -6,6 +6,7 @@ #include <osmocom/core/write_queue.h> #include <osmocom/core/timer.h> #include <osmocom/core/rate_ctr.h> +#include <osmocom/gsm/gsm23003.h> #include <osmocom/sigtran/sccp_sap.h> #include <osmocom/sigtran/osmo_ss7.h> #include <osmocom/ctrl/control_if.h> @@ -253,6 +254,7 @@ /*! The UDP port where we receive multiplexed CS user * plane traffic from HNBs */ uint16_t iuh_cs_mux_port; + struct osmo_plmn_id plmn; uint16_t rnc_id; bool hnbap_allow_tmsi; /*! print hnb-id (true) or MCC-MNC-LAC-RAC-SAC (false) in logs */ diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index fdd6a86..61a8542 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -57,6 +57,9 @@ g_hnbgw->config.iuh_local_port = IUH_DEFAULT_SCTP_PORT; g_hnbgw->config.log_prefix_hnb_id = true; + /* Set zero PLMN to detect a missing PLMN when transmitting RESET */ + g_hnbgw->config.plmn = (struct osmo_plmn_id){ 0, 0, false }; + g_hnbgw->next_ue_ctx_id = 23; INIT_LLIST_HEAD(&g_hnbgw->hnb_list); INIT_LLIST_HEAD(&g_hnbgw->ue_list); diff --git a/src/osmo-hnbgw/hnbgw_l3.c b/src/osmo-hnbgw/hnbgw_l3.c index 607bfc5..ccb4bac 100644 --- a/src/osmo-hnbgw/hnbgw_l3.c +++ b/src/osmo-hnbgw/hnbgw_l3.c @@ -267,15 +267,21 @@ static int peek_l3_initial_ue(struct hnbgw_context_map *map, const RANAP_InitialUE_MessageIEs_t *ies) { - struct osmo_plmn_id plmn; + struct osmo_plmn_id local_plmn; - if (ies->lai.pLMNidentity.size < 3) { - LOGP(DCN, LOGL_ERROR, "Missing PLMN in RANAP InitialUE message\n"); - return -EINVAL; + if (g_hnbgw->config.plmn.mcc) { + /* The user has configured a PLMN */ + local_plmn = g_hnbgw->config.plmn; + } else { + /* The user has not configured a PLMN, gues from the InitialUE message's LAI IE's PLMN */ + if (ies->lai.pLMNidentity.size < 3) { + LOGP(DCN, LOGL_ERROR, "Missing PLMN in RANAP InitialUE message\n"); + return -EINVAL; + } + osmo_plmn_from_bcd(ies->lai.pLMNidentity.buf, &local_plmn); } - osmo_plmn_from_bcd(ies->lai.pLMNidentity.buf, &plmn); - return peek_l3_nas(map, ies->nas_pdu.buf, ies->nas_pdu.size, &plmn); + return peek_l3_nas(map, ies->nas_pdu.buf, ies->nas_pdu.size, &local_plmn); } /* Extract a Layer 3 message (NAS PDU) from the RANAP message, and put the info obtained in map->l3. This is relevant diff --git a/src/osmo-hnbgw/hnbgw_vty.c b/src/osmo-hnbgw/hnbgw_vty.c index bee34f1..8cbe249 100644 --- a/src/osmo-hnbgw/hnbgw_vty.c +++ b/src/osmo-hnbgw/hnbgw_vty.c @@ -281,6 +281,28 @@ return CMD_SUCCESS; } +DEFUN(cfg_hnbgw_plmn, cfg_hnbgw_plmn_cmd, + "plmn <1-999> <0-999>", + "Configure the HNBGW's PLMN. The PLMN is transmitted in RANAP RESET towards the CN.\n" + "MCC, Mobile Country Code\n" + "MNC, Mobile Network Code\n") +{ + struct osmo_plmn_id plmn; + + if (osmo_mcc_from_str(argv[0], &plmn.mcc)) { + vty_out(vty, "%% Error decoding MCC: %s%s", argv[0], VTY_NEWLINE); + return CMD_WARNING; + } + + if (osmo_mnc_from_str(argv[1], &plmn.mnc, &plmn.mnc_3_digits)) { + vty_out(vty, "%% Error decoding MNC: %s%s", argv[1], VTY_NEWLINE); + return CMD_WARNING; + } + + g_hnbgw->config.plmn = plmn; + return CMD_SUCCESS; +} + DEFUN(cfg_hnbgw_rnc_id, cfg_hnbgw_rnc_id_cmd, "rnc-id <0-65535>", "Configure the HNBGW's RNC Id, the common RNC Id used for all connected hNodeB. It is sent to" @@ -849,6 +871,12 @@ { vty_out(vty, "hnbgw%s", VTY_NEWLINE); + if (g_hnbgw->config.plmn.mcc) + vty_out(vty, " plmn %s %s%s", + osmo_mcc_name_c(OTC_SELECT, g_hnbgw->config.plmn.mcc), + osmo_mnc_name_c(OTC_SELECT, g_hnbgw->config.plmn.mnc, g_hnbgw->config.plmn.mnc_3_digits), + VTY_NEWLINE); + vty_out(vty, " rnc-id %u%s", g_hnbgw->config.rnc_id, VTY_NEWLINE); vty_out(vty, " log-prefix %s%s", g_hnbgw->config.log_prefix_hnb_id ? "hnb-id" : "umts-cell-id", @@ -941,6 +969,7 @@ install_element(CONFIG_NODE, &cfg_hnbgw_cmd); install_node(&hnbgw_node, config_write_hnbgw); + install_element(HNBGW_NODE, &cfg_hnbgw_plmn_cmd); install_element(HNBGW_NODE, &cfg_hnbgw_rnc_id_cmd); install_element(HNBGW_NODE, &cfg_hnbgw_log_prefix_cmd); install_element(HNBGW_NODE, &cfg_hnbgw_max_sccp_cr_payload_len_cmd); diff --git a/tests/osmo-hnbgw.vty b/tests/osmo-hnbgw.vty index 72916fb..41bcb73 100644 --- a/tests/osmo-hnbgw.vty +++ b/tests/osmo-hnbgw.vty @@ -11,6 +11,7 @@ OsmoHNBGW(config)# hnbgw OsmoHNBGW(config-hnbgw)# list ... + plmn <1-999> <0-999> rnc-id <0-65535> log-prefix (hnb-id|umts-cell-id) iuh @@ -18,6 +19,46 @@ iups ... +OsmoHNBGW(config-hnbgw)# plmn? + plmn Configure the HNBGW's PLMN. The PLMN is transmitted in RANAP RESET towards the CN. +OsmoHNBGW(config-hnbgw)# plmn ? + <1-999> MCC, Mobile Country Code +OsmoHNBGW(config-hnbgw)# plmn 1 ? + <0-999> MNC, Mobile Network Code +OsmoHNBGW(config-hnbgw)# show running-config +... !plmn +OsmoHNBGW(config-hnbgw)# plmn 001 01 +OsmoHNBGW(config-hnbgw)# show running-config +... +hnbgw +... + plmn 001 01 +... + +OsmoHNBGW(config-hnbgw)# plmn 001 001 +OsmoHNBGW(config-hnbgw)# show running-config +... +hnbgw +... + plmn 001 001 +... + +OsmoHNBGW(config-hnbgw)# plmn 999 999 +OsmoHNBGW(config-hnbgw)# show running-config +... +hnbgw +... + plmn 999 999 +... + +OsmoHNBGW(config-hnbgw)# plmn 23 42 +OsmoHNBGW(config-hnbgw)# show running-config +... +hnbgw +... + plmn 023 42 +... + OsmoHNBGW(config-hnbgw)# rnc-id? rnc-id Configure the HNBGW's RNC Id, the common RNC Id used for all connected hNodeB. It is sent to each hNodeB upon HNBAP HNB-Register-Accept, and the hNodeB will subsequently send this as RANAP InitialUE Messages' GlobalRNC-ID IE. Takes effect as soon as the hNodeB re-registers. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/33178 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: If404c3859acdfba274c719c7cb7d16f97d831a2a Gerrit-Change-Number: 33178 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-hnbgw[master]: fix umts_cell_id_name(): show CID
by neels 05 Jun '23

05 Jun '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/33169 ) Change subject: fix umts_cell_id_name(): show CID ...................................................................... fix umts_cell_id_name(): show CID The Cell ID is an important part to distinguish HNB in logging, add it to the output string. Use OTC_SELECT buffer instead of static buffer. Related: SYS#6412 Change-Id: Id903b8579ded8b908e644808e440d373bcca8da4 --- M src/osmo-hnbgw/hnbgw.c 1 file changed, 17 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/69/33169/1 diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index 1fd04e1..bc5cd9f 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -345,10 +345,8 @@ static const char *umts_cell_id_name(const struct umts_cell_id *ucid) { - static __thread char buf[40]; - - snprintf(buf, sizeof(buf), "%u-%u-L%u-R%u-S%u", ucid->mcc, ucid->mnc, ucid->lac, ucid->rac, ucid->sac); - return buf; + return talloc_asprintf(OTC_SELECT, "%u-%u-L%u-R%u-S%u-C%u", ucid->mcc, ucid->mnc, ucid->lac, ucid->rac, + ucid->sac, ucid->cid); } const char *hnb_context_name(struct hnb_context *ctx) -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/33169 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Id903b8579ded8b908e644808e440d373bcca8da4 Gerrit-Change-Number: 33169 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-hnbgw[master]: doc/examples/osmo-hnbgw/osmo-hnbgw-cnpool.cfg
by neels 05 Jun '23

05 Jun '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/33168 ) Change subject: doc/examples/osmo-hnbgw/osmo-hnbgw-cnpool.cfg ...................................................................... doc/examples/osmo-hnbgw/osmo-hnbgw-cnpool.cfg Change-Id: I932eca7489f29eab23d180cd6d1216d26c62dd30 --- A doc/examples/osmo-hnbgw/osmo-hnbgw-cnpool.cfg 1 file changed, 48 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/68/33168/1 diff --git a/doc/examples/osmo-hnbgw/osmo-hnbgw-cnpool.cfg b/doc/examples/osmo-hnbgw/osmo-hnbgw-cnpool.cfg new file mode 100644 index 0000000..2d0348d --- /dev/null +++ b/doc/examples/osmo-hnbgw/osmo-hnbgw-cnpool.cfg @@ -0,0 +1,39 @@ +log stderr + logging filter all 1 + logging color 1 + logging print level 1 + logging print category 1 + logging print category-hex 0 + logging print file basename last + logging print extended-timestamp 1 + logging level set-all notice + +cs7 instance 0 + point-code 0.42.0 + + sccp-address my-msc-0 + point-code 0.1.0 + sccp-address my-msc-1 + point-code 0.1.1 + sccp-address my-sgsn-0 + point-code 0.2.0 + +hnbgw + iucs + nri bitlen 10 + nri null add 0 7 + iups + nri bitlen 8 + nri null add 0 5 + +msc 0 + remote-addr my-msc-0 + nri add 128 255 + +msc 1 + remote-addr my-msc-1 + nri add 256 511 + +sgsn 0 + remote-addr my-sgsn-0 + nri add 128 255 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/33168 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I932eca7489f29eab23d180cd6d1216d26c62dd30 Gerrit-Change-Number: 33168 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-hnbgw[master]: make public: umts_cell_id_name()
by neels 05 Jun '23

05 Jun '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/33170 ) Change subject: make public: umts_cell_id_name() ...................................................................... make public: umts_cell_id_name() Upcoming logging tweaks will call this from hnbgw_hnbap.c as well. See I41275d8c3e272177976a9302795884666c35cd06 Related: SYS#6412 Change-Id: I499d18876685062d066a9a66d2def827efb77640 --- M include/osmocom/hnbgw/hnbgw.h M src/osmo-hnbgw/hnbgw.c 2 files changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/70/33170/1 diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h index 62e5392..90aee5b 100644 --- a/include/osmocom/hnbgw/hnbgw.h +++ b/include/osmocom/hnbgw/hnbgw.h @@ -71,6 +71,7 @@ uint16_t sac; /*!< Service Area Code */ uint32_t cid; /*!< Cell ID */ }; +const char *umts_cell_id_name(const struct umts_cell_id *ucid); struct hnbgw_context_map; diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index bc5cd9f..f435043 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -343,7 +343,7 @@ return ctx; } -static const char *umts_cell_id_name(const struct umts_cell_id *ucid) +const char *umts_cell_id_name(const struct umts_cell_id *ucid) { return talloc_asprintf(OTC_SELECT, "%u-%u-L%u-R%u-S%u-C%u", ucid->mcc, ucid->mnc, ucid->lac, ucid->rac, ucid->sac, ucid->cid); -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/33170 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I499d18876685062d066a9a66d2def827efb77640 Gerrit-Change-Number: 33170 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-hnbgw[master]: ctrl test: also test msc 1
by neels 05 Jun '23

05 Jun '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/33172 ) Change subject: ctrl test: also test msc 1 ...................................................................... ctrl test: also test msc 1 Change-Id: I957dca863b6cdc8b077f2ec2b2894cebe7613736 --- M tests/Makefile.am M tests/test_nodes.ctrl 2 files changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/72/33172/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 63ce3fe..d499c33 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -78,7 +78,7 @@ ctrl-test: $(top_builddir)/src/osmo-hnbgw/osmo-hnbgw osmo_verify_transcript_ctrl.py -v \ -p 4262 \ - -r "$(top_builddir)/src/osmo-hnbgw/osmo-hnbgw -c $(top_srcdir)/doc/examples/osmo-hnbgw/osmo-hnbgw.cfg" \ + -r "$(top_builddir)/src/osmo-hnbgw/osmo-hnbgw -c $(top_srcdir)/doc/examples/osmo-hnbgw/osmo-hnbgw-cnpool.cfg" \ $(U) $(srcdir)/$(CTRL_TEST) check-local: atconfig $(TESTSUITE) diff --git a/tests/test_nodes.ctrl b/tests/test_nodes.ctrl index 2ce5428..4223187 100644 --- a/tests/test_nodes.ctrl +++ b/tests/test_nodes.ctrl @@ -9,3 +9,6 @@ GET 4 rate_ctr.abs.sgsn.0.cnpool:emerg:forwarded GET_REPLY 4 rate_ctr.abs.sgsn.0.cnpool:emerg:forwarded 0 + +GET 5 rate_ctr.abs.msc.1.cnpool:subscr:new +GET_REPLY 5 rate_ctr.abs.msc.1.cnpool:subscr:new 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/33172 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I957dca863b6cdc8b077f2ec2b2894cebe7613736 Gerrit-Change-Number: 33172 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-hnbgw[master]: cnpool: add context_map_cnlink_lost() handling
by neels 05 Jun '23

05 Jun '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/33173 ) Change subject: cnpool: add context_map_cnlink_lost() handling ...................................................................... cnpool: add context_map_cnlink_lost() handling When proper RANAP RESET handling is in place [1], a specific CN link may be detected to be disconnected or reconnected at any point. [1] Id3eefdea889a736fd5957b80280fa45b9547b792 When that happens, all related context maps should disconnect RUA and SCCP links immediately. Add the context map side of this, so that context_map_cnlink_lost() is ready to be dispatched in [1]. Related: SYS#6412 Change-Id: Ic0a6fcfb747dc093528ca2bd12a269ad390d465c --- M include/osmocom/hnbgw/context_map.h M src/osmo-hnbgw/context_map.c M src/osmo-hnbgw/context_map_sccp.c 3 files changed, 37 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/73/33173/1 diff --git a/include/osmocom/hnbgw/context_map.h b/include/osmocom/hnbgw/context_map.h index f7335a7..1641a84 100644 --- a/include/osmocom/hnbgw/context_map.h +++ b/include/osmocom/hnbgw/context_map.h @@ -66,6 +66,8 @@ /* The human admin asks to drop the current SCCP connection, by telnet VTY 'apply sccp' in presence of SCCP * config changes. */ MAP_SCCP_EV_USER_ABORT, + /* The CN link has RESET */ + MAP_SCCP_EV_CN_LINK_LOST, }; /* For context_map_get_state(), to combine the RUA and SCCP states, for VTY reporting only. */ @@ -186,6 +188,7 @@ bool map_rua_is_active(struct hnbgw_context_map *map); bool map_sccp_is_active(struct hnbgw_context_map *map); +void context_map_cnlink_lost(struct hnbgw_context_map *map); void context_map_free(struct hnbgw_context_map *map); unsigned int msg_has_l2_data(const struct msgb *msg); diff --git a/src/osmo-hnbgw/context_map.c b/src/osmo-hnbgw/context_map.c index 045053c..73a7ecc 100644 --- a/src/osmo-hnbgw/context_map.c +++ b/src/osmo-hnbgw/context_map.c @@ -183,6 +183,11 @@ map_rua_dispatch(map, MAP_RUA_EV_HNB_LINK_LOST, NULL); } +void context_map_cnlink_lost(struct hnbgw_context_map *map) +{ + map_sccp_dispatch(map, MAP_SCCP_EV_RAN_LINK_LOST, NULL); +} + void context_map_free(struct hnbgw_context_map *map) { /* guard against FSM termination infinitely looping back here */ diff --git a/src/osmo-hnbgw/context_map_sccp.c b/src/osmo-hnbgw/context_map_sccp.c index 1f2cd09..9b4837d 100644 --- a/src/osmo-hnbgw/context_map_sccp.c +++ b/src/osmo-hnbgw/context_map_sccp.c @@ -55,6 +55,7 @@ OSMO_VALUE_STRING(MAP_SCCP_EV_RAN_LINK_LOST), OSMO_VALUE_STRING(MAP_SCCP_EV_RX_RELEASED), OSMO_VALUE_STRING(MAP_SCCP_EV_USER_ABORT), + OSMO_VALUE_STRING(MAP_SCCP_EV_CN_LINK_LOST), {} }; @@ -284,6 +285,7 @@ case MAP_SCCP_EV_RAN_LINK_LOST: case MAP_SCCP_EV_RAN_DISC: case MAP_SCCP_EV_USER_ABORT: + case MAP_SCCP_EV_CN_LINK_LOST: /* No CR has been sent yet, just go to disconnected state. */ if (msg_has_l2_data(ranap_msg)) LOG_MAP(map, DLSCCP, LOGL_ERROR, "SCCP not connected, cannot dispatch RANAP message\n"); @@ -321,6 +323,7 @@ case MAP_SCCP_EV_RAN_LINK_LOST: case MAP_SCCP_EV_RAN_DISC: case MAP_SCCP_EV_USER_ABORT: + case MAP_SCCP_EV_CN_LINK_LOST: /* RUA connection was terminated. First wait for the CC before releasing the SCCP conn. */ if (msg_has_l2_data(ranap_msg)) LOGPFSML(fi, LOGL_ERROR, "Connection not yet confirmed, cannot forward RANAP to CN\n"); @@ -379,6 +382,8 @@ * Disconnect on the SCCP layer, ungracefully. */ case MAP_SCCP_EV_USER_ABORT: /* The user is asking for disconnection, so there is no Iu Release in progress. Disconnect now. */ + case MAP_SCCP_EV_CN_LINK_LOST: + /* The CN peer has sent a RANAP RESET, so the old link that this map ran on is lost */ /* There won't be any ranap_msg, but if a caller wants to dispatch a msg, forward it before * disconnecting. */ @@ -448,6 +453,7 @@ return; case MAP_SCCP_EV_USER_ABORT: + case MAP_SCCP_EV_CN_LINK_LOST: /* Stop waiting for RLSD, send RLSD now. */ tx_sccp_rlsd(fi); map_sccp_fsm_state_chg(MAP_SCCP_ST_DISCONNECTED); @@ -525,6 +531,7 @@ | S(MAP_SCCP_EV_RAN_LINK_LOST) | S(MAP_SCCP_EV_RX_RELEASED) | S(MAP_SCCP_EV_USER_ABORT) + | S(MAP_SCCP_EV_CN_LINK_LOST) , .out_state_mask = 0 | S(MAP_SCCP_ST_INIT) @@ -542,6 +549,7 @@ | S(MAP_SCCP_EV_RAN_LINK_LOST) | S(MAP_SCCP_EV_RX_RELEASED) | S(MAP_SCCP_EV_USER_ABORT) + | S(MAP_SCCP_EV_CN_LINK_LOST) , .out_state_mask = 0 | S(MAP_SCCP_ST_CONNECTED) @@ -559,6 +567,7 @@ | S(MAP_SCCP_EV_RX_RELEASED) | S(MAP_SCCP_EV_RX_CONNECTION_CONFIRM) | S(MAP_SCCP_EV_USER_ABORT) + | S(MAP_SCCP_EV_CN_LINK_LOST) , .out_state_mask = 0 | S(MAP_SCCP_ST_WAIT_RLSD) @@ -577,6 +586,7 @@ | S(MAP_SCCP_EV_RAN_LINK_LOST) | S(MAP_SCCP_EV_RX_CONNECTION_CONFIRM) | S(MAP_SCCP_EV_USER_ABORT) + | S(MAP_SCCP_EV_CN_LINK_LOST) , .out_state_mask = 0 | S(MAP_SCCP_ST_DISCONNECTED) @@ -591,6 +601,7 @@ | S(MAP_SCCP_EV_RAN_DISC) | S(MAP_SCCP_EV_RAN_LINK_LOST) | S(MAP_SCCP_EV_USER_ABORT) + | S(MAP_SCCP_EV_CN_LINK_LOST) , .onenter = map_sccp_disconnected_onenter, .action = map_sccp_disconnected_action, -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/33173 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ic0a6fcfb747dc093528ca2bd12a269ad390d465c Gerrit-Change-Number: 33173 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-hnbgw[master]: tweak lots of logging
by neels 05 Jun '23

05 Jun '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/33171 ) Change subject: tweak lots of logging ...................................................................... tweak lots of logging Make lots of small tweaks in logging around RUA to SCCP context maps, CN link selection and HNBAP: - remove duplicate log context (e.g. LOGHNB() already shows the HNB Id) - bring more sense into logging categories and levels / reduce noise - add and clarify the details being logged at what points in time Related: SYS#6412 Change-Id: I41275d8c3e272177976a9302795884666c35cd06 --- M include/osmocom/hnbgw/context_map.h M src/osmo-hnbgw/context_map.c M src/osmo-hnbgw/context_map_sccp.c M src/osmo-hnbgw/hnbgw.c M src/osmo-hnbgw/hnbgw_cn.c M src/osmo-hnbgw/hnbgw_hnbap.c M src/osmo-hnbgw/hnbgw_l3.c M src/osmo-hnbgw/hnbgw_rua.c 8 files changed, 97 insertions(+), 41 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/71/33171/1 diff --git a/include/osmocom/hnbgw/context_map.h b/include/osmocom/hnbgw/context_map.h index 7017491..f7335a7 100644 --- a/include/osmocom/hnbgw/context_map.h +++ b/include/osmocom/hnbgw/context_map.h @@ -7,8 +7,9 @@ #define LOG_MAP(HNB_CTX_MAP, SUBSYS, LEVEL, FMT, ARGS...) \ LOGHNB((HNB_CTX_MAP) ? (HNB_CTX_MAP)->hnb_ctx : NULL, \ - SUBSYS, LEVEL, "RUA-%u %s MI=%s%s%s: " FMT, \ + SUBSYS, LEVEL, "RUA-%u SCCP-%u %s MI=%s%s%s: " FMT, \ (HNB_CTX_MAP) ? (HNB_CTX_MAP)->rua_ctx_id : 0, \ + (HNB_CTX_MAP) ? (HNB_CTX_MAP)->scu_conn_id : 0, \ (HNB_CTX_MAP) ? \ ((HNB_CTX_MAP)->cnlink ? (HNB_CTX_MAP)->cnlink->name \ : ((HNB_CTX_MAP)->is_ps ? "PS" : "CS")) \ diff --git a/src/osmo-hnbgw/context_map.c b/src/osmo-hnbgw/context_map.c index 13aae0e..045053c 100644 --- a/src/osmo-hnbgw/context_map.c +++ b/src/osmo-hnbgw/context_map.c @@ -26,6 +26,8 @@ #include <osmocom/core/timer.h> +#include <osmocom/netif/stream.h> + #include <osmocom/sigtran/sccp_helpers.h> #include <osmocom/hnbgw/hnbgw_cn.h> @@ -92,7 +94,7 @@ llist_add_tail(&map->hnb_list, &hnb->map_list); - LOG_MAP(map, DRUA, LOGL_INFO, "New RUA CTX\n"); + LOG_MAP(map, DRUA, LOGL_DEBUG, "New RUA CTX\n"); return map; } @@ -117,12 +119,23 @@ map->cnlink = cnlink_selected; map->scu_conn_id = new_scu_conn_id; + map_sccp_fsm_alloc(map); + llist_add_tail(&map->hnbgw_cnlink_entry, &cnlink_selected->map_list); hash_add(hsu->hnbgw_context_map_by_conn_id, &map->hnbgw_sccp_user_entry, new_scu_conn_id); - LOG_MAP(map, DMAIN, LOGL_INFO, "Creating new Mapping RUA CTX %u <-> SCU Conn ID %u to %s on %s\n", - map->rua_ctx_id, new_scu_conn_id, cnlink_selected->name, hsu->name); + LOGP(DRUA, LOGL_NOTICE, "New conn: %s '%s' RUA-%u <-> SCCP-%u %s%s%s %s l=%s<->r=%s\n", + osmo_sock_get_name2_c(OTC_SELECT, osmo_stream_srv_get_ofd(map->hnb_ctx->conn)->fd), + hnb_context_name(map->hnb_ctx), map->rua_ctx_id, + new_scu_conn_id, + cnlink_selected->name, + cnlink_selected->use.remote_addr_name ? " ": "", + cnlink_selected->use.remote_addr_name ? : "", + hsu->name, + osmo_ss7_pointcode_print(hsu->ss7, hsu->local_addr.pc), + osmo_ss7_pointcode_print2(hsu->ss7, cnlink_selected->remote_addr.pc) + ); return 0; } diff --git a/src/osmo-hnbgw/context_map_sccp.c b/src/osmo-hnbgw/context_map_sccp.c index 3bdec8c..1f2cd09 100644 --- a/src/osmo-hnbgw/context_map_sccp.c +++ b/src/osmo-hnbgw/context_map_sccp.c @@ -81,7 +81,8 @@ struct osmo_fsm_inst *fi = osmo_fsm_inst_alloc(&map_sccp_fsm, map, map, LOGL_DEBUG, NULL); OSMO_ASSERT(fi); osmo_fsm_inst_update_id_f_sanitize(fi, '-', "%s-%s-SCCP-%u", hnb_context_name(map->hnb_ctx), - map->is_ps ? "PS" : "CS", map->scu_conn_id); + map->cnlink ? map->cnlink->name : (map->is_ps ? "PS" : "CS"), + map->scu_conn_id); OSMO_ASSERT(map->sccp_fi == NULL); map->sccp_fi = fi; diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index f435043..dfeda53 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -351,13 +351,30 @@ const char *hnb_context_name(struct hnb_context *ctx) { + char *result; if (!ctx) return "NULL"; + if (ctx->conn) { + char hostbuf_r[INET6_ADDRSTRLEN]; + char portbuf_r[6]; + int fd = osmo_stream_srv_get_ofd(ctx->conn)->fd; + + /* get remote addr */ + if (osmo_sock_get_ip_and_port(fd, hostbuf_r, sizeof(hostbuf_r), portbuf_r, sizeof(portbuf_r), false) == 0) + result = talloc_asprintf(OTC_SELECT, "%s:%s", hostbuf_r, portbuf_r); + else + result = "?"; + } + else { + result = "disconnected"; + } + if (g_hnbgw->config.log_prefix_hnb_id) - return ctx->identity_info; + result = talloc_asprintf(OTC_SELECT, "%s %s", result, ctx->identity_info); else - return umts_cell_id_name(&ctx->id); + result = talloc_asprintf(OTC_SELECT, "%s %s", result, umts_cell_id_name(&ctx->id)); + return result; } void hnb_context_release_ue_state(struct hnb_context *ctx) diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index f33023e..d577fb4 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -298,7 +298,7 @@ return -ENOENT; if (param->called_addr.ssn != OSMO_SCCP_SSN_RANAP) { - LOGP(DMAIN, LOGL_NOTICE, "N-UNITDATA.ind for unknown SSN %u\n", + LOGP(DCN, LOGL_NOTICE, "N-UNITDATA.ind for unknown SSN %u\n", param->called_addr.ssn); return -1; } @@ -316,7 +316,7 @@ if (!map || !map->cnlink) return -ENOENT; - LOGP(DMAIN, LOGL_DEBUG, "handle_cn_conn_conf() conn_id=%d, addrs: called=%s calling=%s responding=%s\n", + LOGP(DCN, LOGL_DEBUG, "handle_cn_conn_conf() conn_id=%d, addrs: called=%s calling=%s responding=%s\n", param->conn_id, cnlink_sccp_addr_to_str(map->cnlink, &param->called_addr), cnlink_sccp_addr_to_str(map->cnlink, &param->calling_addr), @@ -349,7 +349,7 @@ if (!map || !map->cnlink) return -ENOENT; - LOGP(DMAIN, LOGL_DEBUG, "handle_cn_disc_ind() conn_id=%u responding_addr=%s\n", + LOGP(DCN, LOGL_DEBUG, "handle_cn_disc_ind() conn_id=%u responding_addr=%s\n", param->conn_id, cnlink_sccp_addr_to_str(map->cnlink, &param->responding_addr)); @@ -364,10 +364,10 @@ struct osmo_scu_prim *prim = (struct osmo_scu_prim *) oph; int rc = 0; - LOGP(DMAIN, LOGL_DEBUG, "sccp_sap_up(%s)\n", osmo_scu_prim_name(oph)); + LOGP(DCN, LOGL_DEBUG, "sccp_sap_up(%s)\n", osmo_scu_prim_name(oph)); if (!scu) { - LOGP(DMAIN, LOGL_ERROR, + LOGP(DCN, LOGL_ERROR, "sccp_sap_up(): NULL osmo_sccp_user, cannot send prim (sap %u prim %u op %d)\n", oph->sap, oph->primitive, oph->operation); return -1; @@ -375,7 +375,7 @@ hsu = osmo_sccp_user_get_priv(scu); if (!hsu) { - LOGP(DMAIN, LOGL_ERROR, + LOGP(DCN, LOGL_ERROR, "sccp_sap_up(): NULL hnbgw_sccp_user, cannot send prim (sap %u prim %u op %d)\n", oph->sap, oph->primitive, oph->operation); return -1; @@ -397,11 +397,11 @@ rc = handle_cn_disc_ind(hsu, &prim->u.disconnect, oph); break; case OSMO_PRIM(OSMO_SCU_PRIM_N_PCSTATE, PRIM_OP_INDICATION): - LOGP(DMAIN, LOGL_DEBUG, "Ignoring prim %s from SCCP USER SAP\n", + LOGP(DCN, LOGL_DEBUG, "Ignoring prim %s from SCCP USER SAP\n", osmo_scu_prim_hdr_name_c(OTC_SELECT, oph)); break; default: - LOGP(DMAIN, LOGL_ERROR, + LOGP(DCN, LOGL_ERROR, "Received unknown prim %u from SCCP USER SAP\n", OSMO_PRIM_HDR(oph)); break; @@ -426,7 +426,7 @@ if (!addr_name) { osmo_sccp_make_addr_pc_ssn(dest, default_pc, OSMO_SCCP_SSN_RANAP); if (label) - LOGP(DMAIN, LOGL_INFO, "%s remote addr not configured, using default: %s\n", label, + LOGP(DCN, LOGL_INFO, "%s remote addr not configured, using default: %s\n", label, osmo_sccp_addr_name(*ss7, dest)); return 0; } @@ -434,7 +434,7 @@ *ss7 = osmo_sccp_addr_by_name(dest, addr_name); if (!*ss7) { if (label) - LOGP(DMAIN, LOGL_ERROR, "%s remote addr: no such SCCP address book entry: '%s'\n", + LOGP(DCN, LOGL_ERROR, "%s remote addr: no such SCCP address book entry: '%s'\n", label, addr_name); return -1; } @@ -443,14 +443,11 @@ if (!addr_has_pc_and_ssn(dest)) { if (label) - LOGP(DMAIN, LOGL_ERROR, "Invalid/incomplete %s remote-addr: %s\n", + LOGP(DCN, LOGL_ERROR, "Invalid/incomplete %s remote-addr: %s\n", label, osmo_sccp_addr_name(*ss7, dest)); return -1; } - if (label) - LOGP(DRANAP, LOGL_NOTICE, "Remote %s SCCP addr: %s\n", - label, osmo_sccp_addr_name(*ss7, dest)); return 0; } @@ -512,6 +509,17 @@ cnlink->hnbgw_sccp_user = NULL; } +static void hnbgw_cnlink_log_self(struct hnbgw_cnlink *cnlink) +{ + struct osmo_ss7_instance *ss7 = cnlink->hnbgw_sccp_user->ss7; + LOG_CNLINK(cnlink, DCN, LOGL_NOTICE, "using: cs7-%u %s <-> %s %s %s\n", + ss7->cfg.id, + /* printing the entire SCCP address is quite long, rather just print the point-code */ + osmo_ss7_pointcode_print(ss7, cnlink->hnbgw_sccp_user->local_addr.pc), + osmo_ss7_pointcode_print2(ss7, cnlink->remote_addr.pc), + cnlink->name, cnlink->use.remote_addr_name); +} + /* If not present yet, set up all of osmo_ss7_instance, osmo_sccp_instance and hnbgw_sccp_user for the given cnlink. * The cs7 instance nr to use is determined by cnlink->remote_addr_name, or cs7 instance 0 if that is not present. * Set cnlink->hnbgw_sccp_user to the new SCCP instance. Return 0 on success, negative on error. */ @@ -570,8 +578,9 @@ if (hsu->ss7 != ss7) continue; cnlink->hnbgw_sccp_user = hsu; - LOG_CNLINK(cnlink, DCN, LOGL_NOTICE, "using existing SCCP instance %s on cs7 instance %u\n", + LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "using existing SCCP instance %s on cs7 instance %u\n", hsu->name, ss7->cfg.id); + hnbgw_cnlink_log_self(cnlink); return 0; } /* else cnlink->hnbgw_sccp_user stays NULL and is set up below. */ @@ -605,7 +614,7 @@ sccp_user = osmo_sccp_user_bind_pc(sccp, "OsmoHNBGW", sccp_sap_up, OSMO_SCCP_SSN_RANAP, local_pc); if (!sccp_user) { - LOGP(DMAIN, LOGL_ERROR, "Failed to init SCCP User\n"); + LOGP(DCN, LOGL_ERROR, "Failed to init SCCP User\n"); return -1; } @@ -622,6 +631,8 @@ llist_add_tail(&hsu->entry, &g_hnbgw->sccp.users); cnlink->hnbgw_sccp_user = hsu; + + hnbgw_cnlink_log_self(cnlink); return 0; } @@ -661,6 +672,7 @@ INIT_LLIST_HEAD(&cnlink->map_list); llist_add_tail(&cnlink->entry, &cnpool->cnlinks); + LOG_CNLINK(cnlink, DCN, LOGL_DEBUG, "allocated\n"); return cnlink; } @@ -831,8 +843,7 @@ return NULL; } - LOGP(DCN, LOGL_DEBUG, "New subscriber MI=%s: CN link round-robin selects %s %d\n", - osmo_mobile_identity_to_str_c(OTC_SELECT, &map->l3.mi), cnpool->peer_name, cnlink->nr); + LOG_MAP(map, DCN, LOGL_INFO, "CN link round-robin selects %s %d\n", cnpool->peer_name, cnlink->nr); if (is_null_nri) rate_ctr_inc(rate_ctr_group_get_ctr(cnlink->ctrs, CNLINK_CTR_CNPOOL_SUBSCR_REATTACH)); diff --git a/src/osmo-hnbgw/hnbgw_hnbap.c b/src/osmo-hnbgw/hnbgw_hnbap.c index 85adccd..06d1a9d 100644 --- a/src/osmo-hnbgw/hnbgw_hnbap.c +++ b/src/osmo-hnbgw/hnbgw_hnbap.c @@ -119,7 +119,7 @@ ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_HNBAP_HNBRegisterAccept, &accept_out); - LOGHNB(ctx, DHNBAP, LOGL_NOTICE, "Accepting HNB-REGISTER-REQ from %s\n", ctx->identity_info); + LOGHNB(ctx, DHNBAP, LOGL_NOTICE, "Accepting HNB-REGISTER-REQ\n"); return hnbgw_hnbap_tx(ctx, msg); } @@ -409,14 +409,10 @@ int rc; struct osmo_plmn_id plmn; struct osmo_fd *ofd = osmo_stream_srv_get_ofd(ctx->conn); - char name[OSMO_SOCK_NAME_MAXLEN]; - - osmo_sock_get_name_buf(name, sizeof(name), ofd->fd); rc = hnbap_decode_hnbregisterrequesties(&ies, in); if (rc < 0) { - LOGHNB(ctx, DHNBAP, LOGL_ERROR, "Failure to decode HNB-REGISTER-REQ %s from %s: rc=%d\n", - ctx->identity_info, name, rc); + LOGHNB(ctx, DHNBAP, LOGL_ERROR, "Failure to decode HNB-REGISTER-REQ: rc=%d\n", rc); return rc; } @@ -460,17 +456,15 @@ /* If new conn registering same HNB is from anoter remote addr+port, let's reject it to avoid * misconfigurations or someone trying to impersonate an already working HNB: */ - LOGHNB(ctx, DHNBAP, LOGL_ERROR, "rejecting HNB-REGISTER-REQ with duplicate cell identity " - "MCC=%u,MNC=%u,LAC=%u,RAC=%u,SAC=%u,CID=%u from %s\n", - ctx->id.mcc, ctx->id.mnc, ctx->id.lac, ctx->id.rac, ctx->id.sac, ctx->id.cid, name); + LOGHNB(ctx, DHNBAP, LOGL_ERROR, "rejecting HNB-REGISTER-REQ with duplicate cell identity %s\n", + umts_cell_id_name(&ctx->id)); hnbap_free_hnbregisterrequesties(&ies); return hnbgw_tx_hnb_register_rej(ctx); } } - LOGHNB(ctx, DHNBAP, LOGL_DEBUG, "HNB-REGISTER-REQ %s MCC=%u,MNC=%u,LAC=%u,RAC=%u,SAC=%u,CID=%u from %s%s\n", - ctx->identity_info, ctx->id.mcc, ctx->id.mnc, ctx->id.lac, ctx->id.rac, ctx->id.sac, ctx->id.cid, - name, ctx->hnb_registered ? " (re-connecting)" : ""); + LOGHNB(ctx, DHNBAP, LOGL_DEBUG, "HNB-REGISTER-REQ %s %s%s\n", + ctx->identity_info, umts_cell_id_name(&ctx->id), ctx->hnb_registered ? " (re-connecting)" : ""); /* The HNB is already registered, and we are seeing a new HNB Register Request. The HNB has restarted * without us noticing. Clearly, the HNB does not expect any UE state to be active here, so discard any diff --git a/src/osmo-hnbgw/hnbgw_l3.c b/src/osmo-hnbgw/hnbgw_l3.c index 4547419..607bfc5 100644 --- a/src/osmo-hnbgw/hnbgw_l3.c +++ b/src/osmo-hnbgw/hnbgw_l3.c @@ -193,17 +193,20 @@ gsm48_decode_lai2(&lu->lai, &old_lai); map->l3.from_other_plmn = (osmo_plmn_cmp(&old_lai.plmn, local_plmn) != 0); - LOGP(DCN, LOGL_DEBUG, "LU from_other_plmn=%d\n", map->l3.from_other_plmn); + if (map->l3.from_other_plmn) + LOGP(DRUA, LOGL_INFO, "LU from other PLMN: old LAI=%s my PLMN=%s\n", + osmo_plmn_name_c(OTC_SELECT, &old_lai.plmn), + osmo_plmn_name_c(OTC_SELECT, local_plmn)); break; case GSM48_MT_MM_CM_SERV_REQ: if (len < sizeof(*gh) + sizeof(*cm)) { - LOGP(DCN, LOGL_ERROR, "CM Service Req message too short\n"); + LOGP(DRUA, LOGL_ERROR, "CM Service Req message too short\n"); break; } cm = (struct gsm48_service_request *)&gh->data[0]; map->l3.is_emerg = (cm->cm_service_type == GSM48_CMSERV_EMERGENCY); - LOGP(DCN, LOGL_DEBUG, "CM Service is_emerg=%d\n", map->l3.is_emerg); + LOGP(DRUA, LOGL_DEBUG, "CM Service is_emerg=%d\n", map->l3.is_emerg); break; default: diff --git a/src/osmo-hnbgw/hnbgw_rua.c b/src/osmo-hnbgw/hnbgw_rua.c index 2a7dc20..4e75c91 100644 --- a/src/osmo-hnbgw/hnbgw_rua.c +++ b/src/osmo-hnbgw/hnbgw_rua.c @@ -231,7 +231,6 @@ return NULL; } - LOG_MAP(map, DCN, LOGL_INFO, "establishing SCCP link: selected %s\n", cnlink->name); return map; } -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/33171 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I41275d8c3e272177976a9302795884666c35cd06 Gerrit-Change-Number: 33171 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: struct osmo_sub_auth_data: remove OSMO_DEPRECATED_OUTSIDE
by fixeria 05 Jun '23

05 Jun '23

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33164 ) Change subject: struct osmo_sub_auth_data: remove OSMO_DEPRECATED_OUTSIDE ...................................................................... Patch Set 1: (1 comment) This change is ready for review. Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/33164/comment/11914c59_5186c179 PS1, Line 11: this attribute spams compilation logs of projects : including file <osmocom/crypt/auth.h>, even if the deprecated struct : is not used directly at all. This looks like a compiler/version specific behavior. I am not seeing these false-positive warnings with gcc v13.1.1, but there's lots of them in the build logs on Jenkins, e.g. https://jenkins.osmocom.org/jenkins/view/master/job/master-osmo-bsc/22014/a… (grep for `Wdeprecated`). -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33164 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia5d365206207872d5d3fdd4ae40273eab909fb33 Gerrit-Change-Number: 33164 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 05 Jun 2023 13:12:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: contrib/jenkins.sh: remove unrecognized --enable-vty-tests
by fixeria 05 Jun '23

05 Jun '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33167 ) Change subject: contrib/jenkins.sh: remove unrecognized --enable-vty-tests ...................................................................... contrib/jenkins.sh: remove unrecognized --enable-vty-tests There is no such option in the configure.ac: configure: WARNING: unrecognized options: --enable-vty-tests Change-Id: I04421af0b250651a598a7aeb5bed55dbacec2f7c --- M contrib/jenkins.sh 1 file changed, 14 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/67/33167/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index ba453e9..695af3a 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -80,7 +80,7 @@ LD_LIBRARY_PATH="$inst/lib" $MAKE check \ || exit_tar_workspace LD_LIBRARY_PATH="$inst/lib" \ - DISTCHECK_CONFIGURE_FLAGS="--enable-vty-tests --enable-external-tests --enable-werror $CONFIG" \ + DISTCHECK_CONFIGURE_FLAGS="--enable-external-tests --enable-werror $CONFIG" \ $MAKE $PARALLEL_MAKE distcheck \ || exit_tar_workspace -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I04421af0b250651a598a7aeb5bed55dbacec2f7c Gerrit-Change-Number: 33167 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[L] Change in osmo-hnbgw[master]: cnpool: extract Mobile Identity from RANAP payload
by neels 05 Jun '23

05 Jun '23

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/33133 ) Change subject: cnpool: extract Mobile Identity from RANAP payload ...................................................................... Patch Set 2: (3 comments) File src/osmo-hnbgw/hnbgw_l3.c: https://gerrit.osmocom.org/c/osmo-hnbgw/+/33133/comment/80deffe1_565dfd7e PS2, Line 1: /* OsmoHNBGW implementation of CS and PS Level3 message decoding (NAS PDU */ > missing ")" Done https://gerrit.osmocom.org/c/osmo-hnbgw/+/33133/comment/701b23d3_d105c36a PS2, Line 104: /* Old routing area identification 10.5.5.15. */ > ack, thx. […] problem, gsm48_parse_ra() returns struct gprs_ra_id, but i want struct osmo_routing_area_id, which uses struct osmo_plmn_id so that I can use osmo_plmn_cmp() on it... seems we have a bit of code split. i guess there could be one static function for decoding old RA id for here and below? cannot find a public API function for struct osmo_routing_area_id. any better ideas...? https://gerrit.osmocom.org/c/osmo-hnbgw/+/33133/comment/6768f7a6_b881cb6c PS2, Line 132: /* Old routing area identification 10.5.5.15 */ > gsm48_parse_ra (same as above) -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/33133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I373d665c9684b607207f68094188eab63209db51 Gerrit-Change-Number: 33133 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 05 Jun 2023 13:06:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0