<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20356">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">LCS: SCCP next conn id: prepare Lb-interface<br><br>When adding the Lb interface, it is necessary to determine an unused conn id<br>across *all* SCCP users. Prepare adding Lb by moving conn id creation out of<br>the gscon code and generalizing.<br><br>Change-Id: I12fcb18f6e4380f72929cfe7681bac05330a8c9a<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/Makefile.am<br>A src/osmo-bsc/bsc_sccp.c<br>M src/osmo-bsc/osmo_bsc_sigtran.c<br>4 files changed, 62 insertions(+), 24 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/56/20356/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index 90ab8ea..1ea0172 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -50,6 +50,7 @@</span><br><span> struct bsc_subscr;</span><br><span> struct gprs_ra_id;</span><br><span> struct handover;</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_sccp_instance;</span><br><span> </span><br><span> #define OBSC_LINKID_CB(__msgb) (__msgb)->cb[3]</span><br><span> </span><br><span>@@ -1246,4 +1247,6 @@</span><br><span> enum gsm48_rr_cause bsc_gsm48_rr_cause_from_gsm0808_cause(enum gsm0808_cause c);</span><br><span> enum gsm48_rr_cause bsc_gsm48_rr_cause_from_rsl_cause(uint8_t c);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int bsc_sccp_inst_next_conn_id(struct osmo_sccp_instance *sccp);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #endif /* _GSM_DATA_H */</span><br><span>diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am</span><br><span>index c19d01b..b0fc181 100644</span><br><span>--- a/src/osmo-bsc/Makefile.am</span><br><span>+++ b/src/osmo-bsc/Makefile.am</span><br><span>@@ -40,6 +40,7 @@</span><br><span> bsc_init.c \</span><br><span> bsc_rf_ctrl.c \</span><br><span> bsc_rll.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_sccp.c \</span><br><span> bsc_subscr_conn_fsm.c \</span><br><span> bsc_subscriber.c \</span><br><span> bsc_vty.c \</span><br><span>diff --git a/src/osmo-bsc/bsc_sccp.c b/src/osmo-bsc/bsc_sccp.c</span><br><span>new file mode 100644</span><br><span>index 0000000..9d4289f</span><br><span>--- /dev/null</span><br><span>+++ b/src/osmo-bsc/bsc_sccp.c</span><br><span>@@ -0,0 +1,57 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/* Generic SCCP handling across all OsmoBSC users */</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2020 by sysmocom - s.f.m.c. GmbH <info@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * All Rights Reserved</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * Author: Neels Hofmeyr <neels@hofmeyr.de></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU Affero General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; either version 3 of the License, or</span><br><span style="color: hsl(120, 100%, 40%);">+ * (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU Affero General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * You should have received a copy of the GNU Affero General Public License</span><br><span style="color: hsl(120, 100%, 40%);">+ * along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/gsm_data.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/bsc_msc_data.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* We need an unused SCCP conn_id across all SCCP users. */</span><br><span style="color: hsl(120, 100%, 40%);">+int bsc_sccp_inst_next_conn_id(struct osmo_sccp_instance *sccp)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ static uint32_t next_id = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ int i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* This looks really suboptimal, but in most cases the static next_id should indicate exactly the next unused</span><br><span style="color: hsl(120, 100%, 40%);">+ * conn_id, and we only iterate all conns once to make super sure that it is not already in use. */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < 0xFFFFFF; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_subscriber_connection *conn;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t conn_id = next_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool conn_id_already_used = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ next_id = (next_id + 1) & 0xffffff;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(conn, &bsc_gsmnet->subscr_conns, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (conn->sccp.msc && conn->sccp.msc->a.sccp == sccp) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (conn_id == conn->sccp.conn_id) {</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_id_already_used = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Future for LCS: also check Lb-interface conn IDs here */</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!conn_id_already_used)</span><br><span style="color: hsl(120, 100%, 40%);">+ return conn_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c</span><br><span>index e0c24ef..6853fac 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_sigtran.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_sigtran.c</span><br><span>@@ -44,11 +44,6 @@</span><br><span> #define DEFAULT_ASP_LOCAL_IP "localhost"</span><br><span> #define DEFAULT_ASP_REMOTE_IP "localhost"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* The SCCP stack will not assign connection IDs to us automatically, we</span><br><span style="color: hsl(0, 100%, 40%);">- * will do this ourselves using a counter variable, that counts one up</span><br><span style="color: hsl(0, 100%, 40%);">- * for every new connection */</span><br><span style="color: hsl(0, 100%, 40%);">-static uint32_t conn_id_counter;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Helper function to Check if the given connection id is already assigned */</span><br><span> static struct gsm_subscriber_connection *get_bsc_conn_by_conn_id(int conn_id)</span><br><span> {</span><br><span>@@ -76,24 +71,6 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Pick a free connection id */</span><br><span style="color: hsl(0, 100%, 40%);">-static int pick_free_conn_id(const struct bsc_msc_data *msc)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int conn_id = conn_id_counter;</span><br><span style="color: hsl(0, 100%, 40%);">- int i;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < 0xFFFFFF; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- conn_id++;</span><br><span style="color: hsl(0, 100%, 40%);">- conn_id &= 0xFFFFFF;</span><br><span style="color: hsl(0, 100%, 40%);">- if (get_bsc_conn_by_conn_id(conn_id) == false) {</span><br><span style="color: hsl(0, 100%, 40%);">- conn_id_counter = conn_id;</span><br><span style="color: hsl(0, 100%, 40%);">- return conn_id;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Patch regular BSSMAP RESET to add extra T to announce Osmux support (osmocom extension) */</span><br><span> static void _gsm0808_extend_announce_osmux(struct msgb *msg)</span><br><span> {</span><br><span>@@ -353,7 +330,7 @@</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- conn->sccp.conn_id = conn_id = pick_free_conn_id(msc);</span><br><span style="color: hsl(120, 100%, 40%);">+ conn->sccp.conn_id = conn_id = bsc_sccp_inst_next_conn_id(conn->sccp.msc->a.sccp);</span><br><span> if (conn->sccp.conn_id < 0) {</span><br><span> LOGP(DMSC, LOGL_ERROR, "Unable to allocate SCCP Connection ID\n");</span><br><span> return -1;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/20356">change 20356</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/c/osmo-bsc/+/20356"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I12fcb18f6e4380f72929cfe7681bac05330a8c9a </div>
<div style="display:none"> Gerrit-Change-Number: 20356 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: Jenkins Builder </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>