<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11640">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">library/GSUP_Types.ttcn: introduce new InvokeID IE<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: Ib7ed702cb05328dc4d1f459efc93df4fa947d7ae<br>Related: OS#3587<br>---<br>M library/GSUP_Types.ttcn<br>1 file changed, 42 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/40/11640/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/GSUP_Types.ttcn b/library/GSUP_Types.ttcn</span><br><span>index d7d9a5b..fa8d1ce 100644</span><br><span>--- a/library/GSUP_Types.ttcn</span><br><span>+++ b/library/GSUP_Types.ttcn</span><br><span>@@ -43,6 +43,7 @@</span><br><span> </span><br><span>  OSMO_GSUP_SESSION_ID_IE         ('30'O),</span><br><span>     OSMO_GSUP_SESSION_STATE_IE      ('31'O),</span><br><span style="color: hsl(120, 100%, 40%);">+      OSMO_GSUP_INVOKE_ID_IE          ('32'O),</span><br><span>     OSMO_GSUP_SS_INFO_IE            ('35'O),</span><br><span> </span><br><span>         /* SM related IEs (see 3GPP TS 29.002, section 7.6.8) */</span><br><span>@@ -140,6 +141,7 @@</span><br><span>                                charg_char, tag = OSMO_GSUP_CHARG_CHAR_IE;</span><br><span>                           session_state, tag = OSMO_GSUP_SESSION_STATE_IE;</span><br><span>                             session_id, tag = OSMO_GSUP_SESSION_ID_IE;</span><br><span style="color: hsl(120, 100%, 40%);">+                            invoke_id, tag = OSMO_GSUP_INVOKE_ID_IE;</span><br><span>                             ss_info, tag = OSMO_GSUP_SS_INFO_IE;</span><br><span>                                 sm_rp_da, tag = OSMO_GSUP_SM_RP_DA_IE;</span><br><span>                               sm_rp_oa, tag = OSMO_GSUP_SM_RP_OA_IE;</span><br><span>@@ -176,6 +178,7 @@</span><br><span>        /* Session information */</span><br><span>    GSUP_SessionState       session_state,</span><br><span>       OCT4                    session_id,</span><br><span style="color: hsl(120, 100%, 40%);">+   int8_t                  invoke_id,</span><br><span>   /* Supplementary Services */</span><br><span>         octetstring             ss_info,</span><br><span>     /* Short Message Service */</span><br><span>@@ -613,6 +616,21 @@</span><br><span>   }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+template (value) GSUP_IE ts_GSUP_IE_InvokeID(int8_t invoke_id) := {</span><br><span style="color: hsl(120, 100%, 40%);">+       tag := OSMO_GSUP_INVOKE_ID_IE,</span><br><span style="color: hsl(120, 100%, 40%);">+        len := 0, /* overwritten */</span><br><span style="color: hsl(120, 100%, 40%);">+   val := {</span><br><span style="color: hsl(120, 100%, 40%);">+              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 style="color: hsl(120, 100%, 40%);">+template GSUP_IE tr_GSUP_IE_InvokeID(template int8_t invoke_id) := {</span><br><span style="color: hsl(120, 100%, 40%);">+    tag := OSMO_GSUP_INVOKE_ID_IE,</span><br><span style="color: hsl(120, 100%, 40%);">+        len := ?,</span><br><span style="color: hsl(120, 100%, 40%);">+     val := {</span><br><span style="color: hsl(120, 100%, 40%);">+              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 style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Possible identity types for SM-RP-{OA|DA} IEs */</span><br><span> type enumerated GSUP_SM_RP_ODA_IdType {</span><br><span>     OSMO_GSUP_SM_RP_ODA_ID_NONE             ('00'O),</span><br><span>@@ -922,6 +940,7 @@</span><br><span>       hexstring imsi, /* IMSI (dummy, because mandatory) */</span><br><span>        OCT4 sid, /* TCAP transactionID */</span><br><span>   GSUP_SessionState state, /* TCAP transaction state */</span><br><span style="color: hsl(120, 100%, 40%);">+ int8_t invoke_id, /* InvokeID */</span><br><span>     GSUP_SM_RP_DA sm_rp_da, /* Destination Address, see 7.6.8.1 */</span><br><span>       GSUP_SM_RP_OA sm_rp_oa, /* Originating Address, see 7.6.8.2 */</span><br><span>       octetstring sm_rp_ui /* SM TPDU, see 7.6.8.4 */</span><br><span>@@ -931,6 +950,7 @@</span><br><span>                valueof(ts_GSUP_IE_IMSI(imsi)),</span><br><span>              valueof(ts_GSUP_IE_SessionId(sid)),</span><br><span>          valueof(ts_GSUP_IE_SessionState(state)),</span><br><span style="color: hsl(120, 100%, 40%);">+              valueof(ts_GSUP_IE_InvokeID(invoke_id)),</span><br><span>             valueof(ts_GSUP_IE_SM_RP_DA(sm_rp_da)),</span><br><span>              valueof(ts_GSUP_IE_SM_RP_OA(sm_rp_oa)),</span><br><span>              valueof(ts_GSUP_IE_SM_RP_UI(sm_rp_ui))</span><br><span>@@ -940,6 +960,7 @@</span><br><span>         template hexstring imsi := ?,</span><br><span>        template OCT4 sid := ?, /* TCAP TransactionID */</span><br><span>     template GSUP_SessionState state := ?, /* TCAP transaction state */</span><br><span style="color: hsl(120, 100%, 40%);">+   template int8_t invoke_id := ?, /* InvokeID */</span><br><span>       template GSUP_SM_RP_DA sm_rp_da, /* Destination Address, see 7.6.8.1 */</span><br><span>      template GSUP_SM_RP_OA sm_rp_oa, /* Originating Address, see 7.6.8.2 */</span><br><span>      template octetstring sm_rp_ui /* SM TPDU, see 7.6.8.4 */</span><br><span>@@ -949,6 +970,7 @@</span><br><span>               tr_GSUP_IE_IMSI(imsi),</span><br><span>               tr_GSUP_IE_SessionId(sid),</span><br><span>           tr_GSUP_IE_SessionState(state),</span><br><span style="color: hsl(120, 100%, 40%);">+               tr_GSUP_IE_InvokeID(invoke_id),</span><br><span>              tr_GSUP_IE_SM_RP_DA(sm_rp_da),</span><br><span>               tr_GSUP_IE_SM_RP_OA(sm_rp_oa),</span><br><span>               tr_GSUP_IE_SM_RP_UI(sm_rp_ui)</span><br><span>@@ -959,6 +981,7 @@</span><br><span>  hexstring imsi,</span><br><span>      OCT4 sid, /* TCAP TransactionID */</span><br><span>   GSUP_SessionState state, /* TCAP transaction state */</span><br><span style="color: hsl(120, 100%, 40%);">+ int8_t invoke_id, /* InvokeID */</span><br><span>     octetstring sm_rp_ui /* SM TPDU, see 7.6.8.4 */</span><br><span> ) := ts_GSUP(</span><br><span>     OSMO_GSUP_MSGT_MO_FORWARD_SM_RESULT,</span><br><span>@@ -966,6 +989,7 @@</span><br><span>           valueof(ts_GSUP_IE_IMSI(imsi)),</span><br><span>              valueof(ts_GSUP_IE_SessionId(sid)),</span><br><span>          valueof(ts_GSUP_IE_SessionState(state)),</span><br><span style="color: hsl(120, 100%, 40%);">+              valueof(ts_GSUP_IE_InvokeID(invoke_id)),</span><br><span>             valueof(ts_GSUP_IE_SM_RP_UI(sm_rp_ui))</span><br><span>       }</span><br><span> );</span><br><span>@@ -973,6 +997,7 @@</span><br><span>        template hexstring imsi := ?,</span><br><span>        template OCT4 sid := ?, /* TCAP TransactionID */</span><br><span>     template GSUP_SessionState state := ?, /* TCAP transaction state */</span><br><span style="color: hsl(120, 100%, 40%);">+   template int8_t invoke_id := ?, /* InvokeID */</span><br><span>       template octetstring sm_rp_ui /* SM TPDU, see 7.6.8.4 */</span><br><span> ) := tr_GSUP(</span><br><span>    OSMO_GSUP_MSGT_MO_FORWARD_SM_RESULT,</span><br><span>@@ -980,6 +1005,7 @@</span><br><span>          tr_GSUP_IE_IMSI(imsi),</span><br><span>               tr_GSUP_IE_SessionId(sid),</span><br><span>           tr_GSUP_IE_SessionState(state),</span><br><span style="color: hsl(120, 100%, 40%);">+               tr_GSUP_IE_InvokeID(invoke_id),</span><br><span>              tr_GSUP_IE_SM_RP_UI(sm_rp_ui)</span><br><span>        }</span><br><span> );</span><br><span>@@ -988,6 +1014,7 @@</span><br><span>       hexstring imsi,</span><br><span>      OCT4 sid, /* TCAP TransactionID */</span><br><span>   GSUP_SessionState state, /* TCAP transaction state */</span><br><span style="color: hsl(120, 100%, 40%);">+ int8_t invoke_id, /* InvokeID */</span><br><span>     integer cause /* User error, see 12.2.3 */</span><br><span> ) := ts_GSUP(</span><br><span>  OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR,</span><br><span>@@ -995,6 +1022,7 @@</span><br><span>           valueof(ts_GSUP_IE_IMSI(imsi)),</span><br><span>              valueof(ts_GSUP_IE_SessionId(sid)),</span><br><span>          valueof(ts_GSUP_IE_SessionState(state)),</span><br><span style="color: hsl(120, 100%, 40%);">+              valueof(ts_GSUP_IE_InvokeID(invoke_id)),</span><br><span>             valueof(ts_GSUP_IE_Cause(cause))</span><br><span>     }</span><br><span> );</span><br><span>@@ -1002,6 +1030,7 @@</span><br><span>      template hexstring imsi := ?,</span><br><span>        template OCT4 sid := ?, /* TCAP TransactionID */</span><br><span>     template GSUP_SessionState state := ?, /* TCAP transaction state */</span><br><span style="color: hsl(120, 100%, 40%);">+   template int8_t invoke_id := ?, /* InvokeID */</span><br><span>       template integer cause := ? /* User error, see 12.2.3 */</span><br><span> ) := tr_GSUP(</span><br><span>    OSMO_GSUP_MSGT_MO_FORWARD_SM_ERROR,</span><br><span>@@ -1009,6 +1038,7 @@</span><br><span>          tr_GSUP_IE_IMSI(imsi),</span><br><span>               tr_GSUP_IE_SessionId(sid),</span><br><span>           tr_GSUP_IE_SessionState(state),</span><br><span style="color: hsl(120, 100%, 40%);">+               tr_GSUP_IE_InvokeID(invoke_id),</span><br><span>              tr_GSUP_IE_Cause(cause)</span><br><span>      }</span><br><span> );</span><br><span>@@ -1017,6 +1047,7 @@</span><br><span>      hexstring imsi,</span><br><span>      OCT4 sid, /* TCAP TransactionID */</span><br><span>   GSUP_SessionState state, /* TCAP transaction state */</span><br><span style="color: hsl(120, 100%, 40%);">+ int8_t invoke_id, /* InvokeID */</span><br><span>     GSUP_SM_RP_DA sm_rp_da, /* Destination Address, see 7.6.8.1 */</span><br><span>       GSUP_SM_RP_OA sm_rp_oa, /* Originating Address, see 7.6.8.2 */</span><br><span>       octetstring sm_rp_ui /* SM TPDU, see 7.6.8.4 */</span><br><span>@@ -1032,6 +1063,7 @@</span><br><span>              valueof(ts_GSUP_IE_IMSI(imsi)),</span><br><span>              valueof(ts_GSUP_IE_SessionId(sid)),</span><br><span>          valueof(ts_GSUP_IE_SessionState(state)),</span><br><span style="color: hsl(120, 100%, 40%);">+              valueof(ts_GSUP_IE_InvokeID(invoke_id)),</span><br><span>             valueof(ts_GSUP_IE_SM_RP_DA(sm_rp_da)),</span><br><span>              valueof(ts_GSUP_IE_SM_RP_OA(sm_rp_oa)),</span><br><span>              valueof(ts_GSUP_IE_SM_RP_UI(sm_rp_ui))</span><br><span>@@ -1041,6 +1073,7 @@</span><br><span>       template hexstring imsi := ?,</span><br><span>        template OCT4 sid := ?, /* TCAP TransactionID */</span><br><span>     template GSUP_SessionState state := ?, /* TCAP transaction state */</span><br><span style="color: hsl(120, 100%, 40%);">+   template int8_t invoke_id := ?, /* InvokeID */</span><br><span>       template GSUP_SM_RP_DA sm_rp_da, /* Destination Address, see 7.6.8.1 */</span><br><span>      template GSUP_SM_RP_OA sm_rp_oa, /* Originating Address, see 7.6.8.2 */</span><br><span>      template octetstring sm_rp_ui /* SM TPDU, see 7.6.8.4 */</span><br><span>@@ -1056,6 +1089,7 @@</span><br><span>             tr_GSUP_IE_IMSI(imsi),</span><br><span>               tr_GSUP_IE_SessionId(sid),</span><br><span>           tr_GSUP_IE_SessionState(state),</span><br><span style="color: hsl(120, 100%, 40%);">+               tr_GSUP_IE_InvokeID(invoke_id),</span><br><span>              tr_GSUP_IE_SM_RP_DA(sm_rp_da),</span><br><span>               tr_GSUP_IE_SM_RP_OA(sm_rp_oa),</span><br><span>               tr_GSUP_IE_SM_RP_UI(sm_rp_ui)</span><br><span>@@ -1066,6 +1100,7 @@</span><br><span>        hexstring imsi,</span><br><span>      OCT4 sid, /* TCAP TransactionID */</span><br><span>   GSUP_SessionState state, /* TCAP transaction state */</span><br><span style="color: hsl(120, 100%, 40%);">+ int8_t invoke_id, /* InvokeID */</span><br><span>     octetstring sm_rp_ui /* SM TPDU, see 7.6.8.4 */</span><br><span> ) := ts_GSUP(</span><br><span>     OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT,</span><br><span>@@ -1073,6 +1108,7 @@</span><br><span>                 valueof(ts_GSUP_IE_IMSI(imsi)),</span><br><span>              valueof(ts_GSUP_IE_SessionId(sid)),</span><br><span>          valueof(ts_GSUP_IE_SessionState(state)),</span><br><span style="color: hsl(120, 100%, 40%);">+              valueof(ts_GSUP_IE_InvokeID(invoke_id)),</span><br><span>             valueof(ts_GSUP_IE_SM_RP_UI(sm_rp_ui))</span><br><span>       }</span><br><span> );</span><br><span>@@ -1080,6 +1116,7 @@</span><br><span>      template hexstring imsi := ?,</span><br><span>        template OCT4 sid := ?, /* TCAP TransactionID */</span><br><span>     template GSUP_SessionState state := ?, /* TCAP transaction state */</span><br><span style="color: hsl(120, 100%, 40%);">+   template int8_t invoke_id := ?, /* InvokeID */</span><br><span>       template octetstring sm_rp_ui /* SM TPDU, see 7.6.8.4 */</span><br><span> ) := tr_GSUP(</span><br><span>    OSMO_GSUP_MSGT_MT_FORWARD_SM_RESULT,</span><br><span>@@ -1087,6 +1124,7 @@</span><br><span>                 tr_GSUP_IE_IMSI(imsi),</span><br><span>               tr_GSUP_IE_SessionId(sid),</span><br><span>           tr_GSUP_IE_SessionState(state),</span><br><span style="color: hsl(120, 100%, 40%);">+               tr_GSUP_IE_InvokeID(invoke_id),</span><br><span>              tr_GSUP_IE_SM_RP_UI(sm_rp_ui)</span><br><span>        }</span><br><span> );</span><br><span>@@ -1095,6 +1133,7 @@</span><br><span>      hexstring imsi,</span><br><span>      OCT4 sid, /* TCAP TransactionID */</span><br><span>   GSUP_SessionState state, /* TCAP transaction state */</span><br><span style="color: hsl(120, 100%, 40%);">+ int8_t invoke_id, /* InvokeID */</span><br><span>     integer cause /* User error, see 12.9.3 */</span><br><span> ) := ts_GSUP(</span><br><span>  OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR,</span><br><span>@@ -1102,6 +1141,7 @@</span><br><span>          valueof(ts_GSUP_IE_IMSI(imsi)),</span><br><span>              valueof(ts_GSUP_IE_SessionId(sid)),</span><br><span>          valueof(ts_GSUP_IE_SessionState(state)),</span><br><span style="color: hsl(120, 100%, 40%);">+              valueof(ts_GSUP_IE_InvokeID(invoke_id)),</span><br><span>             valueof(ts_GSUP_IE_Cause(cause))</span><br><span>     }</span><br><span> );</span><br><span>@@ -1109,6 +1149,7 @@</span><br><span>      template hexstring imsi := ?,</span><br><span>        template OCT4 sid := ?, /* TCAP TransactionID */</span><br><span>     template GSUP_SessionState state := ?, /* TCAP transaction state */</span><br><span style="color: hsl(120, 100%, 40%);">+   template int8_t invoke_id := ?, /* InvokeID */</span><br><span>       template integer cause := ? /* User error, see 12.9.3 */</span><br><span> ) := tr_GSUP(</span><br><span>    OSMO_GSUP_MSGT_MT_FORWARD_SM_ERROR,</span><br><span>@@ -1116,6 +1157,7 @@</span><br><span>          tr_GSUP_IE_IMSI(imsi),</span><br><span>               tr_GSUP_IE_SessionId(sid),</span><br><span>           tr_GSUP_IE_SessionState(state),</span><br><span style="color: hsl(120, 100%, 40%);">+               tr_GSUP_IE_InvokeID(invoke_id),</span><br><span>              tr_GSUP_IE_Cause(cause)</span><br><span>      }</span><br><span> );</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11640">change 11640</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/11640"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ib7ed702cb05328dc4d1f459efc93df4fa947d7ae </div>
<div style="display:none"> Gerrit-Change-Number: 11640 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>