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

[M] Change in libosmo-abis[master]: Add support for sending and receiving Sa bits, as well as some line s...
by laforge 24 Jan '24

24 Jan '24

Attention is currently required from: dexter, jolly, tnt. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/35563?usp=email ) Change subject: Add support for sending and receiving Sa bits, as well as some line signals ...................................................................... Patch Set 4: Code-Review+1 (1 comment) File src/e1_input.c: https://gerrit.osmocom.org/c/libosmo-abis/+/35563/comment/e92bf69b_e4286c6d PS4, Line 1124: { S_L_INP_LINE_LOF, "LINE-LOF" }, : { S_L_INP_LINE_NOLOF, "LINE-NOLOF" }, > I already had the loss-of-frame event in a previous patchset of osmo-e1d. as @tnt@246tNt. […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/35563?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie7643693c2daac99f5747591decd60e982b8052a Gerrit-Change-Number: 35563 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-CC: dexter <pmaier(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 24 Jan 2024 08:53:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: tnt <tnt(a)246tNt.com> Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: Add vty commands "no gprs nsvc ..."
by laforge 24 Jan '24

24 Jan '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35571?usp=email ) Change subject: Add vty commands "no gprs nsvc ..." ...................................................................... Add vty commands "no gprs nsvc ..." A switch (bool) is used to enable or disable NSVC 0 or 1. It is enabled via any "gprs nsvc 0|1" command and disabled via "no gprs nsvc 0|1" command. If it is disabled, it is treated as unconfigured, similar when no remote IP or port has been defined. Related: OS#6006 Change-Id: Ia112e86aa35f6a245d98ef1b3720c18835faeda6 --- M include/osmocom/bsc/bts_sm.h M src/osmo-bsc/bts_vty.c M src/osmo-bsc/nm_gprs_nsvc_fsm.c M tests/gprs_params.vty 4 files changed, 51 insertions(+), 7 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/bts_sm.h b/include/osmocom/bsc/bts_sm.h index e25b8da..13be3d9 100644 --- a/include/osmocom/bsc/bts_sm.h +++ b/include/osmocom/bsc/bts_sm.h @@ -40,6 +40,7 @@ /* data read via VTY config file, to configure the BTS * via OML from BSC */ int id; + bool enabled; uint16_t nsvci; uint16_t local_port; /* on the BTS */ struct osmo_sockaddr remote; diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index e38ec94..24224f6 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -1564,6 +1564,22 @@ #define NSVC_TEXT "Network Service Virtual Connection (NS-VC)\n" \ "NSVC Logical Number\n" +DEFUN_USRATTR(cfg_no_bts_gprs_nsvc, + cfg_no_bts_gprs_nsvc_cmd, + X(BSC_VTY_ATTR_RESTART_ABIS_OML_LINK), + "no gprs nsvc <0-1>", + NO_STR GPRS_TEXT NSVC_TEXT) +{ + struct gsm_bts *bts = vty->index; + int idx = atoi(argv[0]); + + GPRS_CHECK_ENABLED(bts); + + bts->site_mgr->gprs.nsvc[idx].enabled = false; + + return CMD_SUCCESS; +} + DEFUN_USRATTR(cfg_bts_gprs_nsvci, cfg_bts_gprs_nsvci_cmd, X(BSC_VTY_ATTR_RESTART_ABIS_OML_LINK), @@ -1578,6 +1594,7 @@ GPRS_CHECK_ENABLED(bts); bts->site_mgr->gprs.nsvc[idx].nsvci = atoi(argv[1]); + bts->site_mgr->gprs.nsvc[idx].enabled = true; return CMD_SUCCESS; } @@ -1598,6 +1615,7 @@ GPRS_CHECK_ENABLED(bts); bts->site_mgr->gprs.nsvc[idx].local_port = atoi(argv[1]); + bts->site_mgr->gprs.nsvc[idx].enabled = true; return CMD_SUCCESS; } @@ -1619,6 +1637,7 @@ /* sockaddr_in and sockaddr_in6 have the port at the same position */ bts->site_mgr->gprs.nsvc[idx].remote.u.sin.sin_port = htons(atoi(argv[1])); + bts->site_mgr->gprs.nsvc[idx].enabled = true; return CMD_SUCCESS; } @@ -1651,9 +1670,11 @@ switch (remote.af) { case AF_INET: osmo_sockaddr_str_to_in_addr(&remote, &bts->site_mgr->gprs.nsvc[idx].remote.u.sin.sin_addr); + bts->site_mgr->gprs.nsvc[idx].enabled = true; break; case AF_INET6: osmo_sockaddr_str_to_in6_addr(&remote, &bts->site_mgr->gprs.nsvc[idx].remote.u.sin6.sin6_addr); + bts->site_mgr->gprs.nsvc[idx].enabled = true; break; } @@ -4251,6 +4272,11 @@ const struct gsm_gprs_nsvc *nsvc = &bts_sm->gprs.nsvc[i]; struct osmo_sockaddr_str remote; + if (!nsvc->enabled) { + vty_out(vty, " no gprs nsvc %u%s", i, VTY_NEWLINE); + continue; + } + vty_out(vty, " gprs nsvc %u nsvci %u%s", i, nsvc->nsvci, VTY_NEWLINE); @@ -4951,6 +4977,7 @@ install_element(BTS_NODE, &cfg_bts_gprs_bvci_cmd); install_element(BTS_NODE, &cfg_bts_gprs_cell_timer_cmd); install_element(BTS_NODE, &cfg_bts_gprs_nsei_cmd); + install_element(BTS_NODE, &cfg_no_bts_gprs_nsvc_cmd); install_element(BTS_NODE, &cfg_bts_gprs_nsvci_cmd); install_element(BTS_NODE, &cfg_bts_gprs_nsvc_lport_cmd); install_element(BTS_NODE, &cfg_bts_gprs_nsvc_rport_cmd); diff --git a/src/osmo-bsc/nm_gprs_nsvc_fsm.c b/src/osmo-bsc/nm_gprs_nsvc_fsm.c index a3555aa..beedcdd 100644 --- a/src/osmo-bsc/nm_gprs_nsvc_fsm.c +++ b/src/osmo-bsc/nm_gprs_nsvc_fsm.c @@ -96,6 +96,10 @@ static bool has_valid_nsvc(const struct gsm_gprs_nsvc *nsvc) { + /* If not configured (enabled) at all. */ + if (!nsvc->enabled) + return false; + /* remote address must be valid */ if (osmo_sockaddr_is_any(&nsvc->remote)) return false; diff --git a/tests/gprs_params.vty b/tests/gprs_params.vty index e0c8b39..0f69a8c 100644 --- a/tests/gprs_params.vty +++ b/tests/gprs_params.vty @@ -41,10 +41,8 @@ gprs ns timer tns-test 30 gprs ns timer tns-alive 3 gprs ns timer tns-alive-retries 10 - gprs nsvc 0 nsvci 0 - gprs nsvc 0 local udp port 0 - gprs nsvc 1 nsvci 0 - gprs nsvc 1 local udp port 0 + no gprs nsvc 0 + no gprs nsvc 1 ... @@ -104,13 +102,12 @@ ... OsmoBSC(config-net-bts)# ### Disable secondary NSVC -OsmoBSC(config-net-bts)# gprs nsvc 1 remote udp port 0 +OsmoBSC(config-net-bts)# no gprs nsvc 1 OsmoBSC(config-net-bts)# show running-config ... bts 0 ... gprs nsvc 0 nsvci 4242 gprs nsvc 0 local udp port 0 - gprs nsvc 1 nsvci 2424 - gprs nsvc 1 local udp port 23023 + no gprs nsvc 1 ... -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35571?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia112e86aa35f6a245d98ef1b3720c18835faeda6 Gerrit-Change-Number: 35571 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-bsc[master]: VTY: Add command `show bts brief`
by laforge 24 Jan '24

