<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13466">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">NOT FOR MERGE: separate sccp user conn id<br><br>Change-Id: Ifd55c6b7ed2558ff072042079cf45f5068a971de<br>---<br>M src/sccp_scoc.c<br>1 file changed, 7 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/66/13466/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c</span><br><span>index cb1d567..57d27ad 100644</span><br><span>--- a/src/sccp_scoc.c</span><br><span>+++ b/src/sccp_scoc.c</span><br><span>@@ -724,7 +724,7 @@</span><br><span>    switch (OSMO_PRIM_HDR(&scu_prim->oph)) {</span><br><span>      case OSMO_PRIM(OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION):</span><br><span>              udisp = &scu_prim->u.disconnect;</span><br><span style="color: hsl(0, 100%, 40%);">-         udisp->conn_id = conn->conn_id;</span><br><span style="color: hsl(120, 100%, 40%);">+         udisp->conn_id = conn->user_conn_id;</span><br><span>           udisp->responding_addr = conn->called_addr;</span><br><span>            udisp->originator = OSMO_SCCP_ORIG_UNDEFINED;</span><br><span>             //udisp->in_sequence_control;</span><br><span>@@ -743,7 +743,7 @@</span><br><span>               break;</span><br><span>       case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION):</span><br><span>                 uconp = &scu_prim->u.connect;</span><br><span style="color: hsl(0, 100%, 40%);">-            uconp->conn_id = conn->conn_id;</span><br><span style="color: hsl(120, 100%, 40%);">+         uconp->conn_id = scu_gen_conn_id(conn->user...);</span><br><span>               uconp->called_addr = conn->called_addr;</span><br><span>                uconp->calling_addr = conn->calling_addr;</span><br><span>              uconp->sccp_class = conn->sccp_class;</span><br><span>@@ -759,7 +759,7 @@</span><br><span>            break;</span><br><span>       case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_CONFIRM):</span><br><span>            uconp = &scu_prim->u.connect;</span><br><span style="color: hsl(0, 100%, 40%);">-            uconp->conn_id = conn->conn_id;</span><br><span style="color: hsl(120, 100%, 40%);">+         uxxp->conn_id = conn->user_conn_id;</span><br><span>            uconp->called_addr = conn->called_addr;</span><br><span>                uconp->calling_addr = conn->calling_addr;</span><br><span>              //scu_prim->u.connect.in_sequence_control</span><br><span>@@ -774,7 +774,7 @@</span><br><span>           break;</span><br><span>       case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION):</span><br><span>            udatp = &scu_prim->u.data;</span><br><span style="color: hsl(0, 100%, 40%);">-               udatp->conn_id = conn->conn_id;</span><br><span style="color: hsl(120, 100%, 40%);">+         xx->conn_id = conn->user_conn_id;</span><br><span>              udatp->importance = conn->importance;</span><br><span>          data_ie = xua_msg_find_tag(xua, SUA_IEI_DATA);</span><br><span>               if (data_ie) {</span><br><span>@@ -1710,7 +1710,8 @@</span><br><span>               return sccp_sclc_user_sap_down(scu, oph);</span><br><span>    case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_REQUEST):</span><br><span>            /* Allocate new connection structure */</span><br><span style="color: hsl(0, 100%, 40%);">-         conn = conn_create_id(inst, prim->u.connect.conn_id);</span><br><span style="color: hsl(120, 100%, 40%);">+              conn = conn_create(inst);</span><br><span style="color: hsl(120, 100%, 40%);">+             conn->user_conn_id = prim->u.connect.conn_id;</span><br><span>          if (!conn) {</span><br><span>                         /* FIXME: inform SCCP user with proper reply */</span><br><span>                      LOGP(DLSCCP, LOGL_ERROR, "Cannot create conn-id for primitive %s\n",</span><br><span>@@ -1724,7 +1725,7 @@</span><br><span>       case OSMO_PRIM(OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_REQUEST):</span><br><span>         case OSMO_PRIM(OSMO_SCU_PRIM_N_RESET, PRIM_OP_REQUEST):</span><br><span>              /* Resolve existing connection structure */</span><br><span style="color: hsl(0, 100%, 40%);">-             conn = conn_find_by_id(inst, scu_prim_conn_id(prim));</span><br><span style="color: hsl(120, 100%, 40%);">+         conn = conn_find_by_user_id(inst, scu, scu_prim_conn_id(prim));</span><br><span>              if (!conn) {</span><br><span>                         /* FIXME: inform SCCP user with proper reply */</span><br><span>                      LOGP(DLSCCP, LOGL_ERROR, "Received unknown conn-id %u for primitive %s\n",</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13466">change 13466</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/13466"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ifd55c6b7ed2558ff072042079cf45f5068a971de </div>
<div style="display:none"> Gerrit-Change-Number: 13466 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>