bsc: Add a mobile country code setting for the backbone.
diff --git a/openbsc/src/bsc/osmo_bsc_filter.c b/openbsc/src/bsc/osmo_bsc_filter.c
index 2503cfb..24710fa 100644
--- a/openbsc/src/bsc/osmo_bsc_filter.c
+++ b/openbsc/src/bsc/osmo_bsc_filter.c
@@ -101,7 +101,8 @@
net = conn->bts->network;
if (mtype == GSM48_MT_MM_LOC_UPD_ACCEPT) {
- if (net->msc_data->core_ncc != -1) {
+ if (net->msc_data->core_ncc != -1 ||
+ net->msc_data->core_mcc != -1) {
if (msgb_l3len(msg) >= sizeof(*gh) + sizeof(*lai)) {
lai = (struct gsm48_loc_area_id *) &gh->data[0];
gsm48_generate_lai(lai, net->country_code,
diff --git a/openbsc/src/bsc/osmo_bsc_vty.c b/openbsc/src/bsc/osmo_bsc_vty.c
index ba6bc1e..a76a7e1 100644
--- a/openbsc/src/bsc/osmo_bsc_vty.c
+++ b/openbsc/src/bsc/osmo_bsc_vty.c
@@ -60,6 +60,9 @@
if (data->core_ncc != -1)
vty_out(vty, " core-mobile-network-code %d%s",
data->core_ncc, VTY_NEWLINE);
+ if (data->core_mcc != -1)
+ vty_out(vty, " core-mobile-country-code %d%s",
+ data->core_mcc, VTY_NEWLINE);
vty_out(vty, " ip.access rtp-payload %d%s",
data->rtp_payload, VTY_NEWLINE);
vty_out(vty, " ip.access rtp-base %d%s", data->rtp_base, VTY_NEWLINE);
@@ -112,6 +115,16 @@
return CMD_SUCCESS;
}
+DEFUN(cfg_net_bsc_mcc,
+ cfg_net_bsc_mcc_cmd,
+ "core-mobile-country-code <0-255>",
+ "Use this country code for the backbone\n" "MCC value\n")
+{
+ struct osmo_msc_data *data = osmo_msc_data(vty);
+ data->core_mcc = atoi(argv[0]);
+ return CMD_SUCCESS;
+}
+
DEFUN(cfg_net_bsc_rtp_payload,
cfg_net_bsc_rtp_payload_cmd,
"ip.access rtp-payload <0-255>",
@@ -269,6 +282,7 @@
install_default(MSC_NODE);
install_element(MSC_NODE, &cfg_net_bsc_token_cmd);
install_element(MSC_NODE, &cfg_net_bsc_ncc_cmd);
+ install_element(MSC_NODE, &cfg_net_bsc_mcc_cmd);
install_element(MSC_NODE, &cfg_net_bsc_rtp_payload_cmd);
install_element(MSC_NODE, &cfg_net_bsc_rtp_base_cmd);
install_element(MSC_NODE, &cfg_net_bsc_codec_list_cmd);
diff --git a/openbsc/src/gsm_data.c b/openbsc/src/gsm_data.c
index dc8024a..a4a5b20 100644
--- a/openbsc/src/gsm_data.c
+++ b/openbsc/src/gsm_data.c
@@ -318,6 +318,7 @@
net->msc_data->ping_timeout = 20;
net->msc_data->pong_timeout = 5;
net->msc_data->core_ncc = -1;
+ net->msc_data->core_mcc = -1;
net->msc_data->rtp_payload = 126;
net->msc_data->rtp_base = 4000;