diff options
| author | Harald Welte <laforge@gnumonks.org> | 2018-05-26 22:42:29 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2018-05-27 20:17:02 +0200 |
| commit | 68e4be9c845e25f53aea511b1c57340a9da5825c (patch) | |
| tree | cb5117542b57a50449854a37f3bec43b7dcafca4 /src/osmo-bsc/osmo_bsc_msc.c | |
| parent | 1c9b8b19176854ecf4a3d57e9eef6b495361557f (diff) | |
Remove 'struct bsc_msc_connection' + fix IPA-encapsulated CTRL
The bsc_msc_connection dates back to the old pre-libosmo-sigtran
days, and 90% of the field members weren't used at all (even the
new sigtran specific ones!). Let's merge what remains into struct
bsc_msc_data.
As a side effect, the already dysfunctional "dest A.B.C.D" VTY
command has been removed from the MSC node.
There's quite a bit of fall-out in the CTRL interface, which was
the code with strongest ties to bsc_msc_connection. This was
resolved by properly porting CTRL handling over to libosmo-sigtran,
meaning that an IPA/SCCPlite connected MSC can now again send CTRL
GET/SET commands, and can also receive those selective few TRAPs
that old osmo-bsc-sccplite also sent to its MSC[s].
Change-Id: I6b7354f3b23a26bb4eab12213ca3d3b614c8154f
Related: OS#2012
Diffstat (limited to 'src/osmo-bsc/osmo_bsc_msc.c')
| -rw-r--r-- | src/osmo-bsc/osmo_bsc_msc.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c index 10f602a09..e00c9ef81 100644 --- a/src/osmo-bsc/osmo_bsc_msc.c +++ b/src/osmo-bsc/osmo_bsc_msc.c @@ -1,6 +1,6 @@ /* * Handle the connection to the MSC. This include ping/timeout/reconnect - * (C) 2008-2009 by Harald Welte <laforge@gnumonks.org> + * (C) 2008-2018 by Harald Welte <laforge@gnumonks.org> * (C) 2009-2015 by Holger Hans Peter Freyther <zecke@selfish.org> * (C) 2009-2015 by On-Waves * All Rights Reserved @@ -41,19 +41,12 @@ int osmo_bsc_msc_init(struct bsc_msc_data *data) { - data->msc_con = bsc_msc_create(data, &data->dests); - if (!data->msc_con) { - LOGP(DMSC, LOGL_ERROR, "Creating the MSC network connection failed.\n"); - return -1; - } - /* FIXME: This is a leftover from the old architecture that used * sccp-lite with osmocom specific authentication. Since we now * changed to AoIP the connected status and the authentication * status is managed differently. However osmo_bsc_filter.c still * needs the flags to be set to one. See also: OS#3112 */ - data->msc_con->is_connected = 1; - data->msc_con->is_authenticated = 1; + data->is_authenticated = 1; return 0; } @@ -86,7 +79,6 @@ struct bsc_msc_data *osmo_msc_data_alloc(struct gsm_network *net, int nr) /* Init back pointer */ msc_data->network = net; - INIT_LLIST_HEAD(&msc_data->dests); msc_data->core_plmn = (struct osmo_plmn_id){ .mcc = GSM_MCC_MNC_INVALID, .mnc = GSM_MCC_MNC_INVALID, |