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

libmsc/msc_net_init.c: pass pointer to gsm_network directly 

Change-Id: I122d2880b356997c60df5f0cf4f5ecb3abb2e672
This commit is contained in:
Vadim Yanitskiy 2019-06-15 17:30:23 +07:00
parent 95b040c45a
commit 805eca2b3e
3 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/libmsc/gsm_04_11_gsup.c
View File

@ -117,19 +117,13 @@ int gsm411_gsup_mo_ready_for_sm_req(struct gsm_trans *trans, uint8_t sm_rp_mr)
}
/* Triggers either RP-ACK or RP-ERROR on response from SMSC */
static int gsm411_gsup_mo_handler(struct vlr_subscr *vsub,
const struct osmo_gsup_message *gsup_msg)
static int gsm411_gsup_mo_handler(struct gsm_network *net, struct vlr_subscr *vsub,
const struct osmo_gsup_message *gsup_msg)
{
struct vlr_instance *vlr;
struct gsm_network *net;
struct gsm_trans *trans;
const char *msg_name;
bool msg_is_err;
/* Obtain required pointers */
vlr = vsub->vlr;
net = (struct gsm_network *) vlr->user_ctx;
/* Associate logging messages with this subscriber */
log_set_context(LOG_CTX_VLR_SUBSCR, vsub);
@ -230,16 +224,12 @@ int gsm411_gsup_mt_fwd_sm_err(struct gsm_trans *trans,
}
/* Handles MT SMS (and triggers Paging Request if required) */
static int gsm411_gsup_mt_handler(struct vlr_subscr *vsub,
const struct osmo_gsup_message *gsup_msg)
static int gsm411_gsup_mt_handler(struct gsm_network *net, struct vlr_subscr *vsub,
const struct osmo_gsup_message *gsup_msg)
{
struct gsm_network *net;
bool sm_rp_mmts_ind;
int rc;
/* Obtain required pointers */
net = (struct gsm_network *) vsub->vlr->user_ctx;
/* Associate logging messages with this subscriber */
log_set_context(LOG_CTX_VLR_SUBSCR, vsub);
@ -296,8 +286,8 @@ msg_error:
int gsm411_gsup_rx(struct gsup_client_mux *gcm, void *data, const struct osmo_gsup_message *gsup_msg)
{
struct vlr_instance *vlr = data;
struct vlr_subscr *vsub = vlr_subscr_find_by_imsi(vlr, gsup_msg->imsi, __func__);
struct gsm_network *net = (struct gsm_network *) data;
struct vlr_subscr *vsub = vlr_subscr_find_by_imsi(net->vlr, gsup_msg->imsi, __func__);
if (!vsub) {
LOGP(DLSMS, LOGL_ERROR, "Rx %s for unknown subscriber, rejecting\n",
@ -313,12 +303,12 @@ int gsm411_gsup_rx(struct gsup_client_mux *gcm, void *data, const struct osmo_gs
case OSMO_GSUP_MSGT_READY_FOR_SM_ERROR:
case OSMO_GSUP_MSGT_READY_FOR_SM_RESULT:
DEBUGP(DMSC, "Routed to GSM 04.11 MO handler\n");
return gsm411_gsup_mo_handler(vsub, gsup_msg);
return gsm411_gsup_mo_handler(net, vsub, gsup_msg);
/* GSM 04.11 code implementing MT SMS */
case OSMO_GSUP_MSGT_MT_FORWARD_SM_REQUEST:
DEBUGP(DMSC, "Routed to GSM 04.11 MT handler\n");
return gsm411_gsup_mt_handler(vsub, gsup_msg);
return gsm411_gsup_mt_handler(net, vsub, gsup_msg);
default:
LOGP(DMM, LOGL_ERROR, "No handler found for %s, dropping message...\n",

13
src/libmsc/gsm_09_11.c
View File

@ -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! */

4
src/libmsc/msc_net_init.c
View File

@ -117,8 +117,8 @@ int msc_gsup_client_start(struct gsm_network *net)
.rx_cb = {
/* vlr.c sets up its own cb and data */
/* MSC-A and MSC-B set up their own cb and data */
[OSMO_GSUP_MESSAGE_CLASS_SMS] = { .func = gsm411_gsup_rx, .data = net->vlr },
[OSMO_GSUP_MESSAGE_CLASS_USSD] = { .func = gsm0911_gsup_rx, .data = net->vlr },
[OSMO_GSUP_MESSAGE_CLASS_SMS] = { .func = gsm411_gsup_rx, .data = net },
[OSMO_GSUP_MESSAGE_CLASS_USSD] = { .func = gsm0911_gsup_rx, .data = net },
},
};