SMS-over-GSUP: move net->sms_over_gsup check to gsm411_gsup_rx()

Change-Id: I89988b7148b164af304ecae1f53b74f322fdc7bd
changes/71/17871/2
Vadim Yanitskiy 3 years ago
parent 46b0f80e69
commit 531d3a4b11
  1. 24
      src/libmsc/gsm_04_11_gsup.c

@ -149,14 +149,6 @@ static int gsm411_gsup_mo_handler(struct gsm_network *net, struct vlr_subscr *vs
OSMO_ASSERT(0);
}
/* Make sure that 'SMS over GSUP' is expected */
if (!net->sms_over_gsup) {
/* TODO: notify sender about that? */
LOGP(DLSMS, LOGL_NOTICE, "Unexpected MO SMS over GSUP "
"(sms-over-gsup is not enabled), ignoring message...\n");
return -EIO;
}
/* Verify GSUP message */
if (!gsup_msg->sm_rp_mr)
goto msg_error;
@ -241,14 +233,6 @@ static int gsm411_gsup_mt_handler(struct gsm_network *net, struct vlr_subscr *vs
LOGP(DLSMS, LOGL_DEBUG, "RX MT-forwardSM-Req\n");
/* Make sure that 'SMS over GSUP' is expected */
if (!net->sms_over_gsup) {
LOGP(DLSMS, LOGL_NOTICE, "Unexpected MT SMS over GSUP "
"(sms-over-gsup is not enabled), ignoring message...\n");
/* TODO: notify sender about that? */
return -EIO;
}
/**
* Verify GSUP message
*
@ -296,6 +280,14 @@ int gsm411_gsup_rx(struct gsup_client_mux *gcm, void *data, const struct osmo_gs
struct vlr_subscr *vsub;
int rc;
/* Make sure that 'SMS over GSUP' is expected */
if (!net->sms_over_gsup) {
/* TODO: notify sender about that? */
LOGP(DLSMS, LOGL_NOTICE, "Unexpected MO/MT SMS over GSUP "
"(sms-over-gsup is not enabled), ignoring message...\n");
return -EIO;
}
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",

Loading…
Cancel
Save