<p>osmith <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13508">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sccp_scoc: conn_create{,_id}() user arg, not inst<br><br>Accept the osmo_sccp_user 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, 11 insertions(+), 13 deletions(-)<br><br></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..91a1ab7 100644</span><br><span>--- a/src/sccp_scoc.c</span><br><span>+++ b/src/sccp_scoc.c</span><br><span>@@ -459,16 +459,16 @@</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(0, 100%, 40%);">- uint32_t conn_id)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct sccp_connection *conn_create_id(struct osmo_sccp_user *user, uint32_t conn_id)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct sccp_connection *conn = talloc_zero(inst, struct sccp_connection);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct sccp_connection *conn = talloc_zero(user->inst, struct sccp_connection);</span><br><span> char name[16];</span><br><span> </span><br><span> conn->conn_id = conn_id;</span><br><span style="color: hsl(0, 100%, 40%);">- conn->inst = inst;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->inst = user->inst;</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->user = user;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- llist_add_tail(&conn->list, &inst->connections);</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add_tail(&conn->list, &user->inst->connections);</span><br><span> </span><br><span> INIT_TIMER(&conn->t_conn, conn_tmr_cb, conn);</span><br><span> INIT_TIMER(&conn->t_ias, tx_inact_tmr_cb, conn);</span><br><span>@@ -494,15 +494,15 @@</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_user *user)</span><br><span> {</span><br><span> uint32_t conn_id;</span><br><span> </span><br><span> do {</span><br><span style="color: hsl(0, 100%, 40%);">- conn_id = inst->next_id++;</span><br><span style="color: hsl(0, 100%, 40%);">- } while (conn_find_by_id(inst, conn_id));</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_id = user->inst->next_id++;</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (conn_find_by_id(user->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(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 +1623,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(scu);</span><br><span> conn->incoming = true;</span><br><span> } else {</span><br><span> uint32_t conn_id;</span><br><span>@@ -1718,14 +1717,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(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: merged </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: 3 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>