<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11633">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">GSUP: introduce new InvokeID Information Element<br><br>Each invoke component in TCAP is identified by an unique InvokeID,<br>assigned by the application that originates the invoke. The<br>InvokeID is returned in the response, and allows the originator<br>to correlate the reply with the invoke operation to which<br>it belongs.<br><br>Since GSUP has no TCAP layer, there are optional SESSION_ID and<br>SESSION_STATE IEs aimed to 'emulate' the dialog. This change<br>introduces the new optional INVOKE_ID IE.<br><br>InvokeID is required in order to support multy-part SMS over GSUP.<br><br>Change-Id: If14006b035ff465b73b39ea4cd59e5fd16a4d7ff<br>Related: OS#3587<br>---<br>M TODO-RELEASE<br>M include/osmocom/gsm/gsup.h<br>M src/gsm/gsup.c<br>M tests/gsup/gsup_test.c<br>M tests/gsup/gsup_test.err<br>5 files changed, 33 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/33/11633/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/TODO-RELEASE b/TODO-RELEASE</span><br><span>index a4c48ca..4bed90d 100644</span><br><span>--- a/TODO-RELEASE</span><br><span>+++ b/TODO-RELEASE</span><br><span>@@ -11,3 +11,4 @@</span><br><span> libosmogsm gsm48_push_l3hdr() (re)introduced in gsm/gsm48.h (GSM 04.08 API)</span><br><span> libosmogsm gsm48_push_l3hdr_tid() a wrapper around gsm48_push_l3hdr()</span><br><span> libosmogsm osmo_gsup_message extended with SMS related fields</span><br><span style="color: hsl(120, 100%, 40%);">+libosmogsm osmo_gsup_message extended with InvokeID</span><br><span>diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h</span><br><span>index f314672..867b409 100644</span><br><span>--- a/include/osmocom/gsm/gsup.h</span><br><span>+++ b/include/osmocom/gsm/gsup.h</span><br><span>@@ -86,6 +86,7 @@</span><br><span> </span><br><span> OSMO_GSUP_SESSION_ID_IE = 0x30,</span><br><span> OSMO_GSUP_SESSION_STATE_IE = 0x31,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_GSUP_INVOKE_ID_IE = 0x32,</span><br><span> </span><br><span> /*! Supplementary Services payload */</span><br><span> OSMO_GSUP_SS_INFO_IE = 0x35,</span><br><span>@@ -223,6 +224,9 @@</span><br><span> /*! Unique session identifier and origination flag.</span><br><span> * Encoded only when \ref session_state != 0x00 */</span><br><span> uint32_t session_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! InvokeID, maps REQ/RES pairs within a single session.</span><br><span style="color: hsl(120, 100%, 40%);">+ * Encoded only when \ref invoke_id != NULL */</span><br><span style="color: hsl(120, 100%, 40%);">+ int8_t *invoke_id;</span><br><span> </span><br><span> /*! ASN.1 encoded MAP payload for Supplementary Services */</span><br><span> uint8_t *ss_info;</span><br><span>diff --git a/src/gsm/gsup.c b/src/gsm/gsup.c</span><br><span>index dbab424..5555d68 100644</span><br><span>--- a/src/gsm/gsup.c</span><br><span>+++ b/src/gsm/gsup.c</span><br><span>@@ -448,6 +448,10 @@</span><br><span> gsup_msg->session_state = *value;</span><br><span> break;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMO_GSUP_INVOKE_ID_IE:</span><br><span style="color: hsl(120, 100%, 40%);">+ gsup_msg->invoke_id = (int8_t *) value;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> case OSMO_GSUP_SS_INFO_IE:</span><br><span> gsup_msg->ss_info = value;</span><br><span> gsup_msg->ss_info_len = value_len;</span><br><span>@@ -657,6 +661,12 @@</span><br><span> msgb_tlv_put(msg, OSMO_GSUP_SESSION_STATE_IE, sizeof(u8), &u8);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsup_msg->invoke_id) {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t *invoke_id = (uint8_t *) gsup_msg->invoke_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_tlv_put(msg, OSMO_GSUP_INVOKE_ID_IE,</span><br><span style="color: hsl(120, 100%, 40%);">+ sizeof(*invoke_id), invoke_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (gsup_msg->ss_info) {</span><br><span> msgb_tlv_put(msg, OSMO_GSUP_SS_INFO_IE,</span><br><span> gsup_msg->ss_info_len, gsup_msg->ss_info);</span><br><span>diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c</span><br><span>index 4eef483..a8c0b4e 100644</span><br><span>--- a/tests/gsup/gsup_test.c</span><br><span>+++ b/tests/gsup/gsup_test.c</span><br><span>@@ -226,6 +226,8 @@</span><br><span> 0xde, 0xad, 0xbe, 0xef,</span><br><span> 0x31, 0x01, /* Session state (BEGIN) */</span><br><span> 0x01,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x32, 0x01, /* InvokeID */</span><br><span style="color: hsl(120, 100%, 40%);">+ 0xfa,</span><br><span> </span><br><span> /* SM related IEs */</span><br><span> 0x40, 0x09, /* SM-RP-DA (Destination Address) */</span><br><span>@@ -246,6 +248,8 @@</span><br><span> 0xde, 0xad, 0xbe, 0xef,</span><br><span> 0x31, 0x01, /* Session state (BEGIN) */</span><br><span> 0x01,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x32, 0x01, /* InvokeID */</span><br><span style="color: hsl(120, 100%, 40%);">+ 0xfa,</span><br><span> </span><br><span> /* SM related IEs */</span><br><span> 0x40, 0x0a, /* SM-RP-DA (Destination Address) */</span><br><span>@@ -267,6 +271,8 @@</span><br><span> 0xde, 0xad, 0xbe, 0xef,</span><br><span> 0x31, 0x01, /* Session state (END) */</span><br><span> 0x03,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x32, 0x01, /* InvokeID */</span><br><span style="color: hsl(120, 100%, 40%);">+ 0xfa,</span><br><span> </span><br><span> /* SM related IEs */</span><br><span> 0x42, 0x04, /* SM-RP-UI (TPDU) */</span><br><span>diff --git a/tests/gsup/gsup_test.err b/tests/gsup/gsup_test.err</span><br><span>index 37aa4ce..864b6af 100644</span><br><span>--- a/tests/gsup/gsup_test.err</span><br><span>+++ b/tests/gsup/gsup_test.err</span><br><span>@@ -49,14 +49,14 @@</span><br><span> generated message: 22 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 35 08 a3 06 02 01 01 02 01 47 </span><br><span> original message: 22 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 35 08 a3 06 02 01 01 02 01 47 </span><br><span> IMSI: 123456789012345</span><br><span style="color: hsl(0, 100%, 40%);">- generated message: 24 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 01 40 09 03 07 91 52 75 47 99 09 82 41 02 ff 00 42 04 de ad be ef </span><br><span style="color: hsl(0, 100%, 40%);">- original message: 24 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 01 40 09 03 07 91 52 75 47 99 09 82 41 02 ff 00 42 04 de ad be ef </span><br><span style="color: hsl(120, 100%, 40%);">+ generated message: 24 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 01 32 01 fa 40 09 03 07 91 52 75 47 99 09 82 41 02 ff 00 42 04 de ad be ef </span><br><span style="color: hsl(120, 100%, 40%);">+ original message: 24 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 01 32 01 fa 40 09 03 07 91 52 75 47 99 09 82 41 02 ff 00 42 04 de ad be ef </span><br><span> IMSI: 123456789012345</span><br><span style="color: hsl(0, 100%, 40%);">- generated message: 28 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 01 40 0a 01 08 21 43 65 87 09 21 43 f5 41 09 03 07 91 52 75 47 99 09 82 42 04 de ad be ef </span><br><span style="color: hsl(0, 100%, 40%);">- original message: 28 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 01 40 0a 01 08 21 43 65 87 09 21 43 f5 41 09 03 07 91 52 75 47 99 09 82 42 04 de ad be ef </span><br><span style="color: hsl(120, 100%, 40%);">+ generated message: 28 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 01 32 01 fa 40 0a 01 08 21 43 65 87 09 21 43 f5 41 09 03 07 91 52 75 47 99 09 82 42 04 de ad be ef </span><br><span style="color: hsl(120, 100%, 40%);">+ original message: 28 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 01 32 01 fa 40 0a 01 08 21 43 65 87 09 21 43 f5 41 09 03 07 91 52 75 47 99 09 82 42 04 de ad be ef </span><br><span> IMSI: 123456789012345</span><br><span style="color: hsl(0, 100%, 40%);">- generated message: 2a 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 42 04 de ad be ef </span><br><span style="color: hsl(0, 100%, 40%);">- original message: 2a 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 42 04 de ad be ef </span><br><span style="color: hsl(120, 100%, 40%);">+ generated message: 2a 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 32 01 fa 42 04 de ad be ef </span><br><span style="color: hsl(120, 100%, 40%);">+ original message: 2a 01 08 21 43 65 87 09 21 43 f5 30 04 de ad be ef 31 01 03 32 01 fa 42 04 de ad be ef </span><br><span> 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>@@ -75,9 +75,9 @@</span><br><span> message 14: tested 20 truncations, 18 parse failures</span><br><span> message 15: tested 42 truncations, 39 parse failures</span><br><span> message 16: tested 30 truncations, 27 parse failures</span><br><span style="color: hsl(0, 100%, 40%);">- message 17: tested 41 truncations, 36 parse failures</span><br><span style="color: hsl(0, 100%, 40%);">- message 18: tested 49 truncations, 44 parse failures</span><br><span style="color: hsl(0, 100%, 40%);">- message 19: tested 26 truncations, 23 parse failures</span><br><span style="color: hsl(120, 100%, 40%);">+ message 17: tested 44 truncations, 38 parse failures</span><br><span style="color: hsl(120, 100%, 40%);">+ message 18: tested 52 truncations, 46 parse failures</span><br><span style="color: hsl(120, 100%, 40%);">+ message 19: tested 29 truncations, 25 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>@@ -96,6 +96,6 @@</span><br><span> message 14: tested 5120 modifications, 1030 parse failures</span><br><span> message 15: tested 10752 modifications, 1262 parse failures</span><br><span> message 16: tested 7680 modifications, 1271 parse failures</span><br><span style="color: hsl(0, 100%, 40%);">- message 17: tested 10496 modifications, 2557 parse failures</span><br><span style="color: hsl(0, 100%, 40%);">- message 18: tested 12544 modifications, 2304 parse failures</span><br><span style="color: hsl(0, 100%, 40%);">- message 19: tested 6656 modifications, 1289 parse failures</span><br><span style="color: hsl(120, 100%, 40%);">+ message 17: tested 11264 modifications, 2812 parse failures</span><br><span style="color: hsl(120, 100%, 40%);">+ message 18: tested 13312 modifications, 2559 parse failures</span><br><span style="color: hsl(120, 100%, 40%);">+ message 19: tested 7424 modifications, 1546 parse failures</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11633">change 11633</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/11633"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: If14006b035ff465b73b39ea4cd59e5fd16a4d7ff </div>
<div style="display:none"> Gerrit-Change-Number: 11633 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>