24 Jan '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35567?usp=email ) Change subject: VTY: Add command `show bts brief` ...................................................................... VTY: Add command `show bts brief` This line shows all BTS an their OML states in a single line. Additionally the uptime or downtime is displayed, if there was a connect or disconnect of the OML link. Related: OS#6018 Change-Id: I003fd32e589ddf53b7dd42089f904cfb598e3625 --- M include/osmocom/bsc/vty.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_vty.c 3 files changed, 47 insertions(+), 9 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/vty.h b/include/osmocom/bsc/vty.h index a54b18e..092bc20 100644 --- a/include/osmocom/bsc/vty.h +++ b/include/osmocom/bsc/vty.h @@ -51,6 +51,7 @@ int bts_vty_init(void); void bts_dump_vty(struct vty *vty, struct gsm_bts *bts); +void bts_dump_vty_oml_link_state(struct vty *vty, struct gsm_bts *bts); void trx_dump_vty(struct vty *vty, struct gsm_bts_trx *trx, bool print_rsl, bool show_connected); void ts_dump_vty(struct vty *vty, struct gsm_bts_trx_ts *ts); void lchan_dump_full_vty(struct vty *vty, struct gsm_lchan *lchan); diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 8a0747c..8690a47 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -257,6 +257,22 @@ return CMD_SUCCESS; } +DEFUN(show_bts_brief, show_bts_brief_cmd, "show bts brief", + SHOW_STR "Display information about a BTS\n" + "Display availability status of all BTS\n") +{ + struct gsm_network *net = gsmnet_from_vty(vty); + struct gsm_bts *bts; + + /* Print OML state of BTSs. */ + llist_for_each_entry(bts, &net->bts_list, list) { + vty_out(vty, "BTS %d:", bts->nr); + bts_dump_vty_oml_link_state(vty, bts); + } + + return CMD_SUCCESS; +} + DEFUN(show_bts_fail_rep, show_bts_fail_rep_cmd, "show bts <0-255> fail-rep [reset]", SHOW_STR "Display information about a BTS\n" "BTS number\n" "OML failure reports\n" @@ -3634,6 +3650,7 @@ install_element_ve(&bsc_show_net_cmd); install_element_ve(&show_bts_cmd); + install_element_ve(&show_bts_brief_cmd); install_element_ve(&show_bts_fail_rep_cmd); install_element_ve(&show_rejected_bts_cmd); install_element_ve(&show_trx_cmd); diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 8aa1f89..e38ec94 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -3992,7 +3992,6 @@ void bts_dump_vty(struct vty *vty, struct gsm_bts *bts) { struct pchan_load pl; - unsigned long long sec; struct gsm_bts_trx *trx; int ts_hopping_total; int ts_non_hopping_total; @@ -4124,14 +4123,7 @@ if (is_ipa_abisip_bts(bts)) { vty_out(vty, " OML Link: "); e1isl_dump_vty_tcp(vty, bts->oml_link); - vty_out(vty, " OML Link state: %s", get_model_oml_status(bts)); - if (bts_setup_ramp_active(bts->network)) - vty_out(vty, " BTS Ramping: %s", bts_setup_ramp_get_state_str(bts)); - sec = bts_updowntime(bts); - if (sec) - vty_out(vty, " %llu days %llu hours %llu min. %llu sec.", - OSMO_SEC2DAY(sec), OSMO_SEC2HRS(sec), OSMO_SEC2MIN(sec), sec % 60); - vty_out(vty, "%s", VTY_NEWLINE); + bts_dump_vty_oml_link_state(vty, bts); } else { vty_out(vty, " E1 Signalling Link:%s", VTY_NEWLINE); e1isl_dump_vty(vty, bts->oml_link); @@ -4209,6 +4201,20 @@ bts_dump_vty_features(vty, bts); } +void bts_dump_vty_oml_link_state(struct vty *vty, struct gsm_bts *bts) +{ + unsigned long long sec; + + vty_out(vty, " OML Link state: %s", get_model_oml_status(bts)); + if (bts_setup_ramp_active(bts->network)) + vty_out(vty, " BTS Ramping: %s", bts_setup_ramp_get_state_str(bts)); + sec = bts_updowntime(bts); + if (sec) + vty_out(vty, " %llu days %llu hours %llu min. %llu sec.", + OSMO_SEC2DAY(sec), OSMO_SEC2HRS(sec), OSMO_SEC2MIN(sec), sec % 60); + vty_out(vty, "%s", VTY_NEWLINE); +} + static void config_write_bts_gprs(struct vty *vty, struct gsm_bts *bts) { unsigned int i; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35567?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I003fd32e589ddf53b7dd42089f904cfb598e3625 Gerrit-Change-Number: 35567 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-bsc[master]: Also track downtime when OML link is lost
by laforge 24 Jan '24

