Osmocom Open Build Service

commit_09f3420b2473da825f38ce6f2d5cddf45bb0992e.txt Added

commit_f2ffced67bb4350bb0d1d3cdbeca9e525bbb767b.txt Deleted

libosmo-sigtran_2.0.0.24.f2ff.dsc -> libosmo-sigtran_2.0.0.27.09f3.dsc Changed

@@ -2,7 +2,7 @@
 Source: libosmo-sigtran
 Binary: libosmo-sigtran10, libosmo-sigtran-dbg, libosmo-sigtran-doc, libosmo-sigtran-dev, osmo-stp, osmo-stp-dbg, osmo-stp-doc
 Architecture: any all
-Version: 2.0.0.24.f2ff
+Version: 2.0.0.27.09f3
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/libosmo-sccp
 Standards-Version: 3.9.7
@@ -18,8 +18,8 @@
  osmo-stp-dbg deb debug optional arch=any
  osmo-stp-doc deb doc optional arch=all
 Checksums-Sha1:
- 02bc4fa8dcd5939a954cd0ada5c07272b0d26bfe 229272 libosmo-sigtran_2.0.0.24.f2ff.tar.xz
+ 57d1fa798192b9e0553f28248d473e101c2263a1 229716 libosmo-sigtran_2.0.0.27.09f3.tar.xz
 Checksums-Sha256:
- 748c58e3fc800be2145753d7b61f9be9fa2b2af42912a726940ddb51535f82be 229272 libosmo-sigtran_2.0.0.24.f2ff.tar.xz
+ f5c72f467809ff17f6be63284da57ca63517e48d01d79af2d103520c46599dbe 229716 libosmo-sigtran_2.0.0.27.09f3.tar.xz
 Files:
- b8782ec6c5161a89bcd5298b2930bd01 229272 libosmo-sigtran_2.0.0.24.f2ff.tar.xz
+ e7bcdffb1a5a1461831ab5ef440829fd 229716 libosmo-sigtran_2.0.0.27.09f3.tar.xz

libosmo-sigtran_2.0.0.24.f2ff.tar.xz/.tarball-version -> libosmo-sigtran_2.0.0.27.09f3.tar.xz/.tarball-version Changed

libosmo-sigtran_2.0.0.24.f2ff.tar.xz/TODO-RELEASE -> libosmo-sigtran_2.0.0.27.09f3.tar.xz/TODO-RELEASE Changed

libosmo-sigtran_2.0.0.24.f2ff.tar.xz/debian/changelog -> libosmo-sigtran_2.0.0.27.09f3.tar.xz/debian/changelog Changed

libosmo-sigtran_2.0.0.24.f2ff.tar.xz/include/osmocom/sigtran/osmo_ss7.h -> libosmo-sigtran_2.0.0.27.09f3.tar.xz/include/osmocom/sigtran/osmo_ss7.h Changed

@@ -125,93 +125,22 @@
  * SS7 Links
  ***********************************************************************/
 
-enum osmo_ss7_link_adm_state {
-	OSMO_SS7_LS_SHUTDOWN,
-	OSMO_SS7_LS_INHIBITED,
-	OSMO_SS7_LS_ENABLED,
-	_NUM_OSMO_SS7_LS
-};
-
-struct osmo_ss7_linkset;
 struct osmo_ss7_link;
 
-struct osmo_ss7_link {
-	/*! \ref osmo_ss7_linkset to which we belong */
-	struct osmo_ss7_linkset *linkset;
-	struct {
-		char *name;
-		char *description;
-		uint32_t id;
-
-		enum osmo_ss7_link_adm_state adm_state;
-	} cfg;
-};
-
-void osmo_ss7_link_destroy(struct osmo_ss7_link *link);
-struct osmo_ss7_link *
-osmo_ss7_link_find_or_create(struct osmo_ss7_linkset *lset, uint32_t id);
-
 /***********************************************************************
  * SS7 Linksets
  ***********************************************************************/
 
-struct osmo_ss7_linkset {
-	struct llist_head list;
-	/*! \ref osmo_ss7_instance to which we belong */
-	struct osmo_ss7_instance *inst;
-	/*! array of \ref osmo_ss7_link */
-	struct osmo_ss7_link *links16;
-
-	struct {
-		char *name;
-		char *description;
-		uint32_t adjacent_pc;
-		uint32_t local_pc;
-	} cfg;
-};
-
-void osmo_ss7_linkset_destroy(struct osmo_ss7_linkset *lset);
-struct osmo_ss7_linkset *
-osmo_ss7_linkset_find_by_name(struct osmo_ss7_instance *inst, const char *name);
-struct osmo_ss7_linkset *
-osmo_ss7_linkset_find_or_create(struct osmo_ss7_instance *inst, const char *name, uint32_t pc);
-
+struct osmo_ss7_linkset;
 
 /***********************************************************************
  * SS7 Routes
  ***********************************************************************/
 
-struct osmo_ss7_route {
-	/*! member in \ref osmo_ss7_route_table.routes */
-	struct llist_head list;
-	/*! \ref osmo_ss7_route_table to which we belong */
-	struct osmo_ss7_route_table *rtable;
-
-	struct {
-		/*! pointer to linkset (destination) of route */
-		struct osmo_ss7_linkset *linkset;
-		/*! pointer to Application Server */
-		struct osmo_ss7_as *as;
-	} dest;
-
-	struct {
-		/* FIXME: presence? */
-		uint32_t pc;
-		uint32_t mask;
-		/*! human-specified linkset name */
-		char *linkset_name;
-		/*! lower priority is higher */
-		uint32_t priority;
-		uint8_t qos_class;
-	} cfg;
-};
+struct osmo_ss7_route;
 
 struct osmo_ss7_route *
 osmo_ss7_route_lookup(struct osmo_ss7_instance *inst, uint32_t dpc);
