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

[M] Change in osmocom-bb[master]: layer23: Use GSM_RESERVED_TMSI from libosmocore everywhere

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32435 ) ( 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: layer23: Use GSM_RESERVED_TMSI from libosmocore everywhere ...................................................................... layer23: Use GSM_RESERVED_TMSI from libosmocore everywhere Change-Id: Ib9483b8ae4067994aef523291733ae706ffabe7a --- M src/host/layer23/include/osmocom/bb/common/subscriber.h M src/host/layer23/src/common/settings.c M src/host/layer23/src/common/subscriber.c M src/host/layer23/src/common/vty.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/vty_interface.c 7 files changed, 33 insertions(+), 22 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/include/osmocom/bb/common/subscriber.h b/src/host/layer23/include/osmocom/bb/common/subscriber.h index 8b15295..3aacbda 100644 --- a/src/host/layer23/include/osmocom/bb/common/subscriber.h +++ b/src/host/layer23/include/osmocom/bb/common/subscriber.h @@ -45,7 +45,7 @@ char iccid[21]; /* 20 + termination */ /* TMSI / LAI */ - uint32_t tmsi; /* invalid tmsi: 0xffffffff */ + uint32_t tmsi; /* invalid tmsi: GSM_RESERVED_TMSI */ uint16_t mcc, mnc, lac; /* invalid lac: 0x0000 */ diff --git a/src/host/layer23/src/common/settings.c b/src/host/layer23/src/common/settings.c index d391f7d..565da96 100644 --- a/src/host/layer23/src/common/settings.c +++ b/src/host/layer23/src/common/settings.c @@ -19,6 +19,7 @@ #include <errno.h> #include <string.h> #include <osmocom/core/talloc.h> +#include <osmocom/gsm/gsm48.h> #include <osmocom/bb/common/settings.h> #include <osmocom/bb/common/utils.h> @@ -69,7 +70,7 @@ strcpy(set->test_imsi, "001010000000000"); set->test_rplmn_mcc = set->test_rplmn_mnc = 1; set->test_lac = 0x0000; - set->test_tmsi = 0xffffffff; + set->test_tmsi = GSM_RESERVED_TMSI; /* set all supported features */ set->sms_ptp = sup->sms_ptp; diff --git a/src/host/layer23/src/common/subscriber.c b/src/host/layer23/src/common/subscriber.c index 41d59f9..90d6a78 100644 --- a/src/host/layer23/src/common/subscriber.c +++ b/src/host/layer23/src/common/subscriber.c @@ -22,6 +22,7 @@ #include <osmocom/core/talloc.h> #include <osmocom/crypt/auth.h> #include <osmocom/gsm/gsm23003.h> +#include <osmocom/gsm/gsm48.h> #include <osmocom/bb/common/logging.h> #include <osmocom/bb/common/osmocom_data.h> @@ -77,7 +78,7 @@ subscr->ms = ms; /* set TMSI / LAC invalid */ - subscr->tmsi = 0xffffffff; + subscr->tmsi = GSM_RESERVED_TMSI; subscr->lac = 0x0000; /* set key invalid */ @@ -1152,7 +1153,7 @@ subscr->sms_sca); print(priv, " Status: %s IMSI %s", subscr_ustate_names[subscr->ustate], (subscr->imsi_attached) ? "attached" : "detached"); - if (subscr->tmsi != 0xffffffff) + if (subscr->tmsi != GSM_RESERVED_TMSI) print(priv, " TMSI 0x%08x", subscr->tmsi); if (subscr->lac > 0x0000 && subscr->lac < 0xfffe) { print(priv, "\n"); diff --git a/src/host/layer23/src/common/vty.c b/src/host/layer23/src/common/vty.c index bbe8e2a..27d0330 100644 --- a/src/host/layer23/src/common/vty.c +++ b/src/host/layer23/src/common/vty.c @@ -635,7 +635,7 @@ if (argc >= 4) set->test_tmsi = strtoul(argv[3], NULL, 16); else - set->test_tmsi = 0xffffffff; + set->test_tmsi = GSM_RESERVED_TMSI; if (attached) set->test_imsi_attached = 1; @@ -763,7 +763,7 @@ 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) { + if (set->test_tmsi != GSM_RESERVED_TMSI) { vty_out(vty, " 0x%08x", set->test_tmsi); if (set->test_imsi_attached) vty_out(vty, " attached"); diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index 6c5a860..e72c3e0 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -1601,12 +1601,12 @@ gsm48_mm_tx_tmsi_reall_cpl(ms); break; case GSM_MI_TYPE_IMSI: - subscr->tmsi = 0xffffffff; + subscr->tmsi = GSM_RESERVED_TMSI; LOGP(DMM, LOGL_INFO, "TMSI removed.\n"); gsm48_mm_tx_tmsi_reall_cpl(ms); break; default: - subscr->tmsi = 0xffffffff; + subscr->tmsi = GSM_RESERVED_TMSI; LOGP(DMM, LOGL_NOTICE, "TMSI reallocation with unknown MI " "type %d.\n", mi_type); gsm48_mm_tx_mm_status(ms, GSM48_REJECT_INCORRECT_MESSAGE); @@ -1698,7 +1698,7 @@ subscr->sim_valid = 0; /* TMSI and LAI invalid */ - subscr->tmsi = 0xffffffff; + subscr->tmsi = GSM_RESERVED_TMSI; subscr->lac = 0x0000; /* key is invalid */ @@ -1755,7 +1755,7 @@ return gsm48_mm_tx_mm_status(ms, GSM48_REJECT_MSG_NOT_COMPATIBLE); } - if (mi_type == GSM_MI_TYPE_TMSI && subscr->tmsi == 0xffffffff) { + if (mi_type == GSM_MI_TYPE_TMSI && subscr->tmsi == GSM_RESERVED_TMSI) { LOGP(DMM, LOGL_INFO, "IDENTITY REQUEST of TMSI, but we have no " "TMSI\n"); return gsm48_mm_tx_mm_status(ms, @@ -1824,7 +1824,7 @@ pwr_lev); msgb_v_put(nmsg, *((uint8_t *)&cm)); /* MI */ - if (subscr->tmsi != 0xffffffff) { /* have TMSI ? */ + if (subscr->tmsi != GSM_RESERVED_TMSI) { /* have TMSI ? */ gsm48_encode_mi(buf, nmsg, ms, GSM_MI_TYPE_TMSI); LOGP(DMM, LOGL_INFO, " using TMSI 0x%08x\n", subscr->tmsi); } else { @@ -2017,7 +2017,7 @@ subscr->sim_valid = 0; /* TMSI and LAI invalid */ - subscr->tmsi = 0xffffffff; + subscr->tmsi = GSM_RESERVED_TMSI; subscr->lac = 0x0000; /* key is invalid */ @@ -2366,7 +2366,7 @@ gsm48_encode_classmark1(&nlu->classmark1, sup->rev_lev, sup->es_ind, set->a5_1, pwr_lev); /* MI */ - if (subscr->tmsi != 0xffffffff) { /* have TMSI ? */ + if (subscr->tmsi != GSM_RESERVED_TMSI) { /* have TMSI ? */ gsm48_encode_mi(buf, NULL, ms, GSM_MI_TYPE_TMSI); LOGP(DMM, LOGL_INFO, " using TMSI 0x%08x\n", subscr->tmsi); } else { @@ -2487,7 +2487,7 @@ break; case GSM_MI_TYPE_IMSI: LOGP(DMM, LOGL_INFO, "TMSI removed\n"); - subscr->tmsi = 0xffffffff; + subscr->tmsi = GSM_RESERVED_TMSI; /* store LOCI on sim */ gsm_subscr_write_loci(ms); @@ -2582,7 +2582,7 @@ case GSM48_REJECT_LOC_NOT_ALLOWED: case GSM48_REJECT_ROAMING_NOT_ALLOWED: /* TMSI and LAI invalid */ - subscr->tmsi = 0xffffffff; + subscr->tmsi = GSM_RESERVED_TMSI; subscr->lac = 0x0000; /* key is invalid */ @@ -2705,7 +2705,7 @@ } /* TMSI and LAI invalid */ - subscr->tmsi = 0xffffffff; + subscr->tmsi = GSM_RESERVED_TMSI; subscr->lac = 0x0000; /* key is invalid */ @@ -2831,7 +2831,7 @@ set->imei); gsm48_encode_mi(buf, NULL, ms, GSM_MI_TYPE_IMEI); } else - if (subscr->tmsi != 0xffffffff) { /* have TMSI ? */ + if (subscr->tmsi != GSM_RESERVED_TMSI) { /* have TMSI ? */ gsm48_encode_mi(buf, NULL, ms, GSM_MI_TYPE_TMSI); LOGP(DMM, LOGL_INFO, "-> Using TMSI\n"); } else { @@ -2913,7 +2913,7 @@ abort_any = 1; /* TMSI and LAI invalid */ - subscr->tmsi = 0xffffffff; + subscr->tmsi = GSM_RESERVED_TMSI; subscr->lac = 0x0000; /* key is invalid */ diff --git a/src/host/layer23/src/mobile/gsm48_rr.c b/src/host/layer23/src/mobile/gsm48_rr.c index 231bea0..5690746 100644 --- a/src/host/layer23/src/mobile/gsm48_rr.c +++ b/src/host/layer23/src/mobile/gsm48_rr.c @@ -3309,7 +3309,7 @@ pr->cm2_len = sizeof(pr->cm2); gsm48_rr_enc_cm2(ms, &pr->cm2, rr->cd_now.arfcn); /* mobile identity */ - if (ms->subscr.tmsi != 0xffffffff + if (ms->subscr.tmsi != GSM_RESERVED_TMSI && ms->subscr.mcc == cs->sel_mcc && ms->subscr.mnc == cs->sel_mnc && ms->subscr.lac == cs->sel_lac diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index e7f0454..3938c3b 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -438,7 +438,7 @@ /* Initial testcard settings */ uint16_t mcc = 0x001, mnc = 0x01f, lac = 0x0000; - uint32_t tmsi = 0xffffffff; + uint32_t tmsi = GSM_RESERVED_TMSI; ms = l23_vty_get_ms(argv[0], vty); if (!ms) @@ -458,7 +458,7 @@ if (set->test_lac > 0x0000 && set->test_lac < 0xfffe) lac = set->test_lac; - if (set->test_tmsi != 0xffffffff) + if (set->test_tmsi != GSM_RESERVED_TMSI) tmsi = set->test_tmsi; } @@ -719,7 +719,7 @@ ms->subscr.mcc = mcc; ms->subscr.mnc = mnc; ms->subscr.lac = lac; - ms->subscr.tmsi = 0xffffffff; + ms->subscr.tmsi = GSM_RESERVED_TMSI; gsm_subscr_write_loci(ms); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32435 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ib9483b8ae4067994aef523291733ae706ffabe7a Gerrit-Change-Number: 32435 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: Use GSM23003_IMEI(SV)_NUM_DIGITS from libosmocore

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32437 ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: layer23: Use GSM23003_IMEI(SV)_NUM_DIGITS from libosmocore ...................................................................... layer23: Use GSM23003_IMEI(SV)_NUM_DIGITS from libosmocore Change-Id: I12a96043947c0f5366f550944a4df5edd2fd2c9d --- M src/host/layer23/include/osmocom/bb/common/settings.h 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/layer23/include/osmocom/bb/common/settings.h b/src/host/layer23/include/osmocom/bb/common/settings.h index 60b9df1..88ce280 100644 --- a/src/host/layer23/include/osmocom/bb/common/settings.h +++ b/src/host/layer23/include/osmocom/bb/common/settings.h @@ -69,8 +69,8 @@ struct audio_settings audio; /* IMEI */ - char imei[16]; - char imeisv[17]; + char imei[GSM23003_IMEI_NUM_DIGITS + 1]; + char imeisv[GSM23003_IMEISV_NUM_DIGITS + 1]; char imei_random; /* network search */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32437 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I12a96043947c0f5366f550944a4df5edd2fd2c9d Gerrit-Change-Number: 32437 Gerrit-PatchSet: 7 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[S] Change in osmocom-bb[master]: Initialize/release sim & subscriber ms parts in common/

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32439 ) Change subject: Initialize/release sim & subscriber ms parts in common/ ...................................................................... Initialize/release sim & subscriber ms parts in common/ Change-Id: Ifb88f7e4dcc049a687af213be597d495731b24b9 --- M src/host/layer23/src/common/ms.c 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/host/layer23/src/common/ms.c b/src/host/layer23/src/common/ms.c index ee27096..4b1440e 100644 --- a/src/host/layer23/src/common/ms.c +++ b/src/host/layer23/src/common/ms.c @@ -27,6 +27,8 @@ static int osmocom_ms_talloc_destructor(struct osmocom_ms *ms) { gprs_settings_fi(ms); + gsm_subscr_exit(ms); + gsm_sim_exit(ms); return 0; } @@ -58,6 +60,8 @@ gsm_support_init(ms); gsm_settings_init(ms); gprs_settings_init(ms); + gsm_sim_init(ms); + gsm_subscr_init(ms); return ms; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32439 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ifb88f7e4dcc049a687af213be597d495731b24b9 Gerrit-Change-Number: 32439 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[M] Change in osmocom-bb[master]: layer23: Move 'show {subscriber,support}' to common/'

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32440 ) ( 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: layer23: Move 'show {subscriber,support}' to common/' ...................................................................... layer23: Move 'show {subscriber,support}' to common/' Those modules are aready in common/, so they can be added to the shared VTY interface to introspect MS objects. Change-Id: Ie4d85bbb1d0af8894683589d8b936f9884f79be9 --- M src/host/layer23/include/osmocom/bb/common/vty.h M src/host/layer23/src/common/vty.c M src/host/layer23/src/mobile/vty_interface.c 3 files changed, 87 insertions(+), 73 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/include/osmocom/bb/common/vty.h b/src/host/layer23/include/osmocom/bb/common/vty.h index 7f6e2d3..b2a52c0 100644 --- a/src/host/layer23/include/osmocom/bb/common/vty.h +++ b/src/host/layer23/include/osmocom/bb/common/vty.h @@ -23,7 +23,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))); +void l23_vty_ms_notify(struct osmocom_ms *ms, const char *fmt, ...) __attribute__ ((format (printf, 2, 3))); +void l23_vty_printf(void *priv, const char *fmt, ...); extern bool l23_vty_reading; extern bool l23_vty_hide_default; diff --git a/src/host/layer23/src/common/vty.c b/src/host/layer23/src/common/vty.c index 27d0330..462998d 100644 --- a/src/host/layer23/src/common/vty.c +++ b/src/host/layer23/src/common/vty.c @@ -130,6 +130,26 @@ } } +void l23_vty_printf(void *priv, const char *fmt, ...) +{ + char buffer[1000]; + struct vty *vty = priv; + va_list args; + + va_start(args, fmt); + vsnprintf(buffer, sizeof(buffer) - 1, fmt, args); + buffer[sizeof(buffer) - 1] = '\0'; + va_end(args); + + if (buffer[0]) { + if (buffer[strlen(buffer) - 1] == '\n') { + buffer[strlen(buffer) - 1] = '\0'; + vty_out(vty, "%s%s", buffer, VTY_NEWLINE); + } 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) { @@ -188,6 +208,50 @@ return CMD_SUCCESS; } +DEFUN(show_support, show_support_cmd, "show support [MS_NAME]", + SHOW_STR "Display information about MS support\n" + "Name of MS (see \"show ms\")") +{ + struct osmocom_ms *ms; + + if (argc) { + ms = l23_vty_get_ms(argv[0], vty); + if (!ms) + return CMD_WARNING; + gsm_support_dump(ms, l23_vty_printf, vty); + } else { + llist_for_each_entry(ms, &ms_list, entity) { + gsm_support_dump(ms, l23_vty_printf, vty); + vty_out(vty, "%s", VTY_NEWLINE); + } + } + + return CMD_SUCCESS; +} + +DEFUN(show_subscr, show_subscr_cmd, "show subscriber [MS_NAME]", + SHOW_STR "Display information about subscriber\n" + "Name of MS (see \"show ms\")") +{ + struct osmocom_ms *ms; + + if (argc) { + ms = l23_vty_get_ms(argv[0], vty); + if (!ms) + return CMD_WARNING; + gsm_subscr_dump(&ms->subscr, l23_vty_printf, vty); + } else { + llist_for_each_entry(ms, &ms_list, entity) { + if (ms->shutdown == MS_SHUTDOWN_NONE) { + gsm_subscr_dump(&ms->subscr, l23_vty_printf, vty); + vty_out(vty, "%s", VTY_NEWLINE); + } + } + } + + return CMD_SUCCESS; +} + /* "gsmtap" config */ gDEFUN(l23_cfg_gsmtap, l23_cfg_gsmtap_cmd, "gsmtap", "Configure GSMTAP\n") @@ -868,6 +932,9 @@ if (l23_app_info.opt_supported & L23_OPT_VTY) osmo_stats_vty_add_cmds(); + install_element_ve(&show_subscr_cmd); + install_element_ve(&show_support_cmd); + install_element(CONFIG_NODE, &cfg_hide_default_cmd); install_element(CONFIG_NODE, &cfg_no_hide_default_cmd); diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index 3938c3b..bdaf69b 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -54,26 +54,6 @@ 1 }; -static void print_vty(void *priv, const char *fmt, ...) -{ - char buffer[1000]; - struct vty *vty = priv; - va_list args; - - va_start(args, fmt); - vsnprintf(buffer, sizeof(buffer) - 1, fmt, args); - buffer[sizeof(buffer) - 1] = '\0'; - va_end(args); - - if (buffer[0]) { - if (buffer[strlen(buffer) - 1] == '\n') { - buffer[strlen(buffer) - 1] = '\0'; - vty_out(vty, "%s%s", buffer, VTY_NEWLINE); - } else - vty_out(vty, "%s", buffer); - } -} - int vty_check_number(struct vty *vty, const char *number) { int i; @@ -231,50 +211,6 @@ return CMD_SUCCESS; } -DEFUN(show_support, show_support_cmd, "show support [MS_NAME]", - SHOW_STR "Display information about MS support\n" - "Name of MS (see \"show ms\")") -{ - struct osmocom_ms *ms; - - if (argc) { - ms = l23_vty_get_ms(argv[0], vty); - if (!ms) - return CMD_WARNING; - gsm_support_dump(ms, print_vty, vty); - } else { - llist_for_each_entry(ms, &ms_list, entity) { - gsm_support_dump(ms, print_vty, vty); - vty_out(vty, "%s", VTY_NEWLINE); - } - } - - return CMD_SUCCESS; -} - -DEFUN(show_subscr, show_subscr_cmd, "show subscriber [MS_NAME]", - SHOW_STR "Display information about subscriber\n" - "Name of MS (see \"show ms\")") -{ - struct osmocom_ms *ms; - - if (argc) { - ms = l23_vty_get_ms(argv[0], vty); - if (!ms) - return CMD_WARNING; - gsm_subscr_dump(&ms->subscr, print_vty, vty); - } else { - llist_for_each_entry(ms, &ms_list, entity) { - if (ms->shutdown == MS_SHUTDOWN_NONE) { - gsm_subscr_dump(&ms->subscr, print_vty, vty); - vty_out(vty, "%s", VTY_NEWLINE); - } - } - } - - return CMD_SUCCESS; -} - DEFUN(show_cell, show_cell_cmd, "show cell MS_NAME", SHOW_STR "Display information about received cells\n" "Name of MS (see \"show ms\")") @@ -285,7 +221,7 @@ if (!ms) return CMD_WARNING; - gsm322_dump_cs_list(&ms->cellsel, GSM322_CS_FLAG_SUPPORT, print_vty, + gsm322_dump_cs_list(&ms->cellsel, GSM322_CS_FLAG_SUPPORT, l23_vty_printf, vty); return CMD_SUCCESS; @@ -320,7 +256,7 @@ return CMD_SUCCESS; } - gsm48_sysinfo_dump(s, arfcn, print_vty, vty, ms->settings.freq_map); + gsm48_sysinfo_dump(s, arfcn, l23_vty_printf, vty, ms->settings.freq_map); return CMD_SUCCESS; } @@ -335,7 +271,7 @@ if (!ms) return CMD_WARNING; - gsm322_dump_nb_list(&ms->cellsel, print_vty, vty); + gsm322_dump_nb_list(&ms->cellsel, l23_vty_printf, vty); return CMD_SUCCESS; } @@ -365,7 +301,7 @@ } } - gsm322_dump_ba_list(&ms->cellsel, mcc, mnc, print_vty, vty); + gsm322_dump_ba_list(&ms->cellsel, mcc, mnc, l23_vty_printf, vty); return CMD_SUCCESS; } @@ -380,7 +316,7 @@ if (!ms) return CMD_WARNING; - gsm_subscr_dump_forbidden_plmn(ms, print_vty, vty); + gsm_subscr_dump_forbidden_plmn(ms, l23_vty_printf, vty); return CMD_SUCCESS; } @@ -395,7 +331,7 @@ if (!ms) return CMD_WARNING; - gsm322_dump_forbidden_la(ms, print_vty, vty); + gsm322_dump_forbidden_la(ms, l23_vty_printf, vty); return CMD_SUCCESS; } @@ -2713,8 +2649,6 @@ return rc; install_element_ve(&show_ms_cmd); - install_element_ve(&show_subscr_cmd); - install_element_ve(&show_support_cmd); install_element_ve(&show_cell_cmd); install_element_ve(&show_cell_si_cmd); install_element_ve(&show_nbcells_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32440 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie4d85bbb1d0af8894683589d8b936f9884f79be9 Gerrit-Change-Number: 32440 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[L] Change in osmocom-bb[master]: layer23: vty: Move sim related commands to common/

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32441 ) ( 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: layer23: vty: Move sim related commands to common/ ...................................................................... layer23: vty: Move sim related commands to common/ Change-Id: I9e95732255c248b000f1045c395a15217d10db78 --- M src/host/layer23/src/common/vty.c M src/host/layer23/src/mobile/vty_interface.c 2 files changed, 366 insertions(+), 354 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/src/common/vty.c b/src/host/layer23/src/common/vty.c index 462998d..3d8214a 100644 --- a/src/host/layer23/src/common/vty.c +++ b/src/host/layer23/src/common/vty.c @@ -469,6 +469,301 @@ return CMD_SUCCESS; } +static int _sim_test_cmd(struct vty *vty, int argc, const char *argv[], + int attached) +{ + struct osmocom_ms *ms; + struct gsm_settings *set; + int rc; + + /* Initial testcard settings */ + uint16_t mcc = 0x001, mnc = 0x01f, lac = 0x0000; + uint32_t tmsi = GSM_RESERVED_TMSI; + + ms = l23_vty_get_ms(argv[0], vty); + if (!ms) + return CMD_WARNING; + + if (ms->subscr.sim_valid) { + vty_out(vty, "SIM already attached, remove first!%s", + VTY_NEWLINE); + return CMD_WARNING; + } + + set = &ms->settings; + if (set->test_rplmn_valid) { + mcc = set->test_rplmn_mcc; + mnc = set->test_rplmn_mnc; + + if (set->test_lac > 0x0000 && set->test_lac < 0xfffe) + lac = set->test_lac; + + if (set->test_tmsi != GSM_RESERVED_TMSI) + tmsi = set->test_tmsi; + } + + if (argc == 2) { + vty_out(vty, "Give MNC together with MCC%s", VTY_NEWLINE); + return CMD_WARNING; + } + if (argc >= 3) { + mcc = gsm_input_mcc((char *)argv[1]); + mnc = gsm_input_mnc((char *)argv[2]); + 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; + } + } + + if (argc >= 4) + lac = strtoul(argv[3], NULL, 16); + + if (argc >= 5) + tmsi = strtoul(argv[4], NULL, 16); + + rc = gsm_subscr_testcard(ms, mcc, mnc, lac, tmsi, attached); + if (rc < 0) { + vty_out(vty, "Attach test SIM card failed: %d%s", rc, VTY_NEWLINE); + return CMD_WARNING; + } + + return CMD_SUCCESS; +} + +DEFUN(sim_test, sim_test_cmd, + "sim testcard MS_NAME [MCC] [MNC] [LAC] [TMSI]", + "SIM actions\nAttach built in test SIM\nName of MS (see \"show ms\")\n" + "Optionally set mobile Country Code of RPLMN\n" + "Optionally set mobile Network Code of RPLMN\n" + "Optionally set location area code of RPLMN\n" + "Optionally set current assigned TMSI") +{ + return _sim_test_cmd(vty, argc, argv, 0); +} + +DEFUN(sim_test_att, sim_test_att_cmd, + "sim testcard MS_NAME MCC MNC LAC TMSI attached", + "SIM actions\nAttach built in test SIM\nName of MS (see \"show ms\")\n" + "Set mobile Country Code of RPLMN\nSet mobile Network Code of RPLMN\n" + "Set location area code\nSet current assigned TMSI\n" + "Indicate to MM that card is already attached") +{ + return _sim_test_cmd(vty, argc, argv, 1); +} + +DEFUN(sim_sap, sim_sap_cmd, "sim sap MS_NAME", + "SIM actions\nAttach SIM over SAP interface\n" + "Name of MS (see \"show ms\")\n") +{ + struct osmocom_ms *ms; + + ms = l23_vty_get_ms(argv[0], vty); + if (!ms) + return CMD_WARNING; + + if (ms->subscr.sim_valid) { + vty_out(vty, "SIM already attached, remove first!%s", + VTY_NEWLINE); + return CMD_WARNING; + } + + if (gsm_subscr_sapcard(ms) != 0) + return CMD_WARNING; + + return CMD_SUCCESS; +} + +DEFUN(sim_reader, sim_reader_cmd, "sim reader MS_NAME", + "SIM actions\nAttach SIM from reader\nName of MS (see \"show ms\")") +{ + struct osmocom_ms *ms; + + ms = l23_vty_get_ms(argv[0], vty); + if (!ms) + return CMD_WARNING; + + if (ms->subscr.sim_valid) { + vty_out(vty, "SIM already attached, remove first!%s", + VTY_NEWLINE); + return CMD_WARNING; + } + + gsm_subscr_simcard(ms); + + return CMD_SUCCESS; +} + +DEFUN(sim_remove, sim_remove_cmd, "sim remove MS_NAME", + "SIM actions\nDetach SIM card\nName of MS (see \"show ms\")") +{ + struct osmocom_ms *ms; + + ms = l23_vty_get_ms(argv[0], vty); + if (!ms) + return CMD_WARNING; + + if (!ms->subscr.sim_valid) { + vty_out(vty, "No SIM attached!%s", VTY_NEWLINE); + return CMD_WARNING; + } + + if (ms->subscr.sim_type == GSM_SIM_TYPE_SAP) + gsm_subscr_remove_sapcard(ms); + + gsm_subscr_remove(ms); + return CMD_SUCCESS; +} + +DEFUN(sim_pin, sim_pin_cmd, "sim pin MS_NAME PIN", + "SIM actions\nEnter PIN for SIM card\nName of MS (see \"show ms\")\n" + "PIN number") +{ + struct osmocom_ms *ms; + + ms = l23_vty_get_ms(argv[0], vty); + if (!ms) + return CMD_WARNING; + + if (strlen(argv[1]) < 4 || strlen(argv[1]) > 8) { + vty_out(vty, "PIN must be in range 4..8!%s", VTY_NEWLINE); + return CMD_WARNING; + } + + if (!ms->subscr.sim_pin_required) { + vty_out(vty, "No PIN is required at this time!%s", VTY_NEWLINE); + return CMD_WARNING; + } + + gsm_subscr_sim_pin(ms, (char *)argv[1], "", 0); + + return CMD_SUCCESS; +} + +DEFUN(sim_disable_pin, sim_disable_pin_cmd, "sim disable-pin MS_NAME PIN", + "SIM actions\nDisable PIN of SIM card\nName of MS (see \"show ms\")\n" + "PIN number") +{ + struct osmocom_ms *ms; + + ms = l23_vty_get_ms(argv[0], vty); + if (!ms) + return CMD_WARNING; + + if (strlen(argv[1]) < 4 || strlen(argv[1]) > 8) { + vty_out(vty, "PIN must be in range 4..8!%s", VTY_NEWLINE); + return CMD_WARNING; + } + + gsm_subscr_sim_pin(ms, (char *)argv[1], "", -1); + + return CMD_SUCCESS; +} + +DEFUN(sim_enable_pin, sim_enable_pin_cmd, "sim enable-pin MS_NAME PIN", + "SIM actions\nEnable PIN of SIM card\nName of MS (see \"show ms\")\n" + "PIN number") +{ + struct osmocom_ms *ms; + + ms = l23_vty_get_ms(argv[0], vty); + if (!ms) + return CMD_WARNING; + + if (strlen(argv[1]) < 4 || strlen(argv[1]) > 8) { + vty_out(vty, "PIN must be in range 4..8!%s", VTY_NEWLINE); + return CMD_WARNING; + } + + gsm_subscr_sim_pin(ms, (char *)argv[1], "", 1); + + return CMD_SUCCESS; +} + +DEFUN(sim_change_pin, sim_change_pin_cmd, "sim change-pin MS_NAME OLD NEW", + "SIM actions\nChange PIN of SIM card\nName of MS (see \"show ms\")\n" + "Old PIN number\nNew PIN number") +{ + struct osmocom_ms *ms; + + ms = l23_vty_get_ms(argv[0], vty); + if (!ms) + return CMD_WARNING; + + if (strlen(argv[1]) < 4 || strlen(argv[1]) > 8) { + vty_out(vty, "Old PIN must be in range 4..8!%s", VTY_NEWLINE); + return CMD_WARNING; + } + if (strlen(argv[2]) < 4 || strlen(argv[2]) > 8) { + vty_out(vty, "New PIN must be in range 4..8!%s", VTY_NEWLINE); + return CMD_WARNING; + } + + gsm_subscr_sim_pin(ms, (char *)argv[1], (char *)argv[2], 2); + + return CMD_SUCCESS; +} + +DEFUN(sim_unblock_pin, sim_unblock_pin_cmd, "sim unblock-pin MS_NAME PUC NEW", + "SIM actions\nChange PIN of SIM card\nName of MS (see \"show ms\")\n" + "Personal Unblock Key\nNew PIN number") +{ + struct osmocom_ms *ms; + + ms = l23_vty_get_ms(argv[0], vty); + if (!ms) + return CMD_WARNING; + + if (strlen(argv[1]) != 8) { + vty_out(vty, "PUC must be 8 digits!%s", VTY_NEWLINE); + return CMD_WARNING; + } + if (strlen(argv[2]) < 4 || strlen(argv[2]) > 8) { + vty_out(vty, "PIN must be in range 4..8!%s", VTY_NEWLINE); + return CMD_WARNING; + } + + gsm_subscr_sim_pin(ms, (char *)argv[1], (char *)argv[2], 99); + + return CMD_SUCCESS; +} + +DEFUN(sim_lai, sim_lai_cmd, "sim lai MS_NAME MCC MNC LAC", + "SIM actions\nChange LAI of SIM card\nName of MS (see \"show ms\")\n" + "Mobile Country Code\nMobile Network Code\nLocation Area Code " + " (use 0000 to remove LAI)") +{ + struct osmocom_ms *ms; + uint16_t mcc = gsm_input_mcc((char *)argv[1]), + mnc = gsm_input_mnc((char *)argv[2]), + lac = strtoul(argv[3], NULL, 16); + + ms = l23_vty_get_ms(argv[0], vty); + if (!ms) + return CMD_WARNING; + + 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; + } + + ms->subscr.mcc = mcc; + ms->subscr.mnc = mnc; + ms->subscr.lac = lac; + ms->subscr.tmsi = GSM_RESERVED_TMSI; + + gsm_subscr_write_loci(ms); + + return CMD_SUCCESS; +} + /* per MS config */ gDEFUN(l23_cfg_ms, l23_cfg_ms_cmd, "ms MS_NAME", "Select a mobile station to configure\nName of MS (see \"show ms\")") @@ -501,6 +796,37 @@ return CMD_SUCCESS; } +DEFUN(cfg_ms_sim, cfg_ms_sim_cmd, "sim (none|reader|test|sap)", + "Set SIM card to attach when powering on\nAttach no SIM\n" + "Attach SIM from reader\nAttach build in test SIM\n" + "Attach SIM over SAP interface") +{ + struct osmocom_ms *ms = vty->index; + struct gsm_settings *set = &ms->settings; + + switch (argv[0][0]) { + case 'n': + set->sim_type = GSM_SIM_TYPE_NONE; + break; + case 'r': + set->sim_type = GSM_SIM_TYPE_L1PHY; + break; + case 't': + set->sim_type = GSM_SIM_TYPE_TEST; + break; + case 's': + set->sim_type = GSM_SIM_TYPE_SAP; + break; + default: + vty_out(vty, "unknown SIM type%s", VTY_NEWLINE); + return CMD_WARNING; + } + + l23_vty_restart_required_warn(vty, ms); + + return CMD_SUCCESS; +} + DEFUN(cfg_ms_no_shutdown, cfg_ms_no_shutdown_cmd, "no shutdown", NO_STR "Activate and run MS") { @@ -865,6 +1191,24 @@ vty_out(vty, "%slayer2-socket %s%s", prefix, set->layer2_socket_path, VTY_NEWLINE); + + switch (set->sim_type) { + case GSM_SIM_TYPE_NONE: + vty_out(vty, "%ssim none%s", prefix, VTY_NEWLINE); + break; + case GSM_SIM_TYPE_L1PHY: + vty_out(vty, "%ssim reader%s", prefix, VTY_NEWLINE); + break; + case GSM_SIM_TYPE_TEST: + vty_out(vty, "%ssim test%s", prefix, VTY_NEWLINE); + break; + case GSM_SIM_TYPE_SAP: + vty_out(vty, "%ssim sap%s", prefix, VTY_NEWLINE); + break; + default: + OSMO_ASSERT(0); + } + l23_vty_config_write_testsim_node(vty, ms, prefix); } @@ -935,11 +1279,24 @@ install_element_ve(&show_subscr_cmd); install_element_ve(&show_support_cmd); + install_element(ENABLE_NODE, &sim_test_cmd); + install_element(ENABLE_NODE, &sim_test_att_cmd); + install_element(ENABLE_NODE, &sim_sap_cmd); + install_element(ENABLE_NODE, &sim_reader_cmd); + install_element(ENABLE_NODE, &sim_remove_cmd); + install_element(ENABLE_NODE, &sim_pin_cmd); + install_element(ENABLE_NODE, &sim_disable_pin_cmd); + install_element(ENABLE_NODE, &sim_enable_pin_cmd); + install_element(ENABLE_NODE, &sim_change_pin_cmd); + install_element(ENABLE_NODE, &sim_unblock_pin_cmd); + install_element(ENABLE_NODE, &sim_lai_cmd); + 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_sim_cmd); install_element(MS_NODE, &cfg_ms_testsim_cmd); install_node(&testsim_node, NULL); install_element(TESTSIM_NODE, &cfg_test_imsi_cmd); diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index bdaf69b..e0a8ede 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -365,303 +365,6 @@ return CMD_SUCCESS; } -static int _sim_test_cmd(struct vty *vty, int argc, const char *argv[], - int attached) -{ - struct osmocom_ms *ms; - struct gsm_settings *set; - int rc; - - /* Initial testcard settings */ - uint16_t mcc = 0x001, mnc = 0x01f, lac = 0x0000; - uint32_t tmsi = GSM_RESERVED_TMSI; - - ms = l23_vty_get_ms(argv[0], vty); - if (!ms) - return CMD_WARNING; - - if (ms->subscr.sim_valid) { - vty_out(vty, "SIM already attached, remove first!%s", - VTY_NEWLINE); - return CMD_WARNING; - } - - set = &ms->settings; - if (set->test_rplmn_valid) { - mcc = set->test_rplmn_mcc; - mnc = set->test_rplmn_mnc; - - if (set->test_lac > 0x0000 && set->test_lac < 0xfffe) - lac = set->test_lac; - - if (set->test_tmsi != GSM_RESERVED_TMSI) - tmsi = set->test_tmsi; - } - - if (argc == 2) { - vty_out(vty, "Give MNC together with MCC%s", VTY_NEWLINE); - return CMD_WARNING; - } - if (argc >= 3) { - mcc = gsm_input_mcc((char *)argv[1]); - mnc = gsm_input_mnc((char *)argv[2]); - 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; - } - } - - if (argc >= 4) - lac = strtoul(argv[3], NULL, 16); - - if (argc >= 5) - tmsi = strtoul(argv[4], NULL, 16); - - rc = gsm_subscr_testcard(ms, mcc, mnc, lac, tmsi, attached); - if (rc < 0) { - vty_out(vty, "Attach test SIM card failed: %d%s", rc, VTY_NEWLINE); - return CMD_WARNING; - } - - return CMD_SUCCESS; -} - -DEFUN(sim_test, sim_test_cmd, - "sim testcard MS_NAME [MCC] [MNC] [LAC] [TMSI]", - "SIM actions\nAttach built in test SIM\nName of MS (see \"show ms\")\n" - "Optionally set mobile Country Code of RPLMN\n" - "Optionally set mobile Network Code of RPLMN\n" - "Optionally set location area code of RPLMN\n" - "Optionally set current assigned TMSI") -{ - return _sim_test_cmd(vty, argc, argv, 0); -} - -DEFUN(sim_test_att, sim_test_att_cmd, - "sim testcard MS_NAME MCC MNC LAC TMSI attached", - "SIM actions\nAttach built in test SIM\nName of MS (see \"show ms\")\n" - "Set mobile Country Code of RPLMN\nSet mobile Network Code of RPLMN\n" - "Set location area code\nSet current assigned TMSI\n" - "Indicate to MM that card is already attached") -{ - return _sim_test_cmd(vty, argc, argv, 1); -} - -DEFUN(sim_sap, sim_sap_cmd, "sim sap MS_NAME", - "SIM actions\nAttach SIM over SAP interface\n" - "Name of MS (see \"show ms\")\n") -{ - struct osmocom_ms *ms; - - ms = l23_vty_get_ms(argv[0], vty); - if (!ms) - return CMD_WARNING; - - if (ms->subscr.sim_valid) { - vty_out(vty, "SIM already attached, remove first!%s", - VTY_NEWLINE); - return CMD_WARNING; - } - - if (gsm_subscr_sapcard(ms) != 0) { - return CMD_WARNING; - } - - return CMD_SUCCESS; -} - -DEFUN(sim_reader, sim_reader_cmd, "sim reader MS_NAME", - "SIM actions\nAttach SIM from reader\nName of MS (see \"show ms\")") -{ - struct osmocom_ms *ms; - - ms = l23_vty_get_ms(argv[0], vty); - if (!ms) - return CMD_WARNING; - - if (ms->subscr.sim_valid) { - vty_out(vty, "SIM already attached, remove first!%s", - VTY_NEWLINE); - return CMD_WARNING; - } - - gsm_subscr_simcard(ms); - - return CMD_SUCCESS; -} - -DEFUN(sim_remove, sim_remove_cmd, "sim remove MS_NAME", - "SIM actions\nDetach SIM card\nName of MS (see \"show ms\")") -{ - struct osmocom_ms *ms; - - ms = l23_vty_get_ms(argv[0], vty); - if (!ms) - return CMD_WARNING; - - if (!ms->subscr.sim_valid) { - vty_out(vty, "No SIM attached!%s", VTY_NEWLINE); - return CMD_WARNING; - } - - if (ms->subscr.sim_type == GSM_SIM_TYPE_SAP) { - gsm_subscr_remove_sapcard(ms); - } - - gsm_subscr_remove(ms); - return CMD_SUCCESS; -} - -DEFUN(sim_pin, sim_pin_cmd, "sim pin MS_NAME PIN", - "SIM actions\nEnter PIN for SIM card\nName of MS (see \"show ms\")\n" - "PIN number") -{ - struct osmocom_ms *ms; - - ms = l23_vty_get_ms(argv[0], vty); - if (!ms) - return CMD_WARNING; - - if (strlen(argv[1]) < 4 || strlen(argv[1]) > 8) { - vty_out(vty, "PIN must be in range 4..8!%s", VTY_NEWLINE); - return CMD_WARNING; - } - - if (!ms->subscr.sim_pin_required) { - vty_out(vty, "No PIN is required at this time!%s", VTY_NEWLINE); - return CMD_WARNING; - } - - gsm_subscr_sim_pin(ms, (char *)argv[1], "", 0); - - return CMD_SUCCESS; -} - -DEFUN(sim_disable_pin, sim_disable_pin_cmd, "sim disable-pin MS_NAME PIN", - "SIM actions\nDisable PIN of SIM card\nName of MS (see \"show ms\")\n" - "PIN number") -{ - struct osmocom_ms *ms; - - ms = l23_vty_get_ms(argv[0], vty); - if (!ms) - return CMD_WARNING; - - if (strlen(argv[1]) < 4 || strlen(argv[1]) > 8) { - vty_out(vty, "PIN must be in range 4..8!%s", VTY_NEWLINE); - return CMD_WARNING; - } - - gsm_subscr_sim_pin(ms, (char *)argv[1], "", -1); - - return CMD_SUCCESS; -} - -DEFUN(sim_enable_pin, sim_enable_pin_cmd, "sim enable-pin MS_NAME PIN", - "SIM actions\nEnable PIN of SIM card\nName of MS (see \"show ms\")\n" - "PIN number") -{ - struct osmocom_ms *ms; - - ms = l23_vty_get_ms(argv[0], vty); - if (!ms) - return CMD_WARNING; - - if (strlen(argv[1]) < 4 || strlen(argv[1]) > 8) { - vty_out(vty, "PIN must be in range 4..8!%s", VTY_NEWLINE); - return CMD_WARNING; - } - - gsm_subscr_sim_pin(ms, (char *)argv[1], "", 1); - - return CMD_SUCCESS; -} - -DEFUN(sim_change_pin, sim_change_pin_cmd, "sim change-pin MS_NAME OLD NEW", - "SIM actions\nChange PIN of SIM card\nName of MS (see \"show ms\")\n" - "Old PIN number\nNew PIN number") -{ - struct osmocom_ms *ms; - - ms = l23_vty_get_ms(argv[0], vty); - if (!ms) - return CMD_WARNING; - - if (strlen(argv[1]) < 4 || strlen(argv[1]) > 8) { - vty_out(vty, "Old PIN must be in range 4..8!%s", VTY_NEWLINE); - return CMD_WARNING; - } - if (strlen(argv[2]) < 4 || strlen(argv[2]) > 8) { - vty_out(vty, "New PIN must be in range 4..8!%s", VTY_NEWLINE); - return CMD_WARNING; - } - - gsm_subscr_sim_pin(ms, (char *)argv[1], (char *)argv[2], 2); - - return CMD_SUCCESS; -} - -DEFUN(sim_unblock_pin, sim_unblock_pin_cmd, "sim unblock-pin MS_NAME PUC NEW", - "SIM actions\nChange PIN of SIM card\nName of MS (see \"show ms\")\n" - "Personal Unblock Key\nNew PIN number") -{ - struct osmocom_ms *ms; - - ms = l23_vty_get_ms(argv[0], vty); - if (!ms) - return CMD_WARNING; - - if (strlen(argv[1]) != 8) { - vty_out(vty, "PUC must be 8 digits!%s", VTY_NEWLINE); - return CMD_WARNING; - } - if (strlen(argv[2]) < 4 || strlen(argv[2]) > 8) { - vty_out(vty, "PIN must be in range 4..8!%s", VTY_NEWLINE); - return CMD_WARNING; - } - - gsm_subscr_sim_pin(ms, (char *)argv[1], (char *)argv[2], 99); - - return CMD_SUCCESS; -} - -DEFUN(sim_lai, sim_lai_cmd, "sim lai MS_NAME MCC MNC LAC", - "SIM actions\nChange LAI of SIM card\nName of MS (see \"show ms\")\n" - "Mobile Country Code\nMobile Network Code\nLocation Area Code " - " (use 0000 to remove LAI)") -{ - struct osmocom_ms *ms; - uint16_t mcc = gsm_input_mcc((char *)argv[1]), - mnc = gsm_input_mnc((char *)argv[2]), - lac = strtoul(argv[3], NULL, 16); - - ms = l23_vty_get_ms(argv[0], vty); - if (!ms) - return CMD_WARNING; - - 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; - } - - ms->subscr.mcc = mcc; - ms->subscr.mnc = mnc; - ms->subscr.lac = lac; - ms->subscr.tmsi = GSM_RESERVED_TMSI; - - gsm_subscr_write_loci(ms); - - return CMD_SUCCESS; -} - DEFUN(network_select, network_select_cmd, "network select MS_NAME MCC MNC [force]", "Select ...\nSelect Network\nName of MS (see \"show ms\")\n" @@ -1227,20 +930,6 @@ case MNCC_HANDLER_DUMMY: vty_out(vty, " mncc-handler dummy%s", VTY_NEWLINE); } - switch(set->sim_type) { - case GSM_SIM_TYPE_NONE: - vty_out(vty, " sim none%s", VTY_NEWLINE); - break; - case GSM_SIM_TYPE_L1PHY: - vty_out(vty, " sim reader%s", VTY_NEWLINE); - break; - case GSM_SIM_TYPE_TEST: - vty_out(vty, " sim test%s", VTY_NEWLINE); - break; - case GSM_SIM_TYPE_SAP: - vty_out(vty, " sim sap%s", VTY_NEWLINE); - break; - } vty_out(vty, " network-selection-mode %s%s", (set->plmn_mode == PLMN_MODE_AUTO) ? "auto" : "manual", VTY_NEWLINE); vty_out(vty, " imei %s %s%s", set->imei, @@ -1524,37 +1213,6 @@ return CMD_SUCCESS; } -DEFUN(cfg_ms_sim, cfg_ms_sim_cmd, "sim (none|reader|test|sap)", - "Set SIM card to attach when powering on\nAttach no SIM\n" - "Attach SIM from reader\nAttach build in test SIM\n" - "Attach SIM over SAP interface") -{ - struct osmocom_ms *ms = vty->index; - struct gsm_settings *set = &ms->settings; - - switch (argv[0][0]) { - case 'n': - set->sim_type = GSM_SIM_TYPE_NONE; - break; - case 'r': - set->sim_type = GSM_SIM_TYPE_L1PHY; - break; - case 't': - set->sim_type = GSM_SIM_TYPE_TEST; - break; - case 's': - set->sim_type = GSM_SIM_TYPE_SAP; - break; - default: - vty_out(vty, "unknown SIM type%s", VTY_NEWLINE); - return CMD_WARNING; - } - - vty_restart_if_started(vty, ms); - - return CMD_SUCCESS; -} - DEFUN(cfg_ms_mode, cfg_ms_mode_cmd, "network-selection-mode (auto|manual)", "Set network selection mode\nAutomatic network selection\n" "Manual network selection") @@ -2659,17 +2317,6 @@ install_element_ve(&no_monitor_network_cmd); install_element(ENABLE_NODE, &off_cmd); - install_element(ENABLE_NODE, &sim_test_cmd); - install_element(ENABLE_NODE, &sim_test_att_cmd); - install_element(ENABLE_NODE, &sim_sap_cmd); - install_element(ENABLE_NODE, &sim_reader_cmd); - install_element(ENABLE_NODE, &sim_remove_cmd); - install_element(ENABLE_NODE, &sim_pin_cmd); - install_element(ENABLE_NODE, &sim_disable_pin_cmd); - install_element(ENABLE_NODE, &sim_enable_pin_cmd); - install_element(ENABLE_NODE, &sim_change_pin_cmd); - install_element(ENABLE_NODE, &sim_unblock_pin_cmd); - install_element(ENABLE_NODE, &sim_lai_cmd); install_element(ENABLE_NODE, &network_search_cmd); install_element(ENABLE_NODE, &network_show_cmd); install_element(ENABLE_NODE, &network_select_cmd); @@ -2700,7 +2347,6 @@ install_element(MS_NODE, &cfg_ms_mncc_sock_cmd); install_element(MS_NODE, &cfg_ms_mncc_handler_cmd); install_element(MS_NODE, &cfg_ms_no_mncc_handler_cmd); - install_element(MS_NODE, &cfg_ms_sim_cmd); install_element(MS_NODE, &cfg_ms_mode_cmd); install_element(MS_NODE, &cfg_ms_imei_cmd); install_element(MS_NODE, &cfg_ms_imei_fixed_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32441 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I9e95732255c248b000f1045c395a15217d10db78 Gerrit-Change-Number: 32441 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: modem: Forward GMM primitives up to SM layer

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32484 ) ( 6 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: layer23: modem: Forward GMM primitives up to SM layer ...................................................................... layer23: modem: Forward GMM primitives up to SM layer Change-Id: I5c5416775ccce4a1cbc70c8f6ba4fc25ace12d6f --- M src/host/layer23/src/modem/gmm.c 1 file changed, 23 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/src/modem/gmm.c b/src/host/layer23/src/modem/gmm.c index 650bd2f..af8b060 100644 --- a/src/host/layer23/src/modem/gmm.c +++ b/src/host/layer23/src/modem/gmm.c @@ -36,6 +36,7 @@ #include <osmocom/gprs/gmm/gmm_prim.h> #include <osmocom/gprs/gmm/gmm.h> #include <osmocom/gprs/rlcmac/rlcmac_prim.h> +#include <osmocom/gprs/sm/sm_prim.h> #include <osmocom/bb/common/settings.h> #include <osmocom/bb/common/logging.h> @@ -59,6 +60,19 @@ break; }; break; + case OSMO_GPRS_GMM_SAP_GMMSM: + switch (OSMO_PRIM_HDR(&gmm_prim->oph)) { + case OSMO_PRIM(OSMO_GPRS_GMM_GMMSM_ESTABLISH, PRIM_OP_CONFIRM): + case OSMO_PRIM(OSMO_GPRS_GMM_GMMSM_RELEASE, PRIM_OP_INDICATION): + case OSMO_PRIM(OSMO_GPRS_GMM_GMMSM_UNITDATA, PRIM_OP_INDICATION): + osmo_gprs_sm_prim_gmm_lower_up(gmm_prim); + rc = 1; /* Tell RLCMAC that we take ownership of the prim. */ + break; + default: + LOGP(DGMM, LOGL_ERROR, "%s(): Rx %s UNIMPLEMENTED\n", __func__, pdu_name); + break; + }; + break; default: LOGP(DGMM, LOGL_ERROR, "%s(): Unexpected Rx %s\n", __func__, pdu_name); OSMO_ASSERT(0); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32484 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5c5416775ccce4a1cbc70c8f6ba4fc25ace12d6f Gerrit-Change-Number: 32484 Gerrit-PatchSet: 7 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[M] Change in osmocom-bb[master]: layer23: Use subscriber information and events to trigger GMMREG Attach

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32442 ) ( 7 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: layer23: Use subscriber information and events to trigger GMMREG Attach ...................................................................... layer23: Use subscriber information and events to trigger GMMREG Attach Change-Id: I1c7cc120ff4098c0b845e13a6e5e5db8b7e18376 --- M src/host/layer23/include/osmocom/bb/modem/gmm.h M src/host/layer23/include/osmocom/bb/modem/sm.h M src/host/layer23/src/modem/app_modem.c M src/host/layer23/src/modem/gmm.c M src/host/layer23/src/modem/sm.c M src/host/layer23/src/modem/vty.c 6 files changed, 161 insertions(+), 65 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/include/osmocom/bb/modem/gmm.h b/src/host/layer23/include/osmocom/bb/modem/gmm.h index 4ec3e8e..6269c82 100644 --- a/src/host/layer23/include/osmocom/bb/modem/gmm.h +++ b/src/host/layer23/include/osmocom/bb/modem/gmm.h @@ -5,3 +5,6 @@ struct osmocom_ms; int modem_gmm_init(struct osmocom_ms *ms); + +int modem_gmm_gmmreg_attach_req(const struct osmocom_ms *ms); +int modem_gmm_gmmreg_detach_req(const struct osmocom_ms *ms); diff --git a/src/host/layer23/include/osmocom/bb/modem/sm.h b/src/host/layer23/include/osmocom/bb/modem/sm.h index 51000cf..b1a5df5 100644 --- a/src/host/layer23/include/osmocom/bb/modem/sm.h +++ b/src/host/layer23/include/osmocom/bb/modem/sm.h @@ -5,3 +5,4 @@ struct osmocom_ms; int modem_sm_init(struct osmocom_ms *ms); +int modem_sm_smreg_pdp_act_req(const struct osmocom_ms *ms, const struct osmobb_apn *apn); diff --git a/src/host/layer23/src/modem/app_modem.c b/src/host/layer23/src/modem/app_modem.c index 12ac4ae..d80fe91 100644 --- a/src/host/layer23/src/modem/app_modem.c +++ b/src/host/layer23/src/modem/app_modem.c @@ -114,10 +114,41 @@ memset(&app_data, 0x00, sizeof(app_data)); } +/* SIM becomes ATTACHED/DETACHED, or answers a request */ +static int modem_l23_subscr_signal_cb(unsigned int subsys, unsigned int signal, + void *handler_data, void *signal_data) +{ + struct osmocom_ms *ms; + struct osmobb_l23_subscr_sim_auth_resp_sig_data *sim_auth_resp; + + OSMO_ASSERT(subsys == SS_L23_SUBSCR); + + switch (signal) { + case S_L23_SUBSCR_SIM_ATTACHED: + ms = signal_data; + modem_gmm_gmmreg_attach_req(ms); + break; + case S_L23_SUBSCR_SIM_DETACHED: + ms = signal_data; + modem_gmm_gmmreg_detach_req(ms); + break; + case S_L23_SUBSCR_SIM_AUTH_RESP: + sim_auth_resp = signal_data; + ms = sim_auth_resp->ms; + /* TODO: pass sim_auth_resp->sres to GMM layer */ + break; + default: + OSMO_ASSERT(0); + } + + return 0; +} + static int global_signal_cb(unsigned int subsys, unsigned int signal, void *handler_data, void *signal_data) { struct osmocom_ms *ms; + struct gsm_settings *set; if (subsys != SS_L1CTL) return 0; @@ -128,6 +159,29 @@ layer3_app_reset(); app_data.ms = ms; + /* insert test card, if enabled */ + set = &ms->settings; + switch (set->sim_type) { + case GSM_SIM_TYPE_L1PHY: + /* trigger sim card reader process */ + gsm_subscr_simcard(ms); + break; + case GSM_SIM_TYPE_TEST: + gsm_subscr_testcard(ms, set->test_rplmn_mcc, + set->test_rplmn_mnc, set->test_lac, + set->test_tmsi, set->test_imsi_attached); + break; + case GSM_SIM_TYPE_SAP: + gsm_subscr_sapcard(ms); + break; + default: + /* No SIM, trigger PLMN selection process. + * FIXME: not implemented. Code in mobile needs to be + * moved to common/ and reuse it here. + */ + break; + } + ms->started = true; return l1ctl_tx_fbsb_req(ms, ms->test_arfcn, L1CTL_FBSB_F_FB01SB, 100, 0, @@ -154,6 +208,7 @@ /* global exit */ static int _modem_exit(void) { + osmo_signal_unregister_handler(SS_L23_SUBSCR, &modem_l23_subscr_signal_cb, NULL); osmo_signal_unregister_handler(SS_GLOBAL, &global_signal_cb, NULL); return 0; } @@ -198,6 +253,7 @@ } osmo_signal_register_handler(SS_L1CTL, &global_signal_cb, NULL); + osmo_signal_register_handler(SS_L23_SUBSCR, &modem_l23_subscr_signal_cb, NULL); lapdm_channel_set_l3(&app_data.ms->lapdm_channel, &modem_grr_rslms_cb, app_data.ms); return 0; } diff --git a/src/host/layer23/src/modem/gmm.c b/src/host/layer23/src/modem/gmm.c index 9472e32..650bd2f 100644 --- a/src/host/layer23/src/modem/gmm.c +++ b/src/host/layer23/src/modem/gmm.c @@ -124,3 +124,38 @@ osmo_gprs_gmm_enable_gprs(true); return rc; } + +int modem_gmm_gmmreg_attach_req(const struct osmocom_ms *ms) +{ + struct osmo_gprs_gmm_prim *gmm_prim; + const struct gsm_subscriber *subscr = &ms->subscr; + int rc; + + gmm_prim = osmo_gprs_gmm_prim_alloc_gmmreg_attach_req(); + gmm_prim->gmmreg.attach_req.attach_type = OSMO_GPRS_GMM_ATTACH_TYPE_GPRS; + gmm_prim->gmmreg.attach_req.ptmsi = subscr->tmsi; + gmm_prim->gmmreg.attach_req.attach_with_imsi = (subscr->tmsi == GSM_RESERVED_TMSI); + memcpy(gmm_prim->gmmreg.attach_req.imsi, subscr->imsi, ARRAY_SIZE(subscr->imsi)); + memcpy(gmm_prim->gmmreg.attach_req.imei, ms->settings.imei, ARRAY_SIZE(ms->settings.imei)); + memcpy(gmm_prim->gmmreg.attach_req.imeisv, ms->settings.imeisv, ARRAY_SIZE(ms->settings.imeisv)); + rc = osmo_gprs_gmm_prim_upper_down(gmm_prim); + if (rc < 0) + LOGP(DMM, LOGL_ERROR, "Failed submitting GMMREG-ATTACH.req\n"); + return rc; +} + +int modem_gmm_gmmreg_detach_req(const struct osmocom_ms *ms) +{ + struct osmo_gprs_gmm_prim *gmm_prim; + const struct gsm_subscriber *subscr = &ms->subscr; + int rc; + + gmm_prim = osmo_gprs_gmm_prim_alloc_gmmreg_detach_req(); + gmm_prim->gmmreg.detach_req.ptmsi = subscr->tmsi; + gmm_prim->gmmreg.detach_req.detach_type = OSMO_GPRS_GMM_DETACH_MS_TYPE_GPRS; + gmm_prim->gmmreg.detach_req.poweroff_type = OSMO_GPRS_GMM_DETACH_POWEROFF_TYPE_NORMAL; + rc = osmo_gprs_gmm_prim_upper_down(gmm_prim); + if (rc < 0) + LOGP(DMM, LOGL_ERROR, "Failed submitting GMMREG-DETACH.req\n"); + return rc; +} diff --git a/src/host/layer23/src/modem/sm.c b/src/host/layer23/src/modem/sm.c index 01d5a42..575321f 100644 --- a/src/host/layer23/src/modem/sm.c +++ b/src/host/layer23/src/modem/sm.c @@ -216,3 +216,48 @@ return rc; } + +int modem_sm_smreg_pdp_act_req(const struct osmocom_ms *ms, const struct osmobb_apn *apn) +{ + struct osmo_gprs_sm_prim *sm_prim; + const struct gsm_subscriber *subscr = &ms->subscr; + enum osmo_gprs_sm_pdp_addr_ietf_type pdp_addr_ietf_type; + uint8_t nsapi = 6; + enum osmo_gprs_sm_llc_sapi llc_sapi = OSMO_GPRS_SM_LLC_SAPI_SAPI3; + struct osmo_sockaddr pdp_addr_any = {0}; + uint8_t qos[OSMO_GPRS_SM_QOS_MAXLEN] = {0}; + uint8_t pco[OSMO_GPRS_SM_QOS_MAXLEN] = {0}; + int rc; + + if (apn->cfg.apn_type_mask & APN_TYPE_IPv4v6) { + pdp_addr_ietf_type = OSMO_GPRS_SM_PDP_ADDR_IETF_IPV4V6; + } else if (apn->cfg.apn_type_mask & APN_TYPE_IPv4) { + pdp_addr_ietf_type = OSMO_GPRS_SM_PDP_ADDR_IETF_IPV4; + } else if (apn->cfg.apn_type_mask & APN_TYPE_IPv6) { + pdp_addr_ietf_type = OSMO_GPRS_SM_PDP_ADDR_IETF_IPV6; + } else { + LOGP(DSM, LOGL_ERROR, "APN '%s' has no PDP address type set\n", apn->cfg.name); + return -EINVAL; + } + + sm_prim = osmo_gprs_sm_prim_alloc_smreg_pdp_act_req(); + sm_prim->smreg.pdp_act_req.nsapi = nsapi; + sm_prim->smreg.pdp_act_req.llc_sapi = llc_sapi; + sm_prim->smreg.pdp_act_req.pdp_addr_ietf_type = pdp_addr_ietf_type; + sm_prim->smreg.pdp_act_req.pdp_addr_v4 = pdp_addr_any; + sm_prim->smreg.pdp_act_req.pdp_addr_v6 = pdp_addr_any; + memcpy(sm_prim->smreg.pdp_act_req.qos, qos, sizeof(qos)); + sm_prim->smreg.pdp_act_req.qos_len = 1; + memcpy(sm_prim->smreg.pdp_act_req.pco, pco, sizeof(pco)); + sm_prim->smreg.pdp_act_req.pco_len = 1; + OSMO_STRLCPY_ARRAY(sm_prim->smreg.pdp_act_req.apn, apn->cfg.name); + sm_prim->smreg.pdp_act_req.gmm.ptmsi = subscr->tmsi; + OSMO_STRLCPY_ARRAY(sm_prim->smreg.pdp_act_req.gmm.imsi, subscr->imsi); + OSMO_STRLCPY_ARRAY(sm_prim->smreg.pdp_act_req.gmm.imei, ms->settings.imei); + OSMO_STRLCPY_ARRAY(sm_prim->smreg.pdp_act_req.gmm.imeisv, ms->settings.imeisv); + + rc = osmo_gprs_sm_prim_upper_down(sm_prim); + if (rc < 0) + LOGP(DSM, LOGL_ERROR, "Failed submitting SMREG-PDP_ACT_REQ.req\n"); + return rc; +} diff --git a/src/host/layer23/src/modem/vty.c b/src/host/layer23/src/modem/vty.c index a23ae73..33891d4 100644 --- a/src/host/layer23/src/modem/vty.c +++ b/src/host/layer23/src/modem/vty.c @@ -36,7 +36,9 @@ #include <osmocom/bb/common/vty.h> #include <osmocom/bb/common/apn.h> #include <osmocom/bb/common/ms.h> +#include <osmocom/bb/modem/gmm.h> #include <osmocom/bb/modem/grr.h> +#include <osmocom/bb/modem/sm.h> #include <osmocom/bb/modem/vty.h> static struct cmd_node apn_node = { @@ -163,25 +165,14 @@ TEST_CMD_DESC MS_NAME_DESC GMM_CMDG_DESC "Enqueue a GMM GMMREG-ATTACH.req for transmission\n") { - struct osmo_gprs_gmm_prim *gmm_prim; - const uint32_t tlli = 0xe1c5d364; - const char *imsi = "1234567890"; - const char *imei = "42342342342342"; - const char *imeisv = "4234234234234275"; struct osmocom_ms *ms; - if ((ms = l23_vty_get_ms(argv[0], vty)) == NULL) + if ((ms = l23_vty_get_ms(argv[0], vty)) == NULL) { + vty_out(vty, "Failed to find ms '%s'%s", argv[0], VTY_NEWLINE); return CMD_WARNING; + } - gmm_prim = osmo_gprs_gmm_prim_alloc_gmmreg_attach_req(); - gmm_prim->gmmreg.attach_req.attach_type = OSMO_GPRS_GMM_ATTACH_TYPE_GPRS; - gmm_prim->gmmreg.attach_req.ptmsi = tlli; - OSMO_STRLCPY_ARRAY(gmm_prim->gmmreg.attach_req.imsi, imsi); - OSMO_STRLCPY_ARRAY(gmm_prim->gmmreg.attach_req.imei, imei); - OSMO_STRLCPY_ARRAY(gmm_prim->gmmreg.attach_req.imeisv, imeisv); - - - if (osmo_gprs_gmm_prim_upper_down(gmm_prim) != 0) { + if (modem_gmm_gmmreg_attach_req(ms) < 0) { vty_out(vty, "Failed to enqueue a GMM PDU%s", VTY_NEWLINE); return CMD_WARNING; } @@ -195,19 +186,14 @@ TEST_CMD_DESC MS_NAME_DESC GMM_CMDG_DESC "Enqueue a GMM GMMREG-DETACH.req for transmission\n") { - struct osmo_gprs_gmm_prim *gmm_prim; - const uint32_t tlli = 0xe1c5d364; struct osmocom_ms *ms; - if ((ms = l23_vty_get_ms(argv[0], vty)) == NULL) + if ((ms = l23_vty_get_ms(argv[0], vty)) == NULL) { + vty_out(vty, "Failed to find ms '%s'%s", argv[0], VTY_NEWLINE); return CMD_WARNING; + } - gmm_prim = osmo_gprs_gmm_prim_alloc_gmmreg_detach_req(); - gmm_prim->gmmreg.detach_req.ptmsi = tlli; - gmm_prim->gmmreg.detach_req.detach_type = OSMO_GPRS_GMM_DETACH_MS_TYPE_GPRS; - gmm_prim->gmmreg.detach_req.poweroff_type = OSMO_GPRS_GMM_DETACH_POWEROFF_TYPE_NORMAL; - - if (osmo_gprs_gmm_prim_upper_down(gmm_prim) != 0) { + if (modem_gmm_gmmreg_detach_req(ms) < 0) { vty_out(vty, "Failed to enqueue a GMM PDU%s", VTY_NEWLINE); return CMD_WARNING; } @@ -222,21 +208,9 @@ "Enqueue a SM SMREG-ACTIVATE.req for transmission\n" "APN to activate\n") { - struct osmo_gprs_sm_prim *sm_prim; struct osmocom_ms *ms; struct osmobb_apn *apn; - uint8_t nsapi = 6; - enum osmo_gprs_sm_llc_sapi llc_sapi = OSMO_GPRS_SM_LLC_SAPI_SAPI3; - struct osmo_sockaddr pdp_addr_any = {0}; - uint8_t qos[OSMO_GPRS_SM_QOS_MAXLEN] = {0}; - uint8_t pco[OSMO_GPRS_SM_QOS_MAXLEN] = {0}; - uint32_t ptmsi = 0x00000000; - char *imsi = "1234567890"; - char *imei = "42342342342342"; - char *imeisv = "4234234234234275"; - enum osmo_gprs_sm_pdp_addr_ietf_type pdp_addr_ietf_type; - if ((ms = l23_vty_get_ms(argv[0], vty)) == NULL) { vty_out(vty, "Unable to find MS '%s'%s", argv[0], VTY_NEWLINE); return CMD_WARNING; @@ -248,35 +222,8 @@ return CMD_WARNING; } - if (apn->cfg.apn_type_mask & APN_TYPE_IPv4v6) { - pdp_addr_ietf_type = OSMO_GPRS_SM_PDP_ADDR_IETF_IPV4V6; - } else if (apn->cfg.apn_type_mask & APN_TYPE_IPv4) { - pdp_addr_ietf_type = OSMO_GPRS_SM_PDP_ADDR_IETF_IPV4; - } else if (apn->cfg.apn_type_mask & APN_TYPE_IPv6) { - pdp_addr_ietf_type = OSMO_GPRS_SM_PDP_ADDR_IETF_IPV6; - } else { - vty_out(vty, "APN '%s' has no PDP address type set%s", argv[1], VTY_NEWLINE); - return CMD_WARNING; - } - - sm_prim = osmo_gprs_sm_prim_alloc_smreg_pdp_act_req(); - sm_prim->smreg.pdp_act_req.nsapi = nsapi; - sm_prim->smreg.pdp_act_req.llc_sapi = llc_sapi; - sm_prim->smreg.pdp_act_req.pdp_addr_ietf_type = pdp_addr_ietf_type; - sm_prim->smreg.pdp_act_req.pdp_addr_v4 = pdp_addr_any; - sm_prim->smreg.pdp_act_req.pdp_addr_v6 = pdp_addr_any; - memcpy(sm_prim->smreg.pdp_act_req.qos, qos, sizeof(qos)); - sm_prim->smreg.pdp_act_req.qos_len = 1; - memcpy(sm_prim->smreg.pdp_act_req.pco, pco, sizeof(pco)); - sm_prim->smreg.pdp_act_req.pco_len = 1; - OSMO_STRLCPY_ARRAY(sm_prim->smreg.pdp_act_req.apn, apn->cfg.name); - sm_prim->smreg.pdp_act_req.gmm.ptmsi = ptmsi; - OSMO_STRLCPY_ARRAY(sm_prim->smreg.pdp_act_req.gmm.imsi, imsi); - OSMO_STRLCPY_ARRAY(sm_prim->smreg.pdp_act_req.gmm.imei, imei); - OSMO_STRLCPY_ARRAY(sm_prim->smreg.pdp_act_req.gmm.imeisv, imeisv); - - if (osmo_gprs_sm_prim_upper_down(sm_prim) != 0) { - vty_out(vty, "Failed to enqueue a SM PDU%s", VTY_NEWLINE); + if (modem_sm_smreg_pdp_act_req(ms, apn) < 0) { + vty_out(vty, "Failed submitting SM PDP Act Req%s", VTY_NEWLINE); return CMD_WARNING; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32442 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I1c7cc120ff4098c0b845e13a6e5e5db8b7e18376 Gerrit-Change-Number: 32442 Gerrit-PatchSet: 8 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[S] Change in osmocom-bb[master]: doc/examples/modem: Update modem.cfg with new features

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32490 ) ( 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: doc/examples/modem: Update modem.cfg with new features ...................................................................... doc/examples/modem: Update modem.cfg with new features Update the example config to contain IMSI and IMEI values which are used when attaching to the network. Set cpu-sched to realtime since RLCMAC is time-constrained. Change-Id: I6060c833de2eef7591b7a4f149d9e148455db970 --- M doc/examples/modem/modem.cfg 1 file changed, 24 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/examples/modem/modem.cfg b/doc/examples/modem/modem.cfg index a441b0e..af98082 100644 --- a/doc/examples/modem/modem.cfg +++ b/doc/examples/modem/modem.cfg @@ -6,9 +6,19 @@ no login ! ms 1 + imei 000000000000000 0 + imei-fixed + sim test + test-sim + imsi 001010000000000 + ki comp128 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + no barred-access + rplmn 001 01 apn internet tun-device modem4 ! tun-netns netns_modem4 type-support v4 no shutdown no shutdown +cpu-sched + policy rr 1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I6060c833de2eef7591b7a4f149d9e148455db970 Gerrit-Change-Number: 32490 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[M] Change in osmocom-bb[master]: layer23: vty: Move imei related commands to common/

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32488 ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: layer23: vty: Move imei related commands to common/ ...................................................................... layer23: vty: Move imei related commands to common/ Change-Id: I3c71586c0eb437ce63beaae5adf8fac6c27e2896 --- M src/host/layer23/src/common/vty.c M src/host/layer23/src/mobile/vty_interface.c 2 files changed, 75 insertions(+), 58 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/src/common/vty.c b/src/host/layer23/src/common/vty.c index 3d8214a..4f9aa20 100644 --- a/src/host/layer23/src/common/vty.c +++ b/src/host/layer23/src/common/vty.c @@ -153,6 +153,7 @@ /* placeholder for layer23 shared MS info to be dumped */ void l23_ms_dump(struct osmocom_ms *ms, struct vty *vty) { + struct gsm_settings *set = &ms->settings; char *service = ""; if (!ms->started) @@ -189,6 +190,14 @@ (ms->shutdown != MS_SHUTDOWN_NONE || !ms->started) ? "down" : "up", (ms->shutdown == MS_SHUTDOWN_NONE) ? service : "", VTY_NEWLINE); + + vty_out(vty, " IMEI: %s%s", set->imei, VTY_NEWLINE); + vty_out(vty, " IMEISV: %s%s", set->imeisv, VTY_NEWLINE); + if (set->imei_random) + vty_out(vty, " IMEI generation: random (%d trailing " + "digits)%s", set->imei_random, VTY_NEWLINE); + else + vty_out(vty, " IMEI generation: fixed%s", VTY_NEWLINE); } /* CONFIG NODE: */ @@ -796,6 +805,53 @@ return CMD_SUCCESS; } +DEFUN(cfg_ms_imei, cfg_ms_imei_cmd, "imei IMEI [SV]", + "Set IMEI (enter without control digit)\n15 Digits IMEI\n" + "Software version digit") +{ + struct osmocom_ms *ms = vty->index; + struct gsm_settings *set = &ms->settings; + char *error, *sv = "0"; + + if (argc >= 2) + sv = (char *)argv[1]; + + error = gsm_check_imei(argv[0], sv); + if (error) { + vty_out(vty, "%s%s", error, VTY_NEWLINE); + return CMD_WARNING; + } + + OSMO_STRLCPY_ARRAY(set->imei, argv[0]); + OSMO_STRLCPY_ARRAY(set->imeisv, argv[0]); + OSMO_STRLCPY_ARRAY(set->imeisv + 15, sv); + + return CMD_SUCCESS; +} + +DEFUN(cfg_ms_imei_fixed, cfg_ms_imei_fixed_cmd, "imei-fixed", + "Use fixed IMEI on every power on") +{ + struct osmocom_ms *ms = vty->index; + struct gsm_settings *set = &ms->settings; + + set->imei_random = 0; + + return CMD_SUCCESS; +} + +DEFUN(cfg_ms_imei_random, cfg_ms_imei_random_cmd, "imei-random <0-15>", + "Use random IMEI on every power on\n" + "Number of trailing digits to randomize") +{ + struct osmocom_ms *ms = vty->index; + struct gsm_settings *set = &ms->settings; + + set->imei_random = atoi(argv[0]); + + return CMD_SUCCESS; +} + DEFUN(cfg_ms_sim, cfg_ms_sim_cmd, "sim (none|reader|test|sap)", "Set SIM card to attach when powering on\nAttach no SIM\n" "Attach SIM from reader\nAttach build in test SIM\n" @@ -1192,6 +1248,13 @@ vty_out(vty, "%slayer2-socket %s%s", prefix, set->layer2_socket_path, VTY_NEWLINE); + vty_out(vty, "%simei %s %s%s", prefix, set->imei, + set->imeisv + strlen(set->imei), VTY_NEWLINE); + if (set->imei_random) + vty_out(vty, "%simei-random %d%s", prefix, set->imei_random, VTY_NEWLINE); + else if (!l23_vty_hide_default) + vty_out(vty, "%simei-fixed%s", prefix, VTY_NEWLINE); + switch (set->sim_type) { case GSM_SIM_TYPE_NONE: vty_out(vty, "%ssim none%s", prefix, VTY_NEWLINE); @@ -1296,6 +1359,9 @@ install_node(&ms_node, config_write_ms_node_cb); install_element(MS_NODE, &cfg_ms_layer2_cmd); + install_element(MS_NODE, &cfg_ms_imei_cmd); + install_element(MS_NODE, &cfg_ms_imei_fixed_cmd); + install_element(MS_NODE, &cfg_ms_imei_random_cmd); install_element(MS_NODE, &cfg_ms_sim_cmd); install_element(MS_NODE, &cfg_ms_testsim_cmd); install_node(&testsim_node, NULL); diff --git a/src/host/layer23/src/mobile/vty_interface.c b/src/host/layer23/src/mobile/vty_interface.c index e0a8ede..0761419 100644 --- a/src/host/layer23/src/mobile/vty_interface.c +++ b/src/host/layer23/src/mobile/vty_interface.c @@ -932,14 +932,6 @@ } vty_out(vty, " network-selection-mode %s%s", (set->plmn_mode == PLMN_MODE_AUTO) ? "auto" : "manual", VTY_NEWLINE); - vty_out(vty, " imei %s %s%s", set->imei, - set->imeisv + strlen(set->imei), VTY_NEWLINE); - if (set->imei_random) - vty_out(vty, " imei-random %d%s", set->imei_random, - VTY_NEWLINE); - else - 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); @@ -1239,53 +1231,6 @@ return CMD_SUCCESS; } -DEFUN(cfg_ms_imei, cfg_ms_imei_cmd, "imei IMEI [SV]", - "Set IMEI (enter without control digit)\n15 Digits IMEI\n" - "Software version digit") -{ - struct osmocom_ms *ms = vty->index; - struct gsm_settings *set = &ms->settings; - char *error, *sv = "0"; - - if (argc >= 2) - sv = (char *)argv[1]; - - error = gsm_check_imei(argv[0], sv); - if (error) { - vty_out(vty, "%s%s", error, VTY_NEWLINE); - return CMD_WARNING; - } - - strcpy(set->imei, argv[0]); - strcpy(set->imeisv, argv[0]); - strcpy(set->imeisv + 15, sv); - - return CMD_SUCCESS; -} - -DEFUN(cfg_ms_imei_fixed, cfg_ms_imei_fixed_cmd, "imei-fixed", - "Use fixed IMEI on every power on") -{ - struct osmocom_ms *ms = vty->index; - struct gsm_settings *set = &ms->settings; - - set->imei_random = 0; - - return CMD_SUCCESS; -} - -DEFUN(cfg_ms_imei_random, cfg_ms_imei_random_cmd, "imei-random <0-15>", - "Use random IMEI on every power on\n" - "Number of trailing digits to randomize") -{ - struct osmocom_ms *ms = vty->index; - struct gsm_settings *set = &ms->settings; - - set->imei_random = atoi(argv[0]); - - return CMD_SUCCESS; -} - DEFUN(cfg_ms_emerg_imsi, cfg_ms_emerg_imsi_cmd, "emergency-imsi IMSI", "Use special IMSI for emergency calls\n15 digits IMSI") { @@ -2348,9 +2293,6 @@ install_element(MS_NODE, &cfg_ms_mncc_handler_cmd); install_element(MS_NODE, &cfg_ms_no_mncc_handler_cmd); install_element(MS_NODE, &cfg_ms_mode_cmd); - install_element(MS_NODE, &cfg_ms_imei_cmd); - install_element(MS_NODE, &cfg_ms_imei_fixed_cmd); - install_element(MS_NODE, &cfg_ms_imei_random_cmd); install_element(MS_NODE, &cfg_ms_no_emerg_imsi_cmd); install_element(MS_NODE, &cfg_ms_emerg_imsi_cmd); install_element(MS_NODE, &cfg_ms_no_sms_sca_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I3c71586c0eb437ce63beaae5adf8fac6c27e2896 Gerrit-Change-Number: 32488 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: modem: Store P-TMSI independently in subscriber

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32497 ) Change subject: layer23: modem: Store P-TMSI independently in subscriber ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32497 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I6f6d230d8c3c4fce27ba87cf9f953dc9db83cb72 Gerrit-Change-Number: 32497 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 26 Apr 2023 12:19:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2023