<p>Vadim Yanitskiy <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11919">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">libmsc/gsm_04_11.c: forward MO SMS messages over GSUP<br><br>Change-Id: I7d651fde3d608d02f275a74043dc42262aabb1b8<br>Depends-on: (core) Ic37f3b2114b8095cfce22977e67133b9103942e3<br>Depends-on: (core) Ibe325c64ae2d6c626b232533bb4cbc65fc2b5d71<br>Depends-on: (OsmoHLR) I0589ff27933e9bca2bcf93b8259004935778db8f<br>Related Change-Id: (TTCN) I7abc95b8e416f7308d54e11be11c08586d18e6c5<br>Related Change-Id: (TTCN) Id14bbd8bd51558cdacefea0fe042769cd69ed5c8<br>Related: OS#3587<br>---<br>M include/osmocom/msc/Makefile.am<br>M include/osmocom/msc/gsm_04_11.h<br>A include/osmocom/msc/gsm_04_11_gsup.h<br>M src/libmsc/Makefile.am<br>M src/libmsc/gsm_04_08.c<br>M src/libmsc/gsm_04_11.c<br>A src/libmsc/gsm_04_11_gsup.c<br>7 files changed, 249 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/Makefile.am b/include/osmocom/msc/Makefile.am</span><br><span>index d98bc9c..13ac166 100644</span><br><span>--- a/include/osmocom/msc/Makefile.am</span><br><span>+++ b/include/osmocom/msc/Makefile.am</span><br><span>@@ -5,6 +5,7 @@</span><br><span> debug.h \</span><br><span> gsm_04_08.h \</span><br><span> gsm_04_11.h \</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_04_11_gsup.h \</span><br><span> gsm_04_14.h \</span><br><span> gsm_04_80.h \</span><br><span> gsm_09_11.h \</span><br><span>diff --git a/include/osmocom/msc/gsm_04_11.h b/include/osmocom/msc/gsm_04_11.h</span><br><span>index 95098c9..b739918 100644</span><br><span>--- a/include/osmocom/msc/gsm_04_11.h</span><br><span>+++ b/include/osmocom/msc/gsm_04_11.h</span><br><span>@@ -2,6 +2,7 @@</span><br><span> #define _GSM_04_11_H</span><br><span> </span><br><span> #include <osmocom/gsm/protocol/gsm_04_11.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/msc/gsm_04_11_gsup.h></span><br><span> </span><br><span> struct vlr_subscr;</span><br><span> struct ran_conn;</span><br><span>diff --git a/include/osmocom/msc/gsm_04_11_gsup.h b/include/osmocom/msc/gsm_04_11_gsup.h</span><br><span>new file mode 100644</span><br><span>index 0000000..94ff8f6</span><br><span>--- /dev/null</span><br><span>+++ b/include/osmocom/msc/gsm_04_11_gsup.h</span><br><span>@@ -0,0 +1,14 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#pragma once</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdint.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_gsup_message;</span><br><span style="color: hsl(120, 100%, 40%);">+struct vlr_subscr;</span><br><span style="color: hsl(120, 100%, 40%);">+struct gsm_trans;</span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int gsm411_gsup_mo_ready_for_sm_req(struct gsm_trans *trans, uint8_t sm_rp_mr);</span><br><span style="color: hsl(120, 100%, 40%);">+int gsm411_gsup_mo_fwd_sm_req(struct gsm_trans *trans, struct msgb *msg,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t sm_rp_mr, uint8_t *sm_rp_da, uint8_t sm_rp_da_len);</span><br><span style="color: hsl(120, 100%, 40%);">+int gsm411_gsup_mo_handler(struct vlr_subscr *vsub,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_message *gsup_msg);</span><br><span>diff --git a/src/libmsc/Makefile.am b/src/libmsc/Makefile.am</span><br><span>index 9183ff9..72da747 100644</span><br><span>--- a/src/libmsc/Makefile.am</span><br><span>+++ b/src/libmsc/Makefile.am</span><br><span>@@ -35,6 +35,7 @@</span><br><span> gsm_04_08.c \</span><br><span> gsm_04_08_cc.c \</span><br><span> gsm_04_11.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_04_11_gsup.c \</span><br><span> gsm_04_14.c \</span><br><span> gsm_04_80.c \</span><br><span> gsm_09_11.c \</span><br><span>diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c</span><br><span>index dc0476b..b042baf 100644</span><br><span>--- a/src/libmsc/gsm_04_08.c</span><br><span>+++ b/src/libmsc/gsm_04_08.c</span><br><span>@@ -1791,6 +1791,14 @@</span><br><span> DEBUGP(DMSC, "Routed to GSM 09.11 SS/USSD handler\n");</span><br><span> return gsm0911_gsup_handler(vsub, gsup_msg);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* GSM 04.11 code implementing MO SMS */</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR:</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSUP_MSGT_MO_FORWARD_SM_RESULT:</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSUP_MSGT_READY_FOR_SM_ERROR:</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSUP_MSGT_READY_FOR_SM_RESULT:</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DMSC, "Routed to GSM 04.11 MO handler\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return gsm411_gsup_mo_handler(vsub, gsup_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> default:</span><br><span> LOGP(DMM, LOGL_ERROR, "No handler found for %s, dropping message...\n",</span><br><span> osmo_gsup_message_type_name(gsup_msg->message_type));</span><br><span>diff --git a/src/libmsc/gsm_04_11.c b/src/libmsc/gsm_04_11.c</span><br><span>index 62f3bba..788a0a9 100644</span><br><span>--- a/src/libmsc/gsm_04_11.c</span><br><span>+++ b/src/libmsc/gsm_04_11.c</span><br><span>@@ -664,10 +664,20 @@</span><br><span> </span><br><span> /* Receive a 04.11 TPDU inside RP-DATA / user data */</span><br><span> static int gsm411_rx_rp_ud(struct msgb *msg, struct gsm_trans *trans,</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm411_rp_hdr *rph)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm411_rp_hdr *rph,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *dst, uint8_t dst_len)</span><br><span> {</span><br><span> int rc = 0;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (trans->net->sms_over_gsup) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* RP-ACK or RP-ERROR is triggered as soon as we get the response */</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gsm411_gsup_mo_fwd_sm_req(trans, msg, rph->msg_ref, dst, dst_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc) /* GSUP message sending error */</span><br><span style="color: hsl(120, 100%, 40%);">+ return gsm411_send_rp_error(trans, rph->msg_ref, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> rc = gsm340_rx_tpdu(trans, msg, rph->msg_ref);</span><br><span> if (rc == 0)</span><br><span> return gsm411_send_rp_ack(trans, rph->msg_ref);</span><br><span>@@ -715,7 +725,7 @@</span><br><span> </span><br><span> DEBUGP(DLSMS, "DST(%u,%s)\n", dst_len, osmo_hexdump(dst, dst_len));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return gsm411_rx_rp_ud(msg, trans, rph);</span><br><span style="color: hsl(120, 100%, 40%);">+ return gsm411_rx_rp_ud(msg, trans, rph, dst, dst_len);</span><br><span> }</span><br><span> </span><br><span> static struct gsm_sms *sms_report_alloc(struct gsm_sms *sms)</span><br><span>@@ -852,6 +862,15 @@</span><br><span> {</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (trans->net->sms_over_gsup) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* RP-ACK or RP-ERROR is triggered as soon as we get the response */</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gsm411_gsup_mo_ready_for_sm_req(trans, rph->msg_ref);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc) /* GSUP message sending error */</span><br><span style="color: hsl(120, 100%, 40%);">+ return gsm411_send_rp_error(trans, rph->msg_ref, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> rc = gsm411_send_rp_ack(trans, rph->msg_ref);</span><br><span> </span><br><span> /* MS tells us that it has memory for more SMS, we need</span><br><span>diff --git a/src/libmsc/gsm_04_11_gsup.c b/src/libmsc/gsm_04_11_gsup.c</span><br><span>new file mode 100644</span><br><span>index 0000000..5c01072</span><br><span>--- /dev/null</span><br><span>+++ b/src/libmsc/gsm_04_11_gsup.c</span><br><span>@@ -0,0 +1,203 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2018 by Vadim Yanitskiy <axilirator@gmail.com></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * All Rights Reserved</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU Affero General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; either version 3 of the License, or</span><br><span style="color: hsl(120, 100%, 40%);">+ * (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU Affero General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * You should have received a copy of the GNU Affero General Public License</span><br><span style="color: hsl(120, 100%, 40%);">+ * along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdio.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <errno.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/linuxlist.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/msgb.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsupclient/gsup_client.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/msc/gsm_subscriber.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/msc/transaction.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/msc/msc_common.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/msc/debug.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/msc/vlr.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Common helper for preparing to be encoded GSUP message */</span><br><span style="color: hsl(120, 100%, 40%);">+static void gsup_sm_msg_init(struct osmo_gsup_message *gsup_msg,</span><br><span style="color: hsl(120, 100%, 40%);">+ enum osmo_gsup_message_type msg_type, const char *imsi,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *sm_rp_mr)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Init a mew GSUP message */</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(gsup_msg, 0x00, sizeof(*gsup_msg));</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_msg->message_type = msg_type;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* SM-RP-MR (Message Reference) */</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_msg->sm_rp_mr = sm_rp_mr;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Fill in subscriber's IMSI */</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRLCPY_ARRAY(gsup_msg->imsi, imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int gsm411_gsup_mo_fwd_sm_req(struct gsm_trans *trans, struct msgb *msg,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t sm_rp_mr, uint8_t *sm_rp_da, uint8_t sm_rp_da_len)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t bcd_buf[GSM48_MI_SIZE] = { 0 };</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_message gsup_msg;</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t bcd_len;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Associate logging messages with this subscriber */</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_VLR_SUBSCR, trans->vsub);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLSMS, LOGL_DEBUG, "TX GSUP MO-forwardSM-Req\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Assign SM-RP-MR to transaction state */</span><br><span style="color: hsl(120, 100%, 40%);">+ trans->sms.sm_rp_mr = sm_rp_mr;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Encode subscriber's MSISDN */</span><br><span style="color: hsl(120, 100%, 40%);">+ bcd_len = gsm48_encode_bcd_number(bcd_buf, sizeof(bcd_buf),</span><br><span style="color: hsl(120, 100%, 40%);">+ 0, trans->vsub->msisdn);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bcd_len <= 0 || bcd_len > sizeof(bcd_buf)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLSMS, LOGL_ERROR, "Failed to encode subscriber's MSISDN\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Initialize a new GSUP message */</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_sm_msg_init(&gsup_msg, OSMO_GSUP_MSGT_MO_FORWARD_SM_REQUEST,</span><br><span style="color: hsl(120, 100%, 40%);">+ trans->vsub->imsi, &sm_rp_mr);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* According to 12.2.3, the MSISDN from VLR is inserted here */</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_msg.sm_rp_oa_type = OSMO_GSUP_SMS_SM_RP_ODA_MSISDN;</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_msg.sm_rp_oa_len = bcd_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_msg.sm_rp_oa = bcd_buf;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* SM-RP-DA should (already) contain SMSC address */</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_msg.sm_rp_da_type = OSMO_GSUP_SMS_SM_RP_ODA_SMSC_ADDR;</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_msg.sm_rp_da_len = sm_rp_da_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_msg.sm_rp_da = sm_rp_da;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* SM-RP-UI (TPDU) is pointed by msgb->l4h */</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_msg.sm_rp_ui_len = msgb_l4len(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_msg.sm_rp_ui = (uint8_t *) msgb_sms(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_gsup_client_enc_send(trans->net->vlr->gsup_client, &gsup_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int gsm411_gsup_mo_ready_for_sm_req(struct gsm_trans *trans, uint8_t sm_rp_mr)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_message gsup_msg;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Associate logging messages with this subscriber */</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_VLR_SUBSCR, trans->vsub);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLSMS, LOGL_DEBUG, "TX GSUP READY-FOR-SM Req\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Assign SM-RP-MR to transaction state */</span><br><span style="color: hsl(120, 100%, 40%);">+ trans->sms.sm_rp_mr = sm_rp_mr;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Initialize a new GSUP message */</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_sm_msg_init(&gsup_msg, OSMO_GSUP_MSGT_READY_FOR_SM_REQUEST,</span><br><span style="color: hsl(120, 100%, 40%);">+ trans->vsub->imsi, &sm_rp_mr);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Indicate SMMA as the Alert Reason */</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_msg.sm_alert_rsn = OSMO_GSUP_SMS_SM_ALERT_RSN_MEM_AVAIL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return osmo_gsup_client_enc_send(trans->net->vlr->gsup_client, &gsup_msg);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* Triggers either RP-ACK or RP-ERROR on response from SMSC */</span><br><span style="color: hsl(120, 100%, 40%);">+int gsm411_gsup_mo_handler(struct vlr_subscr *vsub,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_gsup_message *gsup_msg)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct vlr_instance *vlr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_network *net;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_trans *trans;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ran_conn *conn;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *msg_name;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool msg_is_err;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Obtain required pointers */</span><br><span style="color: hsl(120, 100%, 40%);">+ vlr = vsub->vlr;</span><br><span style="color: hsl(120, 100%, 40%);">+ net = (struct gsm_network *) vlr->user_ctx;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Associate logging messages with this subscriber */</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_context(LOG_CTX_VLR_SUBSCR, vsub);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Determine the message type and name */</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_is_err = OSMO_GSUP_IS_MSGT_ERROR(gsup_msg->message_type);</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (gsup_msg->message_type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR:</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSUP_MSGT_MO_FORWARD_SM_RESULT:</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_name = "MO-forwardSM";</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSUP_MSGT_READY_FOR_SM_ERROR:</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSUP_MSGT_READY_FOR_SM_RESULT:</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_name = "MO-ReadyForSM";</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Shall not happen */</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLSMS, LOGL_DEBUG, "RX %s-%s\n", msg_name,</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_is_err ? "Err" : "Res");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Make sure that 'SMS over GSUP' is expected */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!net->sms_over_gsup) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: notify sender about that? */</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLSMS, LOGL_NOTICE, "Unexpected MO SMS over GSUP, "</span><br><span style="color: hsl(120, 100%, 40%);">+ "ignoring message...\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EIO;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Verify GSUP message */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!gsup_msg->sm_rp_mr)</span><br><span style="color: hsl(120, 100%, 40%);">+ goto msg_error;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msg_is_err && !gsup_msg->sm_rp_cause)</span><br><span style="color: hsl(120, 100%, 40%);">+ goto msg_error;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Attempt to find a DTAP-connection */</span><br><span style="color: hsl(120, 100%, 40%);">+ conn = connection_for_subscr(vsub);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!conn) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: should we establish it then? */</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLSMS, LOGL_NOTICE, "No connection found for %s, "</span><br><span style="color: hsl(120, 100%, 40%);">+ "ignoring %s-%s message...\n", vlr_subscr_name(vsub),</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_name, msg_is_err ? "Err" : "Res");</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EIO; /* TODO: notify sender about that? */</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Attempt to find DTAP-transaction */</span><br><span style="color: hsl(120, 100%, 40%);">+ trans = trans_find_by_sm_rp_mr(conn, *(gsup_msg->sm_rp_mr));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!trans) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLSMS, LOGL_NOTICE, "No transaction found for %s, "</span><br><span style="color: hsl(120, 100%, 40%);">+ "ignoring %s-%s message...\n", vlr_subscr_name(vsub),</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_name, msg_is_err ? "Err" : "Res");</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EIO; /* TODO: notify sender about that? */</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Send either RP-ERROR, or RP-ACK */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msg_is_err) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: handle optional SM-RP-UI payload (requires API change) */</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm411_send_rp_error(trans, *(gsup_msg->sm_rp_mr),</span><br><span style="color: hsl(120, 100%, 40%);">+ *(gsup_msg->sm_rp_cause));</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm411_send_rp_ack(trans, *(gsup_msg->sm_rp_mr));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+msg_error:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: notify sender about that? */</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLSMS, LOGL_NOTICE, "RX malformed %s-%s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ msg_name, msg_is_err ? "Err" : "Res");</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11919">change 11919</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/11919"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I7d651fde3d608d02f275a74043dc42262aabb1b8 </div>
<div style="display:none"> Gerrit-Change-Number: 11919 </div>
<div style="display:none"> Gerrit-PatchSet: 11 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-CC: Stefan Sperling <stsp@stsp.name> </div>