-struct osmo_ss7_route *
-osmo_ss7_route_create(struct osmo_ss7_route_table *rtbl, uint32_t dpc,
-			uint32_t mask, const char *linkset_name);
-void osmo_ss7_route_destroy(struct osmo_ss7_route *rt);
 const char *osmo_ss7_route_print(const struct osmo_ss7_route *rt);
 const char *osmo_ss7_route_name(struct osmo_ss7_route *rt, bool list_asps);
 struct osmo_ss7_as *

libosmo-sigtran_2.0.0.24.f2ff.tar.xz/src/Makefile.am -> libosmo-sigtran_2.0.0.27.09f3.tar.xz/src/Makefile.am Changed

libosmo-sigtran_2.0.0.24.f2ff.tar.xz/src/osmo_ss7.c -> libosmo-sigtran_2.0.0.27.09f3.tar.xz/src/osmo_ss7.c Changed

@@ -51,6 +51,8 @@
 #include "sccp_internal.h"
 #include "xua_internal.h"
 #include "ss7_internal.h"
+#include "ss7_linkset.h"
+#include "ss7_route.h"
 #include "ss7_route_table.h"
 #include "xua_asp_fsm.h"
 #include "xua_as_fsm.h"
@@ -376,7 +378,7 @@
 		osmo_ss7_as_destroy(as);
 
 	llist_for_each_entry_safe(lset, lset2, &inst->linksets, list)
-		osmo_ss7_linkset_destroy(lset);
+		ss7_linkset_destroy(lset);
 
 	llist_del(&inst->list);
 	talloc_free(inst);
