diff options
author | Pau Espin Pedrol <pespin@sysmocom.de> | 2023-05-19 16:20:11 +0200 |
---|---|---|
committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2023-05-22 16:12:09 +0200 |
commit | 741ef88d422e429ab8d68b3d184dfcde5ca8b6eb (patch) | |
tree | ce4eeed7c0cb2cec295499405cc3b4feec28eff6 | |
parent | 4c8017f011d390e13247a8c6fda36754291e2638 (diff) |
layer23: Define (r)plmn_valid field as bool
Change-Id: Ia2316bae5e4f5035f31b4da3937e025537aaf224
-rw-r--r-- | src/host/layer23/include/osmocom/bb/common/settings.h | 2 | ||||
-rw-r--r-- | src/host/layer23/include/osmocom/bb/common/subscriber.h | 2 | ||||
-rw-r--r-- | src/host/layer23/src/common/subscriber.c | 2 | ||||
-rw-r--r-- | src/host/layer23/src/common/vty.c | 8 | ||||
-rw-r--r-- | src/host/layer23/src/mobile/gsm322.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/src/host/layer23/include/osmocom/bb/common/settings.h b/src/host/layer23/include/osmocom/bb/common/settings.h index bae98481..add8dc3c 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 @@ struct test_sim_settings { 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 b829b2e8..cbcfd0e3 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 @@ struct gsm_subscriber { 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 82070519..5f72f52f 100644 --- a/src/host/layer23/src/common/subscriber.c +++ b/src/host/layer23/src/common/subscriber.c @@ -913,7 +913,7 @@ static int subscr_sim_request(struct osmocom_ms *ms) /* 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 c76f498b..67105a0e 100644 --- a/src/host/layer23/src/common/vty.c +++ b/src/host/layer23/src/common/vty.c @@ -513,9 +513,9 @@ static int _sim_testcard_cmd(struct vty *vty, int argc, const char *argv[], 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 @@ DEFUN(cfg_testsim_no_rplmn, cfg_testsim_no_rplmn_cmd, "no rplmn", 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 @@ static int _testsim_rplmn_cmd(struct vty *vty, int argc, const char *argv[], boo 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 f21cb596..35811d33 100644 --- a/src/host/layer23/src/mobile/gsm322.c +++ b/src/host/layer23/src/mobile/gsm322.c @@ -1685,7 +1685,7 @@ static int gsm322_m_go_on_plmn(struct osmocom_ms *ms, struct msgb *msg) 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); |