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

[S] Change in osmocom-bb[master]: Use OSMO_STRLCPY_ARRAY instead of strcpy

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32743 ) Change subject: Use OSMO_STRLCPY_ARRAY instead of strcpy ...................................................................... Use OSMO_STRLCPY_ARRAY instead of strcpy Change-Id: I6b9bfffd715c4238289b693740585ec08f8d8d16 --- M src/host/layer23/src/common/settings.c M src/host/layer23/src/common/subscriber.c 2 files changed, 11 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/host/layer23/src/common/settings.c b/src/host/layer23/src/common/settings.c index 986d551..01a99a9 100644 --- a/src/host/layer23/src/common/settings.c +++ b/src/host/layer23/src/common/settings.c @@ -67,7 +67,7 @@ set->sim_type = GSM_SIM_TYPE_L1PHY; /* test SIM */ - strcpy(set->test_imsi, "001010000000000"); + OSMO_STRLCPY_ARRAY(set->test_imsi, "001010000000000"); set->test_rplmn_mcc = set->test_rplmn_mnc = 1; set->test_lac = 0x0000; set->test_tmsi = GSM_RESERVED_TMSI; diff --git a/src/host/layer23/src/common/subscriber.c b/src/host/layer23/src/common/subscriber.c index 4fdb4d6..84d08e1 100644 --- a/src/host/layer23/src/common/subscriber.c +++ b/src/host/layer23/src/common/subscriber.c @@ -177,7 +177,7 @@ 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); + OSMO_STRLCPY_ARRAY(subscr->imsi, set->test_imsi); LOGP(DMM, LOGL_INFO, "(ms %s) Inserting test card (IMSI=%s %s, %s)\n", ms->name, subscr->imsi, gsm_imsi_mcc(subscr->imsi), -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I6b9bfffd715c4238289b693740585ec08f8d8d16 Gerrit-Change-Number: 32743 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> 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: Migrate sim_ustate to enum + value_string

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32745 ) Change subject: layer23: Migrate sim_ustate to enum + value_string ...................................................................... Patch Set 1: (1 comment) File src/host/layer23/src/common/subscriber.c: https://gerrit.osmocom.org/c/osmocom-bb/+/32745/comment/612cc8fb_be5db4a9 PS1, Line 1023: { GSM_SIM_U3_ROAMING_NA, "U3_ROAMING_NA" }, missing NULL termination: `{ 0, NULL }` -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32745 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I83607caa0b76b6b30db59c53438a55726483b85d Gerrit-Change-Number: 32745 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 17 May 2023 09:57:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[M] Change in osmocom-bb[master]: layer23: Move all test_sim settings to its own substruct

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32744 ) Change subject: layer23: Move all test_sim settings to its own substruct ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I56830c6b905bcbce7e19adbfe5427fd826d15e8c Gerrit-Change-Number: 32744 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 17 May 2023 09:55:45 +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]: Use OSMO_STRLCPY_ARRAY instead of strcpy

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32743 ) Change subject: Use OSMO_STRLCPY_ARRAY instead of strcpy ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I6b9bfffd715c4238289b693740585ec08f8d8d16 Gerrit-Change-Number: 32743 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 17 May 2023 09:54:07 +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]: sim: Introduce EF.LOCIGPRS file structure

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32742 ) Change subject: sim: Introduce EF.LOCIGPRS file structure ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idf93b4ece0a966754f8caacc665038c321b752bb Gerrit-Change-Number: 32742 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 17 May 2023 09:53:48 +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: Migrate sim_ustate to enum + value_string

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32745 ) Change subject: layer23: Migrate sim_ustate to enum + value_string ...................................................................... layer23: Migrate sim_ustate to enum + value_string Change-Id: I83607caa0b76b6b30db59c53438a55726483b85d --- M src/host/layer23/include/osmocom/bb/common/subscriber.h M src/host/layer23/src/common/subscriber.c 2 files changed, 31 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/45/32745/1 diff --git a/src/host/layer23/include/osmocom/bb/common/subscriber.h b/src/host/layer23/include/osmocom/bb/common/subscriber.h index 1dd1869..1a9bc6e 100644 --- a/src/host/layer23/include/osmocom/bb/common/subscriber.h +++ b/src/host/layer23/include/osmocom/bb/common/subscriber.h @@ -1,13 +1,22 @@ #ifndef _SUBSCRIBER_H #define _SUBSCRIBER_H +#include <osmocom/core/utils.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 -#define GSM_SIM_U2_NOT_UPDATED 2 -#define GSM_SIM_U3_ROAMING_NA 3 +enum gsm_sub_sim_ustate { + GSM_SIM_U0_NULL, + GSM_SIM_U1_UPDATED, + GSM_SIM_U2_NOT_UPDATED, + GSM_SIM_U3_ROAMING_NA, +}; +extern const struct value_string gsm_sub_sim_ustate_names[]; +static inline const char *gsm_sub_sim_ustate_name(enum gsm_sub_sim_ustate val) +{ + return get_value_string(gsm_sub_sim_ustate_names, val); +} + struct gsm_sub_plmn_list { struct llist_head entry; @@ -36,7 +45,7 @@ /* status */ uint8_t sim_type; /* type of sim */ uint8_t sim_valid; /* sim inserted and valid */ - uint8_t ustate; /* update status */ + enum gsm_sub_sim_ustate ustate; /* update status */ uint8_t imsi_attached; /* attached state */ /* IMSI & co */ diff --git a/src/host/layer23/src/common/subscriber.c b/src/host/layer23/src/common/subscriber.c index bbbb940..1381efe 100644 --- a/src/host/layer23/src/common/subscriber.c +++ b/src/host/layer23/src/common/subscriber.c @@ -1016,19 +1016,19 @@ * state and lists */ -static const char *subscr_ustate_names[] = { - "U0_NULL", - "U1_UPDATED", - "U2_NOT_UPDATED", - "U3_ROAMING_NA" +const struct value_string gsm_sub_sim_ustate_names[] = { + { GSM_SIM_U0_NULL, "U0_NULL" }, + { GSM_SIM_U1_UPDATED, "U1_UPDATED" }, + { GSM_SIM_U2_NOT_UPDATED, "U2_NOT_UPDATED" }, + { GSM_SIM_U3_ROAMING_NA, "U3_ROAMING_NA" }, }; /* change to new U state */ void new_sim_ustate(struct gsm_subscriber *subscr, int state) { LOGP(DMM, LOGL_INFO, "(ms %s) new state %s -> %s\n", subscr->ms->name, - subscr_ustate_names[subscr->ustate], - subscr_ustate_names[state]); + gsm_sub_sim_ustate_name(subscr->ustate), + gsm_sub_sim_ustate_name(state)); subscr->ustate = state; } @@ -1153,7 +1153,7 @@ if (subscr->sms_sca[0]) print(priv, " SMS Service Center Address: %s\n", subscr->sms_sca); - print(priv, " Status: %s IMSI %s", subscr_ustate_names[subscr->ustate], + print(priv, " Status: %s IMSI %s", gsm_sub_sim_ustate_name(subscr->ustate), (subscr->imsi_attached) ? "attached" : "detached"); if (subscr->tmsi != GSM_RESERVED_TMSI) print(priv, " TMSI 0x%08x", subscr->tmsi); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32745 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I83607caa0b76b6b30db59c53438a55726483b85d Gerrit-Change-Number: 32745 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: Define EF.LOCI Location Update Status values with an enum

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32741 ) Change subject: layer23: Define EF.LOCI Location Update Status values with an enum ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32741 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia54026fa8e4fca05da71e1e6a2dbdb8d900f0dd0 Gerrit-Change-Number: 32741 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 17 May 2023 09:52:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[M] Change in osmocom-bb[master]: layer23: Move all test_sim settings to its own substruct

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32744 ) Change subject: layer23: Move all test_sim settings to its own substruct ...................................................................... layer23: Move all test_sim settings to its own substruct This way it becomes clear those fields are related only to test_sim module, and not some general "test" feature. Change-Id: I56830c6b905bcbce7e19adbfe5427fd826d15e8c --- M src/host/layer23/include/osmocom/bb/common/settings.h M src/host/layer23/src/common/settings.c M src/host/layer23/src/common/subscriber.c M src/host/layer23/src/common/vty.c M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/modem/app_modem.c 6 files changed, 86 insertions(+), 70 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/44/32744/1 diff --git a/src/host/layer23/include/osmocom/bb/common/settings.h b/src/host/layer23/include/osmocom/bb/common/settings.h index 38faa4b..01db2a7 100644 --- a/src/host/layer23/include/osmocom/bb/common/settings.h +++ b/src/host/layer23/include/osmocom/bb/common/settings.h @@ -57,6 +57,19 @@ char alsa_input_dev[128]; }; +struct test_sim_settings { + char imsi[OSMO_IMSI_BUF_SIZE]; + uint32_t tmsi; + uint8_t ki_type; + uint8_t ki[16]; /* 128 bit max */ + uint8_t barr; + uint8_t rplmn_valid; + uint16_t rplmn_mcc, rplmn_mnc; + uint16_t lac; + uint8_t imsi_attached; + uint8_t always; /* ...search hplmn... */ +}; + struct gsm_settings { char layer2_socket_path[128]; char sap_socket_path[128]; @@ -85,16 +98,7 @@ bool store_sms; /* test card simulator settings */ - char test_imsi[OSMO_IMSI_BUF_SIZE]; - uint32_t test_tmsi; - uint8_t test_ki_type; - uint8_t test_ki[16]; /* 128 bit max */ - uint8_t test_barr; - uint8_t test_rplmn_valid; - uint16_t test_rplmn_mcc, test_rplmn_mnc; - uint16_t test_lac; - uint8_t test_imsi_attached; - uint8_t test_always; /* ...search hplmn... */ + struct test_sim_settings test_sim; /* call related settings */ uint8_t cw; /* set if call-waiting is allowed */ diff --git a/src/host/layer23/src/common/settings.c b/src/host/layer23/src/common/settings.c index 01a99a9..f826ce9 100644 --- a/src/host/layer23/src/common/settings.c +++ b/src/host/layer23/src/common/settings.c @@ -67,10 +67,10 @@ set->sim_type = GSM_SIM_TYPE_L1PHY; /* test SIM */ - OSMO_STRLCPY_ARRAY(set->test_imsi, "001010000000000"); - set->test_rplmn_mcc = set->test_rplmn_mnc = 1; - set->test_lac = 0x0000; - set->test_tmsi = GSM_RESERVED_TMSI; + OSMO_STRLCPY_ARRAY(set->test_sim.imsi, "001010000000000"); + set->test_sim.rplmn_mcc = set->test_sim.rplmn_mnc = 1; + set->test_sim.lac = 0x0000; + set->test_sim.tmsi = GSM_RESERVED_TMSI; /* set all supported features */ set->sms_ptp = sup->sms_ptp; diff --git a/src/host/layer23/src/common/subscriber.c b/src/host/layer23/src/common/subscriber.c index 84d08e1..bbbb940 100644 --- a/src/host/layer23/src/common/subscriber.c +++ b/src/host/layer23/src/common/subscriber.c @@ -148,7 +148,7 @@ return -EBUSY; } - if (!osmo_imsi_str_valid(set->test_imsi)) { + if (!osmo_imsi_str_valid(set->test_sim.imsi)) { LOGP(DMM, LOGL_ERROR, "Wrong IMSI format\n"); return -EINVAL; } @@ -160,14 +160,14 @@ subscr->sim_type = GSM_SIM_TYPE_TEST; sprintf(subscr->sim_name, "test"); subscr->sim_valid = 1; - if (imsi_attached && set->test_rplmn_valid) { + if (imsi_attached && set->test_sim.rplmn_valid) { subscr->imsi_attached = imsi_attached; subscr->ustate = GSM_SIM_U1_UPDATED; } else subscr->ustate = GSM_SIM_U2_NOT_UPDATED; - subscr->acc_barr = set->test_barr; /* we may access barred cell */ + subscr->acc_barr = set->test_sim.barr; /* we may access barred cell */ subscr->acc_class = 0xffff; /* we have any access class */ - subscr->plmn_valid = set->test_rplmn_valid; + subscr->plmn_valid = set->test_sim.rplmn_valid; subscr->plmn_mcc = mcc; subscr->plmn_mnc = mnc; subscr->mcc = mcc; @@ -175,9 +175,9 @@ subscr->lac = lac; subscr->tmsi = tmsi; subscr->ptmsi = GSM_RESERVED_TMSI; - subscr->always_search_hplmn = set->test_always; + subscr->always_search_hplmn = set->test_sim.always; subscr->t6m_hplmn = 1; /* try to find home network every 6 min */ - OSMO_STRLCPY_ARRAY(subscr->imsi, set->test_imsi); + OSMO_STRLCPY_ARRAY(subscr->imsi, set->test_sim.imsi); LOGP(DMM, LOGL_INFO, "(ms %s) Inserting test card (IMSI=%s %s, %s)\n", ms->name, subscr->imsi, gsm_imsi_mcc(subscr->imsi), @@ -902,8 +902,8 @@ struct osmo_auth_vector _vec; struct osmo_auth_vector *vec = &_vec; - auth.algo = set->test_ki_type; - memcpy(auth.u.gsm.ki, set->test_ki, sizeof(auth.u.gsm.ki)); + auth.algo = set->test_sim.ki_type; + memcpy(auth.u.gsm.ki, set->test_sim.ki, sizeof(auth.u.gsm.ki)); int ret = osmo_auth_gen_vec(vec, &auth, rand); if (ret < 0) return ret; diff --git a/src/host/layer23/src/common/vty.c b/src/host/layer23/src/common/vty.c index 4f9aa20..51c6f94 100644 --- a/src/host/layer23/src/common/vty.c +++ b/src/host/layer23/src/common/vty.c @@ -500,15 +500,15 @@ } set = &ms->settings; - if (set->test_rplmn_valid) { - mcc = set->test_rplmn_mcc; - mnc = set->test_rplmn_mnc; + if (set->test_sim.rplmn_valid) { + mcc = set->test_sim.rplmn_mcc; + mnc = set->test_sim.rplmn_mnc; - if (set->test_lac > 0x0000 && set->test_lac < 0xfffe) - lac = set->test_lac; + if (set->test_sim.lac > 0x0000 && set->test_sim.lac < 0xfffe) + lac = set->test_sim.lac; - if (set->test_tmsi != GSM_RESERVED_TMSI) - tmsi = set->test_tmsi; + if (set->test_sim.tmsi != GSM_RESERVED_TMSI) + tmsi = set->test_sim.tmsi; } if (argc == 2) { @@ -953,7 +953,7 @@ return CMD_WARNING; } - OSMO_STRLCPY_ARRAY(set->test_imsi, argv[0]); + OSMO_STRLCPY_ARRAY(set->test_sim.imsi, argv[0]); l23_vty_restart_required_warn(vty, ms); @@ -984,8 +984,8 @@ ki[i] = strtoul(p, NULL, 16); } - set->test_ki_type = OSMO_AUTH_ALG_XOR; - memcpy(set->test_ki, ki, 12); + set->test_sim.ki_type = OSMO_AUTH_ALG_XOR; + memcpy(set->test_sim.ki, ki, 12); return CMD_SUCCESS; } @@ -1013,8 +1013,8 @@ ki[i] = strtoul(p, NULL, 16); } - set->test_ki_type = OSMO_AUTH_ALG_COMP128v1; - memcpy(set->test_ki, ki, 16); + set->test_sim.ki_type = OSMO_AUTH_ALG_COMP128v1; + memcpy(set->test_sim.ki, ki, 16); return CMD_SUCCESS; } @@ -1024,7 +1024,7 @@ struct osmocom_ms *ms = vty->index; struct gsm_settings *set = &ms->settings; - set->test_barr = 1; + set->test_sim.barr = 1; return CMD_SUCCESS; } @@ -1035,7 +1035,7 @@ struct osmocom_ms *ms = vty->index; struct gsm_settings *set = &ms->settings; - set->test_barr = 0; + set->test_sim.barr = 0; return CMD_SUCCESS; } @@ -1046,7 +1046,7 @@ struct osmocom_ms *ms = vty->index; struct gsm_settings *set = &ms->settings; - set->test_rplmn_valid = 0; + set->test_sim.rplmn_valid = 0; l23_vty_restart_required_warn(vty, ms); @@ -1069,24 +1069,24 @@ vty_out(vty, "Given MNC invalid%s", VTY_NEWLINE); return CMD_WARNING; } - set->test_rplmn_valid = 1; - set->test_rplmn_mcc = mcc; - set->test_rplmn_mnc = mnc; + set->test_sim.rplmn_valid = 1; + set->test_sim.rplmn_mcc = mcc; + set->test_sim.rplmn_mnc = mnc; if (argc >= 3) - set->test_lac = strtoul(argv[2], NULL, 16); + set->test_sim.lac = strtoul(argv[2], NULL, 16); else - set->test_lac = 0xfffe; + set->test_sim.lac = 0xfffe; if (argc >= 4) - set->test_tmsi = strtoul(argv[3], NULL, 16); + set->test_sim.tmsi = strtoul(argv[3], NULL, 16); else - set->test_tmsi = GSM_RESERVED_TMSI; + set->test_sim.tmsi = GSM_RESERVED_TMSI; if (attached) - set->test_imsi_attached = 1; + set->test_sim.imsi_attached = 1; else - set->test_imsi_attached = 0; + set->test_sim.imsi_attached = 0; l23_vty_restart_required_warn(vty, ms); @@ -1121,10 +1121,10 @@ switch (argv[0][0]) { case 'e': - set->test_always = 1; + set->test_sim.always = 1; break; case 'f': - set->test_always = 0; + set->test_sim.always = 0; break; } @@ -1189,29 +1189,29 @@ { const struct gsm_settings *set = &ms->settings; vty_out(vty, "%stest-sim%s", prefix, VTY_NEWLINE); - vty_out(vty, "%s imsi %s%s", prefix, set->test_imsi, VTY_NEWLINE); - switch (set->test_ki_type) { + vty_out(vty, "%s imsi %s%s", prefix, set->test_sim.imsi, VTY_NEWLINE); + switch (set->test_sim.ki_type) { case OSMO_AUTH_ALG_XOR: vty_out(vty, "%s ki xor %s%s", - prefix, osmo_hexdump(set->test_ki, 12), VTY_NEWLINE); + prefix, osmo_hexdump(set->test_sim.ki, 12), VTY_NEWLINE); break; case OSMO_AUTH_ALG_COMP128v1: vty_out(vty, "%s ki comp128 %s%s", - prefix, osmo_hexdump(set->test_ki, 16), VTY_NEWLINE); + prefix, osmo_hexdump(set->test_sim.ki, 16), VTY_NEWLINE); break; } - if (!l23_vty_hide_default || set->test_barr) + if (!l23_vty_hide_default || set->test_sim.barr) vty_out(vty, "%s %sbarred-access%s", prefix, - (set->test_barr) ? "" : "no ", VTY_NEWLINE); - if (set->test_rplmn_valid) { + (set->test_sim.barr) ? "" : "no ", VTY_NEWLINE); + if (set->test_sim.rplmn_valid) { vty_out(vty, "%s rplmn %s %s", prefix, - gsm_print_mcc(set->test_rplmn_mcc), - gsm_print_mnc(set->test_rplmn_mnc)); - if (set->test_lac > 0x0000 && set->test_lac < 0xfffe) { - vty_out(vty, " 0x%04x", set->test_lac); - if (set->test_tmsi != GSM_RESERVED_TMSI) { - vty_out(vty, " 0x%08x", set->test_tmsi); - if (set->test_imsi_attached) + gsm_print_mcc(set->test_sim.rplmn_mcc), + gsm_print_mnc(set->test_sim.rplmn_mnc)); + if (set->test_sim.lac > 0x0000 && set->test_sim.lac < 0xfffe) { + vty_out(vty, " 0x%04x", set->test_sim.lac); + if (set->test_sim.tmsi != GSM_RESERVED_TMSI) { + vty_out(vty, " 0x%08x", set->test_sim.tmsi); + if (set->test_sim.imsi_attached) vty_out(vty, " attached"); } } @@ -1219,9 +1219,9 @@ } else if (!l23_vty_hide_default) vty_out(vty, "%s no rplmn%s", prefix, VTY_NEWLINE); - if (!l23_vty_hide_default || set->test_always) + if (!l23_vty_hide_default || set->test_sim.always) vty_out(vty, "%s hplmn-search %s%s", prefix, - (set->test_always) ? "everywhere" : "foreign-country", + (set->test_sim.always) ? "everywhere" : "foreign-country", VTY_NEWLINE); return CMD_SUCCESS; } diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index e7caed2..6f00207 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -167,9 +167,9 @@ 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); + gsm_subscr_testcard(ms, set->test_sim.rplmn_mcc, + set->test_sim.rplmn_mnc, set->test_sim.lac, + set->test_sim.tmsi, set->test_sim.imsi_attached); break; case GSM_SIM_TYPE_SAP: gsm_subscr_sapcard(ms); diff --git a/src/host/layer23/src/modem/app_modem.c b/src/host/layer23/src/modem/app_modem.c index b657d8c..b55cacd 100644 --- a/src/host/layer23/src/modem/app_modem.c +++ b/src/host/layer23/src/modem/app_modem.c @@ -213,9 +213,9 @@ 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); + gsm_subscr_testcard(ms, set->test_sim.rplmn_mcc, + set->test_sim.rplmn_mnc, set->test_sim.lac, + set->test_sim.tmsi, set->test_sim.imsi_attached); break; case GSM_SIM_TYPE_SAP: gsm_subscr_sapcard(ms); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I56830c6b905bcbce7e19adbfe5427fd826d15e8c Gerrit-Change-Number: 32744 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[S] Change in osmocom-bb[master]: Use OSMO_STRLCPY_ARRAY instead of strcpy

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/32743 ) Change subject: Use OSMO_STRLCPY_ARRAY instead of strcpy ...................................................................... Use OSMO_STRLCPY_ARRAY instead of strcpy Change-Id: I6b9bfffd715c4238289b693740585ec08f8d8d16 --- M src/host/layer23/src/common/settings.c M src/host/layer23/src/common/subscriber.c 2 files changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/43/32743/1 diff --git a/src/host/layer23/src/common/settings.c b/src/host/layer23/src/common/settings.c index 986d551..01a99a9 100644 --- a/src/host/layer23/src/common/settings.c +++ b/src/host/layer23/src/common/settings.c @@ -67,7 +67,7 @@ set->sim_type = GSM_SIM_TYPE_L1PHY; /* test SIM */ - strcpy(set->test_imsi, "001010000000000"); + OSMO_STRLCPY_ARRAY(set->test_imsi, "001010000000000"); set->test_rplmn_mcc = set->test_rplmn_mnc = 1; set->test_lac = 0x0000; set->test_tmsi = GSM_RESERVED_TMSI; diff --git a/src/host/layer23/src/common/subscriber.c b/src/host/layer23/src/common/subscriber.c index 4fdb4d6..84d08e1 100644 --- a/src/host/layer23/src/common/subscriber.c +++ b/src/host/layer23/src/common/subscriber.c @@ -177,7 +177,7 @@ 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); + OSMO_STRLCPY_ARRAY(subscr->imsi, set->test_imsi); LOGP(DMM, LOGL_INFO, "(ms %s) Inserting test card (IMSI=%s %s, %s)\n", ms->name, subscr->imsi, gsm_imsi_mcc(subscr->imsi), -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I6b9bfffd715c4238289b693740585ec08f8d8d16 Gerrit-Change-Number: 32743 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[L] Change in libosmocore[master]: codec cosmetic: move old FR ECU code to ecu_fr_old.c

by lynxis lazus

Attention is currently required from: falconia, dexter. lynxis lazus has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32711 ) Change subject: codec cosmetic: move old FR ECU code to ecu_fr_old.c ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32711 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ia169b8bcc6331227a11b78eb7ffca0c7ab838c69 Gerrit-Change-Number: 32711 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 17 May 2023 09:29:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2023