@@ -491,408 +493,6 @@
 }
 
 /***********************************************************************
- * SS7 Linkset
- ***********************************************************************/
-
-/*! \brief Destroy a SS7 Linkset
- *  \paramin lset Linkset to be destroyed */
-void osmo_ss7_linkset_destroy(struct osmo_ss7_linkset *lset)
-{
-	struct osmo_ss7_route *rt, *rt2;
-	unsigned int i;
-
-	OSMO_ASSERT(ss7_initialized);
-	LOGSS7(lset->inst, LOGL_INFO, "Destroying Linkset %s\n",
-		lset->cfg.name);
-
-	/* find any routes pointing to this AS and remove them */
-	llist_for_each_entry_safe(rt, rt2, &lset->inst->rtable_system->routes, list) {
-		if (rt->dest.linkset == lset)
-			osmo_ss7_route_destroy(rt);
-	}
-
-	for (i = 0; i < ARRAY_SIZE(lset->links); i++) {
-		struct osmo_ss7_link *link = lset->linksi;
-		if (!link)
-			continue;
-		osmo_ss7_link_destroy(link);
-	}
-	llist_del(&lset->list);
-	talloc_free(lset);
-}
-
-/*! \brief Find SS7 Linkset by given name
- *  \paramin inst SS7 Instance in which to look
- *  \paramin name Name of SS7 Linkset
- *  \returns pointer to linkset on success; NULL on error */
-struct osmo_ss7_linkset *
-osmo_ss7_linkset_find_by_name(struct osmo_ss7_instance *inst, const char *name)
-{
-	struct osmo_ss7_linkset *lset;
-	OSMO_ASSERT(ss7_initialized);
-	llist_for_each_entry(lset, &inst->linksets, list) {
-		if (!strcmp(name, lset->cfg.name))
-			return lset;
-	}
-	return NULL;
-}
-
-/*! \brief Find or allocate SS7 Linkset
- *  \paramin inst SS7 Instance in which we operate
- *  \paramin name Name of SS7 Linkset
- *  \paramin pc Adjacent Pointcode
- *  \returns pointer to Linkset on success; NULL on error */
-struct osmo_ss7_linkset *
-osmo_ss7_linkset_find_or_create(struct osmo_ss7_instance *inst, const char *name, uint32_t pc)
-{
-	struct osmo_ss7_linkset *lset;
-
-	OSMO_ASSERT(ss7_initialized);
-	lset = osmo_ss7_linkset_find_by_name(inst, name);
-	if (lset && lset->cfg.adjacent_pc != pc)
-		return NULL;
-
-	if (!lset) {
-		LOGSS7(inst, LOGL_INFO, "Creating Linkset %s\n", name);
-		lset = talloc_zero(inst, struct osmo_ss7_linkset);
-		lset->inst = inst;
-		lset->cfg.adjacent_pc = pc;
-		lset->cfg.name = talloc_strdup(lset, name);
-		llist_add_tail(&lset->list, &inst->linksets);
-	}
-
-	return lset;
-}
-
-/***********************************************************************
- * SS7 Link
- ***********************************************************************/
-
-/*! \brief Destroy SS7 Link
- *  \paramin link SS7 Link to be destroyed */
-void osmo_ss7_link_destroy(struct osmo_ss7_link *link)
-{
-	struct osmo_ss7_linkset *lset = link->linkset;
-
-	OSMO_ASSERT(ss7_initialized);
-	LOGSS7(lset->inst, LOGL_INFO, "Destroying Link %s:%u\n",
-		lset->cfg.name, link->cfg.id);
-	/* FIXME: do cleanup */
-	lset->linkslink->cfg.id = NULL;
-	talloc_free(link);
-}
-
-/*! \brief Find or create SS7 Link with given ID in given Linkset
- *  \paramin lset SS7 Linkset on which we operate
- *  \paramin id Link number within Linkset
- *  \returns pointer to SS7 Link on success; NULL on error */
-struct osmo_ss7_link *
-osmo_ss7_link_find_or_create(struct osmo_ss7_linkset *lset, uint32_t id)
-{
-	struct osmo_ss7_link *link;
-
-	OSMO_ASSERT(ss7_initialized);
-	if (id >= ARRAY_SIZE(lset->links))
-		return NULL;
-
-	if (lset->linksid) {
-		link = lset->linksid;
-	} else {
-		LOGSS7(lset->inst, LOGL_INFO, "Creating Link %s:%u\n",
-			lset->cfg.name, id);
-		link = talloc_zero(lset, struct osmo_ss7_link);
-		if (!link)
-			return NULL;
-		link->linkset = lset;
-		lset->linksid = link;
-		link->cfg.id = id;
-	}
-
-	return link;
-}
-
-/***********************************************************************
- * SS7 Routes
- ***********************************************************************/
-
-/*! \brief Allocate a route entry
- *  \paramin rtbl Routing Table where the route belongs
- *  \paramin pc Point Code of the destination of the route
- *  \paramin mask Mask of the destination Point Code \ref pc
- *  \returns Allocated route (not yet inserted into its rtbl), NULL on error
- *
- * The returned route has no linkset associated yet, user *must* associate it
- * using API ss7_route_set_linkset() before inserting the route into its
- * routing table.
- *
- * Fields priority and qos_class may be set *before* inserting the route into
- * its routing table:
- * - A default priority of 0 is configured on the route.
- * - A default qos-class of 0 is configured on the route.
- *
- * Use API ss7_route_insert() to insert the route into its routing table.
- *
- * The route entry allocated with this API can be destroyed/freed at any point using API
- * osmo_ss7_route_destroy(), regardless of it being already inserted or not in
- * its routing table.
- */
-struct osmo_ss7_route *
-ss7_route_alloc(struct osmo_ss7_route_table *rtbl, uint32_t pc, uint32_t mask)
-{
-	struct osmo_ss7_route *rt;
-
-	OSMO_ASSERT(ss7_initialized);
-
-	rt = talloc_zero(rtbl, struct osmo_ss7_route);
-	if (!rt)
-		return NULL;
-
-	/* Mark it as not being inserted yet in rtbl */
-	INIT_LLIST_HEAD(&rt->list);
-	rt->rtable = rtbl;
-	/* truncate mask to maximum. Let's avoid callers specifying arbitrary large
-	 * masks to ensure we don't fail duplicate detection with longer mask lengths */
-	rt->cfg.mask = osmo_ss7_pc_normalize(&rtbl->inst->cfg.pc_fmt, mask);
-	rt->cfg.pc = osmo_ss7_pc_normalize(&rtbl->inst->cfg.pc_fmt, pc);
-	rt->cfg.priority = OSMO_SS7_ROUTE_PRIO_DEFAULT;
-	return rt;
-}
-
-/*! \brief Check whether route has already been inserted into its routing table.
- *  \returns true if already inserted, false if not.
- */
-static bool ss7_route_inserted(const struct osmo_ss7_route *rt)
-{
-	return !llist_empty(&rt->list);
-}
-
-/*! \brief Set linkset on route entry
- *  \paramin rt Route to be configured
- *  \paramin linkset_name string name of the linkset to be used

libosmo-sigtran_2.0.0.24.f2ff.tar.xz/src/osmo_ss7_as.c -> libosmo-sigtran_2.0.0.27.09f3.tar.xz/src/osmo_ss7_as.c Changed

libosmo-sigtran_2.0.0.24.f2ff.tar.xz/src/osmo_ss7_hmrt.c -> libosmo-sigtran_2.0.0.27.09f3.tar.xz/src/osmo_ss7_hmrt.c Changed

libosmo-sigtran_2.0.0.27.09f3.tar.xz/src/osmo_ss7_link.c Added

@@ -0,0 +1,77 @@
+/* (C) 2015-2017 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2023-2024 by sysmocom s.f.m.c. GmbH <info@sysmocom.de>
+ * All Rights Reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <errno.h>
+
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/sigtran/osmo_ss7.h>
+
+#include "ss7_link.h"
+#include "ss7_linkset.h"
+#include "ss7_internal.h"
+
+/***********************************************************************
+ * SS7 Link
+ ***********************************************************************/
+
+/*! \brief Destroy SS7 Link
+ *  \paramin link SS7 Link to be destroyed */
+void ss7_link_destroy(struct osmo_ss7_link *link)
+{
+	struct osmo_ss7_linkset *lset = link->linkset;
+
+	OSMO_ASSERT(ss7_initialized);
+	LOGSS7(lset->inst, LOGL_INFO, "Destroying Link %s:%u\n",
+		lset->cfg.name, link->cfg.id);
+	/* FIXME: do cleanup */
+	lset->linkslink->cfg.id = NULL;
+	talloc_free(link);
+}
+
+/*! \brief Find or create SS7 Link with given ID in given Linkset
+ *  \paramin lset SS7 Linkset on which we operate
+ *  \paramin id Link number within Linkset
+ *  \returns pointer to SS7 Link on success; NULL on error */
+struct osmo_ss7_link *
+ss7_link_find_or_create(struct osmo_ss7_linkset *lset, uint32_t id)
+{
+	struct osmo_ss7_link *link;
+
+	OSMO_ASSERT(ss7_initialized);
+	if (id >= ARRAY_SIZE(lset->links))
+		return NULL;
+
+	if (lset->linksid) {
+		link = lset->linksid;
+	} else {
+		LOGSS7(lset->inst, LOGL_INFO, "Creating Link %s:%u\n",
+			lset->cfg.name, id);
+		link = talloc_zero(lset, struct osmo_ss7_link);
+		if (!link)
+			return NULL;
+		link->linkset = lset;
+		lset->linksid = link;
+		link->cfg.id = id;
+	}
+
+	return link;
+}

