diff options
author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2014-03-06 11:10:30 +0100 |
---|---|---|
committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2014-03-06 11:10:30 +0100 |
commit | 1a1463725bb6f3bb8435963eab3685220a2fbcca (patch) | |
tree | c7c5c45419708a154a589401ea939d34ee07caa4 /openbsc/src/osmo-bsc/osmo_bsc_ctrl.c | |
parent | 93de8b259104aa05387e302a4ee6fd6f330bfee7 (diff) | |
parent | 4ecc6877a2a2fd3244979ec4a8d13a2862f5e6a4 (diff) |
Merge branch 'zecke/features/extended-control'
Diffstat (limited to 'openbsc/src/osmo-bsc/osmo_bsc_ctrl.c')
-rw-r--r-- | openbsc/src/osmo-bsc/osmo_bsc_ctrl.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_ctrl.c b/openbsc/src/osmo-bsc/osmo_bsc_ctrl.c index 1d0e2aa01..e32218d0c 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_ctrl.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_ctrl.c @@ -208,7 +208,11 @@ static void generate_location_state_trap(struct gsm_bts *bts, struct bsc_msc_con admin = osmo_bsc_rf_get_adminstate_name(osmo_bsc_rf_get_adminstate_by_bts(bts)); policy = osmo_bsc_rf_get_policy_name(osmo_bsc_rf_get_policy_by_bts(bts)); - cmd->reply = talloc_asprintf_append(cmd->reply, ",%s,%s,%s", oper, admin, policy); + cmd->reply = talloc_asprintf_append(cmd->reply, + ",%s,%s,%s,%d,%d", + oper, admin, policy, + bts->network->country_code, + bts->network->network_code); osmo_bsc_send_trap(cmd, msc_con); talloc_free(cmd); @@ -605,6 +609,9 @@ int bsc_ctrl_cmds_install(struct gsm_network *net) { int rc; + rc = bsc_base_ctrl_cmds_install(); + if (rc) + goto end; rc = ctrl_cmd_install(CTRL_NODE_BTS, &cmd_bts_rf_state); if (rc) goto end; |