<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13508">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sccp_scoc: add user arg to conn_create{,_id}()<br><br>Add the argument instead of calling conn_create() and setting<br>conn->user afterwards. Prepare for generating a local_ref inside<br>conn_create_id() in the future.<br><br>Related: OS#3871<br>Change-Id: I2fb47c8ba6c0ce7cd92c9ac31f15c67eb67fb66e<br>---<br>M src/sccp_scoc.c<br>1 file changed, 6 insertions(+), 7 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/08/13508/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 82590a0..a916e58 100644</span><br><span>--- a/src/sccp_scoc.c</span><br><span>+++ b/src/sccp_scoc.c</span><br><span>@@ -459,7 +459,7 @@</span><br><span> #define INIT_TIMER(x, fn, priv)             do { (x)->cb = fn; (x)->data = priv; } while (0)</span><br><span> </span><br><span> /* allocate + init a SCCP Connection with given ID */</span><br><span style="color: hsl(0, 100%, 40%);">-static struct sccp_connection *conn_create_id(struct osmo_sccp_instance *inst,</span><br><span style="color: hsl(120, 100%, 40%);">+static struct sccp_connection *conn_create_id(struct osmo_sccp_instance *inst, struct osmo_sccp_user *user,</span><br><span>                                             uint32_t conn_id)</span><br><span> {</span><br><span>         struct sccp_connection *conn = talloc_zero(inst, struct sccp_connection);</span><br><span>@@ -490,11 +490,12 @@</span><br><span>            return NULL;</span><br><span>         }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ conn->user = user;</span><br><span>        return conn;</span><br><span> }</span><br><span> </span><br><span> /* Search for next free connection ID and allocate conn */</span><br><span style="color: hsl(0, 100%, 40%);">-static struct sccp_connection *conn_create(struct osmo_sccp_instance *inst)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct sccp_connection *conn_create(struct osmo_sccp_instance *inst, struct osmo_sccp_user *user)</span><br><span> {</span><br><span>        uint32_t conn_id;</span><br><span> </span><br><span>@@ -502,7 +503,7 @@</span><br><span>          conn_id = inst->next_id++;</span><br><span>        } while (conn_find_by_id(inst, conn_id));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   return conn_create_id(inst, conn_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ return conn_create_id(inst, user, conn_id);</span><br><span> }</span><br><span> </span><br><span> /* destroy a SCCP connection state, releasing all timers, terminating</span><br><span>@@ -1623,8 +1624,7 @@</span><br><span>                        return;</span><br><span>              }</span><br><span>            /* Allocate new connection */</span><br><span style="color: hsl(0, 100%, 40%);">-           conn = conn_create(inst);</span><br><span style="color: hsl(0, 100%, 40%);">-               conn->user = scu;</span><br><span style="color: hsl(120, 100%, 40%);">+          conn = conn_create(inst, scu);</span><br><span>               conn->incoming = true;</span><br><span>    } else {</span><br><span>             uint32_t conn_id;</span><br><span>@@ -1718,14 +1718,13 @@</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_id(inst, scu, 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>                            osmo_scu_prim_name(&prim->oph));</span><br><span>                         goto out;</span><br><span>            }</span><br><span style="color: hsl(0, 100%, 40%);">-               conn->user = scu;</span><br><span>                 break;</span><br><span>       case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_RESPONSE):</span><br><span>   case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_REQUEST):</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13508">change 13508</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/13508"/><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: I2fb47c8ba6c0ce7cd92c9ac31f15c67eb67fb66e </div>
<div style="display:none"> Gerrit-Change-Number: 13508 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>