libosmo-sigtran_2.0.0.27.09f3.tar.xz/src/osmo_ss7_linkset.c Added

@@ -0,0 +1,106 @@
+/* (C) 2015-2017 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2023-2024 by sysmocom s.f.m.c. GmbH <info@sysmocom.de>
+ * All Rights Reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <errno.h>
+
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/sigtran/osmo_ss7.h>
+
+#include "ss7_link.h"
+#include "ss7_linkset.h"
+#include "ss7_route.h"
+#include "ss7_route_table.h"
+#include "ss7_internal.h"
+
+/***********************************************************************
+ * SS7 Linkset
+ ***********************************************************************/
+
+/*! \brief Destroy a SS7 Linkset
+ *  \paramin lset Linkset to be destroyed */
+void ss7_linkset_destroy(struct osmo_ss7_linkset *lset)
+{
+	struct osmo_ss7_route *rt, *rt2;
+	unsigned int i;
+
+	OSMO_ASSERT(ss7_initialized);
+	LOGSS7(lset->inst, LOGL_INFO, "Destroying Linkset %s\n",
+		lset->cfg.name);
+
+	/* find any routes pointing to this AS and remove them */
+	llist_for_each_entry_safe(rt, rt2, &lset->inst->rtable_system->routes, list) {
+		if (rt->dest.linkset == lset)
+			ss7_route_destroy(rt);
+	}
+
+	for (i = 0; i < ARRAY_SIZE(lset->links); i++) {
+		struct osmo_ss7_link *link = lset->linksi;
+		if (!link)
+			continue;
+		ss7_link_destroy(link);
+	}
+	llist_del(&lset->list);
+	talloc_free(lset);
+}
+
+/*! \brief Find SS7 Linkset by given name
+ *  \paramin inst SS7 Instance in which to look
+ *  \paramin name Name of SS7 Linkset
+ *  \returns pointer to linkset on success; NULL on error */
+struct osmo_ss7_linkset *
+ss7_linkset_find_by_name(struct osmo_ss7_instance *inst, const char *name)
+{
+	struct osmo_ss7_linkset *lset;
+	OSMO_ASSERT(ss7_initialized);
+	llist_for_each_entry(lset, &inst->linksets, list) {
+		if (!strcmp(name, lset->cfg.name))
+			return lset;
+	}
+	return NULL;
+}
+
+/*! \brief Find or allocate SS7 Linkset
+ *  \paramin inst SS7 Instance in which we operate
+ *  \paramin name Name of SS7 Linkset
+ *  \paramin pc Adjacent Pointcode
+ *  \returns pointer to Linkset on success; NULL on error */
+struct osmo_ss7_linkset *
+ss7_linkset_find_or_create(struct osmo_ss7_instance *inst, const char *name, uint32_t pc)
+{
+	struct osmo_ss7_linkset *lset;
+
+	OSMO_ASSERT(ss7_initialized);
+	lset = ss7_linkset_find_by_name(inst, name);
+	if (lset && lset->cfg.adjacent_pc != pc)
+		return NULL;
+
+	if (!lset) {
+		LOGSS7(inst, LOGL_INFO, "Creating Linkset %s\n", name);
+		lset = talloc_zero(inst, struct osmo_ss7_linkset);
+		lset->inst = inst;
+		lset->cfg.adjacent_pc = pc;
+		lset->cfg.name = talloc_strdup(lset, name);
+		llist_add_tail(&lset->list, &inst->linksets);
+	}
+
+	return lset;
+}

libosmo-sigtran_2.0.0.27.09f3.tar.xz/src/osmo_ss7_route.c Added

