diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2013-01-09 15:44:16 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2014-10-23 21:29:06 +0200 |
| commit | c7fc2cdd2a2b105f51ca86e974e1096f0a8d4202 (patch) | |
| tree | 83b034fd9beb5399e1ec6a766fe2b2fd499bab6d /openbsc/src/libcommon | |
| parent | f9ffd1fa1811914ce6b19f1d17e7a908e550d358 (diff) | |
HACK: Allow each BTS to have a different MCC/MNC for testing purposeszecke/hacks/multiple-mnc-mcc2
Diffstat (limited to 'openbsc/src/libcommon')
| -rw-r--r-- | openbsc/src/libcommon/gsm_data.c | 9 | ||||
| -rw-r--r-- | openbsc/src/libcommon/gsm_data_shared.c | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/openbsc/src/libcommon/gsm_data.c b/openbsc/src/libcommon/gsm_data.c index 51444e7f5..b8e962995 100644 --- a/openbsc/src/libcommon/gsm_data.c +++ b/openbsc/src/libcommon/gsm_data.c @@ -70,8 +70,7 @@ int gsm_bts_model_register(struct gsm_bts_model *model) return 0; } -struct gsm_network *gsm_network_init(uint16_t country_code, uint16_t network_code, - int (*mncc_recv)(struct gsm_network *, struct msgb *)) +struct gsm_network *gsm_network_init(int (*mncc_recv)(struct gsm_network *, struct msgb *)) { struct gsm_network *net; @@ -90,8 +89,6 @@ struct gsm_network *gsm_network_init(uint16_t country_code, uint16_t network_cod net->bsc_data->network = net; INIT_LLIST_HEAD(&net->bsc_data->mscs); - net->country_code = country_code; - net->network_code = network_code; net->num_bts = 0; net->reject_cause = GSM48_REJECT_ROAMING_NOT_ALLOWED; net->T3101 = GSM_T3101_DEFAULT; @@ -404,8 +401,8 @@ struct gsm_bts *gsm_bts_alloc_register(struct gsm_network *net, enum gsm_bts_typ void gprs_ra_id_by_bts(struct gprs_ra_id *raid, struct gsm_bts *bts) { - raid->mcc = bts->network->country_code; - raid->mnc = bts->network->network_code; + raid->mcc = bts->country_code; + raid->mnc = bts->network_code; raid->lac = bts->location_area_code; raid->rac = bts->gprs.rac; } diff --git a/openbsc/src/libcommon/gsm_data_shared.c b/openbsc/src/libcommon/gsm_data_shared.c index 8d5d0f85d..97f4c5fb4 100644 --- a/openbsc/src/libcommon/gsm_data_shared.c +++ b/openbsc/src/libcommon/gsm_data_shared.c @@ -276,6 +276,12 @@ struct gsm_bts *gsm_bts_alloc(void *ctx) bts->rach_ldavg_slots = -1; bts->paging.free_chans_need = -1; + /* hacks */ + bts->network_code = 1; + bts->country_code = 1; + bts->name_long = talloc_strdup(bts, "OpenBSC"); + bts->name_short = talloc_strdup(bts, "OpenBSC"); + return bts; } |