24 Jan '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35566?usp=email ) Change subject: Also track downtime when OML link is lost ...................................................................... Also track downtime when OML link is lost This will be used in a later patch to dertemine when a BTS became offline. Related: OS#6018 Change-Id: I1776099cbfef51af1d5a3a056fb0654abd7366a9 --- M include/osmocom/bsc/bts.h M src/osmo-bsc/bts.c M src/osmo-bsc/bts_ctrl.c M src/osmo-bsc/bts_ipaccess_nanobts.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/e1_config.c 6 files changed, 30 insertions(+), 13 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index a1799eb..e9634ee 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -375,8 +375,8 @@ struct e1inp_sign_link *oml_link; /* Timer to use for deferred drop of OML link, see \ref ipaccess_drop_oml_deferred */ struct osmo_timer_list oml_drop_link_timer; - /* when OML link was established */ - time_t uptime; + /* when OML link was established or lost */ + time_t updowntime; /* Abis network management O&M handle */ struct abis_nm_h *nmh; @@ -815,7 +815,7 @@ #define BTS_STORE_UPTIME_INTERVAL 10 /* in seconds */ void bts_store_uptime(struct gsm_bts *bts); -unsigned long long bts_uptime(const struct gsm_bts *bts); +unsigned long long bts_updowntime(const struct gsm_bts *bts); #define BTS_STORE_LCHAN_DURATIONS_INTERVAL 1 /* in seconds */ void bts_store_lchan_durations(struct gsm_bts *bts); diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 733d16e..8cc9e9a 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -766,7 +766,8 @@ void bts_store_uptime(struct gsm_bts *bts) { - osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_UPTIME_SECONDS), bts_uptime(bts)); + osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_UPTIME_SECONDS), + bts->oml_link ? bts_updowntime(bts) : 0); } void bts_store_lchan_durations(struct gsm_bts *bts) @@ -824,20 +825,20 @@ rate_ctr_add(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_SDCCH_ACTIVE_MILLISECONDS_TOTAL), elapsed_sdcch_ms); } -unsigned long long bts_uptime(const struct gsm_bts *bts) +unsigned long long bts_updowntime(const struct gsm_bts *bts) { struct timespec tp; - if (!bts->uptime || !bts->oml_link) + if (!bts->updowntime) return 0; if (osmo_clock_gettime(CLOCK_MONOTONIC, &tp) != 0) { - LOGP(DNM, LOGL_ERROR, "BTS %u uptime computation failure: %s\n", bts->nr, strerror(errno)); + LOGP(DNM, LOGL_ERROR, "BTS %u uptime/downtime computation failure: %s\n", bts->nr, strerror(errno)); return 0; } /* monotonic clock helps to ensure that the conversion is valid */ - return difftime(tp.tv_sec, bts->uptime); + return difftime(tp.tv_sec, bts->updowntime); } char *get_model_oml_status(const struct gsm_bts *bts) diff --git a/src/osmo-bsc/bts_ctrl.c b/src/osmo-bsc/bts_ctrl.c index acbe68a..9c14190 100644 --- a/src/osmo-bsc/bts_ctrl.c +++ b/src/osmo-bsc/bts_ctrl.c @@ -372,7 +372,7 @@ { const struct gsm_bts *bts = cmd->node; - cmd->reply = talloc_asprintf(cmd, "%llu", bts_uptime(bts)); + cmd->reply = talloc_asprintf(cmd, "%llu", bts->oml_link ? bts_updowntime(bts) : 0); if (!cmd->reply) { cmd->reply = "OOM"; return CTRL_CMD_ERROR; diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index c690b46..b0532e5 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -527,6 +527,8 @@ struct gsm_bts_trx_ts *ts ; uint8_t tn; uint8_t i; + struct timespec tp; + int rc; /* First of all, remove deferred drop if enabled */ osmo_timer_del(&bts->oml_drop_link_timer); @@ -537,7 +539,8 @@ LOG_BTS(bts, DLINP, LOGL_NOTICE, "Dropping OML link: %s\n", reason); e1inp_sign_link_destroy(bts->oml_link); bts->oml_link = NULL; - bts->uptime = 0; + rc = osmo_clock_gettime(CLOCK_MONOTONIC, &tp); + bts->updowntime = (rc < 0) ? 0 : tp.tv_sec; /* we don't need sub-second precision for downtime */ osmo_stat_item_dec(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_OML_CONNECTED), 1); gsm_bts_stats_reset(bts); @@ -710,7 +713,7 @@ E1INP_SIGN_OML, bts->c0, bts->oml_tei, 0); rc = osmo_clock_gettime(CLOCK_MONOTONIC, &tp); - bts->uptime = (rc < 0) ? 0 : tp.tv_sec; /* we don't need sub-second precision for uptime */ + bts->updowntime = (rc < 0) ? 0 : tp.tv_sec; /* we don't need sub-second precision for uptime */ if (!(sign_link->trx->bts->ip_access.flags & OML_UP)) { e1inp_event(sign_link->ts, S_L_INP_TEI_UP, sign_link->tei, sign_link->sapi); diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 8b97dce..8aa1f89 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -4127,7 +4127,7 @@ vty_out(vty, " OML Link state: %s", get_model_oml_status(bts)); if (bts_setup_ramp_active(bts->network)) vty_out(vty, " BTS Ramping: %s", bts_setup_ramp_get_state_str(bts)); - sec = bts_uptime(bts); + sec = bts_updowntime(bts); if (sec) vty_out(vty, " %llu days %llu hours %llu min. %llu sec.", OSMO_SEC2DAY(sec), OSMO_SEC2HRS(sec), OSMO_SEC2MIN(sec), sec % 60); diff --git a/src/osmo-bsc/e1_config.c b/src/osmo-bsc/e1_config.c index db77234..dbea3e9 100644 --- a/src/osmo-bsc/e1_config.c +++ b/src/osmo-bsc/e1_config.c @@ -197,7 +197,7 @@ e1inp_sign_link_destroy(bts->oml_link); bts->oml_link = oml_link; rc = osmo_clock_gettime(CLOCK_MONOTONIC, &tp); - bts->uptime = (rc < 0) ? 0 : tp.tv_sec; /* we don't need sub-second precision for uptime */ + bts->updowntime = (rc < 0) ? 0 : tp.tv_sec; /* we don't need sub-second precision for uptime */ llist_for_each_entry(trx, &bts->trx_list, list) e1_reconfig_trx(trx); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35566?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1776099cbfef51af1d5a3a056fb0654abd7366a9 Gerrit-Change-Number: 35566 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmocore[master]: Add logging category for libosmo-cc
by laforge 24 Jan '24

24 Jan '24

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35572?usp=email ) Change subject: Add logging category for libosmo-cc ...................................................................... Patch Set 2: (1 comment) File include/osmocom/core/logging.h: https://gerrit.osmocom.org/c/libosmocore/+/35572/comment/11c7a53e_fcd03660 PS2, Line 158: #defin this breaks ABI; it means we need to bump the LIBVERSION on next libosmocore release and hence needs a TODO-RELEASE. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35572?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9df433b2cfb51f04dbf16e9f8dee567a59ab5cb7 Gerrit-Change-Number: 35572 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Wed, 24 Jan 2024 08:52:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-msc[master]: Add LLC and HLC information forwarding to MNCC interface
by laforge 24 Jan '24

