<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13278">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">add osmo_sccp_inst_unused_conn_id()<br><br>On incoming connections, sccp_scoc.c assigns a new local reference<br>(osmo_scu_prim conn_id) to a conn. When creating a new outgoing connection, the<br>caller needs to provide that.<br><br>Allow callers to use the same local reference creation code that is used on<br>incoming connections.<br><br>Change-Id: I6e1b4897f4143b97bf90bfd8d0ae5d50bbd2e1dd<br>---<br>M include/osmocom/sigtran/sccp_sap.h<br>M src/sccp_scoc.c<br>2 files changed, 25 insertions(+), 4 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/78/13278/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/sigtran/sccp_sap.h b/include/osmocom/sigtran/sccp_sap.h</span><br><span>index f1fdd98..def8459 100644</span><br><span>--- a/include/osmocom/sigtran/sccp_sap.h</span><br><span>+++ b/include/osmocom/sigtran/sccp_sap.h</span><br><span>@@ -250,6 +250,8 @@</span><br><span> struct osmo_ss7_instance *osmo_sccp_get_ss7(const struct osmo_sccp_instance *sccp);</span><br><span> struct osmo_sccp_instance *osmo_sccp_get_sccp(const struct osmo_sccp_user *scu);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_sccp_instance_unused_conn_id(struct osmo_sccp_instance *inst, uint32_t *conn_id);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void osmo_sccp_user_unbind(struct osmo_sccp_user *scu);</span><br><span> void osmo_sccp_user_set_priv(struct osmo_sccp_user *scu, void *priv);</span><br><span> void *osmo_sccp_user_get_priv(struct osmo_sccp_user *scu);</span><br><span>diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c</span><br><span>index 6a56692..db3ded7 100644</span><br><span>--- a/src/sccp_scoc.c</span><br><span>+++ b/src/sccp_scoc.c</span><br><span>@@ -47,6 +47,7 @@</span><br><span> */</span><br><span> </span><br><span> #include <string.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <errno.h></span><br><span> </span><br><span> #include <osmocom/core/utils.h></span><br><span> #include <osmocom/core/linuxlist.h></span><br><span>@@ -485,14 +486,30 @@</span><br><span> return conn;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Return a free connection ID (local reference) */</span><br><span style="color: hsl(120, 100%, 40%);">+int osmo_sccp_instance_unused_conn_id(struct osmo_sccp_instance *inst, uint32_t *conn_id)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t id;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t started_at = inst->next_id;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ do {</span><br><span style="color: hsl(120, 100%, 40%);">+ id = inst->next_id++;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (inst->next_id == started_at) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLSCCP, LOGL_ERROR, "No unused local reference available\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOSPC;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ } while (conn_find_by_id(inst, id));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ *conn_id = id;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Search for next free connection ID (local reference) and allocate conn */</span><br><span> static struct sccp_connection *conn_create(struct osmo_sccp_instance *inst)</span><br><span> {</span><br><span> uint32_t conn_id;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- 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%);">+ if (osmo_sccp_instance_unused_conn_id(inst, &conn_id))</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span> </span><br><span> return conn_create_id(inst, conn_id);</span><br><span> }</span><br><span>@@ -1616,6 +1633,8 @@</span><br><span> }</span><br><span> /* Allocate new connection */</span><br><span> conn = conn_create(inst);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!conn)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span> conn->user = scu;</span><br><span> conn->incoming = true;</span><br><span> } else {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13278">change 13278</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/13278"/><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: I6e1b4897f4143b97bf90bfd8d0ae5d50bbd2e1dd </div>
<div style="display:none"> Gerrit-Change-Number: 13278 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>