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

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

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32440 ) 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(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/40/32440/1 diff --git a/src/host/layer23/include/osmocom/bb/common/vty.h b/src/host/layer23/include/osmocom/bb/common/vty.h index 7f6e2d3..851a0cb 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_print(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 58ddf06..2be1425 100644 --- a/src/host/layer23/src/common/vty.c +++ b/src/host/layer23/src/common/vty.c @@ -130,6 +130,26 @@ } } +void l23_vty_print(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_print, vty); + } else { + llist_for_each_entry(ms, &ms_list, entity) { + gsm_support_dump(ms, l23_vty_print, 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_print, vty); + } else { + llist_for_each_entry(ms, &ms_list, entity) { + if (ms->shutdown == MS_SHUTDOWN_NONE) { + gsm_subscr_dump(&ms->subscr, l23_vty_print, 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 8751de6..b6faaed 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_print, 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_print, 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_print, 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_print, 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_print, 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_print, 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

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 uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32442 ) 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/src/modem/app_modem.c M src/host/layer23/src/modem/gmm.c M src/host/layer23/src/modem/vty.c 4 files changed, 111 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/42/32442/1 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/src/modem/app_modem.c b/src/host/layer23/src/modem/app_modem.c index c24a6e6..a493a4f 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,28 @@ 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. + */ + } + ms->started = true; return l1ctl_tx_fbsb_req(ms, ms->test_arfcn, L1CTL_FBSB_F_FB01SB, 100, 0, @@ -154,6 +207,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 +252,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/vty.c b/src/host/layer23/src/modem/vty.c index a23ae73..c689806 100644 --- a/src/host/layer23/src/modem/vty.c +++ b/src/host/layer23/src/modem/vty.c @@ -36,6 +36,7 @@ #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/vty.h> @@ -163,25 +164,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 +185,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; } -- 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: 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: vty: Move sim related commands to common/

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32441 ) 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, 348 insertions(+), 340 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/41/32441/1 diff --git a/src/host/layer23/src/common/vty.c b/src/host/layer23/src/common/vty.c index 2be1425..9344bad 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 != 0xffffffff) + 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") { @@ -935,11 +1261,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 b6faaed..d05104d 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 != 0xffffffff) - 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" @@ -1524,37 +1227,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 +2331,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 +2361,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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 2 months

1
0
0 0

[S] Change in libosmo-abis[master]: e1d: initialize file descriptor numbers to -1 on startup

by Jenkins Builder

Attention is currently required from: laforge. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/32401 ) Change subject: e1d: initialize file descriptor numbers to -1 on startup ...................................................................... Patch Set 2: (2 comments) File src/input/e1d.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-6286): https://gerrit.osmocom.org/c/libosmo-abis/+/32401/comment/d0efe9db_94f6e37c PS2, Line 526: for (ts=1; ts<line->num_ts; ts++) { spaces required around that '=' (ctx:VxV) Robot Comment from checkpatch (run ID jenkins-gerrit-lint-6286): https://gerrit.osmocom.org/c/libosmo-abis/+/32401/comment/61befbbb_ae85f4a7 PS2, Line 526: for (ts=1; ts<line->num_ts; ts++) { spaces required around that '<' (ctx:VxV) -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/32401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I2de8fccad56279748ed9cc035aebf4e2d3935172 Gerrit-Change-Number: 32401 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 25 Apr 2023 12:50:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[S] Change in libosmo-abis[master]: e1d: do not set fd number to 0 after close

by dexter