@@ -0,0 +1,313 @@
+/* (C) 2015-2017 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2023-2024 by sysmocom s.f.m.c. GmbH <info@sysmocom.de>
+ * All Rights Reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <errno.h>
+
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/sigtran/mtp_sap.h>
+#include <osmocom/sigtran/osmo_ss7.h>
+
+#include "ss7_linkset.h"
+#include "ss7_route.h"
+#include "ss7_route_table.h"
+#include "ss7_internal.h"
+
+/***********************************************************************
+ * SS7 Routes
+ ***********************************************************************/
+
+/*! \brief Allocate a route entry
+ *  \paramin rtbl Routing Table where the route belongs
+ *  \paramin pc Point Code of the destination of the route
+ *  \paramin mask Mask of the destination Point Code \ref pc
+ *  \returns Allocated route (not yet inserted into its rtbl), NULL on error
+ *
+ * The returned route has no linkset associated yet, user *must* associate it
+ * using API ss7_route_set_linkset() before inserting the route into its
+ * routing table.
+ *
+ * Fields priority and qos_class may be set *before* inserting the route into
+ * its routing table:
+ * - A default priority of 0 is configured on the route.
+ * - A default qos-class of 0 is configured on the route.
+ *
+ * Use API ss7_route_insert() to insert the route into its routing table.
+ *
+ * The route entry allocated with this API can be destroyed/freed at any point using API
+ * ss7_route_destroy(), regardless of it being already inserted or not in
+ * its routing table.
+ */
+struct osmo_ss7_route *
+ss7_route_alloc(struct osmo_ss7_route_table *rtbl, uint32_t pc, uint32_t mask)
+{
+	struct osmo_ss7_route *rt;
+
+	OSMO_ASSERT(ss7_initialized);
+
+	rt = talloc_zero(rtbl, struct osmo_ss7_route);
+	if (!rt)
+		return NULL;
+
+	/* Mark it as not being inserted yet in rtbl */
+	INIT_LLIST_HEAD(&rt->list);
+	rt->rtable = rtbl;
+	/* truncate mask to maximum. Let's avoid callers specifying arbitrary large
+	 * masks to ensure we don't fail duplicate detection with longer mask lengths */
+	rt->cfg.mask = osmo_ss7_pc_normalize(&rtbl->inst->cfg.pc_fmt, mask);
+	rt->cfg.pc = osmo_ss7_pc_normalize(&rtbl->inst->cfg.pc_fmt, pc);
+	rt->cfg.priority = OSMO_SS7_ROUTE_PRIO_DEFAULT;
+	return rt;
+}
+
+/*! \brief Check whether route has already been inserted into its routing table.
+ *  \returns true if already inserted, false if not.
+ */
+static bool ss7_route_inserted(const struct osmo_ss7_route *rt)
+{
+	return !llist_empty(&rt->list);
+}
+
+/*! \brief Set linkset on route entry
+ *  \paramin rt Route to be configured
+ *  \paramin linkset_name string name of the linkset to be used
+ *  \returns 0 on success, negative on error.
+ */
+int
+ss7_route_set_linkset(struct osmo_ss7_route *rt, const char *linkset_name)
+{
+	struct osmo_ss7_linkset *lset;
+	struct osmo_ss7_as *as = NULL;
+	struct osmo_ss7_route_table *rtbl = rt->rtable;
+
+	if (rt->cfg.linkset_name) {
+		LOGSS7(rtbl->inst, LOGL_ERROR, "Attempt setting linkset on route already configured!\n");
+		return -EBUSY;
+	}
+
+	if (ss7_route_inserted(rt)) {
+		LOGSS7(rtbl->inst, LOGL_ERROR, "Attempt setting linkset on route already in the routing table!\n");
+		return -EALREADY;
+	}
+
+	lset = ss7_linkset_find_by_name(rtbl->inst, linkset_name);
+	if (!lset) {
+		as = osmo_ss7_as_find_by_name(rtbl->inst, linkset_name);
+		if (!as)
+			return -ENODEV;
+	}
+
+	rt->cfg.linkset_name = talloc_strdup(rt, linkset_name);
+	if (lset) {
+		rt->dest.linkset = lset;
+		LOGSS7(rtbl->inst, LOGL_INFO, "Creating route: pc=%u=%s mask=0x%x via linkset '%s'\n",
+		       rt->cfg.pc, osmo_ss7_pointcode_print(rtbl->inst, rt->cfg.pc),
+		       rt->cfg.mask, lset->cfg.name);
+	} else {
+		rt->dest.as = as;
+		LOGSS7(rtbl->inst, LOGL_INFO, "Creating route: pc=%u=%s mask=0x%x via AS '%s'\n",
+		       rt->cfg.pc, osmo_ss7_pointcode_print(rtbl->inst, rt->cfg.pc),
+		       rt->cfg.mask, as->cfg.name);
+	}
+	return 0;
+}
+
+/* insert the route in the ordered list of routes. The list is sorted by
+ * mask length, so that the more specific (longer mask) routes are
+ * first, while the less specific routes with shorter masks are last.
+ * Within the same mask length, the routes are ordered by priority.
+ * Hence, the first matching route in a linear iteration is the most
+ * specific match. */
+static void route_insert_sorted(struct osmo_ss7_route_table *rtbl,
+				struct osmo_ss7_route *cmp)
+{
+	struct osmo_ss7_route *rt;
+
+	llist_for_each_entry(rt, &rtbl->routes, list) {
+		if (rt->cfg.mask == cmp->cfg.mask &&
+		    rt->cfg.priority > cmp->cfg.priority) {
+			/* insert before the current entry */
+			llist_add(&cmp->list, rt->list.prev);
+			return;
+		}
+		if (rt->cfg.mask < cmp->cfg.mask) {
+			/* insert before the current entry */
+			llist_add(&cmp->list, rt->list.prev);
+			return;
+		}
+	}
+	/* not added, i.e. no smaller mask length and priority found: we are the
+	 * smallest mask and priority and thus should go last */
+	llist_add_tail(&cmp->list, &rtbl->routes);
+}
+
+/*! \brief Insert route into its routing table
+ *  \paramin rt Route to be inserted into its routing table
+ *  \returns 0 on success, negative on error
+ *
+ * A route is only really used once it has been inserted into its routing table.
+ */
+int
+ss7_route_insert(struct osmo_ss7_route *rt)
+{
+	struct osmo_ss7_route *prev_rt;
+	struct osmo_ss7_route_table *rtbl = rt->rtable;
+
+	if (ss7_route_inserted(rt)) {
+		LOGSS7(rtbl->inst, LOGL_ERROR, "Attempt insert of route already in the routing table!\n");
+		return -EALREADY;
+	}
+
+	if (!rt->cfg.linkset_name) {
+		LOGSS7(rtbl->inst, LOGL_ERROR, "Attempt insert of route with unset linkset!\n");
+		return -EINVAL;
+	}
+
+	/* check for duplicates */
+	prev_rt = ss7_route_table_find_route_by_dpc_mask(rtbl, rt->cfg.pc, rt->cfg.mask);
+	if (prev_rt && !strcmp(prev_rt->cfg.linkset_name, rt->cfg.linkset_name)) {
+		LOGSS7(rtbl->inst, LOGL_ERROR,
+		       "Refusing to create route with existing linkset name: pc=%u=%s mask=0x%x via linkset/AS '%s'\n",
+		       rt->cfg.pc, osmo_ss7_pointcode_print(rtbl->inst, rt->cfg.pc),
+		       rt->cfg.mask, rt->cfg.linkset_name);
+		return -EADDRINUSE;
+	}
+
+	route_insert_sorted(rtbl, rt);
+	return 0;
+}
+
+/*! \brief Create a new route in the given routing table
+ *  \paramin rtbl Routing Table in which the route is to be created

libosmo-sigtran_2.0.0.24.f2ff.tar.xz/src/osmo_ss7_route_table.c -> libosmo-sigtran_2.0.0.27.09f3.tar.xz/src/osmo_ss7_route_table.c Changed

libosmo-sigtran_2.0.0.24.f2ff.tar.xz/src/osmo_ss7_vty.c -> libosmo-sigtran_2.0.0.27.09f3.tar.xz/src/osmo_ss7_vty.c Changed

@@ -46,6 +46,7 @@
 #include "xua_internal.h"
 #include <osmocom/sigtran/sccp_sap.h>
 #include "sccp_internal.h"
+#include "ss7_route.h"
 #include "ss7_route_table.h"
 #include "ss7_internal.h"
 
@@ -443,7 +444,7 @@
 	return CMD_SUCCESS;
 
 destroy_warning:
-	osmo_ss7_route_destroy(rt);
+	ss7_route_destroy(rt);
 	return CMD_WARNING;
 }
 
@@ -477,7 +478,7 @@
 		return CMD_WARNING;
 	}
 
-	osmo_ss7_route_destroy(rt);
+	ss7_route_destroy(rt);
 	return CMD_SUCCESS;
 }
 
@@ -2025,7 +2026,7 @@
 	if (cs7_role == CS7_ROLE_ASP) {
 		rt = ss7_route_table_find_route_by_dpc_mask(as->inst->rtable_system, rkey->pc, 0xffffff);
 		if (rt)
-			osmo_ss7_route_destroy(rt);
+			ss7_route_destroy(rt);
 	}
 
 	rkey->pc = pc;
@@ -2036,7 +2037,7 @@
 
 	/* automatically add new route (see also comment above) */
 	if (cs7_role == CS7_ROLE_ASP) {
-		if (!osmo_ss7_route_create(as->inst->rtable_system, rkey->pc, 0xffffff, as->cfg.name)) {
+		if (!ss7_route_create(as->inst->rtable_system, rkey->pc, 0xffffff, as->cfg.name)) {
 			vty_out(vty, "Cannot create route (pc=%s, linkset=%s) to AS %s", dpc, as->cfg.name, VTY_NEWLINE);
 			return CMD_WARNING;
 		}

libosmo-sigtran_2.0.0.24.f2ff.tar.xz/src/sccp_scrc.c -> libosmo-sigtran_2.0.0.27.09f3.tar.xz/src/sccp_scrc.c Changed

libosmo-sigtran_2.0.0.24.f2ff.tar.xz/src/sccp_user.c -> libosmo-sigtran_2.0.0.27.09f3.tar.xz/src/sccp_user.c Changed

@@ -39,6 +39,7 @@
 
 #include "sccp_internal.h"
 #include "xua_internal.h"
+#include "ss7_route.h"
 #include "ss7_route_table.h"
 #include "ss7_internal.h"
 
@@ -589,7 +590,7 @@
 	rt = ss7_route_table_find_route_by_dpc_mask(ss7->rtable_system, 0, 0);
 	if (!rt) {
 		LOGP(DLSCCP, LOGL_NOTICE, "%s: Creating default route\n", name);
-		rt = osmo_ss7_route_create(ss7->rtable_system, 0, 0,
+		rt = ss7_route_create(ss7->rtable_system, 0, 0,
 					   as->cfg.name);
 		if (!rt)
 			goto out_as;
@@ -711,7 +712,7 @@
 		osmo_ss7_asp_destroy(asp);
 out_rt:
 	if (rt_created)
-		osmo_ss7_route_destroy(rt);
+		ss7_route_destroy(rt);
 out_as:
 	if (as_created)
 		osmo_ss7_as_destroy(as);
@@ -838,7 +839,7 @@
 		goto out_strings;
 
 	/* route only selected PC to the client */
-	rt = osmo_ss7_route_create(ss7->rtable_system, pc, 0xffff, as_name);
+	rt = ss7_route_create(ss7->rtable_system, pc, 0xffff, as_name);
 	if (!rt)
 		goto out_as;
 
@@ -868,7 +869,7 @@
 out_asp:
 	osmo_ss7_asp_destroy(asp);
 out_rt:
-	osmo_ss7_route_destroy(rt);
+	ss7_route_destroy(rt);
 out_as:
 	osmo_ss7_as_destroy(as);
 out_strings:

libosmo-sigtran_2.0.0.24.f2ff.tar.xz/src/ss7_internal.h -> libosmo-sigtran_2.0.0.27.09f3.tar.xz/src/ss7_internal.h Changed

libosmo-sigtran_2.0.0.27.09f3.tar.xz/src/ss7_link.h Added

libosmo-sigtran_2.0.0.27.09f3.tar.xz/src/ss7_linkset.h Added

libosmo-sigtran_2.0.0.27.09f3.tar.xz/src/ss7_route.h Added

@@ -0,0 +1,56 @@
+#pragma once
+
+#include <stdint.h>
+#include <osmocom/core/linuxlist.h>
+
+/***********************************************************************
+ * SS7 Routes
+ ***********************************************************************/
+
+struct osmo_ss7_instance;
+struct osmo_ss7_route_table;
+struct osmo_ss7_linkset;
+struct osmo_ss7_as;
+
+#define OSMO_SS7_ROUTE_PRIO_DEFAULT 5
+
+struct osmo_ss7_route {
+	/*! member in \ref osmo_ss7_route_table.routes */
+	struct llist_head list;
+	/*! \ref osmo_ss7_route_table to which we belong */
+	struct osmo_ss7_route_table *rtable;
+
+	struct {
+		/*! pointer to linkset (destination) of route */
+		struct osmo_ss7_linkset *linkset;
+		/*! pointer to Application Server */
+		struct osmo_ss7_as *as;
+	} dest;
+
+	struct {
+		/* FIXME: presence? */
+		uint32_t pc;
+		uint32_t mask;
+		/*! human-specified linkset name */
+		char *linkset_name;
+		/*! lower priority is higher */
+		uint32_t priority;
+		uint8_t qos_class;
+	} cfg;
+};
+
+struct osmo_ss7_route *
+ss7_route_alloc(struct osmo_ss7_route_table *rtbl, uint32_t pc, uint32_t mask);
+struct osmo_ss7_route *
+ss7_route_create(struct osmo_ss7_route_table *rtbl, uint32_t dpc,
+			uint32_t mask, const char *linkset_name);
+void ss7_route_destroy(struct osmo_ss7_route *rt);
+
+struct osmo_ss7_route *
+ss7_route_find_dpc(struct osmo_ss7_route_table *rtbl, uint32_t dpc);
+struct osmo_ss7_route *
+ss7_route_find_dpc_mask(struct osmo_ss7_route_table *rtbl, uint32_t dpc,
+			     uint32_t mask);
+
+int ss7_route_set_linkset(struct osmo_ss7_route *rt, const char *linkset_name);
+int ss7_route_insert(struct osmo_ss7_route *rt);

libosmo-sigtran_2.0.0.24.f2ff.tar.xz/src/xua_as_fsm.c -> libosmo-sigtran_2.0.0.27.09f3.tar.xz/src/xua_as_fsm.c Changed

libosmo-sigtran_2.0.0.24.f2ff.tar.xz/src/xua_rkm.c -> libosmo-sigtran_2.0.0.27.09f3.tar.xz/src/xua_rkm.c Changed

@@ -28,6 +28,7 @@
 #include <osmocom/sigtran/osmo_ss7.h>
 #include <osmocom/sigtran/protocol/m3ua.h>
 
+#include "ss7_route.h"
 #include "ss7_route_table.h"
 #include "xua_internal.h"
 #include "xua_as_fsm.h"
@@ -260,7 +261,7 @@
 		as->cfg.routing_key.context = rctx;
 
 		/* add route for that routing key */
-		rt = osmo_ss7_route_create(as->inst->rtable_system, dpc, 0xFFFFFF, namebuf);
+		rt = ss7_route_create(as->inst->rtable_system, dpc, 0xFFFFFF, namebuf);
 		if (!rt) {
 			LOGPASP(asp, DLSS7, LOGL_ERROR, "RKM: Cannot insert route for DPC %s / as %s\n",
 				osmo_ss7_pointcode_print(asp->inst, dpc), namebuf);
@@ -271,7 +272,7 @@
 
 		/* append to list of newly assigned as */
 		if (*nas_idx >= max_nas_idx) {
-			osmo_ss7_route_destroy(rt);
+			ss7_route_destroy(rt);
 			osmo_ss7_as_destroy(as);
 			LOGPASP(asp, DLSS7, LOGL_ERROR, "RKM: not enough room for newly assigned AS (max %u AS)\n",
 				max_nas_idx+1);
@@ -392,7 +393,7 @@
 	 * route and destroy the AS */
 	if (as->rkm_dyn_allocated) {
 		/* remove route + AS definition */
-		osmo_ss7_route_destroy(rt);
+		ss7_route_destroy(rt);
 		osmo_ss7_as_destroy(as);
 	}
 	/* report success */

libosmo-sigtran_2.0.0.24.f2ff.tar.xz/tests/ss7/ss7_test.c -> libosmo-sigtran_2.0.0.27.09f3.tar.xz/tests/ss7/ss7_test.c Changed

@@ -1,3 +1,6 @@
+#include "../src/ss7_link.h"
+#include "../src/ss7_linkset.h"
+#include "../src/ss7_route.h"
 #include "../src/ss7_route_table.h"
 #include "../src/xua_internal.h"
 #include "../src/xua_asp_fsm.h"
@@ -155,21 +158,21 @@
 	rtbl = ss7_route_table_find(s7i, "system");
 	OSMO_ASSERT(rtbl && rtbl == s7i->rtable_system);
 
-	lset_a = osmo_ss7_linkset_find_or_create(s7i, "a", 100);
+	lset_a = ss7_linkset_find_or_create(s7i, "a", 100);
 	OSMO_ASSERT(lset_a);
-	lset_b = osmo_ss7_linkset_find_or_create(s7i, "b", 200);
+	lset_b = ss7_linkset_find_or_create(s7i, "b", 200);
 	OSMO_ASSERT(lset_b);
 
 	/* route with full mask */
 	OSMO_ASSERT(ss7_route_table_find_route_by_dpc(rtbl, 12) == NULL);
-	rt = osmo_ss7_route_create(rtbl, 12, 0xffff, "a");
+	rt = ss7_route_create(rtbl, 12, 0xffff, "a");
 	printf("route with full mask: %s\n", osmo_ss7_route_print(rt));
 	OSMO_ASSERT(rt);
 	OSMO_ASSERT(ss7_route_table_find_route_by_dpc(rtbl, 12) == rt);
-	osmo_ss7_route_destroy(rt);
+	ss7_route_destroy(rt);
 
 	/* route with partial mask */
-	rt = osmo_ss7_route_create(rtbl, 8, 0xfff8, "a");
+	rt = ss7_route_create(rtbl, 8, 0xfff8, "a");
 	printf("route with partial mask: %s\n", osmo_ss7_route_print(rt));
 	OSMO_ASSERT(ss7_route_table_find_route_by_dpc(rtbl, 8) == rt);
 	OSMO_ASSERT(ss7_route_table_find_route_by_dpc(rtbl, 9) == rt);
@@ -178,26 +181,26 @@
 	OSMO_ASSERT(ss7_route_table_find_route_by_dpc(rtbl, 16) == NULL);
 	/* insert more specific route for 12, must have higher priority
 	 * than existing one */
-	rt12 = osmo_ss7_route_create(rtbl, 12, 0xffff, "b");
+	rt12 = ss7_route_create(rtbl, 12, 0xffff, "b");
 	OSMO_ASSERT(ss7_route_table_find_route_by_dpc(rtbl, 12) == rt12);
 	OSMO_ASSERT(ss7_route_table_find_route_by_dpc(rtbl, 15) == rt);
 	OSMO_ASSERT(ss7_route_table_find_route_by_dpc(rtbl, 16) == NULL);
 	/* add a default route, which should have lowest precedence */
-	rtdef = osmo_ss7_route_create(rtbl, 0, 0, "a");
+	rtdef = ss7_route_create(rtbl, 0, 0, "a");
 	OSMO_ASSERT(ss7_route_table_find_route_by_dpc(rtbl, 12) == rt12);
 	OSMO_ASSERT(ss7_route_table_find_route_by_dpc(rtbl, 15) == rt);
 	OSMO_ASSERT(ss7_route_table_find_route_by_dpc(rtbl, 16) == rtdef);
 
-	osmo_ss7_route_destroy(rtdef);
-	osmo_ss7_route_destroy(rt12);
-	osmo_ss7_route_destroy(rt);
+	ss7_route_destroy(rtdef);
+	ss7_route_destroy(rt12);
+	ss7_route_destroy(rt);
 
-	rt = osmo_ss7_route_create(rtbl, 8, 0xfff9, "a");
+	rt = ss7_route_create(rtbl, 8, 0xfff9, "a");
 	printf("route with non-consecutive mask: %s\n", osmo_ss7_route_print(rt));
-	osmo_ss7_route_destroy(rt);
+	ss7_route_destroy(rt);
 
-	osmo_ss7_linkset_destroy(lset_a);
-	osmo_ss7_linkset_destroy(lset_b);
+	ss7_linkset_destroy(lset_a);
+	ss7_linkset_destroy(lset_b);
 }
 
 static void test_linkset(void)
@@ -207,32 +210,32 @@
 
 	printf("Testing SS7 linkset/link\n");
 
-	OSMO_ASSERT(osmo_ss7_linkset_find_by_name(s7i, "a") == NULL);
-	OSMO_ASSERT(osmo_ss7_linkset_find_by_name(s7i, "b") == NULL);
+	OSMO_ASSERT(ss7_linkset_find_by_name(s7i, "a") == NULL);
+	OSMO_ASSERT(ss7_linkset_find_by_name(s7i, "b") == NULL);
 
-	lset_a = osmo_ss7_linkset_find_or_create(s7i, "a", 100);
+	lset_a = ss7_linkset_find_or_create(s7i, "a", 100);
 	OSMO_ASSERT(lset_a);
-	OSMO_ASSERT(osmo_ss7_linkset_find_by_name(s7i, "a") == lset_a);
+	OSMO_ASSERT(ss7_linkset_find_by_name(s7i, "a") == lset_a);
 
-	lset_b = osmo_ss7_linkset_find_or_create(s7i, "b", 200);
+	lset_b = ss7_linkset_find_or_create(s7i, "b", 200);
 	OSMO_ASSERT(lset_b);
-	OSMO_ASSERT(osmo_ss7_linkset_find_by_name(s7i, "b") == lset_b);
+	OSMO_ASSERT(ss7_linkset_find_by_name(s7i, "b") == lset_b);
 
-	l_a1 = osmo_ss7_link_find_or_create(lset_a, 1);
+	l_a1 = ss7_link_find_or_create(lset_a, 1);
 	OSMO_ASSERT(l_a1);
-	l_a2 = osmo_ss7_link_find_or_create(lset_a, 2);
+	l_a2 = ss7_link_find_or_create(lset_a, 2);
 	OSMO_ASSERT(l_a2);
 
 	/* ID too high */
-	OSMO_ASSERT(osmo_ss7_link_find_or_create(lset_a, 1000) == NULL);
+	OSMO_ASSERT(ss7_link_find_or_create(lset_a, 1000) == NULL);
 	/* already exists */
-	OSMO_ASSERT(osmo_ss7_link_find_or_create(lset_a, 1) == l_a1);
+	OSMO_ASSERT(ss7_link_find_or_create(lset_a, 1) == l_a1);
 
-	osmo_ss7_link_destroy(l_a1);
-	osmo_ss7_link_destroy(l_a2);
+	ss7_link_destroy(l_a1);
+	ss7_link_destroy(l_a2);
 
-	osmo_ss7_linkset_destroy(lset_a);
-	osmo_ss7_linkset_destroy(lset_b);
+	ss7_linkset_destroy(lset_a);
+	ss7_linkset_destroy(lset_b);
 }
 
 static void test_as(void)

Changes of Revision 13