cellular-infrastructure
/
osmo-bsc
mirror of https://gerrit.osmocom.org/osmo-bsc
9
0
Fork 0
Code Issues Releases Wiki Activity

bsc: Rename core_ncc to core_mnc 

Struct osmo_msc_data contains int core_ncc, which is actually the
MNC part of the PLMN, not to be confused with the Network Colour
Code.

The following patch renames this field for clarity and consistency
with the standards.
This commit is contained in:
Holger Hans Peter Freyther 2015-07-13 11:06:10 +02:00
parent 14a434b9d6
commit 1e365477ee
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openbsc/include/openbsc/osmo_msc_data.h
View File

@ -68,7 +68,7 @@ struct osmo_msc_data {
struct osmo_timer_list pong_timer;
int advanced_ping;
struct bsc_msc_connection *msc_con;
int core_ncc;
int core_mnc;
int core_mcc;
int core_lac;
int core_ci;

4
openbsc/src/osmo-bsc/osmo_bsc_api.c
View File

@ -53,8 +53,8 @@ static int complete_layer3(struct gsm_subscriber_connection *conn,
static uint16_t get_network_code_for_msc(struct osmo_msc_data *msc)
{
if (msc->core_ncc != -1)
return msc->core_ncc;
if (msc->core_mnc != -1)
return msc->core_mnc;
return msc->network->network_code;
}

2
openbsc/src/osmo-bsc/osmo_bsc_filter.c
View File

@ -313,7 +313,7 @@ static int bsc_patch_mm_info(struct gsm_subscriber_connection *conn,
static int has_core_identity(struct osmo_msc_data *msc)
{
if (msc->core_ncc != -1)
if (msc->core_mnc != -1)
return 1;
if (msc->core_mcc != -1)
return 1;

2
openbsc/src/osmo-bsc/osmo_bsc_msc.c
View File

@ -572,7 +572,7 @@ struct osmo_msc_data *osmo_msc_data_alloc(struct gsm_network *net, int nr)
INIT_LLIST_HEAD(&msc_data->dests);
msc_data->ping_timeout = 20;
msc_data->pong_timeout = 5;
msc_data->core_ncc = -1;
msc_data->core_mnc = -1;
msc_data->core_mcc = -1;
msc_data->core_ci = -1;
msc_data->core_lac = -1;

8
openbsc/src/osmo-bsc/osmo_bsc_vty.c
View File

@ -110,9 +110,9 @@ static void write_msc(struct vty *vty, struct osmo_msc_data *msc)
if (msc->bsc_key_present)
vty_out(vty, " auth-key %s%s",
osmo_hexdump(msc->bsc_key, sizeof(msc->bsc_key)), VTY_NEWLINE);
if (msc->core_ncc != -1)
if (msc->core_mnc != -1)
vty_out(vty, " core-mobile-network-code %d%s",
msc->core_ncc, VTY_NEWLINE);
msc->core_mnc, VTY_NEWLINE);
if (msc->core_mcc != -1)
vty_out(vty, " core-mobile-country-code %d%s",
msc->core_mcc, VTY_NEWLINE);
@ -261,10 +261,10 @@ DEFUN(cfg_net_no_bsc_key, cfg_net_bsc_no_key_cmd,
DEFUN(cfg_net_bsc_ncc,
cfg_net_bsc_ncc_cmd,
"core-mobile-network-code <1-999>",
"Use this network code for the core network\n" "NCC value\n")
"Use this network code for the core network\n" "MNC value\n")
{
struct osmo_msc_data *data = osmo_msc_data(vty);
data->core_ncc = atoi(argv[0]);
data->core_mnc = atoi(argv[0]);
return CMD_SUCCESS;
}