commit f7a6329bbd5dd621eccc10a05141b58f3b72ec06
author Neels Hofmeyr <neels@hofmeyr.de> Tue Feb 27 12:37:26 2018 +0100
committer Neels Hofmeyr <neels@hofmeyr.de> Mon Mar 05 05:37:54 2018 +0100
tree ad4e9b671dae8de26a4286a27499aff08dd5fd9c
parent 4d358c00e1b3389291bdb3d5c40d0da8d6cf4d02

cosmetic: bsc_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: Ic16bc0bab3f2d4721e86a1a04f9d9f988d777df2

src/ipaccess/ipaccess-config.c

diff --git a/src/ipaccess/ipaccess-config.c b/src/ipaccess/ipaccess-config.c
index 7e8cafd..a1985b7 100644
--- a/src/ipaccess/ipaccess-config.c
+++ b/src/ipaccess/ipaccess-config.c
@@ -992,7 +992,7 @@
 	}
 	libosmo_abis_init(tall_ctx_config);
 
-	bsc_gsmnet = bsc_network_init(tall_bsc_ctx, 1, 1);
+	bsc_gsmnet = bsc_network_init(tall_bsc_ctx);
 	if (!bsc_gsmnet)
 		exit(1);
 

src/libbsc/bsc_init.c

diff --git a/src/libbsc/bsc_init.c b/src/libbsc/bsc_init.c
index 2fddc80..a2f0504 100644
--- a/src/libbsc/bsc_init.c
+++ b/src/libbsc/bsc_init.c
@@ -547,7 +547,7 @@
 int bsc_network_alloc(void)
 {
 	/* initialize our data structures */
-	bsc_gsmnet = bsc_network_init(tall_bsc_ctx, 1, 1);
+	bsc_gsmnet = bsc_network_init(tall_bsc_ctx);
 	if (!bsc_gsmnet)
 		return -ENOMEM;
 

src/libbsc/net_init.c

diff --git a/src/libbsc/net_init.c b/src/libbsc/net_init.c
index 2f65a52..e44c335 100644
--- a/src/libbsc/net_init.c
+++ b/src/libbsc/net_init.c
@@ -22,6 +22,7 @@
 #include <osmocom/bsc/gsm_04_08_utils.h>
 #include <osmocom/bsc/handover_cfg.h>
 #include <osmocom/bsc/chan_alloc.h>
+#include <osmocom/bsc/common_bsc.h>
 
 /* XXX hard-coded for now */
 #define T3122_CHAN_LOAD_SAMPLE_INTERVAL 1 /* in seconds */
@@ -38,9 +39,7 @@
 	osmo_timer_schedule(&net->t3122_chan_load_timer, T3122_CHAN_LOAD_SAMPLE_INTERVAL, 0);
 }
 
-struct gsm_network *bsc_network_init(void *ctx,
-				     uint16_t country_code,
-				     uint16_t network_code)
+struct gsm_network *bsc_network_init(void *ctx)
 {
 	struct gsm_network *net;
 
@@ -48,8 +47,9 @@
 	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);
 

src/utils/bs11_config.c

diff --git a/src/utils/bs11_config.c b/src/utils/bs11_config.c
index 8e947eb..bc0f488 100644
--- a/src/utils/bs11_config.c
+++ b/src/utils/bs11_config.c
@@ -915,7 +915,7 @@
 	handle_options(argc, argv);
 	bts_model_bs11_init();
 
-	gsmnet = bsc_network_init(tall_bs11cfg_ctx, 1, 1);
+	gsmnet = bsc_network_init(tall_bs11cfg_ctx);
 	if (!gsmnet) {
 		fprintf(stderr, "Unable to allocate gsm network\n");
 		exit(1);