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

[M] Change in libosmo-gprs[master]: gmm: Introduce APIs & unit test to enc/dec GPRS Timer IE

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32906 ) Change subject: gmm: Introduce APIs & unit test to enc/dec GPRS Timer IE ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32906 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ia3b903e8bc7890489390dcc5b2d4b60efd55dc2c Gerrit-Change-Number: 32906 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 23 May 2023 17:42:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[M] Change in libosmo-gprs[master]: gmmrr: Add new LLC_TRANSMITTED.ind

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32905 ) Change subject: gmmrr: Add new LLC_TRANSMITTED.ind ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32905 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I9fd4047cfae4a12ad3be41860032eeda263d3276 Gerrit-Change-Number: 32905 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 23 May 2023 17:42:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in libosmo-gprs[master]: sm: Forward forth and back the P-TMSI signature

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32803 ) Change subject: sm: Forward forth and back the P-TMSI signature ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32803 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ia69b6f885d612c42ab015822031e4c7262f4714e Gerrit-Change-Number: 32803 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 23 May 2023 17:42:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in libosmo-gprs[master]: gmm: Forward forth and back the P-TMSI signature

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/32802 ) Change subject: gmm: Forward forth and back the P-TMSI signature ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/32802 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Ibf12589e7d3029f80b4ced99992155deb9dba036 Gerrit-Change-Number: 32802 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 23 May 2023 17:42:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: Define (r)plmn_valid field as bool

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32797 ) Change subject: layer23: Define (r)plmn_valid field as bool ...................................................................... layer23: Define (r)plmn_valid field as bool Change-Id: Ia2316bae5e4f5035f31b4da3937e025537aaf224 --- 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 M src/host/layer23/src/common/vty.c M src/host/layer23/src/mobile/gsm322.c 5 files changed, 17 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve jolly: 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/settings.h b/src/host/layer23/include/osmocom/bb/common/settings.h index bae9848..add8dc3 100644 --- a/src/host/layer23/include/osmocom/bb/common/settings.h +++ b/src/host/layer23/include/osmocom/bb/common/settings.h @@ -64,7 +64,7 @@ uint8_t ki_type; uint8_t ki[16]; /* 128 bit max */ uint8_t barr; - uint8_t rplmn_valid; + bool rplmn_valid; struct osmo_plmn_id rplmn; uint16_t lac; bool imsi_attached; diff --git a/src/host/layer23/include/osmocom/bb/common/subscriber.h b/src/host/layer23/include/osmocom/bb/common/subscriber.h index b829b2e..cbcfd0e 100644 --- a/src/host/layer23/include/osmocom/bb/common/subscriber.h +++ b/src/host/layer23/include/osmocom/bb/common/subscriber.h @@ -80,7 +80,7 @@ char sim_spn[17]; /* name of service privider */ /* PLMN last registered */ - uint8_t plmn_valid; + bool plmn_valid; struct osmo_plmn_id plmn; /* our access */ diff --git a/src/host/layer23/src/common/subscriber.c b/src/host/layer23/src/common/subscriber.c index 8207051..5f72f52 100644 --- a/src/host/layer23/src/common/subscriber.c +++ b/src/host/layer23/src/common/subscriber.c @@ -913,7 +913,7 @@ /* if LAI is valid, set RPLMN */ if (subscr->lai.lac > 0x0000 && subscr->lai.lac < 0xfffe) { - subscr->plmn_valid = 1; + subscr->plmn_valid = true; memcpy(&subscr->plmn, &subscr->lai.plmn, sizeof(struct osmo_plmn_id)); LOGP(DMM, LOGL_INFO, "-> SIM card registered to %s (%s, %s)\n", osmo_plmn_name(&subscr->plmn), diff --git a/src/host/layer23/src/common/vty.c b/src/host/layer23/src/common/vty.c index c76f498..67105a0 100644 --- a/src/host/layer23/src/common/vty.c +++ b/src/host/layer23/src/common/vty.c @@ -513,9 +513,9 @@ return CMD_WARNING; } memcpy(&set->test_sim.rplmn, &plmn, sizeof(plmn)); - set->test_sim.rplmn_valid = 1; + set->test_sim.rplmn_valid = true; } else { - set->test_sim.rplmn_valid = 0; + set->test_sim.rplmn_valid = false; } if (argc >= 4) @@ -1041,7 +1041,7 @@ struct osmocom_ms *ms = vty->index; struct gsm_settings *set = &ms->settings; - set->test_sim.rplmn_valid = 0; + set->test_sim.rplmn_valid = false; set->test_sim.rplmn.mcc = 1; set->test_sim.rplmn.mnc = 1; set->test_sim.rplmn.mnc_3_digits = false; @@ -1067,7 +1067,7 @@ vty_out(vty, "Given MNC invalid%s", VTY_NEWLINE); return CMD_WARNING; } - set->test_sim.rplmn_valid = 1; + set->test_sim.rplmn_valid = true; memcpy(&set->test_sim.rplmn, &plmn, sizeof(plmn)); if (argc >= 3) diff --git a/src/host/layer23/src/mobile/gsm322.c b/src/host/layer23/src/mobile/gsm322.c index f21cb59..35811d3 100644 --- a/src/host/layer23/src/mobile/gsm322.c +++ b/src/host/layer23/src/mobile/gsm322.c @@ -1685,7 +1685,7 @@ struct gsm_subscriber *subscr = &ms->subscr; /* set last registered PLMN */ - subscr->plmn_valid = 1; + subscr->plmn_valid = true; memcpy(&subscr->plmn, &plmn->plmn, sizeof(struct osmo_plmn_id)); new_m_state(plmn, GSM322_M2_ON_PLMN); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32797 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia2316bae5e4f5035f31b4da3937e025537aaf224 Gerrit-Change-Number: 32797 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: Define sim_pin_required field as bool

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32799 ) Change subject: layer23: Define sim_pin_required field as bool ...................................................................... layer23: Define sim_pin_required field as bool Change-Id: I7c5105da08176f4743f1f3e56ddad9ac170717c7 --- M src/host/layer23/include/osmocom/bb/common/subscriber.h M src/host/layer23/src/common/subscriber.c 2 files changed, 14 insertions(+), 5 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve jolly: 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 e9779e6..792df62 100644 --- a/src/host/layer23/include/osmocom/bb/common/subscriber.h +++ b/src/host/layer23/include/osmocom/bb/common/subscriber.h @@ -89,7 +89,7 @@ /* talk to SIM */ uint8_t sim_state; - uint8_t sim_pin_required; /* state: wait for PIN */ + bool sim_pin_required; /* state: wait for PIN */ uint8_t sim_file_index; uint32_t sim_handle_query; uint32_t sim_handle_update; diff --git a/src/host/layer23/src/common/subscriber.c b/src/host/layer23/src/common/subscriber.c index 5f72f52..dfd44dc 100644 --- a/src/host/layer23/src/common/subscriber.c +++ b/src/host/layer23/src/common/subscriber.c @@ -970,7 +970,7 @@ l23_vty_ms_notify(ms, NULL); l23_vty_ms_notify(ms, "Please give PIN for ICCID %s (you have " "%d tries left)\n", subscr->iccid, payload[1]); - subscr->sim_pin_required = 1; + subscr->sim_pin_required = true; break; case SIM_CAUSE_PIN1_BLOCKED: LOGP(DMM, LOGL_NOTICE, "PIN is blocked\n"); @@ -982,14 +982,14 @@ "(you have %d tries left)\n", subscr->iccid, payload[1]); } - subscr->sim_pin_required = 1; + subscr->sim_pin_required = true; break; case SIM_CAUSE_PUC_BLOCKED: LOGP(DMM, LOGL_NOTICE, "PUC is blocked\n"); l23_vty_ms_notify(ms, NULL); l23_vty_ms_notify(ms, "PUC is blocked\n"); - subscr->sim_pin_required = 1; + subscr->sim_pin_required = true; break; default: if (sf->func && !sf->mandatory) { @@ -1013,7 +1013,7 @@ /* if pin was successfully unlocked, then resend request */ if (subscr->sim_pin_required) { - subscr->sim_pin_required = 0; + subscr->sim_pin_required = false; subscr_sim_request(ms); return; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32799 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7c5105da08176f4743f1f3e56ddad9ac170717c7 Gerrit-Change-Number: 32799 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: Define barr field as bool

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32798 ) Change subject: layer23: Define barr field as bool ...................................................................... layer23: Define barr field as bool Change-Id: I02b95fa5437be1325cfa80fc40350280540fe802 --- 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/vty.c 3 files changed, 13 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve jolly: 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/settings.h b/src/host/layer23/include/osmocom/bb/common/settings.h index add8dc3..f24b006 100644 --- a/src/host/layer23/include/osmocom/bb/common/settings.h +++ b/src/host/layer23/include/osmocom/bb/common/settings.h @@ -63,7 +63,7 @@ uint32_t tmsi; uint8_t ki_type; uint8_t ki[16]; /* 128 bit max */ - uint8_t barr; + bool barr; bool rplmn_valid; struct osmo_plmn_id rplmn; uint16_t lac; diff --git a/src/host/layer23/include/osmocom/bb/common/subscriber.h b/src/host/layer23/include/osmocom/bb/common/subscriber.h index cbcfd0e..e9779e6 100644 --- a/src/host/layer23/include/osmocom/bb/common/subscriber.h +++ b/src/host/layer23/include/osmocom/bb/common/subscriber.h @@ -84,7 +84,7 @@ struct osmo_plmn_id plmn; /* our access */ - uint8_t acc_barr; /* if we may access, if cell barred */ + bool acc_barr; /* if we may access, if cell barred */ uint16_t acc_class; /* bitmask of what we may access */ /* talk to SIM */ diff --git a/src/host/layer23/src/common/vty.c b/src/host/layer23/src/common/vty.c index 67105a0..44fc053 100644 --- a/src/host/layer23/src/common/vty.c +++ b/src/host/layer23/src/common/vty.c @@ -1019,7 +1019,7 @@ struct osmocom_ms *ms = vty->index; struct gsm_settings *set = &ms->settings; - set->test_sim.barr = 1; + set->test_sim.barr = true; return CMD_SUCCESS; } @@ -1030,7 +1030,7 @@ struct osmocom_ms *ms = vty->index; struct gsm_settings *set = &ms->settings; - set->test_sim.barr = 0; + set->test_sim.barr = false; return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32798 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I02b95fa5437be1325cfa80fc40350280540fe802 Gerrit-Change-Number: 32798 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: Define always_search_hplmn field as bool

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32796 ) Change subject: layer23: Define always_search_hplmn field as bool ...................................................................... layer23: Define always_search_hplmn field as bool Change-Id: I0efc16a2362fbfec64cf6ca85bb32db8beb241a3 --- 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 M src/host/layer23/src/common/vty.c 4 files changed, 16 insertions(+), 7 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve jolly: 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/settings.h b/src/host/layer23/include/osmocom/bb/common/settings.h index f480aad..bae9848 100644 --- a/src/host/layer23/include/osmocom/bb/common/settings.h +++ b/src/host/layer23/include/osmocom/bb/common/settings.h @@ -68,7 +68,7 @@ struct osmo_plmn_id rplmn; uint16_t lac; bool imsi_attached; - uint8_t always; /* ...search hplmn... */ + bool always_search_hplmn; }; struct gsm_settings { diff --git a/src/host/layer23/include/osmocom/bb/common/subscriber.h b/src/host/layer23/include/osmocom/bb/common/subscriber.h index f44401d..b829b2e 100644 --- a/src/host/layer23/include/osmocom/bb/common/subscriber.h +++ b/src/host/layer23/include/osmocom/bb/common/subscriber.h @@ -72,7 +72,7 @@ uint8_t t6m_hplmn; /* timer for hplmn search */ /* special things */ - uint8_t always_search_hplmn; + bool always_search_hplmn; /* search hplmn in other countries also (for test cards) */ uint8_t any_timeout; /* timer to restart 'any cell selection' */ diff --git a/src/host/layer23/src/common/subscriber.c b/src/host/layer23/src/common/subscriber.c index b0c5f19..8207051 100644 --- a/src/host/layer23/src/common/subscriber.c +++ b/src/host/layer23/src/common/subscriber.c @@ -526,7 +526,7 @@ subscr->lai.lac = set->test_sim.lac; subscr->tmsi = set->test_sim.tmsi; subscr->ptmsi = GSM_RESERVED_TMSI; - subscr->always_search_hplmn = set->test_sim.always; + subscr->always_search_hplmn = set->test_sim.always_search_hplmn; subscr->t6m_hplmn = 1; /* try to find home network every 6 min */ OSMO_STRLCPY_ARRAY(subscr->imsi, set->test_sim.imsi); diff --git a/src/host/layer23/src/common/vty.c b/src/host/layer23/src/common/vty.c index ef2de24..c76f498 100644 --- a/src/host/layer23/src/common/vty.c +++ b/src/host/layer23/src/common/vty.c @@ -1115,10 +1115,10 @@ switch (argv[0][0]) { case 'e': - set->test_sim.always = 1; + set->test_sim.always_search_hplmn = true; break; case 'f': - set->test_sim.always = 0; + set->test_sim.always_search_hplmn = false; break; } @@ -1213,9 +1213,9 @@ } else if (!l23_vty_hide_default) vty_out(vty, "%s no rplmn%s", prefix, VTY_NEWLINE); - if (!l23_vty_hide_default || set->test_sim.always) + if (!l23_vty_hide_default || set->test_sim.always_search_hplmn) vty_out(vty, "%s hplmn-search %s%s", prefix, - (set->test_sim.always) ? "everywhere" : "foreign-country", + set->test_sim.always_search_hplmn ? "everywhere" : "foreign-country", VTY_NEWLINE); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32796 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I0efc16a2362fbfec64cf6ca85bb32db8beb241a3 Gerrit-Change-Number: 32796 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[M] Change in osmocom-bb[master]: layer23: vty: Rename testsim node functions

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32794 ) Change subject: layer23: vty: Rename testsim node functions ...................................................................... layer23: vty: Rename testsim node functions Change-Id: If84297f026e6804436a0bf16c5c992161cd71ee4 --- M src/host/layer23/src/common/vty.c 1 file changed, 37 insertions(+), 28 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/src/host/layer23/src/common/vty.c b/src/host/layer23/src/common/vty.c index 424efb2..c315689 100644 --- a/src/host/layer23/src/common/vty.c +++ b/src/host/layer23/src/common/vty.c @@ -478,7 +478,7 @@ return CMD_SUCCESS; } -static int _sim_test_cmd(struct vty *vty, int argc, const char *argv[], +static int _sim_testcard_cmd(struct vty *vty, int argc, const char *argv[], int attached) { struct osmocom_ms *ms; @@ -535,7 +535,7 @@ return CMD_SUCCESS; } -DEFUN(sim_test, sim_test_cmd, +DEFUN(sim_testcard, sim_testcard_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" @@ -543,17 +543,17 @@ "Optionally set location area code of RPLMN\n" "Optionally set current assigned TMSI") { - return _sim_test_cmd(vty, argc, argv, 0); + return _sim_testcard_cmd(vty, argc, argv, 0); } -DEFUN(sim_test_att, sim_test_att_cmd, +DEFUN(sim_testcard_att, sim_testcard_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); + return _sim_testcard_cmd(vty, argc, argv, 1); } DEFUN(sim_sap, sim_sap_cmd, "sim sap MS_NAME", @@ -937,7 +937,7 @@ return CMD_SUCCESS; } -DEFUN(cfg_test_imsi, cfg_test_imsi_cmd, "imsi IMSI", +DEFUN(cfg_testsim_imsi, cfg_testsim_imsi_cmd, "imsi IMSI", "Set IMSI on test card\n15 digits IMSI") { struct osmocom_ms *ms = vty->index; @@ -956,7 +956,7 @@ } #define HEX_STR "\nByte as two digits hexadecimal" -DEFUN(cfg_test_ki_xor, cfg_test_ki_xor_cmd, "ki xor HEX HEX HEX HEX HEX HEX " +DEFUN(cfg_testsim_ki_xor, cfg_testsim_ki_xor_cmd, "ki xor HEX HEX HEX HEX HEX HEX " "HEX HEX HEX HEX HEX HEX", "Set Key (Ki) on test card\nUse XOR algorithm" HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR) @@ -984,7 +984,7 @@ return CMD_SUCCESS; } -DEFUN(cfg_test_ki_comp128, cfg_test_ki_comp128_cmd, "ki comp128 HEX HEX HEX " +DEFUN(cfg_testsim_ki_comp128, cfg_testsim_ki_comp128_cmd, "ki comp128 HEX HEX HEX " "HEX HEX HEX HEX HEX HEX HEX HEX HEX HEX HEX HEX HEX", "Set Key (Ki) on test card\nUse XOR algorithm" HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR HEX_STR @@ -1013,7 +1013,7 @@ return CMD_SUCCESS; } -DEFUN(cfg_test_barr, cfg_test_barr_cmd, "barred-access", +DEFUN(cfg_testsim_barr, cfg_testsim_barr_cmd, "barred-access", "Allow access to barred cells") { struct osmocom_ms *ms = vty->index; @@ -1024,7 +1024,7 @@ return CMD_SUCCESS; } -DEFUN(cfg_test_no_barr, cfg_test_no_barr_cmd, "no barred-access", +DEFUN(cfg_testsim_no_barr, cfg_testsim_no_barr_cmd, "no barred-access", NO_STR "Deny access to barred cells") { struct osmocom_ms *ms = vty->index; @@ -1035,7 +1035,7 @@ return CMD_SUCCESS; } -DEFUN(cfg_test_no_rplmn, cfg_test_no_rplmn_cmd, "no rplmn", +DEFUN(cfg_testsim_no_rplmn, cfg_testsim_no_rplmn_cmd, "no rplmn", NO_STR "Unset Registered PLMN") { struct osmocom_ms *ms = vty->index; @@ -1053,7 +1053,7 @@ return CMD_SUCCESS; } -static int _test_rplmn_cmd(struct vty *vty, int argc, const char *argv[], +static int _testsim_rplmn_cmd(struct vty *vty, int argc, const char *argv[], int attached) { struct osmocom_ms *ms = vty->index; @@ -1091,25 +1091,25 @@ return CMD_SUCCESS; } -DEFUN(cfg_test_rplmn, cfg_test_rplmn_cmd, +DEFUN(cfg_testsim_rplmn, cfg_testsim_rplmn_cmd, "rplmn MCC MNC [LAC] [TMSI]", "Set Registered PLMN\nMobile Country Code\nMobile Network Code\n" "Optionally set location area code\n" "Optionally set current assigned TMSI") { - return _test_rplmn_cmd(vty, argc, argv, 0); + return _testsim_rplmn_cmd(vty, argc, argv, 0); } -DEFUN(cfg_test_rplmn_att, cfg_test_rplmn_att_cmd, +DEFUN(cfg_testsim_rplmn_att, cfg_testsim_rplmn_att_cmd, "rplmn MCC MNC LAC TMSI attached", "Set Registered PLMN\nMobile Country Code\nMobile Network Code\n" "Set location area code\nSet current assigned TMSI\n" "Indicate to MM that card is already attached") { - return _test_rplmn_cmd(vty, argc, argv, 1); + return _testsim_rplmn_cmd(vty, argc, argv, 1); } -DEFUN(cfg_test_hplmn, cfg_test_hplmn_cmd, "hplmn-search (everywhere|foreign-country)", +DEFUN(cfg_testsim_hplmn, cfg_testsim_hplmn_cmd, "hplmn-search (everywhere|foreign-country)", "Set Home PLMN search mode\n" "Search for HPLMN when on any other network\n" "Search for HPLMN when in a different country") @@ -1340,8 +1340,8 @@ 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_testcard_cmd); + install_element(ENABLE_NODE, &sim_testcard_att_cmd); install_element(ENABLE_NODE, &sim_sap_cmd); install_element(ENABLE_NODE, &sim_reader_cmd); install_element(ENABLE_NODE, &sim_remove_cmd); @@ -1363,15 +1363,15 @@ 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); - install_element(TESTSIM_NODE, &cfg_test_ki_xor_cmd); - install_element(TESTSIM_NODE, &cfg_test_ki_comp128_cmd); - install_element(TESTSIM_NODE, &cfg_test_barr_cmd); - install_element(TESTSIM_NODE, &cfg_test_no_barr_cmd); - install_element(TESTSIM_NODE, &cfg_test_no_rplmn_cmd); - install_element(TESTSIM_NODE, &cfg_test_rplmn_cmd); - install_element(TESTSIM_NODE, &cfg_test_rplmn_att_cmd); - install_element(TESTSIM_NODE, &cfg_test_hplmn_cmd); + install_element(TESTSIM_NODE, &cfg_testsim_imsi_cmd); + install_element(TESTSIM_NODE, &cfg_testsim_ki_xor_cmd); + install_element(TESTSIM_NODE, &cfg_testsim_ki_comp128_cmd); + install_element(TESTSIM_NODE, &cfg_testsim_barr_cmd); + install_element(TESTSIM_NODE, &cfg_testsim_no_barr_cmd); + install_element(TESTSIM_NODE, &cfg_testsim_no_rplmn_cmd); + install_element(TESTSIM_NODE, &cfg_testsim_rplmn_cmd); + install_element(TESTSIM_NODE, &cfg_testsim_rplmn_att_cmd); + install_element(TESTSIM_NODE, &cfg_testsim_hplmn_cmd); install_element(MS_NODE, &cfg_ms_shutdown_cmd); install_element(MS_NODE, &cfg_ms_shutdown_force_cmd); install_element(MS_NODE, &cfg_ms_no_shutdown_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32794 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If84297f026e6804436a0bf16c5c992161cd71ee4 Gerrit-Change-Number: 32794 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: Define imsi_attached field as bool

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32795 ) Change subject: layer23: Define imsi_attached field as bool ...................................................................... layer23: Define imsi_attached field as bool Change-Id: I47e234dcef4c5af09023318dda45d40c8c92b312 --- 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/vty.c M src/host/layer23/src/mobile/gsm48_mm.c 4 files changed, 17 insertions(+), 12 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve jolly: 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/settings.h b/src/host/layer23/include/osmocom/bb/common/settings.h index f66874c..f480aad 100644 --- a/src/host/layer23/include/osmocom/bb/common/settings.h +++ b/src/host/layer23/include/osmocom/bb/common/settings.h @@ -67,7 +67,7 @@ uint8_t rplmn_valid; struct osmo_plmn_id rplmn; uint16_t lac; - uint8_t imsi_attached; + bool imsi_attached; uint8_t always; /* ...search hplmn... */ }; diff --git a/src/host/layer23/include/osmocom/bb/common/subscriber.h b/src/host/layer23/include/osmocom/bb/common/subscriber.h index e2a8dab..f44401d 100644 --- a/src/host/layer23/include/osmocom/bb/common/subscriber.h +++ b/src/host/layer23/include/osmocom/bb/common/subscriber.h @@ -49,7 +49,7 @@ enum gsm_subscriber_sim_type sim_type; /* type of sim */ bool sim_valid; /* sim inserted and valid */ enum gsm_sub_sim_ustate ustate; /* update status */ - uint8_t imsi_attached; /* attached state */ + bool imsi_attached; /* attached state */ /* IMSI & co */ char imsi[OSMO_IMSI_BUF_SIZE]; diff --git a/src/host/layer23/src/common/vty.c b/src/host/layer23/src/common/vty.c index c315689..ef2de24 100644 --- a/src/host/layer23/src/common/vty.c +++ b/src/host/layer23/src/common/vty.c @@ -1053,8 +1053,7 @@ return CMD_SUCCESS; } -static int _testsim_rplmn_cmd(struct vty *vty, int argc, const char *argv[], - int attached) +static int _testsim_rplmn_cmd(struct vty *vty, int argc, const char *argv[], bool attached) { struct osmocom_ms *ms = vty->index; struct gsm_settings *set = &ms->settings; @@ -1081,10 +1080,7 @@ else set->test_sim.tmsi = GSM_RESERVED_TMSI; - if (attached) - set->test_sim.imsi_attached = 1; - else - set->test_sim.imsi_attached = 0; + set->test_sim.imsi_attached = attached; l23_vty_restart_required_warn(vty, ms); @@ -1097,7 +1093,7 @@ "Optionally set location area code\n" "Optionally set current assigned TMSI") { - return _testsim_rplmn_cmd(vty, argc, argv, 0); + return _testsim_rplmn_cmd(vty, argc, argv, false); } DEFUN(cfg_testsim_rplmn_att, cfg_testsim_rplmn_att_cmd, @@ -1106,7 +1102,7 @@ "Set location area code\nSet current assigned TMSI\n" "Indicate to MM that card is already attached") { - return _testsim_rplmn_cmd(vty, argc, argv, 1); + return _testsim_rplmn_cmd(vty, argc, argv, true); } DEFUN(cfg_testsim_hplmn, cfg_testsim_hplmn_cmd, "hplmn-search (everywhere|foreign-country)", diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index 95808ee..2bba0e1 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -2234,7 +2234,7 @@ && (subscr->imsi_attached || !s->att_allowed)) { LOGP(DMM, LOGL_INFO, "Loc. upd. not required.\n"); - subscr->imsi_attached = 1; + subscr->imsi_attached = true; /* go straight to normal service state */ new_mm_state(mm, GSM48_MM_ST_MM_IDLE, @@ -2413,7 +2413,7 @@ mm->lupd_attempt = 0; /* mark SIM as attached */ - subscr->imsi_attached = 1; + subscr->imsi_attached = true; /* set the status in the sim to updated */ new_sim_ustate(subscr, GSM_SIM_U1_UPDATED); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32795 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I47e234dcef4c5af09023318dda45d40c8c92b312 Gerrit-Change-Number: 32795 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2023