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

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

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/32400 ) Change subject: e1_input: add new driver callback function: line_create ...................................................................... Patch Set 4: (1 comment) Patchset: PS3: > I just realized you are also missing an entry in TODO-RELEASE regarding the ABI break. Thanks. I have updated TODO-RELEASE now. -- 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: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 26 Apr 2023 12:23:19 +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]: e1_input: add new driver callback function: line_create

by dexter

Attention is currently required from: pespin. Hello Jenkins Builder, pespin, 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 (#4). 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 TODO-RELEASE M include/osmocom/abis/e1_input.h M src/e1_input.c 3 files changed, 30 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/00/32400/4 -- 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: 4 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

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, pespin, keith. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/32374 ) Change subject: e1d: reconnect to osmo-e1d after connection loss ...................................................................... Patch Set 6: (1 comment) File src/input/e1d.c: https://gerrit.osmocom.org/c/libosmo-abis/+/32374/comment/045db258_dc82a082 PS4, Line 123: if (bfd->list.next && bfd->list.next != LLIST_POISON1) > no answer on this? I'd welcome if you checked my comments more carefully before submitting new versi […] I always go through the whole patchset, fix all comments and then I push. I guess that is why sometimes comments slip through, but this is patchset 6 and the comment is from patchset 4 - i don't know. The line if (bfd->list.next && bfd->list.next != LLIST_POISON1) can be found in many locations. I wonder why osmo_fd_unregister() does not do a osmo_fd_is_registered() internally. We should fix this in libosmocore first and then remove those checks here. Does this make sense? -- 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: 6 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: pespin <pespin(a)sysmocom.de> Gerrit-CC: tnt <tnt(a)246tNt.com> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: keith <keith(a)rhizomatica.org> Gerrit-Comment-Date: Wed, 26 Apr 2023 12:21:05 +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-gprs[master]: gmm: Provide allocated P-TMSI in GMMREG-ATTACH.cnf

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32495 ) Change subject: gmm: Provide allocated P-TMSI in GMMREG-ATTACH.cnf ...................................................................... gmm: Provide allocated P-TMSI in GMMREG-ATTACH.cnf This allows the upper layers to find out the P-TMSI allocated by the network. Change-Id: I95000ccfb9b4d24804ce916976d26aec8e51c749 --- M include/osmocom/gprs/gmm/gmm_prim.h M src/gmm/gmm.c M tests/gmm/gmm_prim_test.c M tests/gmm/gmm_prim_test.ok 4 files changed, 28 insertions(+), 6 deletions(-) Approvals: fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/gprs/gmm/gmm_prim.h b/include/osmocom/gprs/gmm/gmm_prim.h index 78c8dfb..1f277d5 100644 --- a/include/osmocom/gprs/gmm/gmm_prim.h +++ b/include/osmocom/gprs/gmm/gmm_prim.h @@ -115,9 +115,10 @@ union { struct { /* PLMNs MT-caps, attach-type. */ + uint32_t allocated_ptmsi; } acc; struct { - uint8_t cause; + uint8_t cause; /* See enum gsm48_gsm_cause */ } rej; }; } attach_cnf; diff --git a/src/gmm/gmm.c b/src/gmm/gmm.c index fbe7d40..5174a5e 100644 --- a/src/gmm/gmm.c +++ b/src/gmm/gmm.c @@ -188,8 +188,11 @@ gmm_prim_tx = gprs_gmm_prim_alloc_gmmreg_attach_cnf(); gmm_prim_tx->gmmreg.attach_cnf.accepted = accepted; - if (!accepted) + if (accepted) { + gmm_prim_tx->gmmreg.attach_cnf.acc.allocated_ptmsi = gmme->ptmsi; + } else { gmm_prim_tx->gmmreg.attach_cnf.rej.cause = cause; + } rc = gprs_gmm_prim_call_up_cb(gmm_prim_tx); return rc; diff --git a/tests/gmm/gmm_prim_test.c b/tests/gmm/gmm_prim_test.c index fa300d4..1b91640 100644 --- a/tests/gmm/gmm_prim_test.c +++ b/tests/gmm/gmm_prim_test.c @@ -145,9 +145,15 @@ case OSMO_GPRS_GMM_SAP_GMMREG: switch (OSMO_PRIM_HDR(&gmm_prim->oph)) { case OSMO_PRIM(OSMO_GPRS_GMM_GMMREG_ATTACH, PRIM_OP_CONFIRM): - printf("%s(): Rx %s accepted=%u rej_cause=%u\n", __func__, pdu_name, - gmm_prim->gmmreg.attach_cnf.accepted, - gmm_prim->gmmreg.attach_cnf.rej.cause); + if (gmm_prim->gmmreg.attach_cnf.accepted) { + printf("%s(): Rx %s accepted=%u allocated_ptmsi=0x%08x\n", __func__, pdu_name, + gmm_prim->gmmreg.attach_cnf.accepted, + gmm_prim->gmmreg.attach_cnf.acc.allocated_ptmsi); + } else { + printf("%s(): Rx %s accepted=%u rej_cause=%u\n", __func__, pdu_name, + gmm_prim->gmmreg.attach_cnf.accepted, + gmm_prim->gmmreg.attach_cnf.rej.cause); + } break; case OSMO_PRIM(OSMO_GPRS_GMM_GMMREG_DETACH, PRIM_OP_CONFIRM): printf("%s(): Rx %s detach_type='%s'\n", __func__, pdu_name, diff --git a/tests/gmm/gmm_prim_test.ok b/tests/gmm/gmm_prim_test.ok index 5f4a723..f003efc 100644 --- a/tests/gmm/gmm_prim_test.ok +++ b/tests/gmm/gmm_prim_test.ok @@ -6,7 +6,7 @@ test_gmm_prim_llc_down_cb(): Rx LLGMM-ASSIGN.request TLLI=0x00000000 test_gmm_prim_down_cb(): Rx GMRR-ASSIGN.request new_tlli=0xea711b41 test_gmm_prim_llc_down_cb(): Rx LL-UNITDATA.request TLLI=0xea711b41 SAPI=GMM l3=[08 03 ] -test_gmm_prim_up_cb(): Rx GMMREG-ATTACH.confirm accepted=1 rej_cause=0 +test_gmm_prim_up_cb(): Rx GMMREG-ATTACH.confirm accepted=1 allocated_ptmsi=0xea711b41 test_gmm_prim_llc_down_cb(): Rx LL-UNITDATA.request TLLI=0xea711b41 SAPI=GMM l3=[08 05 20 0a 00 05 f4 ea 71 1b 41 ] test_gmm_prim_llc_down_cb(): Rx LLGMM-ASSIGN.request TLLI=0x00000000 test_gmm_prim_up_cb(): Rx GMMREG-DETACH.confirm detach_type='GPRS detach' -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32495 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I95000ccfb9b4d24804ce916976d26aec8e51c749 Gerrit-Change-Number: 32495 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-MessageType: merged

2 years, 2 months

1
0
0 0

[S] Change in libosmo-gprs[master]: gmm: Provide allocated P-TMSI in GMMREG-ATTACH.cnf

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32495 ) Change subject: gmm: Provide allocated P-TMSI in GMMREG-ATTACH.cnf ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32495 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I95000ccfb9b4d24804ce916976d26aec8e51c749 Gerrit-Change-Number: 32495 Gerrit-PatchSet: 2 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 26 Apr 2023 12:19:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

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 submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32497 ) Change subject: layer23: modem: Store P-TMSI independently in subscriber ...................................................................... layer23: modem: Store P-TMSI independently in subscriber Change-Id: I6f6d230d8c3c4fce27ba87cf9f953dc9db83cb72 --- M src/host/layer23/include/osmocom/bb/common/subscriber.h M src/host/layer23/src/common/subscriber.c M src/host/layer23/src/modem/gmm.c M src/host/layer23/src/modem/sm.c 4 files changed, 18 insertions(+), 4 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/host/layer23/include/osmocom/bb/common/subscriber.h b/src/host/layer23/include/osmocom/bb/common/subscriber.h index 3de8cda..1dd1869 100644 --- a/src/host/layer23/include/osmocom/bb/common/subscriber.h +++ b/src/host/layer23/include/osmocom/bb/common/subscriber.h @@ -46,6 +46,7 @@ /* TMSI / LAI */ uint32_t tmsi; /* invalid tmsi: GSM_RESERVED_TMSI */ + uint32_t ptmsi; /* invalid tmsi: GSM_RESERVED_TMSI */ uint16_t mcc, mnc, lac; /* invalid lac: 0x0000 */ diff --git a/src/host/layer23/src/common/subscriber.c b/src/host/layer23/src/common/subscriber.c index c75c3ce..0669598 100644 --- a/src/host/layer23/src/common/subscriber.c +++ b/src/host/layer23/src/common/subscriber.c @@ -79,6 +79,7 @@ /* set TMSI / LAC invalid */ subscr->tmsi = GSM_RESERVED_TMSI; + subscr->ptmsi = GSM_RESERVED_TMSI; subscr->lac = 0x0000; /* set key invalid */ @@ -173,6 +174,7 @@ subscr->mnc = mnc; subscr->lac = lac; subscr->tmsi = tmsi; + subscr->ptmsi = GSM_RESERVED_TMSI; subscr->always_search_hplmn = set->test_always; subscr->t6m_hplmn = 1; /* try to find home network every 6 min */ strcpy(subscr->imsi, set->test_imsi); @@ -1155,6 +1157,8 @@ (subscr->imsi_attached) ? "attached" : "detached"); if (subscr->tmsi != GSM_RESERVED_TMSI) print(priv, " TMSI 0x%08x", subscr->tmsi); + if (subscr->ptmsi != GSM_RESERVED_TMSI) + print(priv, " P-TMSI 0x%08x", subscr->ptmsi); if (subscr->lac > 0x0000 && subscr->lac < 0xfffe) { print(priv, "\n"); print(priv, " LAI: MCC %s MNC %s LAC 0x%04x " diff --git a/src/host/layer23/src/modem/gmm.c b/src/host/layer23/src/modem/gmm.c index af8b060..6d1f518 100644 --- a/src/host/layer23/src/modem/gmm.c +++ b/src/host/layer23/src/modem/gmm.c @@ -147,8 +147,8 @@ 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); + gmm_prim->gmmreg.attach_req.ptmsi = subscr->ptmsi; + gmm_prim->gmmreg.attach_req.attach_with_imsi = (subscr->ptmsi == 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)); @@ -165,7 +165,7 @@ 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.ptmsi = subscr->ptmsi; 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); diff --git a/src/host/layer23/src/modem/sm.c b/src/host/layer23/src/modem/sm.c index 575321f..2a404d4 100644 --- a/src/host/layer23/src/modem/sm.c +++ b/src/host/layer23/src/modem/sm.c @@ -251,7 +251,7 @@ 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; + sm_prim->smreg.pdp_act_req.gmm.ptmsi = subscr->ptmsi; 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); -- 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-MessageType: merged