Attention is currently required from: pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/32392 to look at the new patch set (#2). Change subject: e1d: do not set fd number to 0 after close ...................................................................... e1d: do not set fd number to 0 after close 0 is reserved for STDIN, so lets not set the file descriptor to 0 after we close it. Lets use -1 instead. Change-Id: I72e4775135caf4e3727c4f0654a545478c73bb83 Related: OS#5983 --- M src/input/e1d.c 1 file changed, 17 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/92/32392/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/32392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I72e4775135caf4e3727c4f0654a545478c73bb83 Gerrit-Change-Number: 32392 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

[S] Change in libosmo-abis[master]: e1_input: add new driver callback function: line_create

by dexter

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/32400 to look at the new patch set (#2). Change subject: e1_input: add new driver callback function: line_create ...................................................................... e1_input: add new driver callback function: line_create When a line is created using e1inp_line_create, then the line data structures are initialized and the line is registered in the line list. struct e1inp_line also contains driver specific sub structs that, depending on the driver, might also need some initialization. At the moment is no way to do that, so lets add a line_create callback that, when populated by the driver, is executed on line creation. Related: OS#5983 Change-Id: I404fa23e9b8a952be84e9716889c0dbbbc665d22 --- M include/osmocom/abis/e1_input.h M src/e1_input.c 2 files changed, 27 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/00/32400/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/32400 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I404fa23e9b8a952be84e9716889c0dbbbc665d22 Gerrit-Change-Number: 32400 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

[S] Change in libosmo-abis[master]: e1d: do not set fd number to 0 after close

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/32392 ) Change subject: e1d: do not set fd number to 0 after close ...................................................................... Patch Set 2: (1 comment) File src/input/e1d.c: https://gerrit.osmocom.org/c/libosmo-abis/+/32392/comment/fb78768b_b28b33f6 PS1, Line 494: if (bfd->fd <= 0) { > these checks can most probably be changed to <, and the "> 0" also can be changed to ">= 0"? Thanks. I will address that in a different patch. -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/32392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I72e4775135caf4e3727c4f0654a545478c73bb83 Gerrit-Change-Number: 32392 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 25 Apr 2023 12:50:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[S] Change in libosmo-abis[master]: e1d: initialize file descriptor numbers to -1 on startup

by dexter

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/32401 to look at the new patch set (#2). Change subject: e1d: initialize file descriptor numbers to -1 on startup ...................................................................... e1d: initialize file descriptor numbers to -1 on startup The file descriptor numbers (bfd->fd) are not initialized, this means they are set to 0 in the beginning. This technically also means that the file descriptors point to STDIN, which is wrong. Let's use the line_create callback of driver to initialize them to -1. Change-Id: I2de8fccad56279748ed9cc035aebf4e2d3935172 Related: OS#5983 --- M src/input/e1d.c 1 file changed, 31 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/01/32401/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/32401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I2de8fccad56279748ed9cc035aebf4e2d3935172 Gerrit-Change-Number: 32401 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

[S] Change in libosmo-abis[master]: e1d: initialize file descriptor numbers to -1 on startup

by dexter

Attention is currently required from: laforge. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/32401 ) Change subject: e1d: initialize file descriptor numbers to -1 on startup ...................................................................... Patch Set 2: (1 comment) Patchset: PS1: > note that this is likely not an e1d driver specific issue, but a general issue, also present wit dah […] It is part of the osmo-e1d crash problem. In this case it really matters since the value of the file descriptor is checked to determine of the file descriptor is currently open (TS is in use) or closed (-1). The checks there would used <= 0 as condition, which is a bit misleading. That is why I fixed this as well. At least DAHDI has similar issues: https://gitea.osmocom.org/osmocom/libosmo-abis/src/branch/master/src/input/… -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/32401 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: I2de8fccad56279748ed9cc035aebf4e2d3935172 Gerrit-Change-Number: 32401 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 25 Apr 2023 12:50:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

2 years, 2 months

1
0
0 0

[L] Change in libosmo-abis[master]: e1d: reconnect to osmo-e1d after connection loss

by dexter

Attention is currently required from: laforge, keith. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-abis/+/32374 to look at the new patch set (#4). Change subject: e1d: reconnect to osmo-e1d after connection loss ...................................................................... e1d: reconnect to osmo-e1d after connection loss When osmo-e1d crashes while a line is in use the client process may experience not only a lost connection, it may also hang up in an endless loop that would also spam the logfile. The reason for this is that the e1d driver in libosmo-abis lacks mechanisms to detect when the connection to osmo-e1d gets lost. When osmo-e1d goes down the effects should be similar to those of a normal connection loss of an e1 line (cable pulled). So let's add an FSM that takes care of the recovery of the connection when it is lost. Also make sure that no havoc happens when the connection gets lost. Related: OS#5983 Change-Id: Iaf4d42c2f009b1d7666e319fabdeb2598aa0b338 --- M src/input/e1d.c 1 file changed, 253 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/74/32374/4 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/32374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Iaf4d42c2f009b1d7666e319fabdeb2598aa0b338 Gerrit-Change-Number: 32374 Gerrit-PatchSet: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: keith <keith(a)rhizomatica.org> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-CC: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-MessageType: newpatchset

2 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2023