diff options
| author | Vadim Yanitskiy <axilirator@gmail.com> | 2019-06-15 17:30:23 +0700 |
|---|---|---|
| committer | Vadim Yanitskiy <axilirator@gmail.com> | 2019-06-17 21:06:43 +0700 |
| commit | 805eca2b3eaaf57cdecca0991e7236b5e5f9edf6 (patch) | |
| tree | 0f2e2a23148aa6bbe899b679897a94268ab7f868 /src/libmsc/gsm_09_11.c | |
| parent | 95b040c45a7f5c0b9ba5c27df6f7bd49ee79307a (diff) | |
libmsc/msc_net_init.c: pass pointer to gsm_network directly
Change-Id: I122d2880b356997c60df5f0cf4f5ecb3abb2e672
Diffstat (limited to 'src/libmsc/gsm_09_11.c')
| -rw-r--r-- | src/libmsc/gsm_09_11.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c index f85c3f662..51cb2fb85 100644 --- a/src/libmsc/gsm_09_11.c +++ b/src/libmsc/gsm_09_11.c @@ -402,14 +402,13 @@ void _gsm911_nc_ss_trans_free(struct gsm_trans *trans) int gsm0911_gsup_rx(struct gsup_client_mux *gcm, void *data, const struct osmo_gsup_message *gsup_msg) { - struct vlr_instance *vlr = data; - struct gsm_network *net; + struct gsm_network *net = (struct gsm_network *) data; struct gsm_trans *trans; struct gsm48_hdr *gh; struct msgb *ss_msg; bool trans_end; struct msc_a *msc_a; - struct vlr_subscr *vsub = vlr_subscr_find_by_imsi(vlr, gsup_msg->imsi, __func__); + struct vlr_subscr *vsub = vlr_subscr_find_by_imsi(net->vlr, gsup_msg->imsi, __func__); if (!vsub) { LOGP(DSS, LOGL_ERROR, "Rx %s for unknown subscriber, rejecting\n", @@ -421,14 +420,6 @@ int gsm0911_gsup_rx(struct gsup_client_mux *gcm, void *data, const struct osmo_g /* Associate logging messages with this subscriber */ log_set_context(LOG_CTX_VLR_SUBSCR, vsub); - /* Obtain pointer to vlr_instance */ - vlr = vsub->vlr; - OSMO_ASSERT(vlr); - - /* Obtain pointer to gsm_network */ - net = (struct gsm_network *) vlr->user_ctx; - OSMO_ASSERT(net); - /* Handle errors */ if (OSMO_GSUP_IS_MSGT_ERROR(gsup_msg->message_type)) { /* FIXME: handle this error somehow! */ |