<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11751">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
Stefan Sperling: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">GSUP/SMS: introduce READY-FOR-SM message<br><br>According to 3GPP TS 29.002, section 12.4, MAP-READY-FOR-SM is<br>used between the MSC and VLR as well as between the VLR and the<br>HLR to indicate that a subscriber has memory available for SMS.<br><br>This change replicates this service in GSUP as READY_FOR_SM_*.<br>The only mandatory IE for this service (excluding Invoke ID) is<br>'Alert Reason' that is replicated by OSMO_GSUP_SM_ALERT_RSN_IE.<br><br>Change-Id: Ic37f3b2114b8095cfce22977e67133b9103942e3<br>Related Change-Id: (docs) I549b6c8840a1e86caac09e77fb8bc5042d939e62<br>Related Change-Id: (TTCN) If2256607527ecfcb10285583332fb8b0515d7c78<br>Related: OS#3587<br>---<br>M include/osmocom/gsm/gsup.h<br>M include/osmocom/gsm/gsup_sms.h<br>M src/gsm/gsup.c<br>M tests/gsup/gsup_test.c<br>M tests/gsup/gsup_test.err<br>M tests/gsup/gsup_test.ok<br>6 files changed, 46 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h</span><br><span>index 192b877..51871e4 100644</span><br><span>--- a/include/osmocom/gsm/gsup.h</span><br><span>+++ b/include/osmocom/gsm/gsup.h</span><br><span>@@ -97,6 +97,7 @@</span><br><span> OSMO_GSUP_SM_RP_UI_IE = 0x43,</span><br><span> OSMO_GSUP_SM_RP_CAUSE_IE = 0x44,</span><br><span> OSMO_GSUP_SM_RP_MMS_IE = 0x45,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_GSUP_SM_ALERT_RSN_IE = 0x46,</span><br><span> };</span><br><span> </span><br><span> /*! GSUP message type */</span><br><span>@@ -138,6 +139,10 @@</span><br><span> OSMO_GSUP_MSGT_MT_FORWARD_SM_REQUEST = 0b00101000,</span><br><span> OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR = 0b00101001,</span><br><span> OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT = 0b00101010,</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_GSUP_MSGT_READY_FOR_SM_REQUEST = 0b00101100,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_GSUP_MSGT_READY_FOR_SM_ERROR = 0b00101101,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_GSUP_MSGT_READY_FOR_SM_RESULT = 0b00101110,</span><br><span> };</span><br><span> </span><br><span> #define OSMO_GSUP_IS_MSGT_REQUEST(msgt) (((msgt) & 0b00000011) == 0b00)</span><br><span>@@ -250,6 +255,8 @@</span><br><span> const uint8_t *sm_rp_cause;</span><br><span> /*! SM-RP-MMS (More Messages to Send), section 7.6.8.7 */</span><br><span> const uint8_t *sm_rp_mms;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Alert reason (see 3GPP TS 29.002, 7.6.8.8) */</span><br><span style="color: hsl(120, 100%, 40%);">+ enum osmo_gsup_sms_sm_alert_rsn_t sm_alert_rsn;</span><br><span> };</span><br><span> </span><br><span> int osmo_gsup_decode(const uint8_t *data, size_t data_len,</span><br><span>diff --git a/include/osmocom/gsm/gsup_sms.h b/include/osmocom/gsm/gsup_sms.h</span><br><span>index 521412d..480971e 100644</span><br><span>--- a/include/osmocom/gsm/gsup_sms.h</span><br><span>+++ b/include/osmocom/gsm/gsup_sms.h</span><br><span>@@ -22,6 +22,13 @@</span><br><span> OSMO_GSUP_SMS_SM_RP_ODA_NULL = 0xff,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Alert reason values, see 7.6.8.8 */</span><br><span style="color: hsl(120, 100%, 40%);">+enum osmo_gsup_sms_sm_alert_rsn_t {</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_GSUP_SMS_SM_ALERT_RSN_NONE = 0x00,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_GSUP_SMS_SM_ALERT_RSN_MS_PRESENT = 0x01,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_GSUP_SMS_SM_ALERT_RSN_MEM_AVAIL = 0x02,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct osmo_gsup_message;</span><br><span> struct msgb;</span><br><span> </span><br><span>diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c</span><br><span>index e433997..c1c9992 100644</span><br><span>--- a/src/gsm/gsup.c</span><br><span>+++ b/src/gsm/gsup.c</span><br><span>@@ -75,6 +75,10 @@</span><br><span> OSMO_VALUE_STRING(OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR),</span><br><span> OSMO_VALUE_STRING(OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT),</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(OSMO_GSUP_MSGT_READY_FOR_SM_REQUEST),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(OSMO_GSUP_MSGT_READY_FOR_SM_ERROR),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(OSMO_GSUP_MSGT_READY_FOR_SM_RESULT),</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> { 0, NULL }</span><br><span> };</span><br><span> </span><br><span>@@ -471,6 +475,10 @@</span><br><span> gsup_msg->sm_rp_cause = value;</span><br><span> break;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSUP_SM_ALERT_RSN_IE:</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_msg->sm_alert_rsn = *value;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> default:</span><br><span> LOGP(DLGSUP, LOGL_NOTICE,</span><br><span> "GSUP IE type %d unknown\n", iei);</span><br><span>@@ -699,6 +707,11 @@</span><br><span> sizeof(*gsup_msg->sm_rp_cause), gsup_msg->sm_rp_cause);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if ((u8 = gsup_msg->sm_alert_rsn)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tlv_put(msg, OSMO_GSUP_SM_ALERT_RSN_IE,</span><br><span style="color: hsl(120, 100%, 40%);">+ sizeof(u8), &u8);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span>diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c</span><br><span>index 0936893..b3a8c77 100644</span><br><span>--- a/tests/gsup/gsup_test.c</span><br><span>+++ b/tests/gsup/gsup_test.c</span><br><span>@@ -280,6 +280,15 @@</span><br><span> 0xde, 0xad, 0xbe, 0xef,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ static const uint8_t send_ready_for_sm_ind[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x2c, /* OSMO_GSUP_MSGT_READY_FOR_SM_REQUEST */</span><br><span style="color: hsl(120, 100%, 40%);">+ TEST_IMSI_IE,</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* SM related IEs */</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x46, 0x01, /* Alert reason */</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x02, /* Memory Available (SMMA) */</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static const struct test {</span><br><span> char *name;</span><br><span> const uint8_t *data;</span><br><span>@@ -327,6 +336,8 @@</span><br><span> send_mo_mt_forward_sm_rsp, sizeof(send_mo_mt_forward_sm_rsp)},</span><br><span> {"MO-/MT-ForwardSM Error",</span><br><span> send_mo_mt_forward_sm_err, sizeof(send_mo_mt_forward_sm_err)},</span><br><span style="color: hsl(120, 100%, 40%);">+ {"ReadyForSM (MSC -> SMSC) Indication",</span><br><span style="color: hsl(120, 100%, 40%);">+ send_ready_for_sm_ind, sizeof(send_ready_for_sm_ind)},</span><br><span> };</span><br><span> </span><br><span> printf("Test GSUP message decoding/encoding\n");</span><br><span>@@ -394,7 +405,7 @@</span><br><span> * FIXME: share the maximal IE value somehow</span><br><span> * in order to avoid manual updating of this</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(t->data[j+0] <= OSMO_GSUP_SM_RP_MMS_IE);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(t->data[j+0] <= OSMO_GSUP_SM_ALERT_RSN_IE);</span><br><span> OSMO_ASSERT(t->data[j+1] <= ie_end - j - 2);</span><br><span> </span><br><span> ie_end = j;</span><br><span>diff --git a/tests/gsup/gsup_test.err b/tests/gsup/gsup_test.err</span><br><span>index 4a1357c..236c38a 100644</span><br><span>--- a/tests/gsup/gsup_test.err</span><br><span>+++ b/tests/gsup/gsup_test.err</span><br><span>@@ -61,6 +61,9 @@</span><br><span> generated message: 25 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 40 01 fa 44 01 af </span><br><span> original message: 25 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 40 01 fa 44 01 af </span><br><span> IMSI: 123456789012345</span><br><span style="color: hsl(120, 100%, 40%);">+ generated message: 2c 01 08 21 43 65 87 09 21 43 f5 46 01 02 </span><br><span style="color: hsl(120, 100%, 40%);">+ original message: 2c 01 08 21 43 65 87 09 21 43 f5 46 01 02 </span><br><span style="color: hsl(120, 100%, 40%);">+ IMSI: 123456789012345</span><br><span> message 0: tested 11 truncations, 11 parse failures</span><br><span> message 1: tested 14 truncations, 13 parse failures</span><br><span> message 2: tested 83 truncations, 81 parse failures</span><br><span>@@ -82,6 +85,7 @@</span><br><span> message 18: tested 44 truncations, 39 parse failures</span><br><span> message 19: tested 20 truncations, 18 parse failures</span><br><span> message 20: tested 26 truncations, 22 parse failures</span><br><span style="color: hsl(120, 100%, 40%);">+ message 21: tested 14 truncations, 13 parse failures</span><br><span> DLGSUP Stopping DLGSUP logging</span><br><span> message 0: tested 2816 modifications, 510 parse failures</span><br><span> message 1: tested 3584 modifications, 770 parse failures</span><br><span>@@ -104,3 +108,4 @@</span><br><span> message 18: tested 11264 modifications, 2307 parse failures</span><br><span> message 19: tested 5120 modifications, 1031 parse failures</span><br><span> message 20: tested 6656 modifications, 1546 parse failures</span><br><span style="color: hsl(120, 100%, 40%);">+ message 21: tested 3584 modifications, 771 parse failures</span><br><span>diff --git a/tests/gsup/gsup_test.ok b/tests/gsup/gsup_test.ok</span><br><span>index 7a9455d..36e35c8 100644</span><br><span>--- a/tests/gsup/gsup_test.ok</span><br><span>+++ b/tests/gsup/gsup_test.ok</span><br><span>@@ -41,4 +41,6 @@</span><br><span> MO-/MT-ForwardSM Response OK</span><br><span> Testing MO-/MT-ForwardSM Error</span><br><span> MO-/MT-ForwardSM Error OK</span><br><span style="color: hsl(120, 100%, 40%);">+ Testing ReadyForSM (MSC -> SMSC) Indication</span><br><span style="color: hsl(120, 100%, 40%);">+ ReadyForSM (MSC -> SMSC) Indication OK</span><br><span> Done.</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11751">change 11751</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/11751"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ic37f3b2114b8095cfce22977e67133b9103942e3 </div>
<div style="display:none"> Gerrit-Change-Number: 11751 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </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: Stefan Sperling <stsp@stsp.name> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>