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

[S] Change in osmo-bsc[master]: fix length check in abis_rsl_rx_rll()

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32421 ) Change subject: fix length check in abis_rsl_rx_rll() ...................................................................... fix length check in abis_rsl_rx_rll() In abis_rsl_rx_rll(), we do the following header length check -- quick challenge, can you spot the two bugs hidden here? struct abis_rsl_rll_hdr *rllh; if (msgb_l2len(msg) > sizeof(struct abis_rsl_common_hdr) + sizeof(*rllh)) msg->l3h = &rllh->data[3]; Fix these bugs: - struct abis_rsl_common_hdr is already included as the first member of abis_rsl_rll_hdr, no need to add that. - We are going to be accessing rrlh->data[3], so we must check for at least sizeof(*rllh) + 4. Change-Id: Ie4aee615c8c904ae8308ec0074d8bc5208137061 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 26 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/21/32421/1 diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 6370942..2fc640b 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -2500,8 +2500,7 @@ switch (rllh->c.msg_type) { case RSL_MT_DATA_IND: LOG_LCHAN(msg->lchan, LOGL_DEBUG, "SAPI=%u DATA INDICATION\n", sapi); - if (msgb_l2len(msg) > - sizeof(struct abis_rsl_common_hdr) + sizeof(*rllh) && + if (msgb_l2len(msg) > (sizeof(*rllh) + 3) && rllh->data[0] == RSL_IE_L3_INFO) { msg->l3h = &rllh->data[3]; return gsm0408_rcvmsg(msg, rllh->link_id); @@ -2543,8 +2542,7 @@ msg->lchan->sapis[sapi] = LCHAN_SAPI_MS; osmo_fsm_inst_dispatch(msg->lchan->fi, LCHAN_EV_RLL_ESTABLISH_IND, msg); - if (msgb_l2len(msg) > - sizeof(struct abis_rsl_common_hdr) + sizeof(*rllh) && + if (msgb_l2len(msg) > (sizeof(*rllh) + 3) && rllh->data[0] == RSL_IE_L3_INFO) { msg->l3h = &rllh->data[3]; return gsm0408_rcvmsg(msg, rllh->link_id); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32421 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie4aee615c8c904ae8308ec0074d8bc5208137061 Gerrit-Change-Number: 32421 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[S] Change in libosmo-pfcp[master]: coverity: fix null deref

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/32363 ) Change subject: coverity: fix null deref ...................................................................... coverity: fix null deref fixup for "pfcp_msg: refactor LOG_PFCP_MSG e6ff99d7acbe270ed8f271daeaafc99e03a48176 Change-Id Ic84090c9b1a34185577cfb2ea1efa9c07542df34 Related: CID#313611 Change-Id: I347a813b31c839eae6b752982952367b2e664dc4 --- M src/libosmo-pfcp/pfcp_msg.c 1 file changed, 16 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved diff --git a/src/libosmo-pfcp/pfcp_msg.c b/src/libosmo-pfcp/pfcp_msg.c index 74335fe..abcee18 100644 --- a/src/libosmo-pfcp/pfcp_msg.c +++ b/src/libosmo-pfcp/pfcp_msg.c @@ -555,7 +555,7 @@ { struct osmo_strbuf sb = { .buf = buf, .len = buflen }; struct osmo_fsm_inst *fi = m ? (m->ctx.session_fi ?: m->ctx.peer_fi) : NULL; - enum osmo_pfcp_cause *cause = osmo_pfcp_msg_cause(m); + enum osmo_pfcp_cause *cause = m ? osmo_pfcp_msg_cause(m) : NULL; if (fi) OSMO_STRBUF_PRINTF(sb, "%s{%s}: ", -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/32363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I347a813b31c839eae6b752982952367b2e664dc4 Gerrit-Change-Number: 32363 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: modem: Fix wrong 'radio not started' vty message

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/32420 to look at the new patch set (#2). Change subject: layer23: modem: Fix wrong 'radio not started' vty message ...................................................................... layer23: modem: Fix wrong 'radio not started' vty message Change-Id: I8871c9d0e820beb75d7820b5a2d8d3c77dac379d --- M src/host/layer23/src/common/vty.c M src/host/layer23/src/modem/app_modem.c 2 files changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/20/32420/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32420 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8871c9d0e820beb75d7820b5a2d8d3c77dac379d Gerrit-Change-Number: 32420 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: modem: Fix wrong 'radio not started' vty message

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32420 ) Change subject: layer23: modem: Fix wrong 'radio not started' vty message ...................................................................... layer23: modem: Fix wrong 'radio not started' vty message Change-Id: I8871c9d0e820beb75d7820b5a2d8d3c77dac379d --- M src/host/layer23/src/common/vty.c M src/host/layer23/src/modem/app_modem.c 2 files changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/20/32420/1 diff --git a/src/host/layer23/src/common/vty.c b/src/host/layer23/src/common/vty.c index c88d88d..dc6e580 100644 --- a/src/host/layer23/src/common/vty.c +++ b/src/host/layer23/src/common/vty.c @@ -137,7 +137,9 @@ if (!ms->started) service = ", radio is not started"; - else if (ms->mmlayer.state == GSM48_MM_ST_MM_IDLE) { + else if (ms->mmlayer.state == GSM48_MM_ST_NULL) { + service = ", MM connection not yet set up"; + } else if (ms->mmlayer.state == GSM48_MM_ST_MM_IDLE) { /* current MM idle state */ switch (ms->mmlayer.substate) { case GSM48_MM_SST_NORMAL_SERVICE: diff --git a/src/host/layer23/src/modem/app_modem.c b/src/host/layer23/src/modem/app_modem.c index 644c630..fec759c 100644 --- a/src/host/layer23/src/modem/app_modem.c +++ b/src/host/layer23/src/modem/app_modem.c @@ -126,6 +126,7 @@ case S_L1CTL_RESET: ms = signal_data; layer3_app_reset(); + ms->started = true; return l1ctl_tx_fbsb_req(ms, ms->test_arfcn, L1CTL_FBSB_F_FB01SB, 100, 0, CCCH_MODE_NONE, dbm2rxlev(-85)); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32420 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I8871c9d0e820beb75d7820b5a2d8d3c77dac379d Gerrit-Change-Number: 32420 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[L] Change in osmocom-bb[master]: layer23: Move testsim node to common/

by pespin

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/32419 to look at the new patch set (#2). Change subject: layer23: Move testsim node to common/ ...................................................................... layer23: Move testsim node to common/ Change-Id: Ife34403a715809b43e7a4cd5ce4dec8616fc08af --- M src/host/layer23/include/osmocom/bb/common/vty.h M src/host/layer23/include/osmocom/bb/mobile/vty.h M src/host/layer23/src/common/vty.c M src/host/layer23/src/mobile/vty_interface.c 4 files changed, 319 insertions(+), 301 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/19/32419/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ife34403a715809b43e7a4cd5ce4dec8616fc08af Gerrit-Change-Number: 32419 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

[L] Change in osmocom-bb[master]: layer23: Move testsim node to common/

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32419 ) Change subject: layer23: Move testsim node to common/ ...................................................................... layer23: Move testsim node to common/ Change-Id: Ife34403a715809b43e7a4cd5ce4dec8616fc08af --- M src/host/layer23/include/osmocom/bb/common/vty.h M src/host/layer23/include/osmocom/bb/mobile/vty.h M src/host/layer23/src/common/vty.c M src/host/layer23/src/mobile/vty_interface.c 4 files changed, 319 insertions(+), 301 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/19/32419/1 diff --git a/src/host/layer23/include/osmocom/bb/common/vty.h b/src/host/layer23/include/osmocom/bb/common/vty.h index 517db95..7f6e2d3 100644 --- a/src/host/layer23/include/osmocom/bb/common/vty.h +++ b/src/host/layer23/include/osmocom/bb/common/vty.h @@ -10,6 +10,7 @@ enum l23_vty_node { MS_NODE = _LAST_OSMOVTY_NODE + 1, + TESTSIM_NODE, GSMTAP_NODE, _LAST_L23VTY_NODE, }; @@ -25,6 +26,7 @@ extern void l23_vty_ms_notify(struct osmocom_ms *ms, const char *fmt, ...) __attribute__ ((format (printf, 2, 3))); extern bool l23_vty_reading; +extern bool l23_vty_hide_default; extern struct llist_head ms_list; diff --git a/src/host/layer23/include/osmocom/bb/mobile/vty.h b/src/host/layer23/include/osmocom/bb/mobile/vty.h index 8ca51d4..4ac084e 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/vty.h +++ b/src/host/layer23/include/osmocom/bb/mobile/vty.h @@ -9,8 +9,7 @@ #include <osmocom/bb/common/vty.h> enum ms_vty_node { - TESTSIM_NODE = _LAST_L23VTY_NODE + 1, - SUPPORT_NODE, + SUPPORT_NODE = _LAST_L23VTY_NODE + 1, AUDIO_NODE, }; diff --git a/src/host/layer23/src/common/vty.c b/src/host/layer23/src/common/vty.c index d9dc022..547c9bd 100644 --- a/src/host/layer23/src/common/vty.c +++ b/src/host/layer23/src/common/vty.c @@ -46,6 +46,8 @@ bool l23_vty_reading = false; +bool l23_vty_hide_default = false; + static struct cmd_node ms_node = { MS_NODE, "%s(ms)# ", @@ -58,6 +60,12 @@ 1 }; +struct cmd_node testsim_node = { + TESTSIM_NODE, + "%s(test-sim)# ", + 1 +}; + static void l23_vty_restart_required_warn(struct vty *vty, struct osmocom_ms *ms) { if (l23_vty_reading) @@ -161,6 +169,23 @@ VTY_NEWLINE); } +/* CONFIG NODE: */ +DEFUN(cfg_hide_default, cfg_hide_default_cmd, "hide-default", + "Hide most default values in config to make it more compact") +{ + l23_vty_hide_default = 1; + + return CMD_SUCCESS; +} + +DEFUN(cfg_no_hide_default, cfg_no_hide_default_cmd, "no hide-default", + NO_STR "Show default values in config") +{ + l23_vty_hide_default = 0; + + return CMD_SUCCESS; +} + /* "gsmtap" config */ gDEFUN(l23_cfg_gsmtap, l23_cfg_gsmtap_cmd, "gsmtap", "Configure GSMTAP\n") @@ -460,6 +485,206 @@ return data.ms_stop.rc; } +/* per testsim config */ +DEFUN(cfg_ms_testsim, cfg_ms_testsim_cmd, "test-sim", + "Configure test SIM emulation") +{ + vty->node = TESTSIM_NODE; + + return CMD_SUCCESS; +} + +DEFUN(cfg_test_imsi, cfg_test_imsi_cmd, "imsi IMSI", + "Set IMSI on test card\n15 digits IMSI") +{ + struct osmocom_ms *ms = vty->index; + struct gsm_settings *set = &ms->settings; + + if (!osmo_imsi_str_valid(argv[0])) { + vty_out(vty, "Wrong IMSI format%s", VTY_NEWLINE); + return CMD_WARNING; + } + + OSMO_STRLCPY_ARRAY(set->test_imsi, argv[0]); + + l23_vty_restart_required_warn(vty, ms); + + return CMD_SUCCESS; +} + +#define HEX_STR "\nByte as two digits hexadecimal" +DEFUN(cfg_test_ki_xor, cfg_test_ki_xor_cmd, "ki xor HEX HEX HEX HEX HEX HEX " + "HEX HEX HEX HEX HEX HEX", + "Set Key (Ki) on test card\nUse XOR algorithm" HEX_STR HEX_STR HEX_STR + HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR) +{ + struct osmocom_ms *ms = vty->index; + struct gsm_settings *set = &ms->settings; + uint8_t ki[12]; + const char *p; + int i; + + for (i = 0; i < 12; i++) { + p = argv[i]; + if (!strncmp(p, "0x", 2)) + p += 2; + if (strlen(p) != 2) { + vty_out(vty, "Expecting two digits hex value (with or " + "without 0x in front)%s", VTY_NEWLINE); + return CMD_WARNING; + } + ki[i] = strtoul(p, NULL, 16); + } + + set->test_ki_type = OSMO_AUTH_ALG_XOR; + memcpy(set->test_ki, ki, 12); + return CMD_SUCCESS; +} + +DEFUN(cfg_test_ki_comp128, cfg_test_ki_comp128_cmd, "ki comp128 HEX HEX HEX " + "HEX HEX HEX HEX HEX HEX HEX HEX HEX HEX HEX HEX HEX", + "Set Key (Ki) on test card\nUse XOR algorithm" HEX_STR HEX_STR HEX_STR + HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR + HEX_STR HEX_STR HEX_STR HEX_STR) +{ + struct osmocom_ms *ms = vty->index; + struct gsm_settings *set = &ms->settings; + uint8_t ki[16]; + const char *p; + int i; + + for (i = 0; i < 16; i++) { + p = argv[i]; + if (!strncmp(p, "0x", 2)) + p += 2; + if (strlen(p) != 2) { + vty_out(vty, "Expecting two digits hex value (with or " + "without 0x in front)%s", VTY_NEWLINE); + return CMD_WARNING; + } + ki[i] = strtoul(p, NULL, 16); + } + + set->test_ki_type = OSMO_AUTH_ALG_COMP128v1; + memcpy(set->test_ki, ki, 16); + return CMD_SUCCESS; +} + +DEFUN(cfg_test_barr, cfg_test_barr_cmd, "barred-access", + "Allow access to barred cells") +{ + struct osmocom_ms *ms = vty->index; + struct gsm_settings *set = &ms->settings; + + set->test_barr = 1; + + return CMD_SUCCESS; +} + +DEFUN(cfg_test_no_barr, cfg_test_no_barr_cmd, "no barred-access", + NO_STR "Deny access to barred cells") +{ + struct osmocom_ms *ms = vty->index; + struct gsm_settings *set = &ms->settings; + + set->test_barr = 0; + + return CMD_SUCCESS; +} + +DEFUN(cfg_test_no_rplmn, cfg_test_no_rplmn_cmd, "no rplmn", + NO_STR "Unset Registered PLMN") +{ + struct osmocom_ms *ms = vty->index; + struct gsm_settings *set = &ms->settings; + + set->test_rplmn_valid = 0; + + l23_vty_restart_required_warn(vty, ms); + + return CMD_SUCCESS; +} + +static int _test_rplmn_cmd(struct vty *vty, int argc, const char *argv[], + int attached) +{ + struct osmocom_ms *ms = vty->index; + struct gsm_settings *set = &ms->settings; + uint16_t mcc = gsm_input_mcc((char *)argv[0]), + mnc = gsm_input_mnc((char *)argv[1]); + + if (mcc == GSM_INPUT_INVALID) { + vty_out(vty, "Given MCC invalid%s", VTY_NEWLINE); + return CMD_WARNING; + } + if (mnc == GSM_INPUT_INVALID) { + vty_out(vty, "Given MNC invalid%s", VTY_NEWLINE); + return CMD_WARNING; + } + set->test_rplmn_valid = 1; + set->test_rplmn_mcc = mcc; + set->test_rplmn_mnc = mnc; + + if (argc >= 3) + set->test_lac = strtoul(argv[2], NULL, 16); + else + set->test_lac = 0xfffe; + + if (argc >= 4) + set->test_tmsi = strtoul(argv[3], NULL, 16); + else + set->test_tmsi = 0xffffffff; + + if (attached) + set->test_imsi_attached = 1; + else + set->test_imsi_attached = 0; + + l23_vty_restart_required_warn(vty, ms); + + return CMD_SUCCESS; +} + +DEFUN(cfg_test_rplmn, cfg_test_rplmn_cmd, + "rplmn MCC MNC [LAC] [TMSI]", + "Set Registered PLMN\nMobile Country Code\nMobile Network Code\n" + "Optionally set location area code\n" + "Optionally set current assigned TMSI") +{ + return _test_rplmn_cmd(vty, argc, argv, 0); +} + +DEFUN(cfg_test_rplmn_att, cfg_test_rplmn_att_cmd, + "rplmn MCC MNC LAC TMSI attached", + "Set Registered PLMN\nMobile Country Code\nMobile Network Code\n" + "Set location area code\nSet current assigned TMSI\n" + "Indicate to MM that card is already attached") +{ + return _test_rplmn_cmd(vty, argc, argv, 1); +} + +DEFUN(cfg_test_hplmn, cfg_test_hplmn_cmd, "hplmn-search (everywhere|foreign-country)", + "Set Home PLMN search mode\n" + "Search for HPLMN when on any other network\n" + "Search for HPLMN when in a different country") +{ + struct osmocom_ms *ms = vty->index; + struct gsm_settings *set = &ms->settings; + + switch (argv[0][0]) { + case 'e': + set->test_always = 1; + break; + case 'f': + set->test_always = 0; + break; + } + + l23_vty_restart_required_warn(vty, ms); + + return CMD_SUCCESS; +} + static int l23_vty_config_write_gsmtap_node(struct vty *vty) { const char *chan_buf; @@ -512,6 +737,47 @@ return CMD_SUCCESS; } +static int l23_vty_config_write_testsim_node(struct vty *vty, const struct osmocom_ms *ms, const char *prefix) +{ + const struct gsm_settings *set = &ms->settings; + vty_out(vty, "%stest-sim%s", prefix, VTY_NEWLINE); + vty_out(vty, "%s imsi %s%s", prefix, set->test_imsi, VTY_NEWLINE); + switch (set->test_ki_type) { + case OSMO_AUTH_ALG_XOR: + vty_out(vty, "%s ki xor %s%s", + osmo_hexdump(set->test_ki, 12), prefix, VTY_NEWLINE); + break; + case OSMO_AUTH_ALG_COMP128v1: + vty_out(vty, "%s ki comp128 %s%s", + osmo_hexdump(set->test_ki, 16), prefix, VTY_NEWLINE); + break; + } + if (!l23_vty_hide_default || set->test_barr) + vty_out(vty, "%s %sbarred-access%s", + (set->test_barr) ? "" : "no ", prefix, VTY_NEWLINE); + if (set->test_rplmn_valid) { + vty_out(vty, "%s rplmn %s %s", prefix, + gsm_print_mcc(set->test_rplmn_mcc), + gsm_print_mnc(set->test_rplmn_mnc)); + if (set->test_lac > 0x0000 && set->test_lac < 0xfffe) { + vty_out(vty, " 0x%04x", set->test_lac); + if (set->test_tmsi != 0xffffffff) { + vty_out(vty, " 0x%08x", set->test_tmsi); + if (set->test_imsi_attached) + vty_out(vty, " attached"); + } + } + vty_out(vty, "%s", VTY_NEWLINE); + } else + if (!l23_vty_hide_default) + vty_out(vty, "%s no rplmn%s", prefix, VTY_NEWLINE); + if (!l23_vty_hide_default || set->test_always) + vty_out(vty, "%s hplmn-search %s%s", prefix, + (set->test_always) ? "everywhere" : "foreign-country", + VTY_NEWLINE); + return CMD_SUCCESS; +} + void l23_vty_config_write_ms_node(struct vty *vty, const struct osmocom_ms *ms, const char *prefix) { size_t prefix_len = strlen(prefix); @@ -533,6 +799,7 @@ vty_out(vty, "%slayer2-socket %s%s", prefix, set->layer2_socket_path, VTY_NEWLINE); + l23_vty_config_write_testsim_node(vty, ms, prefix); } /* placeholder for shared VTY commands. Must be put at the end of the node: */ @@ -599,8 +866,22 @@ if (l23_app_info.opt_supported & L23_OPT_VTY) osmo_stats_vty_add_cmds(); + install_element(CONFIG_NODE, &cfg_hide_default_cmd); + install_element(CONFIG_NODE, &cfg_no_hide_default_cmd); + install_node(&ms_node, config_write_ms_node_cb); install_element(MS_NODE, &cfg_ms_layer2_cmd); + install_element(MS_NODE, &cfg_ms_testsim_cmd); + install_node(&testsim_node, NULL); + install_element(TESTSIM_NODE, &cfg_test_imsi_cmd); + install_element(TESTSIM_NODE, &cfg_test_ki_xor_cmd); + install_element(TESTSIM_NODE, &cfg_test_ki_comp128_cmd); + install_element(TESTSIM_NODE, &cfg_test_barr_cmd); + install_element(TESTSIM_NODE, &cfg_test_no_barr_cmd); + install_element(TESTSIM_NODE, &cfg_test_no_rplmn_cmd); + install_element(TESTSIM_NODE, &cfg_test_rplmn_cmd); + install_element(TESTSIM_NODE, &cfg_test_rplmn_att_cmd); + install_element(TESTSIM_NODE, &cfg_test_hplmn_cmd); install_element(MS_NODE, &cfg_ms_shutdown_cmd); install_element(MS_NODE, &cfg_ms_shutdown_force_cmd); install_element(MS_NODE, &cfg_ms_no_shutdown_cmd); diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index b2ddfe7..57d02e6 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -42,12 +42,6 @@ #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/misc.h> -struct cmd_node testsim_node = { - TESTSIM_NODE, - "%s(test-sim)# ", - 1 -}; - struct cmd_node support_node = { SUPPORT_NODE, "%s(support)# ", @@ -105,8 +99,6 @@ return 0; } -static int hide_default = 0; - static void vty_restart(struct vty *vty, struct osmocom_ms *ms) { if (l23_vty_reading) @@ -1150,22 +1142,6 @@ return CMD_SUCCESS; } -DEFUN(cfg_hide_default, cfg_hide_default_cmd, "hide-default", - "Hide most default values in config to make it more compact") -{ - hide_default = 1; - - return CMD_SUCCESS; -} - -DEFUN(cfg_no_hide_default, cfg_no_hide_default_cmd, "no hide-default", - NO_STR "Show default values in config") -{ - hide_default = 0; - - return CMD_SUCCESS; -} - /* per MS config */ DEFUN(cfg_ms, cfg_ms_cmd, "ms MS_NAME", "Select a mobile station to configure\nName of MS (see \"show ms\")") @@ -1284,7 +1260,7 @@ #define SUP_WRITE(item, cmd) \ if (sup->item) \ - if (!hide_default || !set->item) \ + if (!l23_vty_hide_default || !set->item) \ vty_out(vty, " %s%s%s", (set->item) ? "" : "no ", \ cmd, VTY_NEWLINE); @@ -1332,33 +1308,33 @@ vty_out(vty, " imei-random %d%s", set->imei_random, VTY_NEWLINE); else - if (!hide_default) + if (!l23_vty_hide_default) vty_out(vty, " imei-fixed%s", VTY_NEWLINE); if (set->emergency_imsi[0]) vty_out(vty, " emergency-imsi %s%s", set->emergency_imsi, VTY_NEWLINE); else - if (!hide_default) + if (!l23_vty_hide_default) vty_out(vty, " no emergency-imsi%s", VTY_NEWLINE); if (set->sms_sca[0]) vty_out(vty, " sms-service-center %s%s", set->sms_sca, VTY_NEWLINE); else - if (!hide_default) + if (!l23_vty_hide_default) vty_out(vty, " no sms-service-center%s", VTY_NEWLINE); - if (!hide_default || set->cw) + if (!l23_vty_hide_default || set->cw) vty_out(vty, " %scall-waiting%s", (set->cw) ? "" : "no ", VTY_NEWLINE); - if (!hide_default || set->auto_answer) + if (!l23_vty_hide_default || set->auto_answer) vty_out(vty, " %sauto-answer%s", (set->auto_answer) ? "" : "no ", VTY_NEWLINE); - if (!hide_default || set->force_rekey) + if (!l23_vty_hide_default || set->force_rekey) vty_out(vty, " %sforce-rekey%s", (set->force_rekey) ? "" : "no ", VTY_NEWLINE); - if (!hide_default || set->clip) + if (!l23_vty_hide_default || set->clip) vty_out(vty, " %sclip%s", (set->clip) ? "" : "no ", VTY_NEWLINE); - if (!hide_default || set->clir) + if (!l23_vty_hide_default || set->clir) vty_out(vty, " %sclir%s", (set->clir) ? "" : "no ", VTY_NEWLINE); if (set->alter_tx_power) @@ -1368,25 +1344,25 @@ else vty_out(vty, " tx-power full%s", VTY_NEWLINE); else - if (!hide_default) + if (!l23_vty_hide_default) vty_out(vty, " tx-power auto%s", VTY_NEWLINE); if (set->alter_delay) vty_out(vty, " simulated-delay %d%s", set->alter_delay, VTY_NEWLINE); else - if (!hide_default) + if (!l23_vty_hide_default) vty_out(vty, " no simulated-delay%s", VTY_NEWLINE); if (set->stick) vty_out(vty, " stick %d%s%s", set->stick_arfcn & 1023, (set->stick_arfcn & ARFCN_PCS) ? " pcs" : "", VTY_NEWLINE); else - if (!hide_default) + if (!l23_vty_hide_default) vty_out(vty, " no stick%s", VTY_NEWLINE); - if (!hide_default || set->no_lupd) + if (!l23_vty_hide_default || set->no_lupd) vty_out(vty, " %slocation-updating%s", (set->no_lupd) ? "no " : "", VTY_NEWLINE); - if (!hide_default || set->no_neighbour) + if (!l23_vty_hide_default || set->no_neighbour) vty_out(vty, " %sneighbour-measurement%s", (set->no_neighbour) ? "no " : "", VTY_NEWLINE); if (set->full_v1 || set->full_v2 || set->full_v3) { @@ -1404,7 +1380,7 @@ vty_out(vty, " no codec half-speed%s", VTY_NEWLINE); } if (llist_empty(&set->abbrev)) { - if (!hide_default) + if (!l23_vty_hide_default) vty_out(vty, " no abbrev%s", VTY_NEWLINE); } else { llist_for_each_entry(abbrev, &set->abbrev, list) @@ -1430,26 +1406,26 @@ SUP_WRITE(dcs, "dcs"); SUP_WRITE(pcs, "pcs"); if (sup->r_gsm || sup->e_gsm || sup->p_gsm) - if (!hide_default || sup->class_900 != set->class_900) + if (!l23_vty_hide_default || sup->class_900 != set->class_900) vty_out(vty, " class-900 %d%s", set->class_900, VTY_NEWLINE); if (sup->gsm_850) - if (!hide_default || sup->class_850 != set->class_850) + if (!l23_vty_hide_default || sup->class_850 != set->class_850) vty_out(vty, " class-850 %d%s", set->class_850, VTY_NEWLINE); if (sup->gsm_480 || sup->gsm_450) - if (!hide_default || sup->class_400 != set->class_400) + if (!l23_vty_hide_default || sup->class_400 != set->class_400) vty_out(vty, " class-400 %d%s", set->class_400, VTY_NEWLINE); if (sup->dcs) - if (!hide_default || sup->class_dcs != set->class_dcs) + if (!l23_vty_hide_default || sup->class_dcs != set->class_dcs) vty_out(vty, " class-dcs %d%s", set->class_dcs, VTY_NEWLINE); if (sup->pcs) - if (!hide_default || sup->class_pcs != set->class_pcs) + if (!l23_vty_hide_default || sup->class_pcs != set->class_pcs) vty_out(vty, " class-pcs %d%s", set->class_pcs, VTY_NEWLINE); - if (!hide_default || sup->ch_cap != set->ch_cap) { + if (!l23_vty_hide_default || sup->ch_cap != set->ch_cap) { switch (set->ch_cap) { case GSM_CAP_SDCCH: vty_out(vty, " channel-capability sdcch%s", @@ -1470,50 +1446,15 @@ SUP_WRITE(full_v3, "full-speech-v3"); SUP_WRITE(half_v1, "half-speech-v1"); SUP_WRITE(half_v3, "half-speech-v3"); - if (!hide_default || sup->min_rxlev_dbm != set->min_rxlev_dbm) + if (!l23_vty_hide_default || sup->min_rxlev_dbm != set->min_rxlev_dbm) vty_out(vty, " min-rxlev %d%s", set->min_rxlev_dbm, VTY_NEWLINE); - if (!hide_default || sup->dsc_max != set->dsc_max) + if (!l23_vty_hide_default || sup->dsc_max != set->dsc_max) vty_out(vty, " dsc-max %d%s", set->dsc_max, VTY_NEWLINE); - if (!hide_default || set->skip_max_per_band) + if (!l23_vty_hide_default || set->skip_max_per_band) vty_out(vty, " %sskip-max-per-band%s", (set->skip_max_per_band) ? "" : "no ", VTY_NEWLINE); - vty_out(vty, " test-sim%s", VTY_NEWLINE); - vty_out(vty, " imsi %s%s", set->test_imsi, VTY_NEWLINE); - switch (set->test_ki_type) { - case OSMO_AUTH_ALG_XOR: - vty_out(vty, " ki xor %s%s", - osmo_hexdump(set->test_ki, 12), VTY_NEWLINE); - break; - case OSMO_AUTH_ALG_COMP128v1: - vty_out(vty, " ki comp128 %s%s", - osmo_hexdump(set->test_ki, 16), VTY_NEWLINE); - break; - } - if (!hide_default || set->test_barr) - vty_out(vty, " %sbarred-access%s", - (set->test_barr) ? "" : "no ", VTY_NEWLINE); - if (set->test_rplmn_valid) { - vty_out(vty, " rplmn %s %s", - gsm_print_mcc(set->test_rplmn_mcc), - gsm_print_mnc(set->test_rplmn_mnc)); - if (set->test_lac > 0x0000 && set->test_lac < 0xfffe) { - vty_out(vty, " 0x%04x", set->test_lac); - if (set->test_tmsi != 0xffffffff) { - vty_out(vty, " 0x%08x", set->test_tmsi); - if (set->test_imsi_attached) - vty_out(vty, " attached"); - } - } - vty_out(vty, "%s", VTY_NEWLINE); - } else - if (!hide_default) - vty_out(vty, " no rplmn%s", VTY_NEWLINE); - if (!hide_default || set->test_always) - vty_out(vty, " hplmn-search %s%s", - (set->test_always) ? "everywhere" : "foreign-country", - VTY_NEWLINE); - if (!hide_default || set->any_timeout != MOB_C7_DEFLT_ANY_TIMEOUT) + if (!l23_vty_hide_default || set->any_timeout != MOB_C7_DEFLT_ANY_TIMEOUT) vty_out(vty, " c7-any-timeout %d%s", set->any_timeout, VTY_NEWLINE); @@ -1550,7 +1491,7 @@ vty_out(vty, "%sgps enable%s", (g.enable) ? "" : "no ", VTY_NEWLINE); vty_out(vty, "!%s", VTY_NEWLINE); - vty_out(vty, "%shide-default%s", (hide_default) ? "": "no ", + vty_out(vty, "%shide-default%s", (l23_vty_hide_default) ? "" : "no ", VTY_NEWLINE); vty_out(vty, "!%s", VTY_NEWLINE); @@ -2571,206 +2512,6 @@ return CMD_SUCCESS; } -/* per testsim config */ -DEFUN(cfg_ms_testsim, cfg_ms_testsim_cmd, "test-sim", - "Configure test SIM emulation") -{ - vty->node = TESTSIM_NODE; - - return CMD_SUCCESS; -} - -DEFUN(cfg_test_imsi, cfg_test_imsi_cmd, "imsi IMSI", - "Set IMSI on test card\n15 digits IMSI") -{ - struct osmocom_ms *ms = vty->index; - struct gsm_settings *set = &ms->settings; - - if (!osmo_imsi_str_valid(argv[0])) { - vty_out(vty, "Wrong IMSI format%s", VTY_NEWLINE); - return CMD_WARNING; - } - - strcpy(set->test_imsi, argv[0]); - - vty_restart_if_started(vty, ms); - - return CMD_SUCCESS; -} - -#define HEX_STR "\nByte as two digits hexadecimal" -DEFUN(cfg_test_ki_xor, cfg_test_ki_xor_cmd, "ki xor HEX HEX HEX HEX HEX HEX " - "HEX HEX HEX HEX HEX HEX", - "Set Key (Ki) on test card\nUse XOR algorithm" HEX_STR HEX_STR HEX_STR - HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR) -{ - struct osmocom_ms *ms = vty->index; - struct gsm_settings *set = &ms->settings; - uint8_t ki[12]; - const char *p; - int i; - - for (i = 0; i < 12; i++) { - p = argv[i]; - if (!strncmp(p, "0x", 2)) - p += 2; - if (strlen(p) != 2) { - vty_out(vty, "Expecting two digits hex value (with or " - "without 0x in front)%s", VTY_NEWLINE); - return CMD_WARNING; - } - ki[i] = strtoul(p, NULL, 16); - } - - set->test_ki_type = OSMO_AUTH_ALG_XOR; - memcpy(set->test_ki, ki, 12); - return CMD_SUCCESS; -} - -DEFUN(cfg_test_ki_comp128, cfg_test_ki_comp128_cmd, "ki comp128 HEX HEX HEX " - "HEX HEX HEX HEX HEX HEX HEX HEX HEX HEX HEX HEX HEX", - "Set Key (Ki) on test card\nUse XOR algorithm" HEX_STR HEX_STR HEX_STR - HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR - HEX_STR HEX_STR HEX_STR HEX_STR) -{ - struct osmocom_ms *ms = vty->index; - struct gsm_settings *set = &ms->settings; - uint8_t ki[16]; - const char *p; - int i; - - for (i = 0; i < 16; i++) { - p = argv[i]; - if (!strncmp(p, "0x", 2)) - p += 2; - if (strlen(p) != 2) { - vty_out(vty, "Expecting two digits hex value (with or " - "without 0x in front)%s", VTY_NEWLINE); - return CMD_WARNING; - } - ki[i] = strtoul(p, NULL, 16); - } - - set->test_ki_type = OSMO_AUTH_ALG_COMP128v1; - memcpy(set->test_ki, ki, 16); - return CMD_SUCCESS; -} - -DEFUN(cfg_test_barr, cfg_test_barr_cmd, "barred-access", - "Allow access to barred cells") -{ - struct osmocom_ms *ms = vty->index; - struct gsm_settings *set = &ms->settings; - - set->test_barr = 1; - - return CMD_SUCCESS; -} - -DEFUN(cfg_test_no_barr, cfg_test_no_barr_cmd, "no barred-access", - NO_STR "Deny access to barred cells") -{ - struct osmocom_ms *ms = vty->index; - struct gsm_settings *set = &ms->settings; - - set->test_barr = 0; - - return CMD_SUCCESS; -} - -DEFUN(cfg_test_no_rplmn, cfg_test_no_rplmn_cmd, "no rplmn", - NO_STR "Unset Registered PLMN") -{ - struct osmocom_ms *ms = vty->index; - struct gsm_settings *set = &ms->settings; - - set->test_rplmn_valid = 0; - - vty_restart_if_started(vty, ms); - - return CMD_SUCCESS; -} - -static int _test_rplmn_cmd(struct vty *vty, int argc, const char *argv[], - int attached) -{ - struct osmocom_ms *ms = vty->index; - struct gsm_settings *set = &ms->settings; - uint16_t mcc = gsm_input_mcc((char *)argv[0]), - mnc = gsm_input_mnc((char *)argv[1]); - - if (mcc == GSM_INPUT_INVALID) { - vty_out(vty, "Given MCC invalid%s", VTY_NEWLINE); - return CMD_WARNING; - } - if (mnc == GSM_INPUT_INVALID) { - vty_out(vty, "Given MNC invalid%s", VTY_NEWLINE); - return CMD_WARNING; - } - set->test_rplmn_valid = 1; - set->test_rplmn_mcc = mcc; - set->test_rplmn_mnc = mnc; - - if (argc >= 3) - set->test_lac = strtoul(argv[2], NULL, 16); - else - set->test_lac = 0xfffe; - - if (argc >= 4) - set->test_tmsi = strtoul(argv[3], NULL, 16); - else - set->test_tmsi = 0xffffffff; - - if (attached) - set->test_imsi_attached = 1; - else - set->test_imsi_attached = 0; - - vty_restart_if_started(vty, ms); - - return CMD_SUCCESS; -} - -DEFUN(cfg_test_rplmn, cfg_test_rplmn_cmd, - "rplmn MCC MNC [LAC] [TMSI]", - "Set Registered PLMN\nMobile Country Code\nMobile Network Code\n" - "Optionally set location area code\n" - "Optionally set current assigned TMSI") -{ - return _test_rplmn_cmd(vty, argc, argv, 0); -} - -DEFUN(cfg_test_rplmn_att, cfg_test_rplmn_att_cmd, - "rplmn MCC MNC LAC TMSI attached", - "Set Registered PLMN\nMobile Country Code\nMobile Network Code\n" - "Set location area code\nSet current assigned TMSI\n" - "Indicate to MM that card is already attached") -{ - return _test_rplmn_cmd(vty, argc, argv, 1); -} - -DEFUN(cfg_test_hplmn, cfg_test_hplmn_cmd, "hplmn-search (everywhere|foreign-country)", - "Set Home PLMN search mode\n" - "Search for HPLMN when on any other network\n" - "Search for HPLMN when in a different country") -{ - struct osmocom_ms *ms = vty->index; - struct gsm_settings *set = &ms->settings; - - switch (argv[0][0]) { - case 'e': - set->test_always = 1; - break; - case 'f': - set->test_always = 0; - break; - } - - vty_restart_if_started(vty, ms); - - return CMD_SUCCESS; -} - /* per audio config */ DEFUN(cfg_ms_audio, cfg_ms_audio_cmd, "audio", "Configure audio settings") @@ -3009,9 +2750,6 @@ install_element(CONFIG_NODE, &cfg_gps_enable_cmd); install_element(CONFIG_NODE, &cfg_no_gps_enable_cmd); - install_element(CONFIG_NODE, &cfg_hide_default_cmd); - install_element(CONFIG_NODE, &cfg_no_hide_default_cmd); - install_element(CONFIG_NODE, &cfg_ms_cmd); install_element(CONFIG_NODE, &cfg_ms_create_cmd); install_element(CONFIG_NODE, &cfg_ms_rename_cmd); @@ -3057,7 +2795,6 @@ install_element(MS_NODE, &cfg_ms_no_codec_half_cmd); install_element(MS_NODE, &cfg_ms_abbrev_cmd); install_element(MS_NODE, &cfg_ms_no_abbrev_cmd); - install_element(MS_NODE, &cfg_ms_testsim_cmd); install_element(MS_NODE, &cfg_ms_audio_cmd); install_element(MS_NODE, &cfg_ms_neighbour_cmd); install_element(MS_NODE, &cfg_ms_no_neighbour_cmd); @@ -3120,16 +2857,6 @@ install_element(SUPPORT_NODE, &cfg_ms_sup_dsc_max_cmd); install_element(SUPPORT_NODE, &cfg_ms_sup_skip_max_per_band_cmd); install_element(SUPPORT_NODE, &cfg_ms_sup_no_skip_max_per_band_cmd); - install_node(&testsim_node, config_write_dummy); - install_element(TESTSIM_NODE, &cfg_test_imsi_cmd); - install_element(TESTSIM_NODE, &cfg_test_ki_xor_cmd); - install_element(TESTSIM_NODE, &cfg_test_ki_comp128_cmd); - install_element(TESTSIM_NODE, &cfg_test_barr_cmd); - install_element(TESTSIM_NODE, &cfg_test_no_barr_cmd); - install_element(TESTSIM_NODE, &cfg_test_no_rplmn_cmd); - install_element(TESTSIM_NODE, &cfg_test_rplmn_cmd); - install_element(TESTSIM_NODE, &cfg_test_rplmn_att_cmd); - install_element(TESTSIM_NODE, &cfg_test_hplmn_cmd); install_element(MS_NODE, &cfg_ms_script_load_run_cmd); install_element(MS_NODE, &cfg_ms_no_script_load_run_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ife34403a715809b43e7a4cd5ce4dec8616fc08af Gerrit-Change-Number: 32419 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: Use libosmocore API to validate IMSI string

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32418 ) Change subject: layer23: Use libosmocore API to validate IMSI string ...................................................................... layer23: Use libosmocore API to validate IMSI string Change-Id: I2d4737dabcfb83a7b675c35ad973029a36658d5b --- M src/host/layer23/include/osmocom/bb/common/subscriber.h M src/host/layer23/src/common/subscriber.c M src/host/layer23/src/mobile/vty_interface.c 3 files changed, 17 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/18/32418/1 diff --git a/src/host/layer23/include/osmocom/bb/common/subscriber.h b/src/host/layer23/include/osmocom/bb/common/subscriber.h index 698b0fd..8b15295 100644 --- a/src/host/layer23/include/osmocom/bb/common/subscriber.h +++ b/src/host/layer23/include/osmocom/bb/common/subscriber.h @@ -112,7 +112,6 @@ void (*print)(void *, const char *, ...), void *priv); void gsm_subscr_dump(struct gsm_subscriber *subscr, void (*print)(void *, const char *, ...), void *priv); -char *gsm_check_imsi(const char *imsi); int gsm_subscr_get_key_seq(struct osmocom_ms *ms, struct gsm_subscriber *subscr); #endif /* _SUBSCRIBER_H */ diff --git a/src/host/layer23/src/common/subscriber.c b/src/host/layer23/src/common/subscriber.c index 05771ff..e3f5a8c 100644 --- a/src/host/layer23/src/common/subscriber.c +++ b/src/host/layer23/src/common/subscriber.c @@ -21,6 +21,7 @@ #include <arpa/inet.h> #include <osmocom/core/talloc.h> #include <osmocom/crypt/auth.h> +#include <osmocom/gsm/gsm23003.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> @@ -43,21 +44,6 @@ * support */ -char *gsm_check_imsi(const char *imsi) -{ - int i; - - if (!imsi || strlen(imsi) != 15) - return "IMSI must have 15 digits!"; - - for (i = 0; i < strlen(imsi); i++) { - if (imsi[i] < '0' || imsi[i] > '9') - return "IMSI must have digits 0 to 9 only!"; - } - - return NULL; -} - static char *sim_decode_bcd(uint8_t *data, uint8_t length) { int i, j = 0; @@ -154,7 +140,6 @@ struct gsm_settings *set = &ms->settings; struct gsm_subscriber *subscr = &ms->subscr; struct msgb *nmsg; - char *error; if (subscr->sim_valid) { LOGP(DMM, LOGL_ERROR, "Cannot insert card, until current card " @@ -162,9 +147,8 @@ return -EBUSY; } - error = gsm_check_imsi(set->test_imsi); - if (error) { - LOGP(DMM, LOGL_ERROR, "%s\n", error); + if (!osmo_imsi_str_valid(set->test_imsi)) { + LOGP(DMM, LOGL_ERROR, "Wrong IMSI format\n"); return -EINVAL; } diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index f4dc8a9..b2ddfe7 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -26,6 +26,7 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/signal.h> #include <osmocom/crypt/auth.h> +#include <osmocom/gsm/gsm23003.h> #include <osmocom/bb/common/osmocom_data.h> #include <osmocom/bb/common/ms.h> @@ -1750,11 +1751,9 @@ { struct osmocom_ms *ms = vty->index; struct gsm_settings *set = &ms->settings; - char *error; - error = gsm_check_imsi(argv[0]); - if (error) { - vty_out(vty, "%s%s", error, VTY_NEWLINE); + if (!osmo_imsi_str_valid(argv[0])) { + vty_out(vty, "Wrong IMSI format%s", VTY_NEWLINE); return CMD_WARNING; } strcpy(set->emergency_imsi, argv[0]); @@ -2586,10 +2585,9 @@ { struct osmocom_ms *ms = vty->index; struct gsm_settings *set = &ms->settings; - char *error = gsm_check_imsi(argv[0]); - if (error) { - vty_out(vty, "%s%s", error, VTY_NEWLINE); + if (!osmo_imsi_str_valid(argv[0])) { + vty_out(vty, "Wrong IMSI format%s", VTY_NEWLINE); return CMD_WARNING; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32418 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I2d4737dabcfb83a7b675c35ad973029a36658d5b Gerrit-Change-Number: 32418 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: common/vty: Drop includes pointing to mobile app

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32417 ) Change subject: layer23: common/vty: Drop includes pointing to mobile app ...................................................................... layer23: common/vty: Drop includes pointing to mobile app Change-Id: I025b09500547a739240fc07fa04cb38378ed71db --- M src/host/layer23/src/common/vty.c 1 file changed, 9 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/17/32417/1 diff --git a/src/host/layer23/src/common/vty.c b/src/host/layer23/src/common/vty.c index f28b6eb..d9dc022 100644 --- a/src/host/layer23/src/common/vty.c +++ b/src/host/layer23/src/common/vty.c @@ -41,12 +41,6 @@ #include <osmocom/bb/common/networks.h> #include <osmocom/bb/common/gps.h> #include <osmocom/bb/common/l1l2_interface.h> -#include <osmocom/bb/mobile/mncc.h> -#include <osmocom/bb/mobile/mncc_ms.h> -#include <osmocom/bb/mobile/transaction.h> -#include <osmocom/bb/mobile/vty.h> -#include <osmocom/bb/mobile/gsm480_ss.h> -#include <osmocom/bb/mobile/gsm411_sms.h> extern struct llist_head active_connections; /* libosmocore */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I025b09500547a739240fc07fa04cb38378ed71db Gerrit-Change-Number: 32417 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[L] Change in osmocom-bb[master]: layer23: Move vty_notify() to common/

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32416 ) Change subject: layer23: Move vty_notify() to common/ ...................................................................... layer23: Move vty_notify() to common/ Change-Id: Ic0a98e66adffa9fefeee6e69a4b5c691e0e9c789 --- M src/host/layer23/include/osmocom/bb/common/vty.h M src/host/layer23/include/osmocom/bb/mobile/vty.h M src/host/layer23/src/common/subscriber.c M src/host/layer23/src/common/vty.c M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/mobile/gsm322.c M src/host/layer23/src/mobile/gsm411_sms.c M src/host/layer23/src/mobile/gsm480_ss.c M src/host/layer23/src/mobile/gsm48_mm.c M src/host/layer23/src/mobile/gsm48_rr.c M src/host/layer23/src/mobile/mnccms.c M src/host/layer23/src/mobile/vty_interface.c 12 files changed, 183 insertions(+), 174 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/16/32416/1 diff --git a/src/host/layer23/include/osmocom/bb/common/vty.h b/src/host/layer23/include/osmocom/bb/common/vty.h index 4ff96fe..517db95 100644 --- a/src/host/layer23/include/osmocom/bb/common/vty.h +++ b/src/host/layer23/include/osmocom/bb/common/vty.h @@ -22,6 +22,8 @@ void l23_vty_config_write_ms_node_contents(struct vty *vty, const struct osmocom_ms *ms, const char *prefix); void l23_vty_config_write_ms_node_contents_final(struct vty *vty, const struct osmocom_ms *ms, const char *prefix); +extern void l23_vty_ms_notify(struct osmocom_ms *ms, const char *fmt, ...) __attribute__ ((format (printf, 2, 3))); + extern bool l23_vty_reading; extern struct llist_head ms_list; diff --git a/src/host/layer23/include/osmocom/bb/mobile/vty.h b/src/host/layer23/include/osmocom/bb/mobile/vty.h index 6bd1b37..8ca51d4 100644 --- a/src/host/layer23/include/osmocom/bb/mobile/vty.h +++ b/src/host/layer23/include/osmocom/bb/mobile/vty.h @@ -15,7 +15,5 @@ }; int ms_vty_init(void); -extern void vty_notify(struct osmocom_ms *ms, const char *fmt, ...) __attribute__ ((format (printf, 2, 3))); - #endif diff --git a/src/host/layer23/src/common/subscriber.c b/src/host/layer23/src/common/subscriber.c index 89cacb7..05771ff 100644 --- a/src/host/layer23/src/common/subscriber.c +++ b/src/host/layer23/src/common/subscriber.c @@ -29,7 +29,7 @@ #include <osmocom/bb/common/sap_proto.h> #include <osmocom/bb/common/networks.h> #include <osmocom/bb/common/subscriber.h> -#include <osmocom/bb/mobile/vty.h> +#include <osmocom/bb/common/vty.h> /* enable to get an empty list of forbidden PLMNs, even if stored on SIM. * if list is changed, the result is not written back to SIM */ @@ -621,18 +621,18 @@ LOGP(DMM, LOGL_INFO, "PIN is required, %d tries left\n", payload[1]); - vty_notify(ms, NULL); - vty_notify(ms, "Please give PIN for ICCID %s (you have " + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "Please give PIN for ICCID %s (you have " "%d tries left)\n", subscr->iccid, payload[1]); subscr->sim_pin_required = 1; break; case SIM_CAUSE_PIN1_BLOCKED: LOGP(DMM, LOGL_NOTICE, "PIN is blocked\n"); - vty_notify(ms, NULL); - vty_notify(ms, "PIN is blocked\n"); + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "PIN is blocked\n"); if (payload[1]) { - vty_notify(ms, "Please give PUC for ICCID %s " + l23_vty_ms_notify(ms, "Please give PUC for ICCID %s " "(you have %d tries left)\n", subscr->iccid, payload[1]); } @@ -641,8 +641,8 @@ case SIM_CAUSE_PUC_BLOCKED: LOGP(DMM, LOGL_NOTICE, "PUC is blocked\n"); - vty_notify(ms, NULL); - vty_notify(ms, "PUC is blocked\n"); + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "PUC is blocked\n"); subscr->sim_pin_required = 1; break; default: @@ -653,8 +653,8 @@ } LOGP(DMM, LOGL_NOTICE, "SIM reading failed\n"); - vty_notify(ms, NULL); - vty_notify(ms, "SIM failed, replace SIM!\n"); + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "SIM failed, replace SIM!\n"); /* detach simcard */ subscr->sim_valid = 0; @@ -684,8 +684,8 @@ if (rc) { LOGP(DMM, LOGL_NOTICE, "SIM reading failed, file invalid\n"); if (subscr_sim_files[subscr->sim_file_index].mandatory) { - vty_notify(ms, NULL); - vty_notify(ms, "SIM failed, data invalid, replace " + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "SIM failed, data invalid, replace " "SIM!\n"); msgb_free(msg); @@ -1279,12 +1279,12 @@ subscr->sim_valid = 1; /* Try to connect to the SAP interface */ - vty_notify(ms, NULL); - vty_notify(ms, "Connecting to the SAP interface...\n"); + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "Connecting to the SAP interface...\n"); rc = sap_open(ms); if (rc < 0) { LOGP(DSAP, LOGL_ERROR, "Failed during sap_open(), no SAP based SIM reader\n"); - vty_notify(ms, "SAP connection error!\n"); + l23_vty_ms_notify(ms, "SAP connection error!\n"); ms->sap_wq.bfd.fd = -1; /* Detach SIM */ diff --git a/src/host/layer23/src/common/vty.c b/src/host/layer23/src/common/vty.c index 5985fb1..f28b6eb 100644 --- a/src/host/layer23/src/common/vty.c +++ b/src/host/layer23/src/common/vty.c @@ -48,6 +48,8 @@ #include <osmocom/bb/mobile/gsm480_ss.h> #include <osmocom/bb/mobile/gsm411_sms.h> +extern struct llist_head active_connections; /* libosmocore */ + bool l23_vty_reading = false; static struct cmd_node ms_node = { @@ -91,6 +93,41 @@ return NULL; } +void l23_vty_ms_notify(struct osmocom_ms *ms, const char *fmt, ...) +{ + struct telnet_connection *connection; + char buffer[1000]; + va_list args; + struct vty *vty; + + if (fmt) { + va_start(args, fmt); + vsnprintf(buffer, sizeof(buffer) - 1, fmt, args); + buffer[sizeof(buffer) - 1] = '\0'; + va_end(args); + + if (!buffer[0]) + return; + } + + llist_for_each_entry(connection, &active_connections, entry) { + vty = connection->vty; + if (!vty) + continue; + if (!fmt) { + vty_out(vty, "%s%% (MS %s)%s", VTY_NEWLINE, ms->name, + VTY_NEWLINE); + continue; + } + if (buffer[strlen(buffer) - 1] == '\n') { + buffer[strlen(buffer) - 1] = '\0'; + vty_out(vty, "%% %s%s", buffer, VTY_NEWLINE); + buffer[strlen(buffer)] = '\n'; + } else + vty_out(vty, "%% %s", buffer); + } +} + /* placeholder for layer23 shared MS info to be dumped */ void l23_ms_dump(struct osmocom_ms *ms, struct vty *vty) { diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index a0d2546..8befc80 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -191,8 +191,8 @@ } else { mobile_set_shutdown(ms, MS_SHUTDOWN_COMPL); /* being down */ } - vty_notify(ms, NULL); - vty_notify(ms, "Power off!\n"); + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "Power off!\n"); LOGP(DMOB, LOGL_NOTICE, "Power off! (MS %s)\n", ms->name); return 0; diff --git a/src/host/layer23/src/mobile/gsm322.c b/src/host/layer23/src/mobile/gsm322.c index 80cb342..d7b4154 100644 --- a/src/host/layer23/src/mobile/gsm322.c +++ b/src/host/layer23/src/mobile/gsm322.c @@ -1515,24 +1515,24 @@ /* generate list */ gsm322_sort_list(ms); - vty_notify(ms, NULL); + l23_vty_ms_notify(ms, NULL); switch (msg_type) { case GSM322_EVENT_REG_FAILED: - vty_notify(ms, "Failed to register to network %s, %s " + l23_vty_ms_notify(ms, "Failed to register to network %s, %s " "(%s, %s)\n", gsm_print_mcc(plmn->mcc), gsm_print_mnc(plmn->mnc), gsm_get_mcc(plmn->mcc), gsm_get_mnc(plmn->mcc, plmn->mnc)); break; case GSM322_EVENT_NO_CELL_FOUND: - vty_notify(ms, "No cell found for network %s, %s " + l23_vty_ms_notify(ms, "No cell found for network %s, %s " "(%s, %s)\n", gsm_print_mcc(plmn->mcc), gsm_print_mnc(plmn->mnc), gsm_get_mcc(plmn->mcc), gsm_get_mnc(plmn->mcc, plmn->mnc)); break; case GSM322_EVENT_ROAMING_NA: - vty_notify(ms, "Roaming not allowed to network %s, %s " + l23_vty_ms_notify(ms, "Roaming not allowed to network %s, %s " "(%s, %s)\n", gsm_print_mcc(plmn->mcc), gsm_print_mnc(plmn->mnc), gsm_get_mcc(plmn->mcc), @@ -1541,11 +1541,11 @@ } if (llist_empty(&plmn->sorted_plmn)) - vty_notify(ms, "Search network!\n"); + l23_vty_ms_notify(ms, "Search network!\n"); else { - vty_notify(ms, "Search or select from network:\n"); + l23_vty_ms_notify(ms, "Search or select from network:\n"); llist_for_each_entry(temp, &plmn->sorted_plmn, entry) - vty_notify(ms, " Network %s, %s (%s, %s)\n", + l23_vty_ms_notify(ms, " Network %s, %s (%s, %s)\n", gsm_print_mcc(temp->mcc), gsm_print_mnc(temp->mnc), gsm_get_mcc(temp->mcc), @@ -2442,7 +2442,7 @@ cs->sel_lac = cs->si->lac; cs->sel_id = cs->si->cell_id; if (ms->rrlayer.monitor) { - vty_notify(ms, "MON: %scell selected ARFCN=%s MCC=%s MNC=%s " + l23_vty_ms_notify(ms, "MON: %scell selected ARFCN=%s MCC=%s MNC=%s " "LAC=0x%04x cellid=0x%04x (%s %s)\n", (any) ? "any " : "", gsm_print_arfcn(cs->sel_arfcn), gsm_print_mcc(cs->sel_mcc), gsm_print_mnc(cs->sel_mnc), @@ -2627,7 +2627,7 @@ && cs->list[cs->arfci].sysinfo->sp_cbq)) { LOGP(DCS, LOGL_INFO, "Cell becomes barred.\n"); if (ms->rrlayer.monitor) - vty_notify(ms, "MON: trigger cell re-selection" + l23_vty_ms_notify(ms, "MON: trigger cell re-selection" ": cell becomes barred\n"); trigger_resel: /* mark cell as unscanned */ @@ -2657,7 +2657,7 @@ & (s->class_barr ^ 0xffff))) { LOGP(DCS, LOGL_INFO, "Cell access becomes barred.\n"); if (ms->rrlayer.monitor) - vty_notify(ms, "MON: trigger cell re-selection" + l23_vty_ms_notify(ms, "MON: trigger cell re-selection" ": access to cell becomes barred\n"); goto trigger_resel; } @@ -2669,7 +2669,7 @@ LOGP(DCS, LOGL_NOTICE, "Cell changes location area. " "This is not good!\n"); if (ms->rrlayer.monitor) - vty_notify(ms, "MON: trigger cell re-selection: " + l23_vty_ms_notify(ms, "MON: trigger cell re-selection: " "cell changes LAI\n"); goto trigger_resel; } @@ -2677,7 +2677,7 @@ LOGP(DCS, LOGL_NOTICE, "Cell changes cell ID. " "This is not good!\n"); if (ms->rrlayer.monitor) - vty_notify(ms, "MON: trigger cell re-selection: " + l23_vty_ms_notify(ms, "MON: trigger cell re-selection: " "cell changes cell ID\n"); goto trigger_resel; } @@ -3095,7 +3095,7 @@ LOGP(DCS, LOGL_INFO, "Loss of CCCH, Trigger " "re-selection.\n"); if (ms->rrlayer.monitor) - vty_notify(ms, "MON: trigger cell " + l23_vty_ms_notify(ms, "MON: trigger cell " "re-selection: loss of signal\n"); nmsg = gsm322_msgb_alloc(GSM322_EVENT_CELL_RESEL); @@ -4155,12 +4155,12 @@ } if (ms->rrlayer.monitor) { - vty_notify(ms, "MON: cell ARFCN LAC C1 C2 CRH RLA_C " + l23_vty_ms_notify(ms, "MON: cell ARFCN LAC C1 C2 CRH RLA_C " "bargraph\n"); snprintf(arfcn_text, 10, "%s ", gsm_print_arfcn(cs->sel_arfcn)); arfcn_text[9] = '\0'; - vty_notify(ms, "MON: serving %s 0x%04x %3d %3d %4d " + l23_vty_ms_notify(ms, "MON: serving %s 0x%04x %3d %3d %4d " "%s\n", arfcn_text, cs->sel_lac, cs->c1, cs->c2, cs->rla_c_dbm, bargraph(cs->rla_c_dbm / 2, -55, -24)); } @@ -4182,7 +4182,7 @@ snprintf(arfcn_text, 10, "%s ", gsm_print_arfcn(nb->arfcn)); arfcn_text[9] = '\0'; - vty_notify(ms, "MON: nb %2d %s ARFCN not " + l23_vty_ms_notify(ms, "MON: nb %2d %s ARFCN not " "supported\n", i + 1, arfcn_text); } goto cont; @@ -4195,7 +4195,7 @@ snprintf(arfcn_text, 10, "%s ", gsm_print_arfcn(nb->arfcn)); arfcn_text[9] = '\0'; - vty_notify(ms, "MON: nb %2d %s " + l23_vty_ms_notify(ms, "MON: nb %2d %s " " %4d %s\n", i + 1, arfcn_text, nb->rla_c_dbm, bargraph(nb->rla_c_dbm / 2, -55, -24)); @@ -4244,7 +4244,7 @@ snprintf(arfcn_text, 10, "%s ", gsm_print_arfcn(nb->arfcn)); arfcn_text[9] = '\0'; - vty_notify(ms, "MON: nb %2d %s 0x%04x %3d %3d %2d" + l23_vty_ms_notify(ms, "MON: nb %2d %s 0x%04x %3d %3d %2d" " %4d %s\n", i + 1, arfcn_text, s->lac, nb->c1, nb->c2, nb->crh, nb->rla_c_dbm, bargraph(nb->rla_c_dbm / 2, -55, -24)); @@ -4320,7 +4320,7 @@ if (!i) { if (ms->rrlayer.monitor) - vty_notify(ms, "MON: no neighbour cells\n"); + l23_vty_ms_notify(ms, "MON: no neighbour cells\n"); } if (cs->resel_when + GSM58_RESEL_THRESHOLD >= now) { @@ -4629,7 +4629,7 @@ "reselection.\n"); if (ms->rrlayer.monitor) - vty_notify(ms, "MON: trigger cell re-selection: " + l23_vty_ms_notify(ms, "MON: trigger cell re-selection: " "better cell\n"); cs->resel_when = now; diff --git a/src/host/layer23/src/mobile/gsm411_sms.c b/src/host/layer23/src/mobile/gsm411_sms.c index d00e94d..64d098c 100644 --- a/src/host/layer23/src/mobile/gsm411_sms.c +++ b/src/host/layer23/src/mobile/gsm411_sms.c @@ -120,11 +120,11 @@ static int gsm411_sms_report(struct osmocom_ms *ms, struct gsm_sms *sms, uint8_t cause) { - vty_notify(ms, NULL); + l23_vty_ms_notify(ms, NULL); if (!cause) - vty_notify(ms, "SMS to %s successful\n", sms->address); + l23_vty_ms_notify(ms, "SMS to %s successful\n", sms->address); else - vty_notify(ms, "SMS to %s failed: %s\n", sms->address, + l23_vty_ms_notify(ms, "SMS to %s failed: %s\n", sms->address, get_value_string(gsm411_rp_cause_strs, cause)); mobile_prim_ntfy_sms_status(ms, sms, cause); @@ -190,8 +190,8 @@ if (*p == '\n' || *p == '\r') *p = ' '; } - vty_notify(ms, NULL); - vty_notify(ms, "SMS from %s: '%s'\n", gsms->address, vty_text); + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "SMS from %s: '%s'\n", gsms->address, vty_text); home = getenv("HOME"); if (!home) { diff --git a/src/host/layer23/src/mobile/gsm480_ss.c b/src/host/layer23/src/mobile/gsm480_ss.c index 139b45b..202e1e7 100644 --- a/src/host/layer23/src/mobile/gsm480_ss.c +++ b/src/host/layer23/src/mobile/gsm480_ss.c @@ -193,7 +193,7 @@ static int gsm480_ss_result(struct osmocom_ms *ms, const char *response, uint8_t error) { - vty_notify(ms, NULL); + l23_vty_ms_notify(ms, NULL); if (response) { char text[256], *t = text, *s; @@ -201,13 +201,13 @@ while ((s = strchr(text, '\r'))) *s = '\n'; while ((s = strsep(&t, "\n"))) { - vty_notify(ms, "Service response: %s\n", s); + l23_vty_ms_notify(ms, "Service response: %s\n", s); } } else if (error) - vty_notify(ms, "Service request failed: %s\n", + l23_vty_ms_notify(ms, "Service request failed: %s\n", get_value_string(gsm480_err_names, error)); else - vty_notify(ms, "Service request failed.\n"); + l23_vty_ms_notify(ms, "Service request failed.\n"); return 0; } @@ -260,8 +260,8 @@ msgb_free(trans->ss.msg); trans->ss.msg = NULL; } - vty_notify(trans->ms, NULL); - vty_notify(trans->ms, "Service connection terminated.\n"); + l23_vty_ms_notify(trans->ms, NULL); + l23_vty_ms_notify(trans->ms, "Service connection terminated.\n"); } /* release MM connection, free transaction */ @@ -786,7 +786,7 @@ LOGP(DSS, LOGL_INFO, "call forwarding reply: len %d data %s\n", len, osmo_hexdump(data, len)); - vty_notify(ms, NULL); + l23_vty_ms_notify(ms, NULL); /* forwarding feature list */ if (parse_tag_asn1(data, len, &tag_data, &tag_len) < 0) { @@ -795,9 +795,9 @@ } if (data[0] == 0x80) { if ((tag_data[0] & 0x01)) - vty_notify(ms, "Status: activated\n"); + l23_vty_ms_notify(ms, "Status: activated\n"); else - vty_notify(ms, "Status: deactivated\n"); + l23_vty_ms_notify(ms, "Status: deactivated\n"); return 0; } @@ -816,7 +816,7 @@ /* check for SS code */ if (data[0] != 0x04) break; - vty_notify(ms, "Reply for %s\n", decode_ss_code(tag_data[0])); + l23_vty_ms_notify(ms, "Reply for %s\n", decode_ss_code(tag_data[0])); len -= tag_data - data + tag_len; data = tag_data + tag_len; /* sequence tag */ @@ -832,7 +832,7 @@ data = tag_data; break; default: - vty_notify(ms, "Call Forwarding reply unsupported.\n"); + l23_vty_ms_notify(ms, "Call Forwarding reply unsupported.\n"); return 0; } @@ -864,20 +864,20 @@ osmo_hexdump(tag_data, tag_len)); switch (data2[0]) { case 0x82: - vty_notify(ms, "Bearer Service: %s\n", + l23_vty_ms_notify(ms, "Bearer Service: %s\n", get_value_string(Bearerservice_vals, tag_data[0])); break; case 0x83: - vty_notify(ms, "Teleservice: %s\n", + l23_vty_ms_notify(ms, "Teleservice: %s\n", get_value_string(Teleservice_vals, tag_data[0])); break; case 0x84: if ((tag_data[0] & 0x01)) - vty_notify(ms, "Status: activated\n"); + l23_vty_ms_notify(ms, "Status: activated\n"); else - vty_notify(ms, "Status: deactivated\n"); + l23_vty_ms_notify(ms, "Status: deactivated\n"); break; case 0x85: if (((tag_data[0] & 0x70) >> 4) == 1) @@ -889,7 +889,7 @@ gsm48_decode_bcd_number2(number + strlen(number), sizeof(number) - strlen(number), tag_data - 1, tag_len + 1, 1); - vty_notify(ms, "Destination: %s\n", number); + l23_vty_ms_notify(ms, "Destination: %s\n", number); break; } len2 -= tag_data - data2 + tag_len; diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index 265b720..6c5a860 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -926,33 +926,33 @@ && (mm->state != GSM48_MM_ST_MM_IDLE || mm->substate != substate)) { switch (substate) { case GSM48_MM_SST_NORMAL_SERVICE: - vty_notify(ms, NULL); - vty_notify(ms, "On Network, normal service: %s, %s\n", + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "On Network, normal service: %s, %s\n", gsm_get_mcc(plmn->mcc), gsm_get_mnc(plmn->mcc, plmn->mnc)); break; case GSM48_MM_SST_LIMITED_SERVICE: - vty_notify(ms, NULL); - vty_notify(ms, "Limited service, emergency calls are " + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "Limited service, emergency calls are " "possible.\n"); break; case GSM48_MM_SST_PLMN_SEARCH_NORMAL: case GSM48_MM_SST_PLMN_SEARCH: - vty_notify(ms, NULL); - vty_notify(ms, "Searching network...\n"); + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "Searching network...\n"); break; case GSM48_MM_SST_NO_IMSI: - vty_notify(ms, NULL); - vty_notify(ms, "No SIM, emergency calls are " + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "No SIM, emergency calls are " "possible.\n"); break; case GSM48_MM_SST_NO_CELL_AVAIL: - vty_notify(ms, NULL); - vty_notify(ms, "No service.\n"); + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "No service.\n"); break; case GSM48_MM_SST_ATTEMPT_UPDATE: - vty_notify(ms, NULL); - vty_notify(ms, "Trying to register with network %s, %s...\n", + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "Trying to register with network %s, %s...\n", gsm_get_mcc(plmn->mcc), gsm_get_mnc(plmn->mcc, plmn->mnc)); break; } diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index 7cf222f..231bea0 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -679,7 +679,7 @@ } LOGP(DRR, LOGL_INFO, "%s\n", text); if (rr->monitor) - vty_notify(rr->ms, "%s\n", text); + l23_vty_ms_notify(rr->ms, "%s\n", text); if (rr->dm_est) gsm48_rr_tx_meas_rep(rr->ms); diff --git a/src/host/layer23/src/mobile/mnccms.c b/src/host/layer23/src/mobile/mnccms.c index bfc95e4..60d2e55 100644 --- a/src/host/layer23/src/mobile/mnccms.c +++ b/src/host/layer23/src/mobile/mnccms.c @@ -296,62 +296,62 @@ switch (msg_type) { case MNCC_DISC_IND: - vty_notify(ms, NULL); + l23_vty_ms_notify(ms, NULL); switch (data->cause.value) { case GSM48_CC_CAUSE_UNASSIGNED_NR: - vty_notify(ms, "Call: Number not assigned\n"); + l23_vty_ms_notify(ms, "Call: Number not assigned\n"); break; case GSM48_CC_CAUSE_NO_ROUTE: - vty_notify(ms, "Call: Destination unreachable\n"); + l23_vty_ms_notify(ms, "Call: Destination unreachable\n"); break; case GSM48_CC_CAUSE_NORM_CALL_CLEAR: - vty_notify(ms, "Call: Remote hangs up\n"); + l23_vty_ms_notify(ms, "Call: Remote hangs up\n"); break; case GSM48_CC_CAUSE_USER_BUSY: - vty_notify(ms, "Call: Remote busy\n"); + l23_vty_ms_notify(ms, "Call: Remote busy\n"); break; case GSM48_CC_CAUSE_USER_NOTRESPOND: - vty_notify(ms, "Call: Remote not responding\n"); + l23_vty_ms_notify(ms, "Call: Remote not responding\n"); break; case GSM48_CC_CAUSE_USER_ALERTING_NA: - vty_notify(ms, "Call: Remote not answering\n"); + l23_vty_ms_notify(ms, "Call: Remote not answering\n"); break; case GSM48_CC_CAUSE_CALL_REJECTED: - vty_notify(ms, "Call has been rejected\n"); + l23_vty_ms_notify(ms, "Call has been rejected\n"); break; case GSM48_CC_CAUSE_NUMBER_CHANGED: - vty_notify(ms, "Call: Number changed\n"); + l23_vty_ms_notify(ms, "Call: Number changed\n"); break; case GSM48_CC_CAUSE_PRE_EMPTION: - vty_notify(ms, "Call: Cleared due to pre-emption\n"); + l23_vty_ms_notify(ms, "Call: Cleared due to pre-emption\n"); break; case GSM48_CC_CAUSE_DEST_OOO: - vty_notify(ms, "Call: Remote out of order\n"); + l23_vty_ms_notify(ms, "Call: Remote out of order\n"); break; case GSM48_CC_CAUSE_INV_NR_FORMAT: - vty_notify(ms, "Call: Number invalid or incomplete\n"); + l23_vty_ms_notify(ms, "Call: Number invalid or incomplete\n"); break; case GSM48_CC_CAUSE_NO_CIRCUIT_CHAN: - vty_notify(ms, "Call: No channel available\n"); + l23_vty_ms_notify(ms, "Call: No channel available\n"); break; case GSM48_CC_CAUSE_NETWORK_OOO: - vty_notify(ms, "Call: Network out of order\n"); + l23_vty_ms_notify(ms, "Call: Network out of order\n"); break; case GSM48_CC_CAUSE_TEMP_FAILURE: - vty_notify(ms, "Call: Temporary failure\n"); + l23_vty_ms_notify(ms, "Call: Temporary failure\n"); break; case GSM48_CC_CAUSE_SWITCH_CONG: - vty_notify(ms, "Congestion\n"); + l23_vty_ms_notify(ms, "Congestion\n"); break; default: - vty_notify(ms, "Call has been disconnected " + l23_vty_ms_notify(ms, "Call has been disconnected " "(clear cause %d)\n", data->cause.value); } LOGP(DMNCC, LOGL_INFO, "Call has been disconnected " "(cause %d)\n", data->cause.value); if ((data->fields & MNCC_F_PROGRESS) && data->progress.descr == 8) { - vty_notify(ms, "Please hang up!\n"); + l23_vty_ms_notify(ms, "Please hang up!\n"); break; } free_call(call); @@ -359,18 +359,18 @@ goto release; case MNCC_REL_IND: case MNCC_REL_CNF: - vty_notify(ms, NULL); + l23_vty_ms_notify(ms, NULL); if (data->cause.value == GSM48_CC_CAUSE_CALL_REJECTED) - vty_notify(ms, "Call has been rejected\n"); + l23_vty_ms_notify(ms, "Call has been rejected\n"); else - vty_notify(ms, "Call has been released\n"); + l23_vty_ms_notify(ms, "Call has been released\n"); LOGP(DMNCC, LOGL_INFO, "Call has been released (cause %d)\n", data->cause.value); free_call(call); break; case MNCC_CALL_PROC_IND: - vty_notify(ms, NULL); - vty_notify(ms, "Call is proceeding\n"); + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "Call is proceeding\n"); LOGP(DMNCC, LOGL_INFO, "Call is proceeding\n"); if ((data->fields & MNCC_F_BEARER_CAP) && data->bearer_cap.speech_ver[0] >= 0) { @@ -378,19 +378,19 @@ } break; case MNCC_ALERT_IND: - vty_notify(ms, NULL); - vty_notify(ms, "Call is alerting\n"); + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "Call is alerting\n"); LOGP(DMNCC, LOGL_INFO, "Call is alerting\n"); break; case MNCC_SETUP_CNF: - vty_notify(ms, NULL); - vty_notify(ms, "Call is answered\n"); + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "Call is answered\n"); LOGP(DMNCC, LOGL_INFO, "Call is answered\n"); break; case MNCC_SETUP_IND: - vty_notify(ms, NULL); + l23_vty_ms_notify(ms, NULL); if (!first_call && !ms->settings.cw) { - vty_notify(ms, "Incoming call rejected while busy\n"); + l23_vty_ms_notify(ms, "Incoming call rejected while busy\n"); LOGP(DMNCC, LOGL_INFO, "Incoming call but busy\n"); cause = GSM48_CC_CAUSE_USER_BUSY; goto release; @@ -442,15 +442,15 @@ } /* presentation allowed if present == 0 */ if (data->calling.present || !data->calling.number[0]) - vty_notify(ms, "Incoming call (anonymous)\n"); + l23_vty_ms_notify(ms, "Incoming call (anonymous)\n"); else if (data->calling.type == 1) - vty_notify(ms, "Incoming call (from +%s)\n", + l23_vty_ms_notify(ms, "Incoming call (from +%s)\n", data->calling.number); else if (data->calling.type == 2) - vty_notify(ms, "Incoming call (from 0-%s)\n", + l23_vty_ms_notify(ms, "Incoming call (from 0-%s)\n", data->calling.number); else - vty_notify(ms, "Incoming call (from %s)\n", + l23_vty_ms_notify(ms, "Incoming call (from %s)\n", data->calling.number); LOGP(DMNCC, LOGL_INFO, "Incoming call (from %s callref %x)\n", data->calling.number, call->callref); @@ -488,30 +488,30 @@ } break; case MNCC_SETUP_COMPL_IND: - vty_notify(ms, NULL); - vty_notify(ms, "Call is connected\n"); + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "Call is connected\n"); LOGP(DMNCC, LOGL_INFO, "Call is connected\n"); break; case MNCC_HOLD_CNF: - vty_notify(ms, NULL); - vty_notify(ms, "Call is on hold\n"); + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "Call is on hold\n"); LOGP(DMNCC, LOGL_INFO, "Call is on hold\n"); call->hold = true; break; case MNCC_HOLD_REJ: - vty_notify(ms, NULL); - vty_notify(ms, "Call hold was rejected\n"); + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "Call hold was rejected\n"); LOGP(DMNCC, LOGL_INFO, "Call hold was rejected\n"); break; case MNCC_RETRIEVE_CNF: - vty_notify(ms, NULL); - vty_notify(ms, "Call is retrieved\n"); + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "Call is retrieved\n"); LOGP(DMNCC, LOGL_INFO, "Call is retrieved\n"); call->hold = false; break; case MNCC_RETRIEVE_REJ: - vty_notify(ms, NULL); - vty_notify(ms, "Call retrieve was rejected\n"); + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "Call retrieve was rejected\n"); LOGP(DMNCC, LOGL_INFO, "Call retrieve was rejected\n"); break; case MNCC_FACILITY_IND: @@ -539,8 +539,8 @@ llist_for_each_entry(call, &call_list, entry) { if (!call->hold) { - vty_notify(ms, NULL); - vty_notify(ms, "Please put active call on hold " + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "Please put active call on hold " "first!\n"); LOGP(DMNCC, LOGL_INFO, "Cannot make a call, busy!\n"); return -EBUSY; @@ -607,8 +607,8 @@ } if (!found) { LOGP(DMNCC, LOGL_INFO, "No active call to hangup\n"); - vty_notify(ms, NULL); - vty_notify(ms, "No active call\n"); + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "No active call\n"); return -EINVAL; } @@ -634,14 +634,14 @@ } if (!alerting) { LOGP(DMNCC, LOGL_INFO, "No call alerting\n"); - vty_notify(ms, NULL); - vty_notify(ms, "No alerting call\n"); + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "No alerting call\n"); return -EBUSY; } if (active) { LOGP(DMNCC, LOGL_INFO, "Answer but we have an active call\n"); - vty_notify(ms, NULL); - vty_notify(ms, "Please put active call on hold first!\n"); + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "Please put active call on hold first!\n"); return -EBUSY; } alerting->ring = false; @@ -665,8 +665,8 @@ } if (!found) { LOGP(DMNCC, LOGL_INFO, "No active call to hold\n"); - vty_notify(ms, NULL); - vty_notify(ms, "No active call\n"); + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "No active call\n"); return -EINVAL; } @@ -689,26 +689,26 @@ } if (active) { LOGP(DMNCC, LOGL_INFO, "Cannot retrieve during active call\n"); - vty_notify(ms, NULL); - vty_notify(ms, "Hold active call first!\n"); + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "Hold active call first!\n"); return -EINVAL; } if (holdnum == 0) { - vty_notify(ms, NULL); - vty_notify(ms, "No call on hold!\n"); + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "No call on hold!\n"); return -EINVAL; } if (holdnum > 1 && number <= 0) { - vty_notify(ms, NULL); - vty_notify(ms, "Select call 1..%d\n", holdnum); + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "Select call 1..%d\n", holdnum); return -EINVAL; } if (holdnum == 1 && number <= 0) number = 1; if (number > holdnum) { - vty_notify(ms, NULL); - vty_notify(ms, "Given number %d out of range!\n", number); - vty_notify(ms, "Select call 1..%d\n", holdnum); + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "Given number %d out of range!\n", number); + l23_vty_ms_notify(ms, "Select call 1..%d\n", holdnum); return -EINVAL; } @@ -793,8 +793,8 @@ } if (!found) { LOGP(DMNCC, LOGL_INFO, "No active call to send DTMF\n"); - vty_notify(ms, NULL); - vty_notify(ms, "No active call\n"); + l23_vty_ms_notify(ms, NULL); + l23_vty_ms_notify(ms, "No active call\n"); return -EINVAL; } diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 05690ab..f4dc8a9 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -41,8 +41,6 @@ #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/misc.h> -extern struct llist_head active_connections; - struct cmd_node testsim_node = { TESTSIM_NODE, "%s(test-sim)# ", @@ -3147,38 +3145,3 @@ return 0; } -void vty_notify(struct osmocom_ms *ms, const char *fmt, ...) -{ - struct telnet_connection *connection; - char buffer[1000]; - va_list args; - struct vty *vty; - - if (fmt) { - va_start(args, fmt); - vsnprintf(buffer, sizeof(buffer) - 1, fmt, args); - buffer[sizeof(buffer) - 1] = '\0'; - va_end(args); - - if (!buffer[0]) - return; - } - - llist_for_each_entry(connection, &active_connections, entry) { - vty = connection->vty; - if (!vty) - continue; - if (!fmt) { - vty_out(vty, "%s%% (MS %s)%s", VTY_NEWLINE, ms->name, - VTY_NEWLINE); - continue; - } - if (buffer[strlen(buffer) - 1] == '\n') { - buffer[strlen(buffer) - 1] = '\0'; - vty_out(vty, "%% %s%s", buffer, VTY_NEWLINE); - buffer[strlen(buffer)] = '\n'; - } else - vty_out(vty, "%% %s", buffer); - } -} - -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ic0a98e66adffa9fefeee6e69a4b5c691e0e9c789 Gerrit-Change-Number: 32416 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[S] Change in libosmo-gprs[master]: [WIP] rlcmac: pdch_data_req: support USF based scheduling

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32415 ) Change subject: [WIP] rlcmac: pdch_data_req: support USF based scheduling ...................................................................... [WIP] rlcmac: pdch_data_req: support USF based scheduling Change-Id: I2cdda5787c041c98e8919984653760ec2a97dbb5 Related: OS#5500 --- M include/osmocom/gprs/rlcmac/rlcmac_prim.h M src/rlcmac/sched.c 2 files changed, 18 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/15/32415/1 diff --git a/include/osmocom/gprs/rlcmac/rlcmac_prim.h b/include/osmocom/gprs/rlcmac/rlcmac_prim.h index 9c0bb3c..46495bf 100644 --- a/include/osmocom/gprs/rlcmac/rlcmac_prim.h +++ b/include/osmocom/gprs/rlcmac/rlcmac_prim.h @@ -130,8 +130,9 @@ } ccch_data_ind; /* OSMO_GPRS_RLCMAC_L1CTL_PDCH_DATA | Req */ struct { - uint32_t fn; + uint32_t fn; /* set to 0xffffffff for USF based scheduling */ uint8_t ts_nr; + uint8_t ul_tbf_nr; /* valid for USF based scheduling, otherwise ignored */ uint8_t data_len; uint8_t *data; } pdch_data_req; diff --git a/src/rlcmac/sched.c b/src/rlcmac/sched.c index 25ee6da..b6ce3f7 100644 --- a/src/rlcmac/sched.c +++ b/src/rlcmac/sched.c @@ -303,6 +303,12 @@ tx_msg: rlcmac_prim_tx = gprs_rlcmac_prim_alloc_l1ctl_pdch_data_req(bi->ts, bi->fn, msgb_data(msg), 0); rlcmac_prim_tx->l1ctl.pdch_data_req.data_len = msgb_length(msg); +#if 0 + if (/* USF based scheduling */) { + rlcmac_prim_tx->l1ctl.pdch_data_req.fn = 0xffffffff; + rlcmac_prim_tx->l1ctl.pdch_data_req.ul_tbf_nr = /* TBF */; + } +#endif rc = gprs_rlcmac_prim_call_down_cb(rlcmac_prim_tx); msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32415 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I2cdda5787c041c98e8919984653760ec2a97dbb5 Gerrit-Change-Number: 32415 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2023