aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2018-02-27 12:59:45 +0100
committerNeels Hofmeyr <neels@hofmeyr.de>2018-02-27 13:01:42 +0100
commit7f48420923e46f9476ef7af2d4fe0bd0ed5e30b0 (patch)
treed6010e5052d92e29cb24090f67ad01fe11108640
parente4f9172f44996d36c6ef9d81f89c73ddede51edd (diff)
cosmetic: gsm_network_init(): imply default 001-01 PLMN
All callers pass mcc=1, mnc=1, so just have it as default. (Prepare for net->country_code etc to be replaced by net->plmn) Change-Id: Ibcd1cc38f170895305ae176a5574384c74a33939
-rw-r--r--include/osmocom/msc/common_cs.h5
-rw-r--r--src/libcommon-cs/common_cs.c9
-rw-r--r--src/osmo-msc/msc_main.c2
-rw-r--r--tests/msc_vlr/msc_vlr_tests.c2
4 files changed, 6 insertions, 12 deletions
diff --git a/include/osmocom/msc/common_cs.h b/include/osmocom/msc/common_cs.h
index 6dc956f80..273a8fe98 100644
--- a/include/osmocom/msc/common_cs.h
+++ b/include/osmocom/msc/common_cs.h
@@ -17,10 +17,7 @@ struct gsm_encr {
uint8_t key[MAX_A5_KEY_LEN];
};
-struct gsm_network *gsm_network_init(void *ctx,
- uint16_t country_code,
- uint16_t network_code,
- mncc_recv_cb_t mncc_recv);
+struct gsm_network *gsm_network_init(void *ctx, mncc_recv_cb_t mncc_recv);
int common_cs_vty_init(struct gsm_network *network,
int (* config_write_net )(struct vty *));
diff --git a/src/libcommon-cs/common_cs.c b/src/libcommon-cs/common_cs.c
index a2f5cb38e..c64719bc4 100644
--- a/src/libcommon-cs/common_cs.c
+++ b/src/libcommon-cs/common_cs.c
@@ -37,10 +37,7 @@
* The long term aim should be to have entirely separate structs for libbsc and
* libmsc with some common general items.
*/
-struct gsm_network *gsm_network_init(void *ctx,
- uint16_t country_code,
- uint16_t network_code,
- mncc_recv_cb_t mncc_recv)
+struct gsm_network *gsm_network_init(void *ctx, mncc_recv_cb_t mncc_recv)
{
struct gsm_network *net;
@@ -48,8 +45,8 @@ struct gsm_network *gsm_network_init(void *ctx,
if (!net)
return NULL;
- net->country_code = country_code;
- net->network_code = network_code;
+ net->country_code = 1;
+ net->network_code = 1;
/* Permit a compile-time default of A5/3 and A5/1 */
net->a5_encryption_mask = (1 << 3) | (1 << 1);
diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c
index da2808317..f49c480f6 100644
--- a/src/osmo-msc/msc_main.c
+++ b/src/osmo-msc/msc_main.c
@@ -202,7 +202,7 @@ static void handle_options(int argc, char **argv)
struct gsm_network *msc_network_alloc(void *ctx,
mncc_recv_cb_t mncc_recv)
{
- struct gsm_network *net = gsm_network_init(ctx, 1, 1, mncc_recv);
+ struct gsm_network *net = gsm_network_init(ctx, mncc_recv);
if (!net)
return NULL;
diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c
index f51428618..362f32d80 100644
--- a/tests/msc_vlr/msc_vlr_tests.c
+++ b/tests/msc_vlr/msc_vlr_tests.c
@@ -845,7 +845,7 @@ static void run_tests(int nr, const char *imsi)
struct gsm_network *test_net(void *ctx)
{
- struct gsm_network *net = gsm_network_init(ctx, 1, 1, mncc_recv);
+ struct gsm_network *net = gsm_network_init(ctx, mncc_recv);
net->gsup_server_addr_str = talloc_strdup(net, "no_gsup_server");
net->gsup_server_port = 0;