<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12520">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use explicit protocol discriminator for NC SS/USSD session<br><br>In gsm0911_rcv_nc_ss() we sometimes use pdisc parsed from msgb and<br>sometimes constant. This function is only called when protocol<br>discriminator is GSM48_PDISC_NC_SS so there's no point in parsing it<br>again from msgb.<br><br>Let's make it consistent and always use constant.<br><br>Change-Id: Iae40bf9906fe676ff817c709120015fca4c9e042<br>---<br>M src/libmsc/gsm_09_11.c<br>1 file changed, 5 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/20/12520/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libmsc/gsm_09_11.c b/src/libmsc/gsm_09_11.c</span><br><span>index 3ee6e92..12bec9d 100644</span><br><span>--- a/src/libmsc/gsm_09_11.c</span><br><span>+++ b/src/libmsc/gsm_09_11.c</span><br><span>@@ -60,11 +60,10 @@</span><br><span>   struct msgb *gsup_msgb;</span><br><span>      uint16_t facility_ie_len;</span><br><span>    uint8_t *facility_ie;</span><br><span style="color: hsl(0, 100%, 40%);">-   uint8_t pdisc, tid;</span><br><span style="color: hsl(120, 100%, 40%);">+   uint8_t tid;</span><br><span>         uint8_t msg_type;</span><br><span>    int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     pdisc = gsm48_hdr_pdisc(gh);</span><br><span>         msg_type = gsm48_hdr_msg_type(gh);</span><br><span>   tid = gsm48_hdr_trans_id_flip_ti(gh);</span><br><span> </span><br><span>@@ -72,10 +71,10 @@</span><br><span>      log_set_context(LOG_CTX_VLR_SUBSCR, conn->vsub);</span><br><span> </span><br><span>      DEBUGP(DMM, "Received SS/USSD data (trans_id=%x, msg_type=%s)\n",</span><br><span style="color: hsl(0, 100%, 40%);">-             tid, gsm48_pdisc_msgtype_name(pdisc, msg_type));</span><br><span style="color: hsl(120, 100%, 40%);">+              tid, gsm48_pdisc_msgtype_name(GSM48_PDISC_NC_SS, msg_type));</span><br><span> </span><br><span>     /* Reuse existing transaction, or create a new one */</span><br><span style="color: hsl(0, 100%, 40%);">-   trans = trans_find_by_id(conn, pdisc, tid);</span><br><span style="color: hsl(120, 100%, 40%);">+   trans = trans_find_by_id(conn, GSM48_PDISC_NC_SS, tid);</span><br><span>      if (!trans) {</span><br><span>                /* Count MS-initiated attempts to establish a NC SS/USSD session */</span><br><span>          rate_ctr_inc(&conn->network->msc_ctrs->ctr[MSC_CTR_NC_SS_MO_REQUESTS]);</span><br><span>@@ -91,7 +90,7 @@</span><br><span>             if (msg_type != GSM0480_MTYPE_REGISTER) {</span><br><span>                    LOGP(DMM, LOGL_ERROR, "Unexpected message (msg_type=%s), "</span><br><span>                                 "transaction is not allocated yet\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                         gsm48_pdisc_msgtype_name(pdisc, msg_type));</span><br><span style="color: hsl(120, 100%, 40%);">+                           gsm48_pdisc_msgtype_name(GSM48_PDISC_NC_SS, msg_type));</span><br><span>                      gsm48_tx_simple(conn,</span><br><span>                                GSM48_PDISC_NC_SS | (tid << 4),</span><br><span>                                GSM0480_MTYPE_RELEASE_COMPLETE);</span><br><span>@@ -100,7 +99,7 @@</span><br><span> </span><br><span>            DEBUGP(DMM, " -> (new transaction)\n");</span><br><span>                 trans = trans_alloc(conn->network, conn->vsub,</span><br><span style="color: hsl(0, 100%, 40%);">-                    pdisc, tid, new_callref++);</span><br><span style="color: hsl(120, 100%, 40%);">+                               GSM48_PDISC_NC_SS, tid, new_callref++);</span><br><span>          if (!trans) {</span><br><span>                        DEBUGP(DMM, " -> No memory for trans\n");</span><br><span>                       gsm48_tx_simple(conn,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12520">change 12520</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/12520"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Iae40bf9906fe676ff817c709120015fca4c9e042 </div>
<div style="display:none"> Gerrit-Change-Number: 12520 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>