2 years, 2 months

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: modem: Unregister registered callbacks upon app exit

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32428 ) Change subject: layer23: modem: Unregister registered callbacks upon app exit ...................................................................... layer23: modem: Unregister registered callbacks upon app exit It's just a good practice to delete all resources allocated during startup. The main aim here is to keep resemblance to what the mobile app is doing, so that they can slowly be merged and some functionalities from the mobile app can be added to the modem app, like shutting down the MS without killing the process eventually. Change-Id: I5a641fa3dadb6ea7346b25a20215896ab32eb805 --- M src/host/layer23/src/modem/app_modem.c 1 file changed, 25 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/host/layer23/src/modem/app_modem.c b/src/host/layer23/src/modem/app_modem.c index 211621e..12ac4ae 100644 --- a/src/host/layer23/src/modem/app_modem.c +++ b/src/host/layer23/src/modem/app_modem.c @@ -114,8 +114,8 @@ memset(&app_data, 0x00, sizeof(app_data)); } -static int signal_cb(unsigned int subsys, unsigned int signal, - void *handler_data, void *signal_data) +static int global_signal_cb(unsigned int subsys, unsigned int signal, + void *handler_data, void *signal_data) { struct osmocom_ms *ms; @@ -151,11 +151,19 @@ return 0; } +/* global exit */ +static int _modem_exit(void) +{ + osmo_signal_unregister_handler(SS_GLOBAL, &global_signal_cb, NULL); + return 0; +} + int l23_app_init(void) { int rc; l23_app_start = _modem_start; + l23_app_exit = _modem_exit; log_set_category_filter(osmo_stderr_target, DLGLOBAL, 1, LOGL_DEBUG); log_set_category_filter(osmo_stderr_target, DLCSN1, 1, LOGL_DEBUG); @@ -189,7 +197,7 @@ return rc; } - osmo_signal_register_handler(SS_L1CTL, &signal_cb, NULL); + osmo_signal_register_handler(SS_L1CTL, &global_signal_cb, NULL); lapdm_channel_set_l3(&app_data.ms->lapdm_channel, &modem_grr_rslms_cb, app_data.ms); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32428 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I5a641fa3dadb6ea7346b25a20215896ab32eb805 Gerrit-Change-Number: 32428 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 2 months

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: mobile: Mark several functions static

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32429 ) ( 4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: layer23: mobile: Mark several functions static ...................................................................... layer23: mobile: Mark several functions static Change-Id: Ifdeef9373b903d14fb2f4ec4caa1bf8c42b45aa1 --- M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/mobile/main.c 2 files changed, 17 insertions(+), 10 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index 1fdb275..54f0e6d 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -92,7 +92,7 @@ } /* SIM becomes ATTACHED/DETACHED, or answers a request */ -int mobile_l23_subscr_signal_cb(unsigned int subsys, unsigned int signal, +static int mobile_l23_subscr_signal_cb(unsigned int subsys, unsigned int signal, void *handler_data, void *signal_data) { struct msgb *nmsg; @@ -135,8 +135,8 @@ } /* run ms instance, if layer1 is available */ -int mobile_signal_cb(unsigned int subsys, unsigned int signal, - void *handler_data, void *signal_data) +static int mobile_signal_cb(unsigned int subsys, unsigned int signal, + void *handler_data, void *signal_data) { struct osmocom_ms *ms; struct gsm_settings *set; @@ -412,8 +412,8 @@ } /* handle global shutdown */ -int global_signal_cb(unsigned int subsys, unsigned int signal, - void *handler_data, void *signal_data) +static int global_signal_cb(unsigned int subsys, unsigned int signal, + void *handler_data, void *signal_data) { struct osmocom_ms *ms, *ms2; @@ -437,7 +437,7 @@ } /* global work handler */ -int _mobile_app_work(void) +static int _mobile_app_work(void) { struct osmocom_ms *ms, *ms2; int work = 0; @@ -472,7 +472,7 @@ } /* global exit */ -int _mobile_app_exit(void) +static int _mobile_app_exit(void) { osmo_signal_unregister_handler(SS_L23_SUBSCR, &mobile_l23_subscr_signal_cb, NULL); osmo_signal_unregister_handler(SS_L1CTL, &gsm322_l1_signal, NULL); @@ -487,7 +487,7 @@ } -int _mobile_app_start(void) +static int _mobile_app_start(void) { int rc; diff --git a/src/host/layer23/src/mobile/main.c b/src/host/layer23/src/mobile/main.c index eca082a..11ffd95 100644 --- a/src/host/layer23/src/mobile/main.c +++ b/src/host/layer23/src/mobile/main.c @@ -64,8 +64,6 @@ int (*l23_app_exit)(void) = NULL; int mobile_delete(struct osmocom_ms *ms, int force); -int mobile_signal_cb(unsigned int subsys, unsigned int signal, - void *handler_data, void *signal_data); int mobile_work(struct osmocom_ms *ms); int mobile_exit(struct osmocom_ms *ms, int force); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ifdeef9373b903d14fb2f4ec4caa1bf8c42b45aa1 Gerrit-Change-Number: 32429 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: Call telnet_exit() during app exit if VTY support is enabled

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32431 ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: layer23: Call telnet_exit() during app exit if VTY support is enabled ...................................................................... layer23: Call telnet_exit() during app exit if VTY support is enabled Change-Id: Ic8540c73b1b13134e11f254beb6a16f7e4452317 --- M src/host/layer23/src/common/main.c M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/mobile/main.c 3 files changed, 18 insertions(+), 3 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/main.c b/src/host/layer23/src/common/main.c index 567b2e0..a4b9441 100644 --- a/src/host/layer23/src/common/main.c +++ b/src/host/layer23/src/common/main.c @@ -186,6 +186,9 @@ if (l23_app_exit) rc = l23_app_exit(); + if (l23_app_info.opt_supported & L23_OPT_VTY) + telnet_exit(); + if (rc != -EBUSY) exit (0); } diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index 54f0e6d..e7caed2 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -481,8 +481,6 @@ osmo_gps_close(); - telnet_exit(); - return 0; } diff --git a/src/host/layer23/src/mobile/main.c b/src/host/layer23/src/mobile/main.c index 11ffd95..71a16c1 100644 --- a/src/host/layer23/src/mobile/main.c +++ b/src/host/layer23/src/mobile/main.c @@ -339,7 +339,12 @@ osmo_select_main(0); } - l23_app_exit(); + if (l23_app_exit) + rc = l23_app_exit(); + + if (l23_app_info.opt_supported & L23_OPT_VTY) + telnet_exit(); + log_fini(); talloc_free(config_file); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32431 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ic8540c73b1b13134e11f254beb6a16f7e4452317 Gerrit-Change-Number: 32431 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: Use OSMO_IMSI_BUF_SIZE from libosmocore

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32436 ) ( 6 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: layer23: Use OSMO_IMSI_BUF_SIZE from libosmocore ...................................................................... layer23: Use OSMO_IMSI_BUF_SIZE from libosmocore Note: GSM_IMSI_LENGTH was 16 octets, and OSMO_IMSI_BUF_SIZE is 17 octets. Probably a bug in old osmocom-bb code since that code predates the one in libosmocore. Change-Id: I295444bb3b75ed236ea4af5563d9a9c9e590cab7 --- M src/host/layer23/include/osmocom/bb/common/settings.h M src/host/layer23/include/osmocom/bb/common/subscriber.h M src/host/layer23/src/common/subscriber.c 3 files changed, 20 insertions(+), 6 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/include/osmocom/bb/common/settings.h b/src/host/layer23/include/osmocom/bb/common/settings.h index 5e04894..60b9df1 100644 --- a/src/host/layer23/include/osmocom/bb/common/settings.h +++ b/src/host/layer23/include/osmocom/bb/common/settings.h @@ -3,6 +3,7 @@ #include <osmocom/core/utils.h> #include <osmocom/core/linuxlist.h> +#include <osmocom/gsm/protocol/gsm_23_003.h> struct osmocom_ms; struct osmobb_apn; @@ -77,14 +78,14 @@ /* SIM */ int sim_type; /* selects card on power on */ - char emergency_imsi[16]; + char emergency_imsi[OSMO_IMSI_BUF_SIZE]; /* SMS */ char sms_sca[22]; bool store_sms; /* test card simulator settings */ - char test_imsi[16]; + char test_imsi[OSMO_IMSI_BUF_SIZE]; uint32_t test_tmsi; uint8_t test_ki_type; uint8_t test_ki[16]; /* 128 bit max */ diff --git a/src/host/layer23/include/osmocom/bb/common/subscriber.h b/src/host/layer23/include/osmocom/bb/common/subscriber.h index 3aacbda..3de8cda 100644 --- a/src/host/layer23/include/osmocom/bb/common/subscriber.h +++ b/src/host/layer23/include/osmocom/bb/common/subscriber.h @@ -1,6 +1,8 @@ #ifndef _SUBSCRIBER_H #define _SUBSCRIBER_H +#include <osmocom/gsm/protocol/gsm_23_003.h> + /* GSM 04.08 4.1.2.2 SIM update status */ #define GSM_SIM_U0_NULL 0 #define GSM_SIM_U1_UPDATED 1 @@ -18,8 +20,6 @@ uint8_t cause; }; -#define GSM_IMSI_LENGTH 16 - #define GSM_SIM_IS_READER(type) \ (type == GSM_SIM_TYPE_L1PHY || type == GSM_SIM_TYPE_SAP) @@ -40,7 +40,7 @@ uint8_t imsi_attached; /* attached state */ /* IMSI & co */ - char imsi[GSM_IMSI_LENGTH]; + char imsi[OSMO_IMSI_BUF_SIZE]; char msisdn[31]; /* may include access codes */ char iccid[21]; /* 20 + termination */ diff --git a/src/host/layer23/src/common/subscriber.c b/src/host/layer23/src/common/subscriber.c index 90d6a78..c75c3ce 100644 --- a/src/host/layer23/src/common/subscriber.c +++ b/src/host/layer23/src/common/subscriber.c @@ -229,7 +229,7 @@ /* decode IMSI, skip first digit (parity) */ imsi = sim_decode_bcd(data + 1, length); - if (strlen(imsi) - 1 > GSM_IMSI_LENGTH - 1 || strlen(imsi) - 1 < 6) { + if (strlen(imsi) >= OSMO_IMSI_BUF_SIZE || strlen(imsi) - 1 < 6) { LOGP(DMM, LOGL_NOTICE, "IMSI invalid length = %zu\n", strlen(imsi) - 1); return -EINVAL; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32436 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I295444bb3b75ed236ea4af5563d9a9c9e590cab7 Gerrit-Change-Number: 32436 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

2025

2024

2023

2022

gerrit-log April 2023