24 Jan '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35393?usp=email ) Change subject: Add LLC and HLC information forwarding to MNCC interface ...................................................................... Add LLC and HLC information forwarding to MNCC interface low/high layer compatibility are used for capability checking between caller and called entitiy. The transcoding is performed by libosmogsm. Related: OS#6152 Depends: libosmocore.git Ia6a2159ecf810a02f85b558026edf20b934567de Change-Id: I760980a7e17e2fa81615adc69ef85797eb0c07f1 --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 34 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index f6ec81b..63b1699 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -654,6 +654,20 @@ gsm48_decode_called(&setup.called, TLVP_VAL(&tp, GSM48_IE_CALLED_BCD)-1); } + /* low layer compatibility */ + if (TLVP_PRESENT(&tp, GSM48_IE_LOWL_COMPAT) && TLVP_LEN(&tp, GSM48_IE_LOWL_COMPAT) > 0 && + TLVP_LEN(&tp, GSM48_IE_LOWL_COMPAT) <= sizeof(setup.llc.compat)) { + setup.fields |= MNCC_F_LOWL_COMPAT; + setup.llc.len = TLVP_LEN(&tp, GSM48_IE_LOWL_COMPAT); + memcpy(setup.llc.compat, TLVP_VAL(&tp, GSM48_IE_LOWL_COMPAT), setup.llc.len); + } + /* high layer compatibility */ + if (TLVP_PRESENT(&tp, GSM48_IE_HIGHL_COMPAT) && TLVP_LEN(&tp, GSM48_IE_HIGHL_COMPAT) > 0 && + TLVP_LEN(&tp, GSM48_IE_HIGHL_COMPAT) <= sizeof(setup.hlc.compat)) { + setup.fields |= MNCC_F_HIGHL_COMPAT; + setup.hlc.len = TLVP_LEN(&tp, GSM48_IE_HIGHL_COMPAT); + memcpy(setup.hlc.compat, TLVP_VAL(&tp, GSM48_IE_HIGHL_COMPAT), setup.hlc.len); + } /* user-user */ if (TLVP_PRESENT(&tp, GSM48_IE_USER_USER)) { setup.fields |= MNCC_F_USERUSER; @@ -961,6 +975,12 @@ /* called party BCD number */ if (setup->fields & MNCC_F_CALLED) gsm48_encode_called(msg, &setup->called); + /* low layer compatibility */ + if (setup->fields & MNCC_F_LOWL_COMPAT && setup->llc.len > 0 && setup->llc.len <= sizeof(setup->llc.compat)) + msgb_tlv_put(msg, GSM48_IE_LOWL_COMPAT, setup->llc.len, setup->llc.compat); + /* high layer compatibility */ + if (setup->fields & MNCC_F_HIGHL_COMPAT && setup->hlc.len > 0 && setup->hlc.len <= sizeof(setup->hlc.compat)) + msgb_tlv_put(msg, GSM48_IE_HIGHL_COMPAT, setup->hlc.len, setup->hlc.compat); /* user-user */ if (setup->fields & MNCC_F_USERUSER) gsm48_encode_useruser(msg, 0, &setup->useruser); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35393?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I760980a7e17e2fa81615adc69ef85797eb0c07f1 Gerrit-Change-Number: 35393 Gerrit-PatchSet: 7 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in osmo-msc[master]: ASCI: Remove debug line, used during development process
by laforge 24 Jan '24

