[S] Change in libosmo-sigtran[master]: Move code to delete routes by as/linkset to helper functions
by pespin
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38730?usp=email )
Change subject: Move code to delete routes by as/linkset to helper functions
......................................................................
Move code to delete routes by as/linkset to helper functions
This really fits into a helper function, allowig for further reuse in
the future and removing complexity from other code functions.
It also makes the logic independent on the implementation of the routing
table.
Change-Id: Ic36fd6a0466cc0338132f2e34eb7c916115c9d4a
---
M src/osmo_ss7_as.c
M src/osmo_ss7_linkset.c
M src/osmo_ss7_route_table.c
M src/ss7_route_table.h
4 files changed, 28 insertions(+), 12 deletions(-)
Approvals:
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
diff --git a/src/osmo_ss7_as.c b/src/osmo_ss7_as.c
index 3540fde..eb655ca 100644
--- a/src/osmo_ss7_as.c
+++ b/src/osmo_ss7_as.c
@@ -167,8 +167,6 @@
* \param[in] as Application Server to destroy */
void osmo_ss7_as_destroy(struct osmo_ss7_as *as)
{
- struct osmo_ss7_route *rt, *rt2;
-
OSMO_ASSERT(ss7_initialized);
LOGPAS(as, DLSS7, LOGL_INFO, "Destroying AS\n");
@@ -176,10 +174,7 @@
osmo_fsm_inst_term(as->fi, OSMO_FSM_TERM_REQUEST, NULL);
/* find any routes pointing to this AS and remove them */
- llist_for_each_entry_safe(rt, rt2, &as->inst->rtable_system->routes, list) {
- if (rt->dest.as == as)
- ss7_route_destroy(rt);
- }
+ ss7_route_table_del_routes_by_as(as->inst->rtable_system, as);
as->inst = NULL;
llist_del(&as->list);
diff --git a/src/osmo_ss7_linkset.c b/src/osmo_ss7_linkset.c
index 9e0b17b..146ec92 100644
--- a/src/osmo_ss7_linkset.c
+++ b/src/osmo_ss7_linkset.c
@@ -39,18 +39,14 @@
* \param[in] 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);
- }
+ /* find any routes pointing to this linkset and remove them */
+ ss7_route_table_del_routes_by_linkset(lset->inst->rtable_system, lset);
for (i = 0; i < ARRAY_SIZE(lset->links); i++) {
struct osmo_ss7_link *link = lset->links[i];
diff --git a/src/osmo_ss7_route_table.c b/src/osmo_ss7_route_table.c
index 910633b..03596d0 100644
--- a/src/osmo_ss7_route_table.c
+++ b/src/osmo_ss7_route_table.c
@@ -122,3 +122,25 @@
}
return NULL;
}
+
+/* find any routes pointing to this linkset and remove them */
+void ss7_route_table_del_routes_by_linkset(struct osmo_ss7_route_table *rtbl, struct osmo_ss7_linkset *lset)
+{
+ struct osmo_ss7_route *rt, *rt2;
+
+ llist_for_each_entry_safe(rt, rt2, &rtbl->routes, list) {
+ if (rt->dest.linkset == lset)
+ ss7_route_destroy(rt);
+ }
+}
+
+/* find any routes pointing to this AS and remove them */
+void ss7_route_table_del_routes_by_as(struct osmo_ss7_route_table *rtbl, struct osmo_ss7_as *as)
+{
+ struct osmo_ss7_route *rt, *rt2;
+
+ llist_for_each_entry_safe(rt, rt2, &rtbl->routes, list) {
+ if (rt->dest.as == as)
+ ss7_route_destroy(rt);
+ }
+}
diff --git a/src/ss7_route_table.h b/src/ss7_route_table.h
index 5c70c4c..38cff31 100644
--- a/src/ss7_route_table.h
+++ b/src/ss7_route_table.h
@@ -34,3 +34,6 @@
struct osmo_ss7_route *
ss7_route_table_find_route_by_dpc_mask(struct osmo_ss7_route_table *rtbl, uint32_t dpc,
uint32_t mask);
+
+void ss7_route_table_del_routes_by_as(struct osmo_ss7_route_table *rtbl, struct osmo_ss7_as *as);
+void ss7_route_table_del_routes_by_linkset(struct osmo_ss7_route_table *rtbl, struct osmo_ss7_linkset *lset);
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38730?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: Ic36fd6a0466cc0338132f2e34eb7c916115c9d4a
Gerrit-Change-Number: 38730
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
7 months, 2 weeks
- 1
- 0
[M] Change in libosmo-sigtran[master]: sigtran: Add public APIs to manage struct osmo_ss7_user
by pespin
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38727?usp=email )
Change subject: sigtran: Add public APIs to manage struct osmo_ss7_user
......................................................................
sigtran: Add public APIs to manage struct osmo_ss7_user
Change-Id: I81b424239e9f7d4dc84bf167053f784ad2e8ca49
---
M TODO-RELEASE
M include/osmocom/sigtran/osmo_ss7.h
M src/Makefile.am
A src/osmo_ss7_user.c
M src/sccp_internal.h
M src/sccp_user.c
M tests/ss7/ss7_test.c
7 files changed, 102 insertions(+), 15 deletions(-)
Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
diff --git a/TODO-RELEASE b/TODO-RELEASE
index 08978d4..a8b60f1 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -14,3 +14,4 @@
libosmo-sigtran add API osmo_ss7_instance_get_id(), osmo_ss7_instance_get_name(), osmo_ss7_instance_get_pc_fmt(), osmo_ss7_instance_get_primary_pc(), osmo_ss7_get_sccp()
libosmo-sigtran add API osmo_ss7_instances_llist_entry()
libosmo-sigtran add API osmo_ss7_as_get_asp_protocol(), osmo_ss7_as_select_asp()
+libosmo-sigtran add API osmo_ss7_user: create(), get_instance(), set_prim_cb(), set_priv(), get_priv()
diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h
index 361e715..ccf2247 100644
--- a/include/osmocom/sigtran/osmo_ss7.h
+++ b/include/osmocom/sigtran/osmo_ss7.h
@@ -128,9 +128,16 @@
void *priv;
};
+struct osmo_ss7_user *osmo_ss7_user_create(struct osmo_ss7_instance *inst, const char *name);
+void osmo_ss7_user_destroy(struct osmo_ss7_user *user);
+
+struct osmo_ss7_instance *osmo_ss7_user_get_instance(const struct osmo_ss7_user *user);
+void osmo_ss7_user_set_prim_cb(struct osmo_ss7_user *user, osmo_prim_cb prim_cb);
+void osmo_ss7_user_set_priv(struct osmo_ss7_user *user, void *priv);
+void *osmo_ss7_user_get_priv(const struct osmo_ss7_user *user);
+
int osmo_ss7_user_register(struct osmo_ss7_instance *inst, uint8_t service_ind,
struct osmo_ss7_user *user);
-
int osmo_ss7_user_unregister(struct osmo_ss7_instance *inst, uint8_t service_ind,
struct osmo_ss7_user *user);
diff --git a/src/Makefile.am b/src/Makefile.am
index 78e9764..44e6c34 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -46,6 +46,7 @@
osmo_ss7_xua_srv.c \
osmo_ss7_route.c \
osmo_ss7_route_table.c \
+ osmo_ss7_user.c \
sccp2sua.c \
sccp_helpers.c \
sccp_lbcs.c \
diff --git a/src/osmo_ss7_user.c b/src/osmo_ss7_user.c
new file mode 100644
index 0000000..3aea3a9
--- /dev/null
+++ b/src/osmo_ss7_user.c
@@ -0,0 +1,71 @@
+/* (C) 2015-2017 by Harald Welte <laforge(a)gnumonks.org>
+ * (C) 2023-2024 by sysmocom s.f.m.c. GmbH <info(a)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/core/talloc.h>
+#include <osmocom/core/prim.h>
+#include <osmocom/sigtran/osmo_ss7.h>
+
+#include "ss7_internal.h"
+
+/***********************************************************************
+ * MTP Users (Users of MTP, such as SCCP or ISUP)
+ ***********************************************************************/
+
+struct osmo_ss7_user *osmo_ss7_user_create(struct osmo_ss7_instance *inst, const char *name)
+{
+ struct osmo_ss7_user *user;
+ user = talloc_zero(inst, struct osmo_ss7_user);
+ if (!user)
+ return NULL;
+
+ user->inst = inst;
+ user->name = talloc_strdup(user, name ? : "");
+ return user;
+}
+
+void osmo_ss7_user_destroy(struct osmo_ss7_user *user)
+{
+ talloc_free(user);
+}
+
+struct osmo_ss7_instance *osmo_ss7_user_get_instance(const struct osmo_ss7_user *user)
+{
+ return user->inst;
+}
+
+void osmo_ss7_user_set_prim_cb(struct osmo_ss7_user *user, osmo_prim_cb prim_cb)
+{
+ user->prim_cb = prim_cb;
+}
+
+void osmo_ss7_user_set_priv(struct osmo_ss7_user *user, void *priv)
+{
+ user->priv = priv;
+}
+
+void *osmo_ss7_user_get_priv(const struct osmo_ss7_user *user)
+{
+ return user->priv;
+}
diff --git a/src/sccp_internal.h b/src/sccp_internal.h
index 0367fe1..dedcdcd 100644
--- a/src/sccp_internal.h
+++ b/src/sccp_internal.h
@@ -48,7 +48,7 @@
struct osmo_ss7_instance *ss7;
void *priv;
- struct osmo_ss7_user ss7_user;
+ struct osmo_ss7_user *ss7_user;
struct osmo_tdef *tdefs;
diff --git a/src/sccp_user.c b/src/sccp_user.c
index 4f94bf8..2cd5315 100644
--- a/src/sccp_user.c
+++ b/src/sccp_user.c
@@ -235,10 +235,6 @@
inst->priv = priv;
INIT_LLIST_HEAD(&inst->users);
- inst->ss7_user.inst = ss7;
- inst->ss7_user.name = "SCCP";
- inst->ss7_user.prim_cb = mtp_user_prim_cb;
- inst->ss7_user.priv = inst;
inst->max_optional_data = SCCP_MAX_OPTIONAL_DATA;
inst->tdefs = talloc_memdup(inst, osmo_sccp_timer_defaults,
@@ -251,7 +247,10 @@
return NULL;
}
- osmo_ss7_user_register(ss7, MTP_SI_SCCP, &inst->ss7_user);
+ inst->ss7_user = osmo_ss7_user_create(ss7, "SCCP");
+ osmo_ss7_user_set_prim_cb(inst->ss7_user, mtp_user_prim_cb);
+ osmo_ss7_user_set_priv(inst->ss7_user, inst);
+ osmo_ss7_user_register(ss7, MTP_SI_SCCP, inst->ss7_user);
llist_add_tail(&inst->list, &sccp_instances);
@@ -263,7 +262,9 @@
struct osmo_sccp_user *scu, *scu2;
inst->ss7->sccp = NULL;
- osmo_ss7_user_unregister(inst->ss7, MTP_SI_SCCP, &inst->ss7_user);
+ osmo_ss7_user_unregister(inst->ss7, MTP_SI_SCCP, inst->ss7_user);
+ osmo_ss7_user_destroy(inst->ss7_user);
+ inst->ss7_user = NULL;
llist_for_each_entry_safe(scu, scu2, &inst->users, list) {
osmo_sccp_user_unbind(scu);
diff --git a/tests/ss7/ss7_test.c b/tests/ss7/ss7_test.c
index 7d4ec5f..5211fe6 100644
--- a/tests/ss7/ss7_test.c
+++ b/tests/ss7/ss7_test.c
@@ -98,7 +98,7 @@
static void test_user(void)
{
- struct osmo_ss7_user user, user2;
+ struct osmo_ss7_user *user, *user2;
struct osmo_mtp_prim omp = {
.oph = {
.sap = MTP_SAP_USER,
@@ -111,13 +111,16 @@
};
printf("Testing SS7 user\n");
+ user = osmo_ss7_user_create(s7i, "testuser");
+ osmo_ss7_user_set_prim_cb(user, test_user_prim_cb);
+ osmo_ss7_user_set_priv(user, (void *) 0x1234);
- user.name = "testuser";
- user.priv = (void *) 0x1234;
- user.prim_cb = test_user_prim_cb;
+ user2 = osmo_ss7_user_create(s7i, "testuser_notregistered");
+ osmo_ss7_user_set_prim_cb(user, test_user_prim_cb);
+ osmo_ss7_user_set_priv(user, (void *) 0x1234);
/* registration */
- OSMO_ASSERT(osmo_ss7_user_register(s7i, 1, &user) == 0);
+ OSMO_ASSERT(osmo_ss7_user_register(s7i, 1, user) == 0);
OSMO_ASSERT(osmo_ss7_user_register(s7i, 1, NULL) == -EBUSY);
OSMO_ASSERT(osmo_ss7_user_register(s7i, 255, NULL) == -EINVAL);
@@ -127,8 +130,8 @@
/* cleanup */
OSMO_ASSERT(osmo_ss7_user_unregister(s7i, 255, NULL) == -EINVAL);
OSMO_ASSERT(osmo_ss7_user_unregister(s7i, 10, NULL) == -ENODEV);
- OSMO_ASSERT(osmo_ss7_user_unregister(s7i, 1, &user2) == -EINVAL);
- OSMO_ASSERT(osmo_ss7_user_unregister(s7i, 1, &user) == 0);
+ OSMO_ASSERT(osmo_ss7_user_unregister(s7i, 1, user2) == -EINVAL);
+ OSMO_ASSERT(osmo_ss7_user_unregister(s7i, 1, user) == 0);
/* primitive delivery should fail now */
OSMO_ASSERT(osmo_ss7_mtp_to_user(s7i, &omp) == -ENODEV);
@@ -136,6 +139,9 @@
/* wrong primitive delivery should also fail */
omp.oph.primitive = OSMO_MTP_PRIM_PAUSE;
OSMO_ASSERT(osmo_ss7_mtp_to_user(s7i, &omp) == -EINVAL);
+
+ osmo_ss7_user_destroy(user);
+ osmo_ss7_user_destroy(user2);
}
static void test_route(void)
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38727?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: I81b424239e9f7d4dc84bf167053f784ad2e8ca49
Gerrit-Change-Number: 38727
Gerrit-PatchSet: 4
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
7 months, 2 weeks
- 1
- 0
[M] Change in libosmo-sigtran[master]: sigtran: Make osmo_ss7_user struct private
by pespin
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38640?usp=email )
Change subject: sigtran: Make osmo_ss7_user struct private
......................................................................
sigtran: Make osmo_ss7_user struct private
ss7_user objects are managed so far exclusively through libosmo-sigtran
internal upper layers (SCCP), hence make the struct as well as all its
APIs private.
API ss7_mtp_to_user() is also made private since that's only meant for
internal use from lower layers in the library.
Change-Id: I59d8f70aa81ba396159af40ffd7e8cc6c27cb864
---
M include/osmocom/sigtran/osmo_ss7.h
M src/Makefile.am
M src/osmo_ss7.c
M src/osmo_ss7_hmrt.c
M src/osmo_ss7_user.c
M src/sccp_internal.h
A src/ss7_user.h
M tests/ss7/ss7_test.c
8 files changed, 109 insertions(+), 93 deletions(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h
index ccf2247..47e25d2 100644
--- a/include/osmocom/sigtran/osmo_ss7.h
+++ b/include/osmocom/sigtran/osmo_ss7.h
@@ -117,16 +117,8 @@
* MTP Users (Users of MTP, such as SCCP or ISUP)
***********************************************************************/
-struct osmo_ss7_user {
- /* pointer back to SS7 instance */
- struct osmo_ss7_instance *inst;
- /* name of the user */
- const char *name;
- /* primitive call-back for incoming MTP primitives */
- osmo_prim_cb prim_cb;
- /* private data */
- void *priv;
-};
+struct osmo_ss7_user;
+
struct osmo_ss7_user *osmo_ss7_user_create(struct osmo_ss7_instance *inst, const char *name);
void osmo_ss7_user_destroy(struct osmo_ss7_user *user);
@@ -141,8 +133,6 @@
int osmo_ss7_user_unregister(struct osmo_ss7_instance *inst, uint8_t service_ind,
struct osmo_ss7_user *user);
-int osmo_ss7_mtp_to_user(struct osmo_ss7_instance *inst, struct osmo_mtp_prim *omp);
-
/* SS7 User wants to issue MTP-TRANSFER.req */
int osmo_ss7_user_mtp_xfer_req(struct osmo_ss7_instance *inst,
struct osmo_mtp_prim *omp);
diff --git a/src/Makefile.am b/src/Makefile.am
index 44e6c34..8f848de 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,6 +9,7 @@
ss7_linkset.h \
ss7_route.h \
ss7_route_table.h \
+ ss7_user.h \
ss7_xua_srv.h \
xua_asp_fsm.h \
xua_as_fsm.h \
diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c
index 3659516..63456a0 100644
--- a/src/osmo_ss7.c
+++ b/src/osmo_ss7.c
@@ -462,84 +462,6 @@
}
/***********************************************************************
- * MTP Users (Users of MTP, such as SCCP or ISUP)
- ***********************************************************************/
-
-/*! \brief Register a MTP user for a given service indicator
- * \param[in] inst SS7 instance for which we register the user
- * \param[in] service_ind Service (ISUP, SCCP, ...)
- * \param[in] user SS7 user (including primitive call-back)
- * \returns 0 on success; negative on error */
-int osmo_ss7_user_register(struct osmo_ss7_instance *inst, uint8_t service_ind,
- struct osmo_ss7_user *user)
-{
- if (service_ind >= ARRAY_SIZE(inst->user))
- return -EINVAL;
-
- if (inst->user[service_ind])
- return -EBUSY;
-
- DEBUGP(DLSS7, "registering user=%s for SI %u with priv %p\n",
- user->name, service_ind, user->priv);
-
- user->inst = inst;
- inst->user[service_ind] = user;
-
- return 0;
-}
-
-/*! \brief Unregister a MTP user for a given service indicator
- * \param[in] inst SS7 instance for which we register the user
- * \param[in] service_ind Service (ISUP, SCCP, ...)
- * \param[in] user (optional) SS7 user. If present, we will not
- * unregister other users
- * \returns 0 on success; negative on error */
-int osmo_ss7_user_unregister(struct osmo_ss7_instance *inst, uint8_t service_ind,
- struct osmo_ss7_user *user)
-{
- if (service_ind >= ARRAY_SIZE(inst->user))
- return -EINVAL;
-
- if (!inst->user[service_ind])
- return -ENODEV;
-
- if (user && (inst->user[service_ind] != user))
- return -EINVAL;
-
- if (user)
- user->inst = NULL;
- inst->user[service_ind] = NULL;
-
- return 0;
-}
-
-/* deliver to a local MTP user */
-int osmo_ss7_mtp_to_user(struct osmo_ss7_instance *inst, struct osmo_mtp_prim *omp)
-{
- uint32_t service_ind;
- const struct osmo_ss7_user *osu;
-
- if (omp->oph.sap != MTP_SAP_USER ||
- omp->oph.primitive != OSMO_MTP_PRIM_TRANSFER ||
- omp->oph.operation != PRIM_OP_INDICATION) {
- LOGP(DLSS7, LOGL_ERROR, "Unsupported Primitive\n");
- return -EINVAL;
- }
-
- service_ind = omp->u.transfer.sio & 0xF;
- osu = inst->user[service_ind];
-
- if (!osu) {
- LOGP(DLSS7, LOGL_NOTICE, "No MTP-User for SI %u\n", service_ind);
- return -ENODEV;
- }
-
- DEBUGP(DLSS7, "delivering MTP-TRANSFER.ind to user %s, priv=%p\n",
- osu->name, osu->priv);
- return osu->prim_cb(&omp->oph, (void *) osu->priv);
-}
-
-/***********************************************************************
* SS7 Application Server
***********************************************************************/
diff --git a/src/osmo_ss7_hmrt.c b/src/osmo_ss7_hmrt.c
index b0208b0..e504cb1 100644
--- a/src/osmo_ss7_hmrt.c
+++ b/src/osmo_ss7_hmrt.c
@@ -39,6 +39,7 @@
#include "ss7_route.h"
#include "ss7_route_table.h"
#include "ss7_internal.h"
+#include "ss7_user.h"
/* convert from M3UA message to MTP-TRANSFER.ind osmo_mtp_prim */
struct osmo_mtp_prim *m3ua_to_xfer_ind(struct xua_msg *xua)
diff --git a/src/osmo_ss7_user.c b/src/osmo_ss7_user.c
index 3aea3a9..e7d0483 100644
--- a/src/osmo_ss7_user.c
+++ b/src/osmo_ss7_user.c
@@ -27,6 +27,7 @@
#include <osmocom/core/prim.h>
#include <osmocom/sigtran/osmo_ss7.h>
+#include "ss7_user.h"
#include "ss7_internal.h"
/***********************************************************************
@@ -69,3 +70,77 @@
{
return user->priv;
}
+
+/*! \brief Register a MTP user for a given service indicator
+ * \param[in] inst SS7 instance for which we register the user
+ * \param[in] service_ind Service (ISUP, SCCP, ...)
+ * \param[in] user SS7 user (including primitive call-back)
+ * \returns 0 on success; negative on error */
+int osmo_ss7_user_register(struct osmo_ss7_instance *inst, uint8_t service_ind,
+ struct osmo_ss7_user *user)
+{
+ if (service_ind >= ARRAY_SIZE(inst->user))
+ return -EINVAL;
+
+ if (inst->user[service_ind])
+ return -EBUSY;
+
+ DEBUGP(DLSS7, "registering user=%s for SI %u with priv %p\n",
+ user->name, service_ind, user->priv);
+
+ user->inst = inst;
+ inst->user[service_ind] = user;
+
+ return 0;
+}
+
+/*! \brief Unregister a MTP user for a given service indicator
+ * \param[in] inst SS7 instance for which we register the user
+ * \param[in] service_ind Service (ISUP, SCCP, ...)
+ * \param[in] user (optional) SS7 user. If present, we will not
+ * unregister other users
+ * \returns 0 on success; negative on error */
+int osmo_ss7_user_unregister(struct osmo_ss7_instance *inst, uint8_t service_ind,
+ struct osmo_ss7_user *user)
+{
+ if (service_ind >= ARRAY_SIZE(inst->user))
+ return -EINVAL;
+
+ if (!inst->user[service_ind])
+ return -ENODEV;
+
+ if (user && (inst->user[service_ind] != user))
+ return -EINVAL;
+
+ if (user)
+ user->inst = NULL;
+ inst->user[service_ind] = NULL;
+
+ return 0;
+}
+
+/* deliver to a local MTP user */
+int ss7_mtp_to_user(struct osmo_ss7_instance *inst, struct osmo_mtp_prim *omp)
+{
+ uint32_t service_ind;
+ const struct osmo_ss7_user *osu;
+
+ if (omp->oph.sap != MTP_SAP_USER ||
+ omp->oph.primitive != OSMO_MTP_PRIM_TRANSFER ||
+ omp->oph.operation != PRIM_OP_INDICATION) {
+ LOGP(DLSS7, LOGL_ERROR, "Unsupported Primitive\n");
+ return -EINVAL;
+ }
+
+ service_ind = omp->u.transfer.sio & 0xF;
+ osu = inst->user[service_ind];
+
+ if (!osu) {
+ LOGP(DLSS7, LOGL_NOTICE, "No MTP-User for SI %u\n", service_ind);
+ return -ENODEV;
+ }
+
+ DEBUGP(DLSS7, "delivering MTP-TRANSFER.ind to user %s, priv=%p\n",
+ osu->name, osu->priv);
+ return osu->prim_cb(&omp->oph, (void *) osu->priv);
+}
diff --git a/src/sccp_internal.h b/src/sccp_internal.h
index dedcdcd..45df22d 100644
--- a/src/sccp_internal.h
+++ b/src/sccp_internal.h
@@ -11,6 +11,8 @@
#define SCCP_STR "Signalling Connection Control Part\n"
+#include "ss7_user.h"
+
/* Appendix C.4 of Q.714 */
enum osmo_sccp_timer {
/* 0 kept unused on purpose since it's handled specially by osmo_fsm */
diff --git a/src/ss7_user.h b/src/ss7_user.h
new file mode 100644
index 0000000..6021330
--- /dev/null
+++ b/src/ss7_user.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include <stdint.h>
+#include <osmocom/core/prim.h>
+#include <osmocom/sigtran/mtp_sap.h>
+
+/***********************************************************************
+ * SS7 Linksets
+ ***********************************************************************/
+
+struct osmo_ss7_instance;
+
+struct osmo_ss7_user {
+ /* pointer back to SS7 instance */
+ struct osmo_ss7_instance *inst;
+ /* name of the user */
+ const char *name;
+ /* primitive call-back for incoming MTP primitives */
+ osmo_prim_cb prim_cb;
+ /* private data */
+ void *priv;
+};
+
+int ss7_mtp_to_user(struct osmo_ss7_instance *inst, struct osmo_mtp_prim *omp);
diff --git a/tests/ss7/ss7_test.c b/tests/ss7/ss7_test.c
index 5211fe6..9be7434 100644
--- a/tests/ss7/ss7_test.c
+++ b/tests/ss7/ss7_test.c
@@ -2,6 +2,7 @@
#include "../src/ss7_linkset.h"
#include "../src/ss7_route.h"
#include "../src/ss7_route_table.h"
+#include "../src/ss7_user.h"
#include "../src/xua_internal.h"
#include "../src/xua_asp_fsm.h"
@@ -125,7 +126,7 @@
OSMO_ASSERT(osmo_ss7_user_register(s7i, 255, NULL) == -EINVAL);
/* primitive delivery */
- OSMO_ASSERT(osmo_ss7_mtp_to_user(s7i, &omp) == 23);
+ OSMO_ASSERT(ss7_mtp_to_user(s7i, &omp) == 23);
/* cleanup */
OSMO_ASSERT(osmo_ss7_user_unregister(s7i, 255, NULL) == -EINVAL);
@@ -134,11 +135,11 @@
OSMO_ASSERT(osmo_ss7_user_unregister(s7i, 1, user) == 0);
/* primitive delivery should fail now */
- OSMO_ASSERT(osmo_ss7_mtp_to_user(s7i, &omp) == -ENODEV);
+ OSMO_ASSERT(ss7_mtp_to_user(s7i, &omp) == -ENODEV);
/* wrong primitive delivery should also fail */
omp.oph.primitive = OSMO_MTP_PRIM_PAUSE;
- OSMO_ASSERT(osmo_ss7_mtp_to_user(s7i, &omp) == -EINVAL);
+ OSMO_ASSERT(ss7_mtp_to_user(s7i, &omp) == -EINVAL);
osmo_ss7_user_destroy(user);
osmo_ss7_user_destroy(user2);
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38640?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: I59d8f70aa81ba396159af40ffd7e8cc6c27cb864
Gerrit-Change-Number: 38640
Gerrit-PatchSet: 10
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
7 months, 2 weeks
- 1
- 0
[M] Change in libosmo-sigtran[master]: sigtran: Make osmo_ss7_asp struct private
by pespin
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38645?usp=email )
Change subject: sigtran: Make osmo_ss7_asp struct private
......................................................................
sigtran: Make osmo_ss7_asp struct private
The object should only (and currently is only) be used throuh public
APIs using a pointer.
Change-Id: I5839b4dd04468af20d1836386dcc722e7a83ac5f
---
M include/osmocom/sigtran/osmo_ss7.h
M src/Makefile.am
M src/ipa.c
M src/m3ua.c
M src/osmo_ss7.c
M src/osmo_ss7_as.c
M src/osmo_ss7_asp.c
M src/osmo_ss7_hmrt.c
M src/osmo_ss7_vty.c
M src/osmo_ss7_xua_srv.c
M src/sccp_user.c
A src/ss7_asp.h
M src/ss7_internal.h
M src/sua.c
M src/xua_as_fsm.c
M src/xua_asp_fsm.c
M src/xua_default_lm_fsm.c
M src/xua_rkm.c
M src/xua_shared.c
M src/xua_snm.c
M tests/ss7/ss7_test.c
21 files changed, 132 insertions(+), 89 deletions(-)
Approvals:
pespin: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h
index 47e25d2..1a48ee5 100644
--- a/include/osmocom/sigtran/osmo_ss7.h
+++ b/include/osmocom/sigtran/osmo_ss7.h
@@ -307,77 +307,7 @@
extern const struct value_string osmo_ss7_asp_role_names[];
-struct osmo_ss7_asp {
- /*! entry in \ref osmo_ss7_instance.asp_list */
- struct llist_head list;
- struct osmo_ss7_instance *inst;
-
- /*! ASP FSM */
- struct osmo_fsm_inst *fi;
-
- /*! \ref osmo_xua_server over which we were established */
- struct osmo_xua_server *xua_server;
- struct llist_head siblings;
-
- /*! osmo_stream / libosmo-netif handles */
- struct osmo_stream_cli *client;
- struct osmo_stream_srv *server;
- /*! pre-formatted human readable local/remote socket name */
- char *sock_name;
-
- /* ASP Identifier for ASP-UP + NTFY */
- uint32_t asp_id;
- bool asp_id_present;
-
- /* Layer Manager to which we talk */
- const struct osmo_xua_layer_manager *lm;
- void *lm_priv;
-
- /*! Were we dynamically allocated */
- bool dyn_allocated;
-
- /*! Were we allocated by "simple client" support? */
- bool simple_client_allocated;
-
- /*! Rate Counter Group */
- struct rate_ctr_group *ctrg;
-
- /*! Pending message for non-blocking IPA read */
- struct msgb *pending_msg;
-
- struct {
- char *name;
- char *description;
- enum osmo_ss7_asp_protocol proto;
- enum osmo_ss7_asp_admin_state adm_state;
- bool is_server;
- enum osmo_ss7_asp_role role;
- bool role_set_by_vty;
- bool trans_role_set_by_vty;
-
- struct osmo_ss7_asp_peer local;
- struct osmo_ss7_asp_peer remote;
- uint8_t qos_class;
- uint32_t quirks;
-
- /* T_defs used by the default_lm: */
- struct osmo_tdef *T_defs_lm;
-
- struct {
- bool num_ostreams_present;
- bool max_instreams_present;
- bool max_attempts_present;
- bool max_init_timeo_present;
- uint16_t num_ostreams_value;
- uint16_t max_instreams_value;
- uint16_t max_attempts_value;
- uint16_t max_init_timeo_value; /* ms */
- } sctp_init;
-
- /*! The underlaying transport protocol (one of IPPROTO_*) */
- int trans_proto;
- } cfg;
-};
+struct osmo_ss7_asp;
/*! Peer SG doesn't send NTFY(AS-INACTIVE) after ASP-UP procedure */
#define OSMO_SS7_ASP_QUIRK_NO_NOTIFY 0x00000001
diff --git a/src/Makefile.am b/src/Makefile.am
index 8f848de..8071be8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,6 +4,7 @@
noinst_HEADERS = \
sccp_internal.h \
+ ss7_asp.h \
ss7_internal.h \
ss7_link.h \
ss7_linkset.h \
diff --git a/src/ipa.c b/src/ipa.c
index 64eb4d4..ce44262 100644
--- a/src/ipa.c
+++ b/src/ipa.c
@@ -47,6 +47,7 @@
#include <osmocom/sigtran/protocol/mtp.h>
#include "xua_internal.h"
+#include "ss7_asp.h"
#include "ss7_internal.h"
#include "xua_asp_fsm.h"
diff --git a/src/m3ua.c b/src/m3ua.c
index 05680ea..a4db7f6 100644
--- a/src/m3ua.c
+++ b/src/m3ua.c
@@ -44,6 +44,7 @@
#include "xua_as_fsm.h"
#include "xua_asp_fsm.h"
#include "xua_internal.h"
+#include "ss7_asp.h"
#include "ss7_internal.h"
#define M3UA_MSGB_SIZE 1500
diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c
index 63456a0..0284890 100644
--- a/src/osmo_ss7.c
+++ b/src/osmo_ss7.c
@@ -50,6 +50,7 @@
#include "sccp_internal.h"
#include "xua_internal.h"
+#include "ss7_asp.h"
#include "ss7_internal.h"
#include "ss7_linkset.h"
#include "ss7_route.h"
diff --git a/src/osmo_ss7_as.c b/src/osmo_ss7_as.c
index 9451f2d..5ec5d88 100644
--- a/src/osmo_ss7_as.c
+++ b/src/osmo_ss7_as.c
@@ -33,6 +33,7 @@
#include <osmocom/core/talloc.h>
#include <osmocom/core/logging.h>
+#include "ss7_asp.h"
#include "ss7_route.h"
#include "ss7_route_table.h"
#include "ss7_internal.h"
diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c
index 6058304..1ee0f76 100644
--- a/src/osmo_ss7_asp.c
+++ b/src/osmo_ss7_asp.c
@@ -51,6 +51,7 @@
#include "sccp_internal.h"
#include "xua_internal.h"
+#include "ss7_asp.h"
#include "ss7_internal.h"
#include "ss7_xua_srv.h"
#include "xua_asp_fsm.h"
diff --git a/src/osmo_ss7_hmrt.c b/src/osmo_ss7_hmrt.c
index e504cb1..9aaa1df 100644
--- a/src/osmo_ss7_hmrt.c
+++ b/src/osmo_ss7_hmrt.c
@@ -35,6 +35,7 @@
#include <osmocom/sigtran/protocol/m3ua.h>
#include "xua_internal.h"
+#include "ss7_asp.h"
#include "ss7_linkset.h"
#include "ss7_route.h"
#include "ss7_route_table.h"
diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c
index 7f9aa39..8dd9a4f 100644
--- a/src/osmo_ss7_vty.c
+++ b/src/osmo_ss7_vty.c
@@ -46,6 +46,7 @@
#include "xua_internal.h"
#include <osmocom/sigtran/sccp_sap.h>
#include "sccp_internal.h"
+#include "ss7_asp.h"
#include "ss7_route.h"
#include "ss7_route_table.h"
#include "ss7_internal.h"
diff --git a/src/osmo_ss7_xua_srv.c b/src/osmo_ss7_xua_srv.c
index 4fb2115..db1481b 100644
--- a/src/osmo_ss7_xua_srv.c
+++ b/src/osmo_ss7_xua_srv.c
@@ -51,6 +51,7 @@
#include "sccp_internal.h"
#include "xua_internal.h"
+#include "ss7_asp.h"
#include "ss7_internal.h"
#include "xua_asp_fsm.h"
#include "xua_as_fsm.h"
diff --git a/src/sccp_user.c b/src/sccp_user.c
index 2cd5315..fab1dfd 100644
--- a/src/sccp_user.c
+++ b/src/sccp_user.c
@@ -39,6 +39,7 @@
#include "sccp_internal.h"
#include "xua_internal.h"
+#include "ss7_asp.h"
#include "ss7_route.h"
#include "ss7_route_table.h"
#include "ss7_internal.h"
diff --git a/src/ss7_asp.h b/src/ss7_asp.h
new file mode 100644
index 0000000..7466f8a
--- /dev/null
+++ b/src/ss7_asp.h
@@ -0,0 +1,112 @@
+#pragma once
+
+#include <stdint.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/fsm.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/core/tdef.h>
+#include <osmocom/netif/stream.h>
+
+#include <osmocom/sigtran/osmo_ss7.h>
+
+#include "ss7_internal.h"
+
+/***********************************************************************
+ * SS7 Application Server Processes
+ ***********************************************************************/
+
+struct osmo_ss7_instance;
+struct osmo_xua_layer_manager;
+
+enum ss7_asp_ctr {
+ SS7_ASP_CTR_PKT_RX_TOTAL,
+ SS7_ASP_CTR_PKT_RX_UNKNOWN,
+ SS7_ASP_CTR_PKT_TX_TOTAL,
+};
+
+struct osmo_ss7_asp {
+ /*! entry in \ref osmo_ss7_instance.asp_list */
+ struct llist_head list;
+ struct osmo_ss7_instance *inst;
+
+ /*! ASP FSM */
+ struct osmo_fsm_inst *fi;
+
+ /*! \ref osmo_xua_server over which we were established */
+ struct osmo_xua_server *xua_server;
+ struct llist_head siblings;
+
+ /*! osmo_stream / libosmo-netif handles */
+ struct osmo_stream_cli *client;
+ struct osmo_stream_srv *server;
+ /*! pre-formatted human readable local/remote socket name */
+ char *sock_name;
+
+ /* ASP Identifier for ASP-UP + NTFY */
+ uint32_t asp_id;
+ bool asp_id_present;
+
+ /* Layer Manager to which we talk */
+ const struct osmo_xua_layer_manager *lm;
+ void *lm_priv;
+
+ /*! Were we dynamically allocated */
+ bool dyn_allocated;
+
+ /*! Were we allocated by "simple client" support? */
+ bool simple_client_allocated;
+
+ /*! Rate Counter Group */
+ struct rate_ctr_group *ctrg;
+
+ /*! Pending message for non-blocking IPA read */
+ struct msgb *pending_msg;
+
+ struct {
+ char *name;
+ char *description;
+ enum osmo_ss7_asp_protocol proto;
+ enum osmo_ss7_asp_admin_state adm_state;
+ bool is_server;
+ enum osmo_ss7_asp_role role;
+ bool role_set_by_vty;
+ bool trans_role_set_by_vty;
+
+ struct osmo_ss7_asp_peer local;
+ struct osmo_ss7_asp_peer remote;
+ uint8_t qos_class;
+ uint32_t quirks;
+
+ /* T_defs used by the default_lm: */
+ struct osmo_tdef *T_defs_lm;
+
+ struct {
+ bool num_ostreams_present;
+ bool max_instreams_present;
+ bool max_attempts_present;
+ bool max_init_timeo_present;
+ uint16_t num_ostreams_value;
+ uint16_t max_instreams_value;
+ uint16_t max_attempts_value;
+ uint16_t max_init_timeo_value; /* ms */
+ } sctp_init;
+
+ /*! The underlaying transport protocol (one of IPPROTO_*) */
+ int trans_proto;
+ } cfg;
+};
+
+struct osmo_ss7_asp *ss7_asp_alloc(struct osmo_ss7_instance *inst, const char *name,
+ uint16_t remote_port, uint16_t local_port,
+ int trans_proto, enum osmo_ss7_asp_protocol proto);
+bool ss7_asp_set_default_peer_hosts(struct osmo_ss7_asp *asp);
+bool ss7_asp_is_started(const struct osmo_ss7_asp *asp);
+int ss7_asp_get_fd(const struct osmo_ss7_asp *asp);
+
+int ss7_asp_apply_peer_primary_address(const struct osmo_ss7_asp *asp);
+int ss7_asp_apply_primary_address(const struct osmo_ss7_asp *asp);
+int ss7_asp_apply_new_local_address(const struct osmo_ss7_asp *asp, unsigned int loc_idx);
+int ss7_asp_apply_drop_local_address(const struct osmo_ss7_asp *asp, unsigned int loc_idx);
+
+#define LOGPASP(asp, subsys, level, fmt, args ...) \
+ _LOGSS7((asp)->inst, subsys, level, "asp-%s: " fmt, (asp)->cfg.name, ## args)
diff --git a/src/ss7_internal.h b/src/ss7_internal.h
index 5d576c5..943ea20 100644
--- a/src/ss7_internal.h
+++ b/src/ss7_internal.h
@@ -4,6 +4,7 @@
#include <stdbool.h>
#include <stdint.h>
+#include <osmocom/netif/stream.h>
#include <osmocom/sigtran/osmo_ss7.h>
extern bool ss7_initialized;
@@ -14,12 +15,6 @@
struct osmo_ss7_as *ss7_as_alloc(struct osmo_ss7_instance *inst, const char *name,
enum osmo_ss7_asp_protocol proto);
-struct osmo_ss7_asp *ss7_asp_alloc(struct osmo_ss7_instance *inst, const char *name,
- uint16_t remote_port, uint16_t local_port,
- int trans_proto, enum osmo_ss7_asp_protocol proto);
-bool ss7_asp_set_default_peer_hosts(struct osmo_ss7_asp *asp);
-bool ss7_asp_is_started(const struct osmo_ss7_asp *asp);
-int ss7_asp_get_fd(const struct osmo_ss7_asp *asp);
struct osmo_ss7_asp *ss7_asp_find_by_socket_addr(int fd, int trans_proto);
bool ss7_asp_protocol_check_trans_proto(enum osmo_ss7_asp_protocol proto, int trans_proto);
@@ -28,10 +23,6 @@
int ss7_asp_xua_srv_conn_rx_cb(struct osmo_stream_srv *conn, int res, struct msgb *msg);
int ss7_asp_m3ua_tcp_srv_conn_rx_cb(struct osmo_stream_srv *conn, int res, struct msgb *msg);
int ss7_asp_xua_srv_conn_closed_cb(struct osmo_stream_srv *srv);
-int ss7_asp_apply_peer_primary_address(const struct osmo_ss7_asp *asp);
-int ss7_asp_apply_primary_address(const struct osmo_ss7_asp *asp);
-int ss7_asp_apply_new_local_address(const struct osmo_ss7_asp *asp, unsigned int loc_idx);
-int ss7_asp_apply_drop_local_address(const struct osmo_ss7_asp *asp, unsigned int loc_idx);
bool ss7_asp_peer_match_host(const struct osmo_ss7_asp_peer *peer, const char *host, bool host_is_v6);
int ss7_asp_peer_find_host(const struct osmo_ss7_asp_peer *peer, const char *host);
@@ -43,18 +34,10 @@
SS7_AS_CTR_TX_MSU_TOTAL,
};
-enum ss7_asp_ctr {
- SS7_ASP_CTR_PKT_RX_TOTAL,
- SS7_ASP_CTR_PKT_RX_UNKNOWN,
- SS7_ASP_CTR_PKT_TX_TOTAL,
-};
-
#define _LOGSS7(inst, subsys, level, fmt, args ...) \
LOGP(subsys, level, "%u: " fmt, inst ? (inst)->cfg.id : 0, ## args)
#define LOGSS7(inst, level, fmt, args ...) \
_LOGSS7(inst, DLSS7, level, fmt, ## args)
-#define LOGPASP(asp, subsys, level, fmt, args ...) \
- _LOGSS7((asp)->inst, subsys, level, "asp-%s: " fmt, (asp)->cfg.name, ## args)
#define LOGPAS(as, subsys, level, fmt, args ...) \
_LOGSS7((as)->inst, subsys, level, "as-%s: " fmt, (as)->cfg.name, ## args)
diff --git a/src/sua.c b/src/sua.c
index a69f3b5..b7c70bb 100644
--- a/src/sua.c
+++ b/src/sua.c
@@ -47,6 +47,7 @@
#include "xua_asp_fsm.h"
#include "xua_internal.h"
#include "sccp_internal.h"
+#include "ss7_asp.h"
#include "ss7_internal.h"
/* Appendix C.4 of Q.714 (all in milliseconds) */
diff --git a/src/xua_as_fsm.c b/src/xua_as_fsm.c
index 29d31a9..632bb01 100644
--- a/src/xua_as_fsm.c
+++ b/src/xua_as_fsm.c
@@ -23,6 +23,7 @@
#include <osmocom/sigtran/protocol/sua.h>
#include <osmocom/sigtran/protocol/m3ua.h>
+#include "ss7_asp.h"
#include "ss7_route.h"
#include "ss7_route_table.h"
#include "xua_asp_fsm.h"
diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c
index 9e9f8ac..37932a7 100644
--- a/src/xua_asp_fsm.c
+++ b/src/xua_asp_fsm.c
@@ -27,6 +27,7 @@
#include "xua_msg.h"
#include <osmocom/sigtran/protocol/sua.h>
+#include "ss7_asp.h"
#include "ss7_internal.h"
#include "ss7_xua_srv.h"
#include "xua_asp_fsm.h"
diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c
index b55f982..dd8e505 100644
--- a/src/xua_default_lm_fsm.c
+++ b/src/xua_default_lm_fsm.c
@@ -37,6 +37,7 @@
#include "xua_internal.h"
#include "xua_asp_fsm.h"
+#include "ss7_asp.h"
#include "ss7_xua_srv.h"
#define S(x) (1 << (x))
diff --git a/src/xua_rkm.c b/src/xua_rkm.c
index 5a7bc2e..0a05cdc 100644
--- a/src/xua_rkm.c
+++ b/src/xua_rkm.c
@@ -28,6 +28,7 @@
#include <osmocom/sigtran/osmo_ss7.h>
#include <osmocom/sigtran/protocol/m3ua.h>
+#include "ss7_asp.h"
#include "ss7_internal.h"
#include "ss7_route.h"
#include "ss7_route_table.h"
diff --git a/src/xua_shared.c b/src/xua_shared.c
index 15b9b52..6fd0369 100644
--- a/src/xua_shared.c
+++ b/src/xua_shared.c
@@ -34,6 +34,7 @@
#include <osmocom/sigtran/protocol/m3ua.h>
#include <osmocom/sigtran/protocol/sua.h>
+#include "ss7_asp.h"
#include "ss7_internal.h"
#include "xua_internal.h"
diff --git a/src/xua_snm.c b/src/xua_snm.c
index b5737cd..78720cc 100644
--- a/src/xua_snm.c
+++ b/src/xua_snm.c
@@ -31,6 +31,7 @@
#include <osmocom/sigtran/protocol/sua.h>
#include <osmocom/sigtran/protocol/mtp.h>
+#include "ss7_asp.h"
#include "ss7_internal.h"
#include "xua_internal.h"
#include "sccp_internal.h"
diff --git a/tests/ss7/ss7_test.c b/tests/ss7/ss7_test.c
index 9be7434..bee0ea2 100644
--- a/tests/ss7/ss7_test.c
+++ b/tests/ss7/ss7_test.c
@@ -1,3 +1,4 @@
+#include "../src/ss7_asp.h"
#include "../src/ss7_link.h"
#include "../src/ss7_linkset.h"
#include "../src/ss7_route.h"
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38645?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: I5839b4dd04468af20d1836386dcc722e7a83ac5f
Gerrit-Change-Number: 38645
Gerrit-PatchSet: 11
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
7 months, 2 weeks
- 1
- 0
[M] Change in libosmo-sigtran[master]: sigtran: Make osmo_ss7_asp_peer private
by pespin
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38647?usp=email )
Change subject: sigtran: Make osmo_ss7_asp_peer private
......................................................................
sigtran: Make osmo_ss7_asp_peer private
This struct object is only used internally so far, there's no need to
make it public.
Change-Id: I6729cc599af3a799d89bc0514d223c84f2233a4b
---
M include/osmocom/sigtran/osmo_ss7.h
M src/Makefile.am
M src/osmo_ss7_asp.c
M src/osmo_ss7_asp_peer.c
M src/osmo_ss7_vty.c
M src/osmo_ss7_xua_srv.c
M src/sccp_user.c
M src/ss7_asp.h
A src/ss7_asp_peer.h
M src/ss7_internal.h
10 files changed, 67 insertions(+), 55 deletions(-)
Approvals:
pespin: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h
index 1a48ee5..5ce9206 100644
--- a/include/osmocom/sigtran/osmo_ss7.h
+++ b/include/osmocom/sigtran/osmo_ss7.h
@@ -282,14 +282,6 @@
* SS7 Application Server Processes
***********************************************************************/
-struct osmo_ss7_asp_peer {
- char *host[OSMO_SOCK_MAX_ADDRS];
- size_t host_cnt;
- uint16_t port;
- /* index in "hosts" array marking the SCTP Primary Address, -1 if no explicit Primary Address set */
- int idx_primary;
-};
-
enum osmo_ss7_asp_admin_state {
/*! no SCTP association with peer */
OSMO_SS7_ASP_ADM_S_SHUTDOWN,
@@ -316,16 +308,6 @@
/*! Accept SSNM even if ASP is in AS-INACTIVE state */
#define OSMO_SS7_ASP_QUIRK_SNM_INACTIVE 0x00000004
-int osmo_ss7_asp_peer_snprintf(char* buf, size_t buf_len, struct osmo_ss7_asp_peer *peer);
-void osmo_ss7_asp_peer_init(struct osmo_ss7_asp_peer *peer);
-int osmo_ss7_asp_peer_set_hosts(struct osmo_ss7_asp_peer *peer, void *talloc_ctx,
- const char *const*hosts, size_t host_cnt);
-int osmo_ss7_asp_peer_set_hosts2(struct osmo_ss7_asp_peer *peer, void *talloc_ctx,
- const char *const*hosts, size_t host_cnt, int idx_primary);
-int osmo_ss7_asp_peer_add_host(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *host);
-int osmo_ss7_asp_peer_add_host2(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *host, bool is_primary_addr);
-int osmo_ss7_asp_peer_del_host(struct osmo_ss7_asp_peer *peer, const char *host);
-
struct osmo_ss7_asp *
osmo_ss7_asp_find_by_name(struct osmo_ss7_instance *inst, const char *name);
diff --git a/src/Makefile.am b/src/Makefile.am
index 8071be8..1d09c0e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,6 +5,7 @@
noinst_HEADERS = \
sccp_internal.h \
ss7_asp.h \
+ ss7_asp_peer.h \
ss7_internal.h \
ss7_link.h \
ss7_linkset.h \
diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c
index 1ee0f76..12a5d5f 100644
--- a/src/osmo_ss7_asp.c
+++ b/src/osmo_ss7_asp.c
@@ -410,16 +410,16 @@
* address are set on the remote side, IPv4 on the local
* side must be set too */
if (ss7_ipv6_sctp_supported("::", true) && !(rem_has_v4 && !rem_has_v6))
- osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, "::");
+ ss7_asp_peer_add_host(&asp->cfg.local, asp, "::");
else
- osmo_ss7_asp_peer_add_host(&asp->cfg.local, asp, "0.0.0.0");
+ ss7_asp_peer_add_host(&asp->cfg.local, asp, "0.0.0.0");
changed = true;
}
/* If no remote addr was set */
if (!asp->cfg.remote.host_cnt) {
- osmo_ss7_asp_peer_add_host(&asp->cfg.remote, asp, "127.0.0.1");
+ ss7_asp_peer_add_host(&asp->cfg.remote, asp, "127.0.0.1");
if (ss7_ipv6_sctp_supported("::1", false))
- osmo_ss7_asp_peer_add_host(&asp->cfg.remote, asp, "::1");
+ ss7_asp_peer_add_host(&asp->cfg.remote, asp, "::1");
changed = true;
}
return changed;
@@ -552,9 +552,9 @@
}
rate_ctr_group_set_name(asp->ctrg, name);
asp->inst = inst;
- osmo_ss7_asp_peer_init(&asp->cfg.remote);
+ ss7_asp_peer_init(&asp->cfg.remote);
asp->cfg.remote.port = remote_port;
- osmo_ss7_asp_peer_init(&asp->cfg.local);
+ ss7_asp_peer_init(&asp->cfg.local);
asp->cfg.local.port = local_port;
asp->cfg.trans_proto = trans_proto;
asp->cfg.proto = proto;
@@ -617,8 +617,8 @@
uint8_t byte;
OSMO_ASSERT(ss7_initialized);
- osmo_ss7_asp_peer_snprintf(bufloc, sizeof(bufloc), &asp->cfg.local);
- osmo_ss7_asp_peer_snprintf(bufrem, sizeof(bufrem), &asp->cfg.remote);
+ ss7_asp_peer_snprintf(bufloc, sizeof(bufloc), &asp->cfg.local);
+ ss7_asp_peer_snprintf(bufrem, sizeof(bufrem), &asp->cfg.remote);
LOGPASP(asp, DLSS7, LOGL_INFO, "Restarting ASP %s, r=%s<->l=%s\n",
asp->cfg.name, bufrem, bufloc);
diff --git a/src/osmo_ss7_asp_peer.c b/src/osmo_ss7_asp_peer.c
index 39a92b1..c31cdd9 100644
--- a/src/osmo_ss7_asp_peer.c
+++ b/src/osmo_ss7_asp_peer.c
@@ -37,6 +37,7 @@
#include <osmocom/sigtran/osmo_ss7.h>
+#include "ss7_asp_peer.h"
#include "ss7_internal.h"
@@ -44,13 +45,13 @@
* SS7 Application Server Process peer
***********************************************************************/
-void osmo_ss7_asp_peer_init(struct osmo_ss7_asp_peer *peer)
+void ss7_asp_peer_init(struct osmo_ss7_asp_peer *peer)
{
memset(peer, 0, sizeof(*peer));
peer->idx_primary = -1;
}
-int osmo_ss7_asp_peer_snprintf(char *buf, size_t buf_len, struct osmo_ss7_asp_peer *peer)
+int ss7_asp_peer_snprintf(char *buf, size_t buf_len, struct osmo_ss7_asp_peer *peer)
{
int len = 0, offset = 0, rem = buf_len;
int ret, i;
@@ -90,7 +91,7 @@
* \param[in] host_cnt Number of strings in hosts
* \param[in] idx_primary Index in "hosts" array marking the SCTP Primary Address, -1 if no explicit Primary Address set
* \returns 0 on success; negative otherwise */
-int osmo_ss7_asp_peer_set_hosts2(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *const*hosts, size_t host_cnt, int idx_primary)
+int ss7_asp_peer_set_hosts2(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *const*hosts, size_t host_cnt, int idx_primary)
{
int i = 0;
@@ -118,9 +119,9 @@
* \param[in] hosts Array of strings containing IP addresses.
* \param[in] host_cnt Number of strings in hosts
* \returns 0 on success; negative otherwise */
-int osmo_ss7_asp_peer_set_hosts(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *const*hosts, size_t host_cnt)
+int ss7_asp_peer_set_hosts(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *const*hosts, size_t host_cnt)
{
- return osmo_ss7_asp_peer_set_hosts2(peer, talloc_ctx, hosts, host_cnt, -1);
+ return ss7_asp_peer_set_hosts2(peer, talloc_ctx, hosts, host_cnt, -1);
}
/* Is string formatted IPv4/v6 addr considered IN(6)ADDR_ANY? */
@@ -139,7 +140,7 @@
* \param[in] host string containing an IP address.
* \param[in] is_primary_addr whether this IP address is to be added as SCTP Primary Address
* \returns 0 on success; negative otherwise */
-int osmo_ss7_asp_peer_add_host2(struct osmo_ss7_asp_peer *peer, void *talloc_ctx,
+int ss7_asp_peer_add_host2(struct osmo_ss7_asp_peer *peer, void *talloc_ctx,
const char *host, bool is_primary_addr)
{
int i;
@@ -212,7 +213,7 @@
* \param[in] peer Application Server Process peer the address is removed from.
* \param[in] host string containing an IP address.
* \returns 0 on success; negative otherwise */
-int osmo_ss7_asp_peer_del_host(struct osmo_ss7_asp_peer *peer, const char *host)
+int ss7_asp_peer_del_host(struct osmo_ss7_asp_peer *peer, const char *host)
{
int i;
struct osmo_sockaddr_str addr_str;
@@ -257,10 +258,10 @@
* \param[in] talloc_ctx talloc context used to allocate new address.
* \param[in] host string containing an IP address.
* \returns 0 on success; negative otherwise */
-int osmo_ss7_asp_peer_add_host(struct osmo_ss7_asp_peer *peer, void *talloc_ctx,
+int ss7_asp_peer_add_host(struct osmo_ss7_asp_peer *peer, void *talloc_ctx,
const char *host)
{
- return osmo_ss7_asp_peer_add_host2(peer, talloc_ctx, host, false);
+ return ss7_asp_peer_add_host2(peer, talloc_ctx, host, false);
}
bool ss7_asp_peer_match_host(const struct osmo_ss7_asp_peer *peer, const char *host, bool host_is_v6)
diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c
index 8dd9a4f..482e2f8 100644
--- a/src/osmo_ss7_vty.c
+++ b/src/osmo_ss7_vty.c
@@ -751,7 +751,7 @@
int fd = xs->server ? osmo_stream_srv_link_get_fd(xs->server) : -1;
if (fd < 0) {
- if (osmo_ss7_asp_peer_snprintf(buf, sizeof(buf), &xs->cfg.local) < 0)
+ if (ss7_asp_peer_snprintf(buf, sizeof(buf), &xs->cfg.local) < 0)
snprintf(buf, sizeof(buf), "<error>");
} else {
char hostbuf[OSMO_SOCK_MAX_ADDRS][INET6_ADDRSTRLEN];
@@ -965,7 +965,7 @@
int old_host_count = asp->cfg.local.host_cnt;
int rc;
- if (osmo_ss7_asp_peer_add_host2(&asp->cfg.local, asp, argv[0], is_primary) != 0) {
+ if (ss7_asp_peer_add_host2(&asp->cfg.local, asp, argv[0], is_primary) != 0) {
vty_out(vty, "%% Failed adding host '%s' to set%s", argv[0], VTY_NEWLINE);
return CMD_WARNING;
}
@@ -1027,7 +1027,7 @@
}
}
- if (osmo_ss7_asp_peer_del_host(&asp->cfg.local, argv[0]) != 0) {
+ if (ss7_asp_peer_del_host(&asp->cfg.local, argv[0]) != 0) {
vty_out(vty, "%% Failed deleting local address '%s' from set%s", argv[0], VTY_NEWLINE);
return CMD_WARNING;
}
@@ -1047,7 +1047,7 @@
int old_idx_primary = asp->cfg.remote.idx_primary;
int rc;
- if (osmo_ss7_asp_peer_add_host2(&asp->cfg.remote, asp, argv[0], is_primary) != 0) {
+ if (ss7_asp_peer_add_host2(&asp->cfg.remote, asp, argv[0], is_primary) != 0) {
vty_out(vty, "%% Failed adding host '%s' to set%s", argv[0], VTY_NEWLINE);
return CMD_WARNING;
}
@@ -1084,7 +1084,7 @@
return CMD_WARNING;
}
- if (osmo_ss7_asp_peer_del_host(&asp->cfg.remote, argv[0]) != 0) {
+ if (ss7_asp_peer_del_host(&asp->cfg.remote, argv[0]) != 0) {
vty_out(vty, "%% Failed deleting remote address '%s' from set%s", argv[0], VTY_NEWLINE);
return CMD_WARNING;
}
@@ -1390,8 +1390,8 @@
if (!get_sockname_buf(buf_rem, sizeof(buf_rem), fd, trans_proto, false))
OSMO_STRLCPY_ARRAY(buf_rem, "<sockname-error>");
} else {
- osmo_ss7_asp_peer_snprintf(buf_loc, sizeof(buf_loc), &asp->cfg.local);
- osmo_ss7_asp_peer_snprintf(buf_rem, sizeof(buf_rem), &asp->cfg.remote);
+ ss7_asp_peer_snprintf(buf_loc, sizeof(buf_loc), &asp->cfg.local);
+ ss7_asp_peer_snprintf(buf_rem, sizeof(buf_rem), &asp->cfg.remote);
}
vty_out(vty, "%-12s %-12s %-13s %-4s %-4s %-9s %-23s %-23s%s",
diff --git a/src/osmo_ss7_xua_srv.c b/src/osmo_ss7_xua_srv.c
index db1481b..4962bfd 100644
--- a/src/osmo_ss7_xua_srv.c
+++ b/src/osmo_ss7_xua_srv.c
@@ -148,10 +148,10 @@
asp->cfg.remote.port = atoi(portbuf);
asp->dyn_allocated = true;
asp->server = srv;
- osmo_ss7_asp_peer_set_hosts(&asp->cfg.local, asp,
+ ss7_asp_peer_set_hosts(&asp->cfg.local, asp,
(const char * const*)oxs->cfg.local.host,
oxs->cfg.local.host_cnt);
- osmo_ss7_asp_peer_set_hosts(&asp->cfg.remote, asp,
+ ss7_asp_peer_set_hosts(&asp->cfg.remote, asp,
&hostbuf_ptr, 1);
osmo_ss7_asp_restart(asp);
}
@@ -279,7 +279,7 @@
uint8_t byte;
const char *proto = get_value_string(osmo_ss7_asp_protocol_vals, xs->cfg.proto);
- rc = osmo_ss7_asp_peer_snprintf(buf, sizeof(buf), &xs->cfg.local);
+ rc = ss7_asp_peer_snprintf(buf, sizeof(buf), &xs->cfg.local);
if (rc < 0) {
LOGP(DLSS7, LOGL_INFO, "Failed parsing %s Server osmo_ss7_asp_peer\n", proto);
} else {
@@ -316,7 +316,7 @@
int rc;
OSMO_ASSERT(ss7_initialized);
- rc = osmo_ss7_asp_peer_set_hosts(&xs->cfg.local, xs, local_hosts, local_host_cnt);
+ rc = ss7_asp_peer_set_hosts(&xs->cfg.local, xs, local_hosts, local_host_cnt);
if (rc < 0)
return rc;
return osmo_stream_srv_link_set_addrs(xs->server, (const char **)xs->cfg.local.host, xs->cfg.local.host_cnt);
@@ -327,7 +327,7 @@
{
int rc;
- rc = osmo_ss7_asp_peer_add_host(&xs->cfg.local, xs, local_host);
+ rc = ss7_asp_peer_add_host(&xs->cfg.local, xs, local_host);
if (rc < 0)
return rc;
return osmo_stream_srv_link_set_addrs(xs->server, (const char **)xs->cfg.local.host, xs->cfg.local.host_cnt);
@@ -338,7 +338,7 @@
{
int rc;
- rc = osmo_ss7_asp_peer_del_host(&xs->cfg.local, local_host);
+ rc = ss7_asp_peer_del_host(&xs->cfg.local, local_host);
if (rc < 0)
return rc;
return osmo_stream_srv_link_set_addrs(xs->server, (const char **)xs->cfg.local.host, xs->cfg.local.host_cnt);
diff --git a/src/sccp_user.c b/src/sccp_user.c
index fab1dfd..1b8250c 100644
--- a/src/sccp_user.c
+++ b/src/sccp_user.c
@@ -646,9 +646,9 @@
/* Ensure that the ASP we use is set to role ASP. */
asp->cfg.role = OSMO_SS7_ASP_ROLE_ASP;
if (default_local_ip)
- osmo_ss7_asp_peer_set_hosts(&asp->cfg.local, asp, &default_local_ip, 1);
+ ss7_asp_peer_set_hosts(&asp->cfg.local, asp, &default_local_ip, 1);
if (default_remote_ip)
- osmo_ss7_asp_peer_set_hosts(&asp->cfg.remote, asp, &default_remote_ip, 1);
+ ss7_asp_peer_set_hosts(&asp->cfg.remote, asp, &default_remote_ip, 1);
/* Make sure proper defaults are applied if app didn't provide specific default values */
ss7_asp_set_default_peer_hosts(asp);
asp->simple_client_allocated = true;
@@ -854,11 +854,11 @@
oxs = ss7_xua_server_find2(ss7, asp->cfg.trans_proto, prot, local_port);
if (!oxs)
goto out_asp;
- if (osmo_ss7_asp_peer_set_hosts(&asp->cfg.local, asp,
+ if (ss7_asp_peer_set_hosts(&asp->cfg.local, asp,
(const char* const*)oxs->cfg.local.host,
oxs->cfg.local.host_cnt) < 0)
goto out_asp;
- if (osmo_ss7_asp_peer_add_host(&asp->cfg.remote, asp, remote_ip) < 0)
+ if (ss7_asp_peer_add_host(&asp->cfg.remote, asp, remote_ip) < 0)
goto out_asp;
asp->cfg.is_server = true;
asp->cfg.role = OSMO_SS7_ASP_ROLE_SG;
diff --git a/src/ss7_asp.h b/src/ss7_asp.h
index 7466f8a..e2bd46d 100644
--- a/src/ss7_asp.h
+++ b/src/ss7_asp.h
@@ -9,6 +9,7 @@
#include <osmocom/sigtran/osmo_ss7.h>
+#include "ss7_asp_peer.h"
#include "ss7_internal.h"
/***********************************************************************
diff --git a/src/ss7_asp_peer.h b/src/ss7_asp_peer.h
new file mode 100644
index 0000000..bdd9b56
--- /dev/null
+++ b/src/ss7_asp_peer.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <unistd.h>
+
+/***********************************************************************
+ * SS7 ASP Peer
+ ***********************************************************************/
+
+struct osmo_ss7_asp_peer {
+ char *host[OSMO_SOCK_MAX_ADDRS];
+ size_t host_cnt;
+ uint16_t port;
+ /* index in "hosts" array marking the SCTP Primary Address, -1 if no explicit Primary Address set */
+ int idx_primary;
+};
+
+int ss7_asp_peer_snprintf(char *buf, size_t buf_len, struct osmo_ss7_asp_peer *peer);
+void ss7_asp_peer_init(struct osmo_ss7_asp_peer *peer);
+int ss7_asp_peer_set_hosts(struct osmo_ss7_asp_peer *peer, void *talloc_ctx,
+ const char *const*hosts, size_t host_cnt);
+int ss7_asp_peer_set_hosts2(struct osmo_ss7_asp_peer *peer, void *talloc_ctx,
+ const char *const*hosts, size_t host_cnt, int idx_primary);
+int ss7_asp_peer_add_host(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *host);
+int ss7_asp_peer_add_host2(struct osmo_ss7_asp_peer *peer, void *talloc_ctx, const char *host, bool is_primary_addr);
+int ss7_asp_peer_del_host(struct osmo_ss7_asp_peer *peer, const char *host);
+
+bool ss7_asp_peer_match_host(const struct osmo_ss7_asp_peer *peer, const char *host, bool host_is_v6);
+int ss7_asp_peer_find_host(const struct osmo_ss7_asp_peer *peer, const char *host);
diff --git a/src/ss7_internal.h b/src/ss7_internal.h
index 943ea20..db8f198 100644
--- a/src/ss7_internal.h
+++ b/src/ss7_internal.h
@@ -24,9 +24,6 @@
int ss7_asp_m3ua_tcp_srv_conn_rx_cb(struct osmo_stream_srv *conn, int res, struct msgb *msg);
int ss7_asp_xua_srv_conn_closed_cb(struct osmo_stream_srv *srv);
-bool ss7_asp_peer_match_host(const struct osmo_ss7_asp_peer *peer, const char *host, bool host_is_v6);
-int ss7_asp_peer_find_host(const struct osmo_ss7_asp_peer *peer, const char *host);
-
int xua_tcp_segmentation_cb(struct msgb *msg);
enum ss7_as_ctr {
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38647?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: I6729cc599af3a799d89bc0514d223c84f2233a4b
Gerrit-Change-Number: 38647
Gerrit-PatchSet: 9
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
7 months, 2 weeks
- 1
- 0
[M] Change in libosmo-sigtran[master]: sigtran: Make osmo_ss7_as struct private
by pespin
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38720?usp=email )
Change subject: sigtran: Make osmo_ss7_as struct private
......................................................................
sigtran: Make osmo_ss7_as struct private
Change-Id: I8c6513e6d2c152e853270fa5b488b606a3d18b14
---
M include/osmocom/sigtran/osmo_ss7.h
M src/Makefile.am
M src/ipa.c
M src/m3ua.c
M src/osmo_ss7.c
M src/osmo_ss7_as.c
M src/osmo_ss7_asp.c
M src/osmo_ss7_hmrt.c
M src/osmo_ss7_instance.c
M src/osmo_ss7_route.c
M src/osmo_ss7_vty.c
M src/sccp_scrc.c
M src/sccp_user.c
A src/ss7_as.h
M src/ss7_internal.h
M src/sua.c
M src/xua_as_fsm.c
M src/xua_asp_fsm.c
M src/xua_default_lm_fsm.c
M src/xua_rkm.c
M src/xua_shared.c
M src/xua_snm.c
M tests/ss7/ss7_test.c
23 files changed, 123 insertions(+), 79 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
pespin: Looks good to me, approved
diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h
index 0067841..dcf985d 100644
--- a/include/osmocom/sigtran/osmo_ss7.h
+++ b/include/osmocom/sigtran/osmo_ss7.h
@@ -135,6 +135,9 @@
* SS7 Application Servers
***********************************************************************/
+struct osmo_ss7_as;
+struct osmo_ss7_asp;
+
struct osmo_ss7_routing_key {
uint32_t context;
uint32_t l_rk_id;
@@ -179,50 +182,6 @@
int osmo_ss7_asp_protocol_port(enum osmo_ss7_asp_protocol prot);
-enum osmo_ss7_as_patch_sccp_mode {
- OSMO_SS7_PATCH_NONE, /* no patching of SCCP */
- OSMO_SS7_PATCH_BOTH, /* patch both OPC and DPC into SCCP addresses */
-};
-
-struct osmo_ss7_as {
- /*! entry in 'ref osmo_ss7_instance.as_list */
- struct llist_head list;
- struct osmo_ss7_instance *inst;
-
- /*! AS FSM */
- struct osmo_fsm_inst *fi;
-
- /*! Were we dynamically allocated by RKM? */
- bool rkm_dyn_allocated;
-
- /*! Were we allocated by "simple client" support? */
- bool simple_client_allocated;
-
- /*! Rate Counter Group */
- struct rate_ctr_group *ctrg;
-
- struct {
- char *name;
- char *description;
- enum osmo_ss7_asp_protocol proto;
- struct osmo_ss7_routing_key routing_key;
- enum osmo_ss7_as_traffic_mode mode;
- /* traffic mode was configured by VTY / config file */
- bool mode_set_by_vty;
- /* traffic mode was configured by RKM (routing key management) or first ASPAC */
- bool mode_set_by_peer;
- uint32_t recovery_timeout_msec;
- uint8_t qos_class;
- struct {
- uint32_t dpc;
- enum osmo_ss7_as_patch_sccp_mode sccp_mode;
- } pc_override;
-
- struct osmo_ss7_asp *asps[16];
- uint8_t last_asp_idx_sent; /* used for load-sharing traffic mode (round robin implementation) */
- } cfg;
-};
-
struct osmo_ss7_as *
osmo_ss7_as_find_by_name(struct osmo_ss7_instance *inst, const char *name);
struct osmo_ss7_as *
diff --git a/src/Makefile.am b/src/Makefile.am
index 356a33a..dc35ecc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,6 +4,7 @@
noinst_HEADERS = \
sccp_internal.h \
+ ss7_as.h \
ss7_asp.h \
ss7_asp_peer.h \
ss7_instance.h \
diff --git a/src/ipa.c b/src/ipa.c
index ce44262..d62d710 100644
--- a/src/ipa.c
+++ b/src/ipa.c
@@ -47,6 +47,7 @@
#include <osmocom/sigtran/protocol/mtp.h>
#include "xua_internal.h"
+#include "ss7_as.h"
#include "ss7_asp.h"
#include "ss7_internal.h"
#include "xua_asp_fsm.h"
diff --git a/src/m3ua.c b/src/m3ua.c
index a4db7f6..be1f167 100644
--- a/src/m3ua.c
+++ b/src/m3ua.c
@@ -44,6 +44,7 @@
#include "xua_as_fsm.h"
#include "xua_asp_fsm.h"
#include "xua_internal.h"
+#include "ss7_as.h"
#include "ss7_asp.h"
#include "ss7_internal.h"
diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c
index c906cf5..5965cd5 100644
--- a/src/osmo_ss7.c
+++ b/src/osmo_ss7.c
@@ -50,6 +50,7 @@
#include "sccp_internal.h"
#include "xua_internal.h"
+#include "ss7_as.h"
#include "ss7_asp.h"
#include "ss7_internal.h"
#include "ss7_linkset.h"
@@ -213,28 +214,3 @@
OSMO_ASSERT(false);
}
}
-
-bool osmo_ss7_as_tmode_compatible_xua(struct osmo_ss7_as *as, uint32_t m3ua_tmt)
-{
- if (!as->cfg.mode_set_by_vty && !as->cfg.mode_set_by_peer)
- return true;
-
- switch (m3ua_tmt) {
- case M3UA_TMOD_OVERRIDE:
- if (as->cfg.mode == OSMO_SS7_AS_TMOD_OVERRIDE)
- return true;
- break;
- case M3UA_TMOD_LOADSHARE:
- if (as->cfg.mode == OSMO_SS7_AS_TMOD_LOADSHARE ||
- as->cfg.mode == OSMO_SS7_AS_TMOD_ROUNDROBIN)
- return true;
- break;
- case M3UA_TMOD_BCAST:
- if (as->cfg.mode == OSMO_SS7_AS_TMOD_BCAST)
- return true;
- break;
- default:
- break;
- }
- return false;
-}
diff --git a/src/osmo_ss7_as.c b/src/osmo_ss7_as.c
index 5ec5d88..3540fde 100644
--- a/src/osmo_ss7_as.c
+++ b/src/osmo_ss7_as.c
@@ -26,13 +26,15 @@
#include <unistd.h>
#include <inttypes.h>
-#include <osmocom/sigtran/osmo_ss7.h>
-
#include <osmocom/core/linuxlist.h>
#include <osmocom/core/utils.h>
#include <osmocom/core/talloc.h>
#include <osmocom/core/logging.h>
+#include <osmocom/sigtran/osmo_ss7.h>
+#include <osmocom/sigtran/protocol/m3ua.h>
+
+#include "ss7_as.h"
#include "ss7_asp.h"
#include "ss7_route.h"
#include "ss7_route_table.h"
@@ -308,3 +310,29 @@
}
return asp;
}
+
+bool osmo_ss7_as_tmode_compatible_xua(struct osmo_ss7_as *as, uint32_t m3ua_tmt)
+{
+ if (!as->cfg.mode_set_by_vty && !as->cfg.mode_set_by_peer)
+ return true;
+
+ switch (m3ua_tmt) {
+ case M3UA_TMOD_OVERRIDE:
+ if (as->cfg.mode == OSMO_SS7_AS_TMOD_OVERRIDE)
+ return true;
+ break;
+ case M3UA_TMOD_LOADSHARE:
+ if (as->cfg.mode == OSMO_SS7_AS_TMOD_LOADSHARE ||
+ as->cfg.mode == OSMO_SS7_AS_TMOD_ROUNDROBIN)
+ return true;
+ break;
+ case M3UA_TMOD_BCAST:
+ if (as->cfg.mode == OSMO_SS7_AS_TMOD_BCAST)
+ return true;
+ break;
+ default:
+ break;
+ }
+ return false;
+
+}
diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c
index 12a5d5f..d81d25c 100644
--- a/src/osmo_ss7_asp.c
+++ b/src/osmo_ss7_asp.c
@@ -51,6 +51,7 @@
#include "sccp_internal.h"
#include "xua_internal.h"
+#include "ss7_as.h"
#include "ss7_asp.h"
#include "ss7_internal.h"
#include "ss7_xua_srv.h"
diff --git a/src/osmo_ss7_hmrt.c b/src/osmo_ss7_hmrt.c
index 9aaa1df..c256860 100644
--- a/src/osmo_ss7_hmrt.c
+++ b/src/osmo_ss7_hmrt.c
@@ -35,6 +35,7 @@
#include <osmocom/sigtran/protocol/m3ua.h>
#include "xua_internal.h"
+#include "ss7_as.h"
#include "ss7_asp.h"
#include "ss7_linkset.h"
#include "ss7_route.h"
diff --git a/src/osmo_ss7_instance.c b/src/osmo_ss7_instance.c
index 60a8829..f7d9a41 100644
--- a/src/osmo_ss7_instance.c
+++ b/src/osmo_ss7_instance.c
@@ -33,6 +33,7 @@
#include <osmocom/sigtran/osmo_ss7.h>
#include <osmocom/sigtran/sccp_sap.h>
+#include "ss7_as.h"
#include "ss7_asp.h"
#include "ss7_internal.h"
#include "ss7_instance.h"
diff --git a/src/osmo_ss7_route.c b/src/osmo_ss7_route.c
index dc48e28..1afc75c 100644
--- a/src/osmo_ss7_route.c
+++ b/src/osmo_ss7_route.c
@@ -27,6 +27,7 @@
#include <osmocom/sigtran/osmo_ss7.h>
#include "ss7_linkset.h"
+#include "ss7_as.h"
#include "ss7_route.h"
#include "ss7_route_table.h"
#include "ss7_internal.h"
diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c
index 482e2f8..6b404b3 100644
--- a/src/osmo_ss7_vty.c
+++ b/src/osmo_ss7_vty.c
@@ -46,6 +46,7 @@
#include "xua_internal.h"
#include <osmocom/sigtran/sccp_sap.h>
#include "sccp_internal.h"
+#include "ss7_as.h"
#include "ss7_asp.h"
#include "ss7_route.h"
#include "ss7_route_table.h"
diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c
index 33f0633..23c3f2d 100644
--- a/src/sccp_scrc.c
+++ b/src/sccp_scrc.c
@@ -33,6 +33,7 @@
#include <osmocom/sigtran/protocol/mtp.h>
#include "sccp_internal.h"
+#include "ss7_as.h"
#include "ss7_instance.h"
#include "ss7_linkset.h"
#include "ss7_route.h"
diff --git a/src/sccp_user.c b/src/sccp_user.c
index 1b8250c..d27d4bb 100644
--- a/src/sccp_user.c
+++ b/src/sccp_user.c
@@ -39,6 +39,7 @@
#include "sccp_internal.h"
#include "xua_internal.h"
+#include "ss7_as.h"
#include "ss7_asp.h"
#include "ss7_route.h"
#include "ss7_route_table.h"
diff --git a/src/ss7_as.h b/src/ss7_as.h
new file mode 100644
index 0000000..504818c
--- /dev/null
+++ b/src/ss7_as.h
@@ -0,0 +1,71 @@
+#pragma once
+
+#include <stdint.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/fsm.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/core/tdef.h>
+#include <osmocom/netif/stream.h>
+
+#include <osmocom/sigtran/osmo_ss7.h>
+
+#include "ss7_internal.h"
+
+/***********************************************************************
+ * SS7 Application Server
+ ***********************************************************************/
+
+struct osmo_ss7_instance;
+struct osmo_ss7_asp;
+
+enum osmo_ss7_as_patch_sccp_mode {
+ OSMO_SS7_PATCH_NONE, /* no patching of SCCP */
+ OSMO_SS7_PATCH_BOTH, /* patch both OPC and DPC into SCCP addresses */
+};
+
+enum ss7_as_ctr {
+ SS7_AS_CTR_RX_MSU_TOTAL,
+ SS7_AS_CTR_TX_MSU_TOTAL,
+};
+
+struct osmo_ss7_as {
+ /*! entry in 'ref osmo_ss7_instance.as_list */
+ struct llist_head list;
+ struct osmo_ss7_instance *inst;
+
+ /*! AS FSM */
+ struct osmo_fsm_inst *fi;
+
+ /*! Were we dynamically allocated by RKM? */
+ bool rkm_dyn_allocated;
+
+ /*! Were we allocated by "simple client" support? */
+ bool simple_client_allocated;
+
+ /*! Rate Counter Group */
+ struct rate_ctr_group *ctrg;
+
+ struct {
+ char *name;
+ char *description;
+ enum osmo_ss7_asp_protocol proto;
+ struct osmo_ss7_routing_key routing_key;
+ enum osmo_ss7_as_traffic_mode mode;
+ /* traffic mode was configured by VTY / config file */
+ bool mode_set_by_vty;
+ /* traffic mode was configured by RKM (routing key management) or first ASPAC */
+ bool mode_set_by_peer;
+ uint32_t recovery_timeout_msec;
+ uint8_t qos_class;
+ struct {
+ uint32_t dpc;
+ enum osmo_ss7_as_patch_sccp_mode sccp_mode;
+ } pc_override;
+
+ struct osmo_ss7_asp *asps[16];
+ uint8_t last_asp_idx_sent; /* used for load-sharing traffic mode (round robin implementation) */
+ } cfg;
+};
+
+#define LOGPAS(as, subsys, level, fmt, args ...) \
+ _LOGSS7((as)->inst, subsys, level, "as-%s: " fmt, (as)->cfg.name, ## args)
diff --git a/src/ss7_internal.h b/src/ss7_internal.h
index 27bd54f..9475645 100644
--- a/src/ss7_internal.h
+++ b/src/ss7_internal.h
@@ -28,11 +28,3 @@
int ss7_asp_xua_srv_conn_closed_cb(struct osmo_stream_srv *srv);
int xua_tcp_segmentation_cb(struct msgb *msg);
-
-enum ss7_as_ctr {
- SS7_AS_CTR_RX_MSU_TOTAL,
- SS7_AS_CTR_TX_MSU_TOTAL,
-};
-
-#define LOGPAS(as, subsys, level, fmt, args ...) \
- _LOGSS7((as)->inst, subsys, level, "as-%s: " fmt, (as)->cfg.name, ## args)
diff --git a/src/sua.c b/src/sua.c
index b7c70bb..c7bde24 100644
--- a/src/sua.c
+++ b/src/sua.c
@@ -47,6 +47,7 @@
#include "xua_asp_fsm.h"
#include "xua_internal.h"
#include "sccp_internal.h"
+#include "ss7_as.h"
#include "ss7_asp.h"
#include "ss7_internal.h"
diff --git a/src/xua_as_fsm.c b/src/xua_as_fsm.c
index 632bb01..6517f73 100644
--- a/src/xua_as_fsm.c
+++ b/src/xua_as_fsm.c
@@ -23,6 +23,7 @@
#include <osmocom/sigtran/protocol/sua.h>
#include <osmocom/sigtran/protocol/m3ua.h>
+#include "ss7_as.h"
#include "ss7_asp.h"
#include "ss7_route.h"
#include "ss7_route_table.h"
diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c
index 37932a7..089c31c 100644
--- a/src/xua_asp_fsm.c
+++ b/src/xua_asp_fsm.c
@@ -27,6 +27,7 @@
#include "xua_msg.h"
#include <osmocom/sigtran/protocol/sua.h>
+#include "ss7_as.h"
#include "ss7_asp.h"
#include "ss7_internal.h"
#include "ss7_xua_srv.h"
diff --git a/src/xua_default_lm_fsm.c b/src/xua_default_lm_fsm.c
index dd8e505..7c27b19 100644
--- a/src/xua_default_lm_fsm.c
+++ b/src/xua_default_lm_fsm.c
@@ -37,6 +37,7 @@
#include "xua_internal.h"
#include "xua_asp_fsm.h"
+#include "ss7_as.h"
#include "ss7_asp.h"
#include "ss7_xua_srv.h"
diff --git a/src/xua_rkm.c b/src/xua_rkm.c
index 0a05cdc..9a3918e 100644
--- a/src/xua_rkm.c
+++ b/src/xua_rkm.c
@@ -28,6 +28,7 @@
#include <osmocom/sigtran/osmo_ss7.h>
#include <osmocom/sigtran/protocol/m3ua.h>
+#include "ss7_as.h"
#include "ss7_asp.h"
#include "ss7_internal.h"
#include "ss7_route.h"
diff --git a/src/xua_shared.c b/src/xua_shared.c
index 6fd0369..022b8ed 100644
--- a/src/xua_shared.c
+++ b/src/xua_shared.c
@@ -34,6 +34,7 @@
#include <osmocom/sigtran/protocol/m3ua.h>
#include <osmocom/sigtran/protocol/sua.h>
+#include "ss7_as.h"
#include "ss7_asp.h"
#include "ss7_internal.h"
#include "xua_internal.h"
diff --git a/src/xua_snm.c b/src/xua_snm.c
index 78720cc..36fe3c7 100644
--- a/src/xua_snm.c
+++ b/src/xua_snm.c
@@ -31,6 +31,7 @@
#include <osmocom/sigtran/protocol/sua.h>
#include <osmocom/sigtran/protocol/mtp.h>
+#include "ss7_as.h"
#include "ss7_asp.h"
#include "ss7_internal.h"
#include "xua_internal.h"
diff --git a/tests/ss7/ss7_test.c b/tests/ss7/ss7_test.c
index bee0ea2..6fe1110 100644
--- a/tests/ss7/ss7_test.c
+++ b/tests/ss7/ss7_test.c
@@ -1,3 +1,4 @@
+#include "../src/ss7_as.h"
#include "../src/ss7_asp.h"
#include "../src/ss7_link.h"
#include "../src/ss7_linkset.h"
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38720?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: I8c6513e6d2c152e853270fa5b488b606a3d18b14
Gerrit-Change-Number: 38720
Gerrit-PatchSet: 5
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
7 months, 2 weeks
- 1
- 0
[XL] Change in libosmo-sigtran[master]: sigtran: Make osmo_ss7_instance struct private
by pespin
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38664?usp=email )
Change subject: sigtran: Make osmo_ss7_instance struct private
......................................................................
sigtran: Make osmo_ss7_instance struct private
Change-Id: I4562fe21535c5aa468ac0e3831d505bf08b336ec
---
M TODO-RELEASE
M include/osmocom/sigtran/osmo_ss7.h
M src/Makefile.am
M src/osmo_ss7.c
A src/osmo_ss7_instance.c
M src/sccp_scoc.c
M src/sccp_scrc.c
M src/sccp_vty.c
A src/ss7_instance.h
M src/ss7_internal.h
10 files changed, 695 insertions(+), 614 deletions(-)
Approvals:
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/TODO-RELEASE b/TODO-RELEASE
index a8b60f1..101d9cd 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -15,3 +15,4 @@
libosmo-sigtran add API osmo_ss7_instances_llist_entry()
libosmo-sigtran add API osmo_ss7_as_get_asp_protocol(), osmo_ss7_as_select_asp()
libosmo-sigtran add API osmo_ss7_user: create(), get_instance(), set_prim_cb(), set_priv(), get_priv()
+libosmo-sigtran Make private struct osmo_ss7_instance
diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h
index 5ce9206..0067841 100644
--- a/include/osmocom/sigtran/osmo_ss7.h
+++ b/include/osmocom/sigtran/osmo_ss7.h
@@ -17,20 +17,7 @@
/* Get an entry pointer from a list item in osmo_ss7_instances: */
struct osmo_ss7_instance *osmo_ss7_instances_llist_entry(struct llist_head *list);
-struct osmo_ss7_user;
-struct osmo_sccp_instance;
-struct osmo_mtp_prim;
-struct osmo_ss7_route_table;
-
int osmo_ss7_init(void);
-int osmo_ss7_find_free_rctx(struct osmo_ss7_instance *inst);
-
-bool osmo_ss7_pc_is_local(const struct osmo_ss7_instance *inst, uint32_t pc);
-int osmo_ss7_pointcode_parse(const struct osmo_ss7_instance *inst, const char *str);
-int osmo_ss7_pointcode_parse_mask_or_len(const struct osmo_ss7_instance *inst, const char *in);
-const char *osmo_ss7_pointcode_print_buf(char *buf, size_t buf_len, const struct osmo_ss7_instance *inst, uint32_t pc);
-const char *osmo_ss7_pointcode_print(const struct osmo_ss7_instance *inst, uint32_t pc);
-const char *osmo_ss7_pointcode_print2(const struct osmo_ss7_instance *inst, uint32_t pc);
/* All known point-code formats have a length of or below 24 bit.
* A point-code value exceeding that is used to indicate an unset PC. */
@@ -52,45 +39,8 @@
* SS7 Instances
***********************************************************************/
-struct osmo_ss7_pc_fmt {
- char delimiter;
- uint8_t component_len[3];
-};
-
-struct osmo_ss7_instance {
- /*! member of global list of instances */
- struct llist_head list;
- /*! list of \ref osmo_ss7_linkset */
- struct llist_head linksets;
- /*! list of \ref osmo_ss7_as */
- struct llist_head as_list;
- /*! list of \ref osmo_ss7_asp */
- struct llist_head asp_list;
- /*! list of \ref osmo_ss7_route_table */
- struct llist_head rtable_list;
- /*! list of \ref osmo_xua_servers */
- struct llist_head xua_servers;
- /* array for faster lookup of user (indexed by service
- * indicator) */
- const struct osmo_ss7_user *user[16];
-
- struct osmo_ss7_route_table *rtable_system;
-
- struct osmo_sccp_instance *sccp;
-
- struct {
- uint32_t id;
- char *name;
- char *description;
- uint32_t primary_pc;
- /* capability PCs */
- uint8_t network_indicator;
- struct osmo_ss7_pc_fmt pc_fmt;
- bool permit_dyn_rkm_alloc;
- struct llist_head sccp_address_book;
- uint32_t secondary_pc;
- } cfg;
-};
+struct osmo_ss7_pc_fmt;
+struct osmo_ss7_instance;
struct osmo_ss7_instance *osmo_ss7_instance_find(uint32_t id);
struct osmo_ss7_instance *
@@ -110,6 +60,15 @@
struct osmo_sccp_instance *osmo_ss7_ensure_sccp(struct osmo_ss7_instance *inst);
struct osmo_sccp_instance *osmo_ss7_get_sccp(const struct osmo_ss7_instance *inst);
+int osmo_ss7_find_free_rctx(struct osmo_ss7_instance *inst);
+
+bool osmo_ss7_pc_is_local(const struct osmo_ss7_instance *inst, uint32_t pc);
+int osmo_ss7_pointcode_parse(const struct osmo_ss7_instance *inst, const char *str);
+int osmo_ss7_pointcode_parse_mask_or_len(const struct osmo_ss7_instance *inst, const char *in);
+const char *osmo_ss7_pointcode_print_buf(char *buf, size_t buf_len, const struct osmo_ss7_instance *inst, uint32_t pc);
+const char *osmo_ss7_pointcode_print(const struct osmo_ss7_instance *inst, uint32_t pc);
+const char *osmo_ss7_pointcode_print2(const struct osmo_ss7_instance *inst, uint32_t pc);
+
uint8_t osmo_ss7_pc_width(const struct osmo_ss7_pc_fmt *pc_fmt);
uint32_t osmo_ss7_pc_normalize(const struct osmo_ss7_pc_fmt *pc_fmt, uint32_t pc);
@@ -118,6 +77,7 @@
***********************************************************************/
struct osmo_ss7_user;
+struct osmo_mtp_prim;
struct osmo_ss7_user *osmo_ss7_user_create(struct osmo_ss7_instance *inst, const char *name);
@@ -137,6 +97,15 @@
int osmo_ss7_user_mtp_xfer_req(struct osmo_ss7_instance *inst,
struct osmo_mtp_prim *omp);
+
+/***********************************************************************
+ * SCCP Instance
+ ***********************************************************************/
+
+struct osmo_sccp_instance;
+
+void osmo_sccp_set_max_optional_data(struct osmo_sccp_instance *inst, int val);
+
/***********************************************************************
* SS7 Links
***********************************************************************/
@@ -386,8 +355,6 @@
int local_port, int remote_port,
const char *remote_ip);
-void osmo_sccp_set_max_optional_data(struct osmo_sccp_instance *inst, int val);
-
enum osmo_ss7_as_traffic_mode osmo_ss7_tmode_from_xua(uint32_t in);
int osmo_ss7_tmode_to_xua(enum osmo_ss7_as_traffic_mode tmod);
diff --git a/src/Makefile.am b/src/Makefile.am
index 1d09c0e..356a33a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,6 +6,7 @@
sccp_internal.h \
ss7_asp.h \
ss7_asp_peer.h \
+ ss7_instance.h \
ss7_internal.h \
ss7_link.h \
ss7_linkset.h \
@@ -43,6 +44,7 @@
osmo_ss7_asp.c \
osmo_ss7_asp_peer.c \
osmo_ss7_hmrt.c \
+ osmo_ss7_instance.c \
osmo_ss7_link.c \
osmo_ss7_linkset.c \
osmo_ss7_vty.c \
diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c
index 0284890..c906cf5 100644
--- a/src/osmo_ss7.c
+++ b/src/osmo_ss7.c
@@ -58,8 +58,6 @@
#include "xua_asp_fsm.h"
#include "xua_as_fsm.h"
-#define MAX_PC_STR_LEN 32
-
bool ss7_initialized = false;
LLIST_HEAD(osmo_ss7_instances);
@@ -73,9 +71,6 @@
return pos;
}
-static int32_t next_rctx = 1;
-static int32_t next_l_rk_id = 1;
-
const struct value_string mtp_unavail_cause_vals[] = {
{ MTP_UNAVAIL_C_UNKNOWN, "unknown" },
{ MTP_UNAVAIL_C_UNEQUIP_REM_USER, "unequipped-remote-user" },
@@ -83,94 +78,10 @@
{ 0, NULL }
};
-int osmo_ss7_find_free_rctx(struct osmo_ss7_instance *inst)
-{
- int32_t rctx;
-
- for (rctx = next_rctx; rctx; rctx = ++next_rctx) {
- if (!osmo_ss7_as_find_by_rctx(inst, next_rctx))
- return rctx;
- }
- return -1;
-}
-
-uint32_t ss7_find_free_l_rk_id(struct osmo_ss7_instance *inst)
-{
- uint32_t l_rk_id;
-
- for (l_rk_id = next_l_rk_id; next_l_rk_id; l_rk_id = ++next_l_rk_id) {
- if (!osmo_ss7_as_find_by_l_rk_id(inst, next_l_rk_id))
- return l_rk_id;
- }
- return -1;
-}
-
/***********************************************************************
* SS7 Point Code Parsing / Printing
***********************************************************************/
-static const struct osmo_ss7_pc_fmt default_pc_fmt = {
- .delimiter = '.',
- .component_len = { 3, 8, 3},
-};
-
-/* like strcat() but appends a single character */
-static int strnappendchar(char *str, char c, size_t n)
-{
- unsigned int curlen = strlen(str);
-
- if (n < curlen + 2)
- return -1;
-
- str[curlen] = c;
- str[curlen+1] = '\0';
-
- return curlen+1;
-}
-
-/* generate a format string for formatting a point code. The result can
- * e.g. be used with sscanf() or sprintf() */
-static const char *gen_pc_fmtstr(const struct osmo_ss7_pc_fmt *pc_fmt,
- unsigned int *num_comp_exp)
-{
- static char buf[MAX_PC_STR_LEN];
- unsigned int num_comp = 0;
-
- buf[0] = '\0';
- strcat(buf, "%u");
- num_comp++;
-
- if (pc_fmt->component_len[1] == 0)
- goto out;
- strnappendchar(buf, pc_fmt->delimiter, sizeof(buf));
- strcat(buf, "%u");
- num_comp++;
-
- if (pc_fmt->component_len[2] == 0)
- goto out;
- strnappendchar(buf, pc_fmt->delimiter, sizeof(buf));
- strcat(buf, "%u");
- num_comp++;
-out:
- if (num_comp_exp)
- *num_comp_exp = num_comp;
- return buf;
-}
-
-/* get number of components we expect for a point code, depending on the
- * configuration of this ss7_instance */
-static unsigned int num_pc_comp_exp(const struct osmo_ss7_pc_fmt *pc_fmt)
-{
- unsigned int num_comp_exp = 1;
-
- if (pc_fmt->component_len[1])
- num_comp_exp++;
- if (pc_fmt->component_len[2])
- num_comp_exp++;
-
- return num_comp_exp;
-}
-
/* get the total width (in bits) of the point-codes in this ss7_instance */
uint8_t osmo_ss7_pc_width(const struct osmo_ss7_pc_fmt *pc_fmt)
{
@@ -186,126 +97,6 @@
return pc & mask;
}
-/* get the number of bits we must shift the given component of a point
- * code in this ss7_instance */
-static unsigned int get_pc_comp_shift(const struct osmo_ss7_pc_fmt *pc_fmt,
- unsigned int comp_num)
-{
- uint32_t pc_width = osmo_ss7_pc_width(pc_fmt);
- switch (comp_num) {
- case 0:
- return pc_width - pc_fmt->component_len[0];
- case 1:
- return pc_width - pc_fmt->component_len[0] - pc_fmt->component_len[1];
- case 2:
- return 0;
- default:
- /* Invalid number of components */
- OSMO_ASSERT(false);
- }
-}
-
-static uint32_t pc_comp_shift_and_mask(const struct osmo_ss7_pc_fmt *pc_fmt,
- unsigned int comp_num, uint32_t pc)
-{
- unsigned int shift = get_pc_comp_shift(pc_fmt, comp_num);
- uint32_t mask = (1 << pc_fmt->component_len[comp_num]) - 1;
-
- return (pc >> shift) & mask;
-}
-
-/* parse a point code according to the structure configured for this
- * ss7_instance */
-int osmo_ss7_pointcode_parse(const struct osmo_ss7_instance *inst, const char *str)
-{
- unsigned int component[3];
- const struct osmo_ss7_pc_fmt *pc_fmt = inst ? &inst->cfg.pc_fmt : &default_pc_fmt;
- unsigned int num_comp_exp = num_pc_comp_exp(pc_fmt);
- const char *fmtstr = gen_pc_fmtstr(pc_fmt, &num_comp_exp);
- int i, rc;
-
- rc = sscanf(str, fmtstr, &component[0], &component[1], &component[2]);
- /* ensure all components were parsed */
- if (rc != num_comp_exp)
- goto err;
-
- /* check none of the component values exceeds what can be
- * represented within its bit-width */
- for (i = 0; i < num_comp_exp; i++) {
- if (component[i] >= (1 << pc_fmt->component_len[i]))
- goto err;
- }
-
- /* shift them all together */
- rc = (component[0] << get_pc_comp_shift(pc_fmt, 0));
- if (num_comp_exp > 1)
- rc |= (component[1] << get_pc_comp_shift(pc_fmt, 1));
- if (num_comp_exp > 2)
- rc |= (component[2] << get_pc_comp_shift(pc_fmt, 2));
-
- return rc;
-
-err:
- LOGSS7(inst, LOGL_NOTICE, "Error parsing Pointcode '%s'\n", str);
- return -EINVAL;
-}
-
-const char *osmo_ss7_pointcode_print_buf(char *buf, size_t len, const struct osmo_ss7_instance *inst, uint32_t pc)
-{
- const struct osmo_ss7_pc_fmt *pc_fmt;
- unsigned int num_comp_exp;
- const char *fmtstr;
-
- if (!osmo_ss7_pc_is_valid(pc))
- return "(no PC)";
-
- pc_fmt = inst ? &inst->cfg.pc_fmt : &default_pc_fmt;
- num_comp_exp = num_pc_comp_exp(pc_fmt);
- fmtstr = gen_pc_fmtstr(pc_fmt, &num_comp_exp);
- OSMO_ASSERT(fmtstr);
- snprintf(buf, len, fmtstr,
- pc_comp_shift_and_mask(pc_fmt, 0, pc),
- pc_comp_shift_and_mask(pc_fmt, 1, pc),
- pc_comp_shift_and_mask(pc_fmt, 2, pc));
-
- return buf;
-}
-
-
-/* print a pointcode according to the structure configured for this
- * ss7_instance */
-const char *osmo_ss7_pointcode_print(const struct osmo_ss7_instance *inst, uint32_t pc)
-{
- static char buf[MAX_PC_STR_LEN];
- return osmo_ss7_pointcode_print_buf(buf, sizeof(buf), inst, pc);
-}
-
-/* same as osmo_ss7_pointcode_print() but using a separate buffer, useful for multiple point codes in the
- * same LOGP/printf. */
-const char *osmo_ss7_pointcode_print2(const struct osmo_ss7_instance *inst, uint32_t pc)
-{
- static char buf[MAX_PC_STR_LEN];
- return osmo_ss7_pointcode_print_buf(buf, sizeof(buf), inst, pc);
-}
-
-int osmo_ss7_pointcode_parse_mask_or_len(const struct osmo_ss7_instance *inst, const char *in)
-{
- unsigned int width = osmo_ss7_pc_width(inst ? &inst->cfg.pc_fmt : &default_pc_fmt);
-
- if (in[0] == '/') {
- /* parse mask by length */
- int masklen = atoi(in+1);
- if (masklen < 0 || masklen > 32)
- return -EINVAL;
- if (masklen == 0)
- return 0;
- return (0xFFFFFFFF << (width - masklen)) & ((1 << width)-1);
- } else {
- /* parse mask as point code */
- return osmo_ss7_pointcode_parse(inst, in);
- }
-}
-
/***********************************************************************
* SS7 Instance
***********************************************************************/
@@ -326,41 +117,6 @@
return NULL;
}
-static struct osmo_ss7_instance *
-ss7_instance_alloc(void *ctx, uint32_t id)
-{
- struct osmo_ss7_instance *inst;
-
- inst = talloc_zero(ctx, struct osmo_ss7_instance);
- if (!inst)
- return NULL;
-
- inst->cfg.primary_pc = OSMO_SS7_PC_INVALID;
- inst->cfg.secondary_pc = OSMO_SS7_PC_INVALID;
-
- inst->cfg.id = id;
- LOGSS7(inst, LOGL_INFO, "Creating SS7 Instance\n");
-
- INIT_LLIST_HEAD(&inst->linksets);
- INIT_LLIST_HEAD(&inst->as_list);
- INIT_LLIST_HEAD(&inst->asp_list);
- INIT_LLIST_HEAD(&inst->rtable_list);
- INIT_LLIST_HEAD(&inst->xua_servers);
- inst->rtable_system = ss7_route_table_find_or_create(inst, "system");
-
- /* default point code structure + formatting */
- inst->cfg.pc_fmt.delimiter = '.';
- inst->cfg.pc_fmt.component_len[0] = 3;
- inst->cfg.pc_fmt.component_len[1] = 8;
- inst->cfg.pc_fmt.component_len[2] = 3;
-
- llist_add_tail(&inst->list, &osmo_ss7_instances);
-
- INIT_LLIST_HEAD(&inst->cfg.sccp_address_book);
-
- return inst;
-}
-
/*! \brief Find or create a SS7 Instance
* \param[in] ctx talloc allocation context to use for allocations
* \param[in] id ID of SS7 Instance
@@ -378,206 +134,6 @@
return inst;
}
-/*! \brief Destroy a SS7 Instance
- * \param[in] inst SS7 Instance to be destroyed */
-void osmo_ss7_instance_destroy(struct osmo_ss7_instance *inst)
-{
- struct osmo_ss7_linkset *lset, *lset2;
- struct osmo_ss7_as *as, *as2;
- struct osmo_ss7_asp *asp, *asp2;
-
- OSMO_ASSERT(ss7_initialized);
- LOGSS7(inst, LOGL_INFO, "Destroying SS7 Instance\n");
-
- llist_for_each_entry_safe(asp, asp2, &inst->asp_list, list)
- osmo_ss7_asp_destroy(asp);
-
- llist_for_each_entry_safe(as, as2, &inst->as_list, list)
- osmo_ss7_as_destroy(as);
-
- llist_for_each_entry_safe(lset, lset2, &inst->linksets, list)
- ss7_linkset_destroy(lset);
-
- llist_del(&inst->list);
- talloc_free(inst);
-}
-
-uint32_t osmo_ss7_instance_get_id(const struct osmo_ss7_instance *inst)
-{
- return inst->cfg.id;
-}
-
-const char *osmo_ss7_instance_get_name(const struct osmo_ss7_instance *inst)
-{
- return inst->cfg.name;
-}
-
-uint32_t osmo_ss7_instance_get_primary_pc(const struct osmo_ss7_instance *inst)
-{
- return inst->cfg.primary_pc;
-}
-
-/*! \brief Set the point code format used in given SS7 instance */
-int osmo_ss7_instance_set_pc_fmt(struct osmo_ss7_instance *inst,
- uint8_t c0, uint8_t c1, uint8_t c2)
-{
- if (c0+c1+c2 > 32)
- return -EINVAL;
-
- if (c0+c1+c2 > 14)
- LOGSS7(inst, LOGL_NOTICE, "Point Code Format %u-%u-%u "
- "is longer than 14 bits, odd?\n", c0, c1, c2);
-
- inst->cfg.pc_fmt.component_len[0] = c0;
- inst->cfg.pc_fmt.component_len[1] = c1;
- inst->cfg.pc_fmt.component_len[2] = c2;
-
- return 0;
-}
-
-const struct osmo_ss7_pc_fmt *
-osmo_ss7_instance_get_pc_fmt(const struct osmo_ss7_instance *inst)
-{
- return &inst->cfg.pc_fmt;
-}
-
-/*! Allocate an SCCP instance, if not present yet.
- * \returns inst->sccp. */
-struct osmo_sccp_instance *osmo_ss7_ensure_sccp(struct osmo_ss7_instance *inst)
-{
- if (inst->sccp)
- return inst->sccp;
-
- LOGSS7(inst, LOGL_NOTICE, "Creating SCCP instance\n");
- inst->sccp = osmo_sccp_instance_create(inst, NULL);
- return inst->sccp;
-}
-
-/*! Get the SCCP instance, if present.
- * \param[in] inst SS7 Instance on which we operate
- * \returns inst->sccp, may be NULL if no SCCP instance was created yet (see osmo_ss7_ensure_sccp()).
- */
-struct osmo_sccp_instance *osmo_ss7_get_sccp(const struct osmo_ss7_instance *inst)
-{
- return inst->sccp;
-}
-
-/***********************************************************************
- * SS7 Application Server
- ***********************************************************************/
-
-/*! \brief Find Application Server by given name
- * \param[in] inst SS7 Instance on which we operate
- * \param[in] name Name of AS
- * \returns pointer to Application Server on success; NULL otherwise */
-struct osmo_ss7_as *
-osmo_ss7_as_find_by_name(struct osmo_ss7_instance *inst, const char *name)
-{
- struct osmo_ss7_as *as;
-
- OSMO_ASSERT(ss7_initialized);
- llist_for_each_entry(as, &inst->as_list, list) {
- if (!strcmp(name, as->cfg.name))
- return as;
- }
- return NULL;
-}
-
-/*! \brief Find Application Server by given routing context
- * \param[in] inst SS7 Instance on which we operate
- * \param[in] rctx Routing Context
- * \returns pointer to Application Server on success; NULL otherwise */
-struct osmo_ss7_as *
-osmo_ss7_as_find_by_rctx(struct osmo_ss7_instance *inst, uint32_t rctx)
-{
- struct osmo_ss7_as *as;
-
- OSMO_ASSERT(ss7_initialized);
- llist_for_each_entry(as, &inst->as_list, list) {
- if (as->cfg.routing_key.context == rctx)
- return as;
- }
- return NULL;
-}
-
-/*! \brief Find Application Server by given local routing key ID
- * \param[in] inst SS7 Instance on which we operate
- * \param[in] l_rk_id Local Routing Key ID
- * \returns pointer to Application Server on success; NULL otherwise */
-struct osmo_ss7_as *
-osmo_ss7_as_find_by_l_rk_id(struct osmo_ss7_instance *inst, uint32_t l_rk_id)
-{
- struct osmo_ss7_as *as;
-
- OSMO_ASSERT(ss7_initialized);
- llist_for_each_entry(as, &inst->as_list, list) {
- if (as->cfg.routing_key.l_rk_id == l_rk_id)
- return as;
- }
- return NULL;
-}
-
-/*! \brief Find Application Server (AS) by given protocol.
- * \param[in] inst SS7 Instance on which we operate
- * \param[in] proto Protocol identifier that must match
- * \returns pointer to AS on success; NULL otherwise
- * If an AS has an ASP also matching the given protocol, that AS is preferred.
- * If there are multiple matches, return the first matching AS. */
-struct osmo_ss7_as *osmo_ss7_as_find_by_proto(struct osmo_ss7_instance *inst,
- enum osmo_ss7_asp_protocol proto)
-{
- struct osmo_ss7_as *as;
- struct osmo_ss7_as *as_without_asp = NULL;
-
- OSMO_ASSERT(ss7_initialized);
-
- /* Loop through the list with AS and try to find one where the proto
- matches up */
- llist_for_each_entry(as, &inst->as_list, list) {
- if (as->cfg.proto != proto)
- continue;
-
- /* Put down the first AS that matches the proto, just in
- * case we will not find any matching ASP */
- if (!as_without_asp)
- as_without_asp = as;
-
- /* Check if the candicate we have here has any suitable ASP */
- if (osmo_ss7_asp_find_by_proto(as, proto))
- return as;
- }
-
- /* Return with the second best find, if there is any */
- return as_without_asp;
-}
-
-/*! \brief Find or Create Application Server
- * \param[in] inst SS7 Instance on which we operate
- * \param[in] name Name of Application Server
- * \param[in] proto Protocol of Application Server
- * \returns pointer to Application Server on success; NULL otherwise */
-struct osmo_ss7_as *
-osmo_ss7_as_find_or_create(struct osmo_ss7_instance *inst, const char *name,
- enum osmo_ss7_asp_protocol proto)
-{
- struct osmo_ss7_as *as;
-
- OSMO_ASSERT(ss7_initialized);
- as = osmo_ss7_as_find_by_name(inst, name);
-
- if (as && as->cfg.proto != proto)
- return NULL;
-
- if (!as) {
- as = ss7_as_alloc(inst, name, proto);
- if (!as)
- return NULL;
- LOGPAS(as, DLSS7, LOGL_INFO, "Created AS\n");
- }
-
- return as;
-}
-
bool ss7_ipv6_sctp_supported(const char *host, bool bind)
{
int rc;
@@ -604,116 +160,6 @@
return true;
}
-struct osmo_ss7_asp *
-osmo_ss7_asp_find_by_name(struct osmo_ss7_instance *inst, const char *name)
-{
- struct osmo_ss7_asp *asp;
-
- OSMO_ASSERT(ss7_initialized);
- llist_for_each_entry(asp, &inst->asp_list, list) {
- if (!strcmp(name, asp->cfg.name))
- return asp;
- }
- return NULL;
-}
-
-/*! \brief Find an ASP that matches the given ASP protocol (xUA variant).
- * \param[in] as Application Server in which to look for \ref asp
- * \param[in] proto ASP protocol (xUA variant) to match
- * \returns SS7 ASP in case a matching one is found; NULL otherwise */
-struct osmo_ss7_asp *
-osmo_ss7_asp_find_by_proto(struct osmo_ss7_as *as,
- enum osmo_ss7_asp_protocol proto)
-{
- unsigned int i;
-
- for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) {
- if (as->cfg.asps[i] && as->cfg.asps[i]->cfg.proto == proto)
- return as->cfg.asps[i];
- }
-
- return NULL;
-}
-
-struct osmo_ss7_asp *
-osmo_ss7_asp_find2(struct osmo_ss7_instance *inst, const char *name,
- uint16_t remote_port, uint16_t local_port,
- int trans_proto, enum osmo_ss7_asp_protocol proto)
-{
- struct osmo_ss7_asp *asp;
-
- OSMO_ASSERT(ss7_initialized);
- asp = osmo_ss7_asp_find_by_name(inst, name);
- if (!asp)
- return NULL;
-
- if (asp->cfg.remote.port != remote_port || asp->cfg.local.port != local_port)
- return NULL;
- if (asp->cfg.trans_proto != trans_proto)
- return NULL;
- if (asp->cfg.proto != proto)
- return NULL;
-
- return asp;
-}
-
-struct osmo_ss7_asp *
-osmo_ss7_asp_find(struct osmo_ss7_instance *inst, const char *name,
- uint16_t remote_port, uint16_t local_port,
- enum osmo_ss7_asp_protocol proto)
-{
- const int trans_proto = ss7_default_trans_proto_for_asp_proto(proto);
-
- return osmo_ss7_asp_find2(inst, name,
- remote_port, local_port,
- trans_proto, proto);
-}
-
-struct osmo_ss7_asp *
-osmo_ss7_asp_find_or_create2(struct osmo_ss7_instance *inst, const char *name,
- uint16_t remote_port, uint16_t local_port,
- int trans_proto, enum osmo_ss7_asp_protocol proto)
-{
- struct osmo_ss7_asp *asp;
-
- OSMO_ASSERT(ss7_initialized);
- asp = osmo_ss7_asp_find_by_name(inst, name);
- if (asp) {
- if (asp->cfg.remote.port != remote_port || asp->cfg.local.port != local_port)
- return NULL;
- if (asp->cfg.trans_proto != trans_proto)
- return NULL;
- if (asp->cfg.proto != proto)
- return NULL;
- return asp;
- }
-
- return ss7_asp_alloc(inst, name, remote_port, local_port, trans_proto, proto);
-}
-
-struct osmo_ss7_asp *
-osmo_ss7_asp_find_or_create(struct osmo_ss7_instance *inst, const char *name,
- uint16_t remote_port, uint16_t local_port,
- enum osmo_ss7_asp_protocol proto)
-{
- const int trans_proto = ss7_default_trans_proto_for_asp_proto(proto);
-
- return osmo_ss7_asp_find_or_create2(inst, name,
- remote_port, local_port,
- trans_proto, proto);
-}
-
-bool osmo_ss7_pc_is_local(const struct osmo_ss7_instance *inst, uint32_t pc)
-{
- OSMO_ASSERT(ss7_initialized);
- if (osmo_ss7_pc_is_valid(inst->cfg.primary_pc) && pc == inst->cfg.primary_pc)
- return true;
- if (osmo_ss7_pc_is_valid(inst->cfg.secondary_pc) && pc == inst->cfg.secondary_pc)
- return true;
- /* FIXME: Capability Point Codes */
- return false;
-}
-
int osmo_ss7_init(void)
{
int rc;
diff --git a/src/osmo_ss7_instance.c b/src/osmo_ss7_instance.c
new file mode 100644
index 0000000..60a8829
--- /dev/null
+++ b/src/osmo_ss7_instance.c
@@ -0,0 +1,601 @@
+/* (C) 2015-2017 by Harald Welte <laforge(a)gnumonks.org>
+ * (C) 2023-2024 by sysmocom s.f.m.c. GmbH <info(a)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/>.
+ *
+ */
+
+/***********************************************************************
+ * SS7 Instance
+ ***********************************************************************/
+
+#include <errno.h>
+#include <stdint.h>
+#include <unistd.h>
+
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/talloc.h>
+
+#include <osmocom/sigtran/osmo_ss7.h>
+#include <osmocom/sigtran/sccp_sap.h>
+
+#include "ss7_asp.h"
+#include "ss7_internal.h"
+#include "ss7_instance.h"
+#include "ss7_linkset.h"
+#include "ss7_route_table.h"
+
+static int32_t next_rctx = 1;
+static int32_t next_l_rk_id = 1;
+
+static const struct osmo_ss7_pc_fmt default_pc_fmt = {
+ .delimiter = '.',
+ .component_len = { 3, 8, 3},
+};
+
+struct osmo_ss7_instance *
+ss7_instance_alloc(void *ctx, uint32_t id)
+{
+ struct osmo_ss7_instance *inst;
+
+ inst = talloc_zero(ctx, struct osmo_ss7_instance);
+ if (!inst)
+ return NULL;
+
+ inst->cfg.primary_pc = OSMO_SS7_PC_INVALID;
+ inst->cfg.secondary_pc = OSMO_SS7_PC_INVALID;
+
+ inst->cfg.id = id;
+ LOGSS7(inst, LOGL_INFO, "Creating SS7 Instance\n");
+
+ INIT_LLIST_HEAD(&inst->linksets);
+ INIT_LLIST_HEAD(&inst->as_list);
+ INIT_LLIST_HEAD(&inst->asp_list);
+ INIT_LLIST_HEAD(&inst->rtable_list);
+ INIT_LLIST_HEAD(&inst->xua_servers);
+ inst->rtable_system = ss7_route_table_find_or_create(inst, "system");
+
+ /* default point code structure + formatting */
+ inst->cfg.pc_fmt.delimiter = '.';
+ inst->cfg.pc_fmt.component_len[0] = 3;
+ inst->cfg.pc_fmt.component_len[1] = 8;
+ inst->cfg.pc_fmt.component_len[2] = 3;
+
+ llist_add_tail(&inst->list, &osmo_ss7_instances);
+
+ INIT_LLIST_HEAD(&inst->cfg.sccp_address_book);
+
+ return inst;
+}
+
+
+/*! \brief Destroy a SS7 Instance
+ * \param[in] inst SS7 Instance to be destroyed */
+void osmo_ss7_instance_destroy(struct osmo_ss7_instance *inst)
+{
+ struct osmo_ss7_linkset *lset, *lset2;
+ struct osmo_ss7_as *as, *as2;
+ struct osmo_ss7_asp *asp, *asp2;
+
+ OSMO_ASSERT(ss7_initialized);
+ LOGSS7(inst, LOGL_INFO, "Destroying SS7 Instance\n");
+
+ llist_for_each_entry_safe(asp, asp2, &inst->asp_list, list)
+ osmo_ss7_asp_destroy(asp);
+
+ llist_for_each_entry_safe(as, as2, &inst->as_list, list)
+ osmo_ss7_as_destroy(as);
+
+ llist_for_each_entry_safe(lset, lset2, &inst->linksets, list)
+ ss7_linkset_destroy(lset);
+
+ llist_del(&inst->list);
+ talloc_free(inst);
+}
+
+
+uint32_t osmo_ss7_instance_get_id(const struct osmo_ss7_instance *inst)
+{
+ return inst->cfg.id;
+}
+
+const char *osmo_ss7_instance_get_name(const struct osmo_ss7_instance *inst)
+{
+ return inst->cfg.name;
+}
+
+uint32_t osmo_ss7_instance_get_primary_pc(const struct osmo_ss7_instance *inst)
+{
+ return inst->cfg.primary_pc;
+}
+
+/*! \brief Set the point code format used in given SS7 instance */
+int osmo_ss7_instance_set_pc_fmt(struct osmo_ss7_instance *inst,
+ uint8_t c0, uint8_t c1, uint8_t c2)
+{
+ if (c0+c1+c2 > 32)
+ return -EINVAL;
+
+ if (c0+c1+c2 > 14)
+ LOGSS7(inst, LOGL_NOTICE, "Point Code Format %u-%u-%u "
+ "is longer than 14 bits, odd?\n", c0, c1, c2);
+
+ inst->cfg.pc_fmt.component_len[0] = c0;
+ inst->cfg.pc_fmt.component_len[1] = c1;
+ inst->cfg.pc_fmt.component_len[2] = c2;
+
+ return 0;
+}
+
+const struct osmo_ss7_pc_fmt *
+osmo_ss7_instance_get_pc_fmt(const struct osmo_ss7_instance *inst)
+{
+ return &inst->cfg.pc_fmt;
+}
+
+/*! Allocate an SCCP instance, if not present yet.
+ * \returns inst->sccp. */
+struct osmo_sccp_instance *osmo_ss7_ensure_sccp(struct osmo_ss7_instance *inst)
+{
+ if (inst->sccp)
+ return inst->sccp;
+
+ LOGSS7(inst, LOGL_NOTICE, "Creating SCCP instance\n");
+ inst->sccp = osmo_sccp_instance_create(inst, NULL);
+ return inst->sccp;
+}
+
+/*! Get the SCCP instance, if present.
+ * \param[in] inst SS7 Instance on which we operate
+ * \returns inst->sccp, may be NULL if no SCCP instance was created yet (see osmo_ss7_ensure_sccp()).
+ */
+struct osmo_sccp_instance *osmo_ss7_get_sccp(const struct osmo_ss7_instance *inst)
+{
+ return inst->sccp;
+}
+
+bool osmo_ss7_pc_is_local(const struct osmo_ss7_instance *inst, uint32_t pc)
+{
+ OSMO_ASSERT(ss7_initialized);
+ if (osmo_ss7_pc_is_valid(inst->cfg.primary_pc) && pc == inst->cfg.primary_pc)
+ return true;
+ if (osmo_ss7_pc_is_valid(inst->cfg.secondary_pc) && pc == inst->cfg.secondary_pc)
+ return true;
+ /* FIXME: Capability Point Codes */
+ return false;
+}
+
+int osmo_ss7_find_free_rctx(struct osmo_ss7_instance *inst)
+{
+ int32_t rctx;
+
+ for (rctx = next_rctx; rctx; rctx = ++next_rctx) {
+ if (!osmo_ss7_as_find_by_rctx(inst, next_rctx))
+ return rctx;
+ }
+ return -1;
+}
+
+uint32_t ss7_find_free_l_rk_id(struct osmo_ss7_instance *inst)
+{
+ uint32_t l_rk_id;
+
+ for (l_rk_id = next_l_rk_id; next_l_rk_id; l_rk_id = ++next_l_rk_id) {
+ if (!osmo_ss7_as_find_by_l_rk_id(inst, next_l_rk_id))
+ return l_rk_id;
+ }
+ return -1;
+}
+
+/***********************************************************************
+ * SS7 Application Server
+ ***********************************************************************/
+
+/*! \brief Find Application Server by given name
+ * \param[in] inst SS7 Instance on which we operate
+ * \param[in] name Name of AS
+ * \returns pointer to Application Server on success; NULL otherwise */
+struct osmo_ss7_as *
+osmo_ss7_as_find_by_name(struct osmo_ss7_instance *inst, const char *name)
+{
+ struct osmo_ss7_as *as;
+
+ OSMO_ASSERT(ss7_initialized);
+ llist_for_each_entry(as, &inst->as_list, list) {
+ if (!strcmp(name, as->cfg.name))
+ return as;
+ }
+ return NULL;
+}
+
+/*! \brief Find Application Server by given routing context
+ * \param[in] inst SS7 Instance on which we operate
+ * \param[in] rctx Routing Context
+ * \returns pointer to Application Server on success; NULL otherwise */
+struct osmo_ss7_as *
+osmo_ss7_as_find_by_rctx(struct osmo_ss7_instance *inst, uint32_t rctx)
+{
+ struct osmo_ss7_as *as;
+
+ OSMO_ASSERT(ss7_initialized);
+ llist_for_each_entry(as, &inst->as_list, list) {
+ if (as->cfg.routing_key.context == rctx)
+ return as;
+ }
+ return NULL;
+}
+
+/*! \brief Find Application Server by given local routing key ID
+ * \param[in] inst SS7 Instance on which we operate
+ * \param[in] l_rk_id Local Routing Key ID
+ * \returns pointer to Application Server on success; NULL otherwise */
+struct osmo_ss7_as *
+osmo_ss7_as_find_by_l_rk_id(struct osmo_ss7_instance *inst, uint32_t l_rk_id)
+{
+ struct osmo_ss7_as *as;
+
+ OSMO_ASSERT(ss7_initialized);
+ llist_for_each_entry(as, &inst->as_list, list) {
+ if (as->cfg.routing_key.l_rk_id == l_rk_id)
+ return as;
+ }
+ return NULL;
+}
+
+/*! \brief Find Application Server (AS) by given protocol.
+ * \param[in] inst SS7 Instance on which we operate
+ * \param[in] proto Protocol identifier that must match
+ * \returns pointer to AS on success; NULL otherwise
+ * If an AS has an ASP also matching the given protocol, that AS is preferred.
+ * If there are multiple matches, return the first matching AS. */
+struct osmo_ss7_as *osmo_ss7_as_find_by_proto(struct osmo_ss7_instance *inst,
+ enum osmo_ss7_asp_protocol proto)
+{
+ struct osmo_ss7_as *as;
+ struct osmo_ss7_as *as_without_asp = NULL;
+
+ OSMO_ASSERT(ss7_initialized);
+
+ /* Loop through the list with AS and try to find one where the proto
+ matches up */
+ llist_for_each_entry(as, &inst->as_list, list) {
+ if (as->cfg.proto != proto)
+ continue;
+
+ /* Put down the first AS that matches the proto, just in
+ * case we will not find any matching ASP */
+ if (!as_without_asp)
+ as_without_asp = as;
+
+ /* Check if the candicate we have here has any suitable ASP */
+ if (osmo_ss7_asp_find_by_proto(as, proto))
+ return as;
+ }
+
+ /* Return with the second best find, if there is any */
+ return as_without_asp;
+}
+
+/*! \brief Find or Create Application Server
+ * \param[in] inst SS7 Instance on which we operate
+ * \param[in] name Name of Application Server
+ * \param[in] proto Protocol of Application Server
+ * \returns pointer to Application Server on success; NULL otherwise */
+struct osmo_ss7_as *
+osmo_ss7_as_find_or_create(struct osmo_ss7_instance *inst, const char *name,
+ enum osmo_ss7_asp_protocol proto)
+{
+ struct osmo_ss7_as *as;
+
+ OSMO_ASSERT(ss7_initialized);
+ as = osmo_ss7_as_find_by_name(inst, name);
+
+ if (as && as->cfg.proto != proto)
+ return NULL;
+
+ if (!as) {
+ as = ss7_as_alloc(inst, name, proto);
+ if (!as)
+ return NULL;
+ LOGPAS(as, DLSS7, LOGL_INFO, "Created AS\n");
+ }
+
+ return as;
+}
+
+/***********************************************************************
+ * SS7 Application Server Process
+ ***********************************************************************/
+
+struct osmo_ss7_asp *
+osmo_ss7_asp_find_by_name(struct osmo_ss7_instance *inst, const char *name)
+{
+ struct osmo_ss7_asp *asp;
+
+ OSMO_ASSERT(ss7_initialized);
+ llist_for_each_entry(asp, &inst->asp_list, list) {
+ if (!strcmp(name, asp->cfg.name))
+ return asp;
+ }
+ return NULL;
+}
+
+/*! \brief Find an ASP that matches the given ASP protocol (xUA variant).
+ * \param[in] as Application Server in which to look for \ref asp
+ * \param[in] proto ASP protocol (xUA variant) to match
+ * \returns SS7 ASP in case a matching one is found; NULL otherwise */
+struct osmo_ss7_asp *
+osmo_ss7_asp_find_by_proto(struct osmo_ss7_as *as,
+ enum osmo_ss7_asp_protocol proto)
+{
+ unsigned int i;
+
+ for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) {
+ if (as->cfg.asps[i] && as->cfg.asps[i]->cfg.proto == proto)
+ return as->cfg.asps[i];
+ }
+
+ return NULL;
+}
+
+struct osmo_ss7_asp *
+osmo_ss7_asp_find2(struct osmo_ss7_instance *inst, const char *name,
+ uint16_t remote_port, uint16_t local_port,
+ int trans_proto, enum osmo_ss7_asp_protocol proto)
+{
+ struct osmo_ss7_asp *asp;
+
+ OSMO_ASSERT(ss7_initialized);
+ asp = osmo_ss7_asp_find_by_name(inst, name);
+ if (!asp)
+ return NULL;
+
+ if (asp->cfg.remote.port != remote_port || asp->cfg.local.port != local_port)
+ return NULL;
+ if (asp->cfg.trans_proto != trans_proto)
+ return NULL;
+ if (asp->cfg.proto != proto)
+ return NULL;
+
+ return asp;
+}
+
+struct osmo_ss7_asp *
+osmo_ss7_asp_find(struct osmo_ss7_instance *inst, const char *name,
+ uint16_t remote_port, uint16_t local_port,
+ enum osmo_ss7_asp_protocol proto)
+{
+ const int trans_proto = ss7_default_trans_proto_for_asp_proto(proto);
+
+ return osmo_ss7_asp_find2(inst, name,
+ remote_port, local_port,
+ trans_proto, proto);
+}
+
+struct osmo_ss7_asp *
+osmo_ss7_asp_find_or_create2(struct osmo_ss7_instance *inst, const char *name,
+ uint16_t remote_port, uint16_t local_port,
+ int trans_proto, enum osmo_ss7_asp_protocol proto)
+{
+ struct osmo_ss7_asp *asp;
+
+ OSMO_ASSERT(ss7_initialized);
+ asp = osmo_ss7_asp_find_by_name(inst, name);
+ if (asp) {
+ if (asp->cfg.remote.port != remote_port || asp->cfg.local.port != local_port)
+ return NULL;
+ if (asp->cfg.trans_proto != trans_proto)
+ return NULL;
+ if (asp->cfg.proto != proto)
+ return NULL;
+ return asp;
+ }
+
+ return ss7_asp_alloc(inst, name, remote_port, local_port, trans_proto, proto);
+}
+
+struct osmo_ss7_asp *
+osmo_ss7_asp_find_or_create(struct osmo_ss7_instance *inst, const char *name,
+ uint16_t remote_port, uint16_t local_port,
+ enum osmo_ss7_asp_protocol proto)
+{
+ const int trans_proto = ss7_default_trans_proto_for_asp_proto(proto);
+
+ return osmo_ss7_asp_find_or_create2(inst, name,
+ remote_port, local_port,
+ trans_proto, proto);
+}
+
+/***********************************************************************
+ * SS7 Point Code Parsing / Printing
+ ***********************************************************************/
+
+/* like strcat() but appends a single character */
+static int strnappendchar(char *str, char c, size_t n)
+{
+ unsigned int curlen = strlen(str);
+
+ if (n < curlen + 2)
+ return -1;
+
+ str[curlen] = c;
+ str[curlen+1] = '\0';
+
+ return curlen+1;
+}
+
+/* generate a format string for formatting a point code. The result can
+ * e.g. be used with sscanf() or sprintf() */
+static const char *gen_pc_fmtstr(const struct osmo_ss7_pc_fmt *pc_fmt,
+ unsigned int *num_comp_exp)
+{
+ static char buf[MAX_PC_STR_LEN];
+ unsigned int num_comp = 0;
+
+ buf[0] = '\0';
+ strcat(buf, "%u");
+ num_comp++;
+
+ if (pc_fmt->component_len[1] == 0)
+ goto out;
+ strnappendchar(buf, pc_fmt->delimiter, sizeof(buf));
+ strcat(buf, "%u");
+ num_comp++;
+
+ if (pc_fmt->component_len[2] == 0)
+ goto out;
+ strnappendchar(buf, pc_fmt->delimiter, sizeof(buf));
+ strcat(buf, "%u");
+ num_comp++;
+out:
+ if (num_comp_exp)
+ *num_comp_exp = num_comp;
+ return buf;
+}
+
+/* get number of components we expect for a point code, depending on the
+ * configuration of this ss7_instance */
+static unsigned int num_pc_comp_exp(const struct osmo_ss7_pc_fmt *pc_fmt)
+{
+ unsigned int num_comp_exp = 1;
+
+ if (pc_fmt->component_len[1])
+ num_comp_exp++;
+ if (pc_fmt->component_len[2])
+ num_comp_exp++;
+
+ return num_comp_exp;
+}
+
+/* get the number of bits we must shift the given component of a point
+ * code in this ss7_instance */
+static unsigned int get_pc_comp_shift(const struct osmo_ss7_pc_fmt *pc_fmt,
+ unsigned int comp_num)
+{
+ uint32_t pc_width = osmo_ss7_pc_width(pc_fmt);
+ switch (comp_num) {
+ case 0:
+ return pc_width - pc_fmt->component_len[0];
+ case 1:
+ return pc_width - pc_fmt->component_len[0] - pc_fmt->component_len[1];
+ case 2:
+ return 0;
+ default:
+ /* Invalid number of components */
+ OSMO_ASSERT(false);
+ }
+}
+
+static uint32_t pc_comp_shift_and_mask(const struct osmo_ss7_pc_fmt *pc_fmt,
+ unsigned int comp_num, uint32_t pc)
+{
+ unsigned int shift = get_pc_comp_shift(pc_fmt, comp_num);
+ uint32_t mask = (1 << pc_fmt->component_len[comp_num]) - 1;
+
+ return (pc >> shift) & mask;
+}
+
+/* parse a point code according to the structure configured for this
+ * ss7_instance */
+int osmo_ss7_pointcode_parse(const struct osmo_ss7_instance *inst, const char *str)
+{
+ unsigned int component[3];
+ const struct osmo_ss7_pc_fmt *pc_fmt = inst ? &inst->cfg.pc_fmt : &default_pc_fmt;
+ unsigned int num_comp_exp = num_pc_comp_exp(pc_fmt);
+ const char *fmtstr = gen_pc_fmtstr(pc_fmt, &num_comp_exp);
+ int i, rc;
+
+ rc = sscanf(str, fmtstr, &component[0], &component[1], &component[2]);
+ /* ensure all components were parsed */
+ if (rc != num_comp_exp)
+ goto err;
+
+ /* check none of the component values exceeds what can be
+ * represented within its bit-width */
+ for (i = 0; i < num_comp_exp; i++) {
+ if (component[i] >= (1 << pc_fmt->component_len[i]))
+ goto err;
+ }
+
+ /* shift them all together */
+ rc = (component[0] << get_pc_comp_shift(pc_fmt, 0));
+ if (num_comp_exp > 1)
+ rc |= (component[1] << get_pc_comp_shift(pc_fmt, 1));
+ if (num_comp_exp > 2)
+ rc |= (component[2] << get_pc_comp_shift(pc_fmt, 2));
+
+ return rc;
+
+err:
+ LOGSS7(inst, LOGL_NOTICE, "Error parsing Pointcode '%s'\n", str);
+ return -EINVAL;
+}
+
+const char *osmo_ss7_pointcode_print_buf(char *buf, size_t len, const struct osmo_ss7_instance *inst, uint32_t pc)
+{
+ const struct osmo_ss7_pc_fmt *pc_fmt;
+ unsigned int num_comp_exp;
+ const char *fmtstr;
+
+ if (!osmo_ss7_pc_is_valid(pc))
+ return "(no PC)";
+
+ pc_fmt = inst ? &inst->cfg.pc_fmt : &default_pc_fmt;
+ num_comp_exp = num_pc_comp_exp(pc_fmt);
+ fmtstr = gen_pc_fmtstr(pc_fmt, &num_comp_exp);
+ OSMO_ASSERT(fmtstr);
+ snprintf(buf, len, fmtstr,
+ pc_comp_shift_and_mask(pc_fmt, 0, pc),
+ pc_comp_shift_and_mask(pc_fmt, 1, pc),
+ pc_comp_shift_and_mask(pc_fmt, 2, pc));
+
+ return buf;
+}
+
+
+/* print a pointcode according to the structure configured for this
+ * ss7_instance */
+const char *osmo_ss7_pointcode_print(const struct osmo_ss7_instance *inst, uint32_t pc)
+{
+ static char buf[MAX_PC_STR_LEN];
+ return osmo_ss7_pointcode_print_buf(buf, sizeof(buf), inst, pc);
+}
+
+/* same as osmo_ss7_pointcode_print() but using a separate buffer, useful for multiple point codes in the
+ * same LOGP/printf. */
+const char *osmo_ss7_pointcode_print2(const struct osmo_ss7_instance *inst, uint32_t pc)
+{
+ static char buf[MAX_PC_STR_LEN];
+ return osmo_ss7_pointcode_print_buf(buf, sizeof(buf), inst, pc);
+}
+
+int osmo_ss7_pointcode_parse_mask_or_len(const struct osmo_ss7_instance *inst, const char *in)
+{
+ unsigned int width = osmo_ss7_pc_width(inst ? &inst->cfg.pc_fmt : &default_pc_fmt);
+
+ if (in[0] == '/') {
+ /* parse mask by length */
+ int masklen = atoi(in+1);
+ if (masklen < 0 || masklen > 32)
+ return -EINVAL;
+ if (masklen == 0)
+ return 0;
+ return (0xFFFFFFFF << (width - masklen)) & ((1 << width)-1);
+ }
+ /* parse mask as point code */
+ return osmo_ss7_pointcode_parse(inst, in);
+}
diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c
index 0e1eb34..c11dddf 100644
--- a/src/sccp_scoc.c
+++ b/src/sccp_scoc.c
@@ -63,6 +63,7 @@
#include "xua_internal.h"
#include "sccp_internal.h"
+#include "ss7_instance.h"
#define S(x) (1 << (x))
#define SCU_MSGB_SIZE 1024
diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c
index d9eb6df..33f0633 100644
--- a/src/sccp_scrc.c
+++ b/src/sccp_scrc.c
@@ -33,6 +33,7 @@
#include <osmocom/sigtran/protocol/mtp.h>
#include "sccp_internal.h"
+#include "ss7_instance.h"
#include "ss7_linkset.h"
#include "ss7_route.h"
#include "xua_internal.h"
diff --git a/src/sccp_vty.c b/src/sccp_vty.c
index 4bd1e4d..49f3577 100644
--- a/src/sccp_vty.c
+++ b/src/sccp_vty.c
@@ -41,6 +41,7 @@
#include "xua_internal.h"
#include "sccp_internal.h"
+#include "ss7_instance.h"
static void show_user(struct vty *vty, struct osmo_sccp_user *user)
{
diff --git a/src/ss7_instance.h b/src/ss7_instance.h
new file mode 100644
index 0000000..d76891f
--- /dev/null
+++ b/src/ss7_instance.h
@@ -0,0 +1,63 @@
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <osmocom/core/linuxlist.h>
+
+/***********************************************************************
+ * SS7 Instances
+ ***********************************************************************/
+
+struct osmo_ss7_user;
+struct osmo_ss7_route_table;
+struct osmo_sccp_instance;
+
+struct osmo_ss7_pc_fmt {
+ char delimiter;
+ uint8_t component_len[3];
+};
+
+struct osmo_ss7_instance {
+ /*! member of global list of instances */
+ struct llist_head list;
+ /*! list of \ref osmo_ss7_linkset */
+ struct llist_head linksets;
+ /*! list of \ref osmo_ss7_as */
+ struct llist_head as_list;
+ /*! list of \ref osmo_ss7_asp */
+ struct llist_head asp_list;
+ /*! list of \ref osmo_ss7_route_table */
+ struct llist_head rtable_list;
+ /*! list of \ref osmo_xua_servers */
+ struct llist_head xua_servers;
+ /* array for faster lookup of user (indexed by service
+ * indicator) */
+ const struct osmo_ss7_user *user[16];
+
+ struct osmo_ss7_route_table *rtable_system;
+
+ struct osmo_sccp_instance *sccp;
+
+ struct {
+ uint32_t id;
+ char *name;
+ char *description;
+ uint32_t primary_pc;
+ /* capability PCs */
+ uint8_t network_indicator;
+ struct osmo_ss7_pc_fmt pc_fmt;
+ bool permit_dyn_rkm_alloc;
+ struct llist_head sccp_address_book;
+ uint32_t secondary_pc;
+ } cfg;
+};
+
+struct osmo_ss7_instance *
+ss7_instance_alloc(void *ctx, uint32_t id);
+
+uint32_t ss7_find_free_l_rk_id(struct osmo_ss7_instance *inst);
+
+#define _LOGSS7(inst, subsys, level, fmt, args ...) \
+ LOGP(subsys, level, "%u: " fmt, inst ? (inst)->cfg.id : 0, ## args)
+#define LOGSS7(inst, level, fmt, args ...) \
+ _LOGSS7(inst, DLSS7, level, fmt, ## args)
diff --git a/src/ss7_internal.h b/src/ss7_internal.h
index db8f198..27bd54f 100644
--- a/src/ss7_internal.h
+++ b/src/ss7_internal.h
@@ -7,8 +7,11 @@
#include <osmocom/netif/stream.h>
#include <osmocom/sigtran/osmo_ss7.h>
+#include "ss7_instance.h"
+
+#define MAX_PC_STR_LEN 32
+
extern bool ss7_initialized;
-uint32_t ss7_find_free_l_rk_id(struct osmo_ss7_instance *inst);
bool ss7_ipv6_sctp_supported(const char *host, bool bind);
@@ -31,10 +34,5 @@
SS7_AS_CTR_TX_MSU_TOTAL,
};
-#define _LOGSS7(inst, subsys, level, fmt, args ...) \
- LOGP(subsys, level, "%u: " fmt, inst ? (inst)->cfg.id : 0, ## args)
-#define LOGSS7(inst, level, fmt, args ...) \
- _LOGSS7(inst, DLSS7, level, fmt, ## args)
-
#define LOGPAS(as, subsys, level, fmt, args ...) \
_LOGSS7((as)->inst, subsys, level, "as-%s: " fmt, (as)->cfg.name, ## args)
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38664?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: I4562fe21535c5aa468ac0e3831d505bf08b336ec
Gerrit-Change-Number: 38664
Gerrit-PatchSet: 9
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
7 months, 2 weeks
- 1
- 0
[S] Change in libosmo-sigtran[master]: Move code to delete routes by as/linkset to helper functions
by pespin
pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38730?usp=email )
Change subject: Move code to delete routes by as/linkset to helper functions
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38730?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: Ic36fd6a0466cc0338132f2e34eb7c916115c9d4a
Gerrit-Change-Number: 38730
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 12 Nov 2024 16:09:09 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
7 months, 2 weeks
- 1
- 0
[S] Change in libosmo-sigtran[master]: route_table: Split allocation code to its own function
by pespin
pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38729?usp=email )
Change subject: route_table: Split allocation code to its own function
......................................................................
Patch Set 2: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38729?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: Id081d6de14be84b05ed38f3f8211ba91e675cff0
Gerrit-Change-Number: 38729
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 12 Nov 2024 16:09:04 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
7 months, 2 weeks
- 1
- 0
[M] Change in libosmo-sigtran[master]: cosmetic: osmo_ss7: Rearrange some contents
by pespin
pespin has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/38721?usp=email )
Change subject: cosmetic: osmo_ss7: Rearrange some contents
......................................................................
Patch Set 5: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/38721?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: I592db59e27fa7b401d1281921e38817772308c00
Gerrit-Change-Number: 38721
Gerrit-PatchSet: 5
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 12 Nov 2024 16:09:02 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
7 months, 2 weeks
- 1
- 0