24 Jan '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35545?usp=email ) Change subject: ASCI: Remove debug line, used during development process ...................................................................... ASCI: Remove debug line, used during development process Change-Id: Ie297353146cf30360a7030a2d5ee03e3391cce64 --- M src/libmsc/msc_vgcs.c 1 file changed, 9 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, approved diff --git a/src/libmsc/msc_vgcs.c b/src/libmsc/msc_vgcs.c index d3f2e0e..264fa49 100644 --- a/src/libmsc/msc_vgcs.c +++ b/src/libmsc/msc_vgcs.c @@ -1776,7 +1776,6 @@ struct osmo_mobile_identity mi; int rc; - puts(osmo_hexdump(l3, l3_len)); rc = osmo_mobile_identity_decode_from_l3_buf(&mi, l3, l3_len, false); if (rc < 0) { LOG_BSS(bss, LOGL_DEBUG, "Talker's Identity cannot be decoded.\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35545?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie297353146cf30360a7030a2d5ee03e3391cce64 Gerrit-Change-Number: 35545 Gerrit-PatchSet: 5 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in osmo-msc[master]: Add LLC and HLC information to MNCC interface definiton
by laforge 24 Jan '24

24 Jan '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35392?usp=email ) Change subject: Add LLC and HLC information to MNCC interface definiton ...................................................................... Add LLC and HLC information to MNCC interface definiton low/high layer compatibility are used for capability checking between caller and called entitiy. The information is added to the end of struct gsm_mncc increases, so that the version number needs not to be incremented. Related: OS#6152 Change-Id: I15f5afcf069ee6c1c4641108ceacc837bee311b5 --- M include/osmocom/msc/mncc.h M tests/mncc/mncc_test.ok 2 files changed, 38 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/msc/mncc.h b/include/osmocom/msc/mncc.h index c8f3bfd..d258630 100644 --- a/include/osmocom/msc/mncc.h +++ b/include/osmocom/msc/mncc.h @@ -125,9 +125,14 @@ #define MNCC_F_KEYPAD 0x1000 #define MNCC_F_SIGNAL 0x2000 #define MNCC_F_GCR 0x4000 +#define MNCC_F_HIGHL_COMPAT 0x8000 +#define MNCC_F_LOWL_COMPAT 0x10000 /* UPDATEME when adding new MNCC_F_* entries above */ -#define MNCC_F_ALL 0x7fff +#define MNCC_F_ALL 0x1ffff + +#define GSM_MAX_LOWL_COMPAT 16 /* (18 with TLV) */ +#define GSM_MAX_HIGHL_COMPAT 3 /* (5 with TLV) */ struct gsm_mncc { /* context based information */ @@ -170,6 +175,20 @@ /* A buffer to contain SDP ('\0' terminated) */ char sdp[1024]; + + /* Additional information that extends current socket interface version. */ + + /* The content requals of Low Layer compatibility IE, described in 3GPP TS 24.008 §10.5.4.18. */ + struct gsm_mncc_lowl_compat { + uint8_t len; + uint8_t compat[GSM_MAX_LOWL_COMPAT]; + } llc; + + /* The content requals of High Layer compatibility IE, described in 3GPP TS 24.008 §10.5.4.16. */ + struct gsm_mncc_highl_compat { + uint8_t len; + uint8_t compat[GSM_MAX_HIGHL_COMPAT]; + } hlc; }; struct gsm_data_frame { diff --git a/tests/mncc/mncc_test.ok b/tests/mncc/mncc_test.ok index 059e808..ca3ac64 100644 --- a/tests/mncc/mncc_test.ok +++ b/tests/mncc/mncc_test.ok @@ -1,10 +1,10 @@ test_sdp_termination() struct gsm_mncc: -empty SDP: len=1876 sdplen=1026 sdp="\0" rc=0 +empty SDP: len=1896 sdplen=1046 sdp="\0" rc=0 empty SDP, shortest possible: len=851 sdplen=1 sdp="\0" rc=0 empty SDP, zero len: len=850 sdplen=0 sdp=- rc=-22 -terminated SDP str: len=1876 sdplen=1026 sdp="Privacy is a desirable marketing option\0" rc=0 +terminated SDP str: len=1896 sdplen=1046 sdp="Privacy is a desirable marketing option\0" rc=0 terminated SDP str, shortest possible: len=890 sdplen=40 sdp="Privacy is a desirable marketing option\0" rc=0 terminated SDP str, but len excludes nul: len=889 sdplen=39 sdp="Privacy is a desirable marketing option" rc=-22 terminated SDP str, but len too short: len=873 sdplen=23 sdp="Privacy is a desirable " rc=-22 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35392?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I15f5afcf069ee6c1c4641108ceacc837bee311b5 Gerrit-Change-Number: 35392 Gerrit-PatchSet: 6 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-msc[master]: ASCI: Remove debug line, used during development process
by laforge 24 Jan '24

24 Jan '24

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35545?usp=email ) Change subject: ASCI: Remove debug line, used during development process ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35545?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ie297353146cf30360a7030a2d5ee03e3391cce64 Gerrit-Change-Number: 35545 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Wed, 24 Jan 2024 08:50:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-msc[master]: Add LLC and HLC information forwarding to MNCC interface
by laforge 24 Jan '24

24 Jan '24

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35393?usp=email ) Change subject: Add LLC and HLC information forwarding to MNCC interface ...................................................................... Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35393?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I760980a7e17e2fa81615adc69ef85797eb0c07f1 Gerrit-Change-Number: 35393 Gerrit-PatchSet: 6 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Wed, 24 Jan 2024 08:50:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0