[XL] Change in libosmo-sigtran[master]: sccp: Split sccp_scoc into multiple files
by pespin
Attention is currently required from: pespin.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmo-sigtran/+/40581?usp=email
to look at the new patch set (#3).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
Change subject: sccp: Split sccp_scoc into multiple files
......................................................................
sccp: Split sccp_scoc into multiple files
The previous state was really messy with sccp_scoc.c containing lots
of different not-directly-related modules, which made it very
difficult to find all the parts and gasp the whole picture.
It also makes it easier to extend the code in the future as we plan to
be adding more features from time to time.
This commit moves (splits) sccp_scoc.c + sccp_internal.h out to
different modules:
* sccp_user.h is added since there already existed sccp_user.c,
operating on struct sccp_user.
* sccp_connection.{c,h} is added to contain all the struct
sccp_connection data domain logic.
* sccp_scoc_fsm.{c,h} is added to have all the related FSM code
self-contained in a file.
* sccp_sap.c: Some code related to the SCU primitive is moved here,
where it belongs.
* sccp_vty: Some related vty code is moved here, where it belongs.
The SCOC handling logic is kept in the sccp_scoc.c file.
Some functions are properly prefixed when moved to the correct file.
Change-Id: I51e9bf60bc4c4b2babd3f408daed914eaf398e82
---
M src/Makefile.am
A src/sccp_connection.c
A src/sccp_connection.h
M src/sccp_helpers.c
M src/sccp_internal.h
M src/sccp_lbcs.c
M src/sccp_sap.c
M src/sccp_sclc.c
M src/sccp_scmg.c
M src/sccp_scoc.c
A src/sccp_scoc_fsm.c
A src/sccp_scoc_fsm.h
M src/sccp_user.c
A src/sccp_user.h
M src/sccp_vty.c
M src/ss7.c
16 files changed, 1,403 insertions(+), 1,236 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/81/40581/3
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40581?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: I51e9bf60bc4c4b2babd3f408daed914eaf398e82
Gerrit-Change-Number: 40581
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
3 weeks, 6 days
- 1
- 0
[XL] Change in libosmo-sigtran[master]: sccp: Split sccp_instance code from sccp_user.c to its own file
by pespin
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40582?usp=email )
Change subject: sccp: Split sccp_instance code from sccp_user.c to its own file
......................................................................
sccp: Split sccp_instance code from sccp_user.c to its own file
Move code logic affecting management of struct sccp_instance to its own
file. Previously, code was messily split between sccp_scoc.c and
sccp_user.c.
Change-Id: I632f1825fe696bf73c0f9220dc8e8463337d8ba8
---
M src/Makefile.am
M src/sccp_connection.c
M src/sccp_helpers.c
A src/sccp_instance.c
A src/sccp_instance.h
M src/sccp_internal.h
M src/sccp_lbcs.c
M src/sccp_sap.c
M src/sccp_sclc.c
M src/sccp_scmg.c
M src/sccp_scoc.c
M src/sccp_scoc_fsm.c
M src/sccp_scrc.c
M src/sccp_user.c
M src/sccp_user.h
M src/sccp_vty.c
M src/ss7_vty.c
17 files changed, 1,012 insertions(+), 922 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/82/40582/1
diff --git a/src/Makefile.am b/src/Makefile.am
index 714bf02..0dc965e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,6 +5,7 @@
noinst_HEADERS = \
sccp_connection.h \
sccp_scoc_fsm.h \
+ sccp_instance.h \
sccp_internal.h \
sccp_user.h \
ss7_as.h \
@@ -48,6 +49,7 @@
sccp2sua.c \
sccp_connection.c \
sccp_helpers.c \
+ sccp_instance.c \
sccp_lbcs.c \
sccp_sap.c \
sccp_sclc.c \
diff --git a/src/sccp_connection.c b/src/sccp_connection.c
index a8d2876..10c2760 100644
--- a/src/sccp_connection.c
+++ b/src/sccp_connection.c
@@ -40,6 +40,7 @@
#include <osmocom/sigtran/sccp_helpers.h>
#include <osmocom/sccp/sccp_types.h>
+#include "sccp_instance.h"
#include "sccp_internal.h"
#include "sccp_connection.h"
#include "sccp_scoc_fsm.h"
diff --git a/src/sccp_helpers.c b/src/sccp_helpers.c
index e86aa32..696f7a7 100644
--- a/src/sccp_helpers.c
+++ b/src/sccp_helpers.c
@@ -34,6 +34,7 @@
#include <osmocom/sigtran/sccp_helpers.h>
#include "ss7_internal.h"
+#include "sccp_instance.h"
#include "sccp_internal.h"
#include "sccp_user.h"
diff --git a/src/sccp_instance.c b/src/sccp_instance.c
new file mode 100644
index 0000000..a90657d
--- /dev/null
+++ b/src/sccp_instance.c
@@ -0,0 +1,923 @@
+/* SCCP Instance related routines */
+
+/* (C) 2017 by Harald Welte <laforge(a)gnumonks.org>
+ * All Rights Reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * based on my 2011 Erlang implementation osmo_ss7/src/sua_sccp_conv.erl
+ *
+ * References: ITU-T Q.713 and IETF RFC 3868
+ *
+ * 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 <stdbool.h>
+#include <string.h>
+#include <limits.h>
+
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/logging.h>
+
+#include <osmocom/sigtran/osmo_ss7.h>
+#include <osmocom/sigtran/sccp_sap.h>
+#include <osmocom/sigtran/mtp_sap.h>
+#include <osmocom/sigtran/protocol/mtp.h>
+#include <osmocom/sigtran/sccp_helpers.h>
+#include <osmocom/sccp/sccp_types.h>
+
+#include "sccp_internal.h"
+#include "sccp_instance.h"
+#include "sccp_user.h"
+#include "xua_internal.h"
+#include "ss7_as.h"
+#include "ss7_asp.h"
+#include "ss7_route.h"
+#include "ss7_route_table.h"
+#include "ss7_internal.h"
+#include "ss7_xua_srv.h"
+
+/***********************************************************************
+ * Timer Handling
+ ***********************************************************************/
+
+/* Mostly pasted from Appendix C.4 of ITU-T Q.714 (05/2001) -- some of their descriptions are quite
+ * unintelligible out of context, for which we have our own description here. */
+const struct osmo_tdef osmo_sccp_timer_defaults[OSMO_SCCP_TIMERS_LEN] = {
+ { .T = OSMO_SCCP_TIMER_CONN_EST, .default_val = 1*60, .unit = OSMO_TDEF_S,
+ .desc = "Waiting for connection confirm message, 1 to 2 minutes" },
+ { .T = OSMO_SCCP_TIMER_IAS, .default_val = 7*60, .unit = OSMO_TDEF_S,
+ .desc = "Send keep-alive: on an idle connection, delay before sending an Idle Timer message, 5 to 10 minutes" }, /* RFC 3868 Ch. 8. */
+ { .T = OSMO_SCCP_TIMER_IAR, .default_val = 15*60, .unit = OSMO_TDEF_S,
+ .desc = "Receive keep-alive: on an idle connection, delay until considering a connection as stale, 11 to 21 minutes" }, /* RFC 3868 Ch. 8. */
+ { .T = OSMO_SCCP_TIMER_REL, .default_val = 10, .unit = OSMO_TDEF_S,
+ .desc = "Waiting for release complete message, 10 to 20 seconds" },
+ { .T = OSMO_SCCP_TIMER_REPEAT_REL, .default_val = 10, .unit = OSMO_TDEF_S,
+ .desc = "Waiting for release complete message; or to repeat sending released message after the initial expiry, 10 to 20 seconds" },
+ { .T = OSMO_SCCP_TIMER_INT, .default_val = 1*60, .unit = OSMO_TDEF_S,
+ .desc = "Waiting for release complete message; or to release connection resources, freeze the LRN and "
+ "alert a maintenance function after the initial expiry, extending to 1 minute" },
+ { .T = OSMO_SCCP_TIMER_GUARD, .default_val = 23*60, .unit = OSMO_TDEF_S,
+ .desc = "Waiting to resume normal procedure for temporary connection sections during the restart procedure, 23 to 25 minutes" },
+ { .T = OSMO_SCCP_TIMER_RESET, .default_val = 10, .unit = OSMO_TDEF_S,
+ .desc = "Waiting to release temporary connection section or alert maintenance function after reset request message is sent, 10 to 20 seconds" },
+ { .T = OSMO_SCCP_TIMER_REASSEMBLY, .default_val = 10, .unit = OSMO_TDEF_S,
+ .desc = "Waiting to receive all the segments of the remaining segments, single segmented message after receiving the first segment, 10 to 20 seconds" },
+ {}
+};
+
+/* Appendix C.4 of ITU-T Q.714 */
+const struct value_string osmo_sccp_timer_names[] = {
+ { OSMO_SCCP_TIMER_CONN_EST, "conn_est" },
+ { OSMO_SCCP_TIMER_IAS, "ias" },
+ { OSMO_SCCP_TIMER_IAR, "iar" },
+ { OSMO_SCCP_TIMER_REL, "rel" },
+ { OSMO_SCCP_TIMER_REPEAT_REL, "repeat_rel" },
+ { OSMO_SCCP_TIMER_INT, "int" },
+ { OSMO_SCCP_TIMER_GUARD, "guard" },
+ { OSMO_SCCP_TIMER_RESET, "reset" },
+ { OSMO_SCCP_TIMER_REASSEMBLY, "reassembly" },
+ {}
+};
+
+osmo_static_assert(ARRAY_SIZE(osmo_sccp_timer_defaults) == (OSMO_SCCP_TIMERS_LEN) &&
+ ARRAY_SIZE(osmo_sccp_timer_names) == (OSMO_SCCP_TIMERS_LEN),
+ assert_osmo_sccp_timers_count);
+
+/*! \brief Find a SCCP User registered for given PC+SSN or SSN only
+ * First search all users with a valid PC for a full PC+SSN match.
+ * If no such match was found, search all users with an invalid PC for an SSN-only match.
+ * \param[in] inst SCCP Instance in which to search
+ * \param[in] ssn Sub-System Number to search for
+ * \param[in] pc Point Code to search for
+ * \returns Matching SCCP User; NULL if none found */
+struct osmo_sccp_user *
+sccp_user_find(struct osmo_sccp_instance *inst, uint16_t ssn, uint32_t pc)
+{
+ struct osmo_sccp_user *scu;
+
+ if (osmo_ss7_pc_is_valid(pc)) {
+ /* First try to find match for PC + SSN */
+ llist_for_each_entry(scu, &inst->users, list) {
+ if (osmo_ss7_pc_is_valid(scu->pc) && scu->pc == pc && scu->ssn == ssn)
+ return scu;
+ }
+ }
+
+ /* Then try to match on SSN only */
+ llist_for_each_entry(scu, &inst->users, list) {
+ if (!osmo_ss7_pc_is_valid(scu->pc) && scu->ssn == ssn)
+ return scu;
+ }
+
+ return NULL;
+}
+
+/*! Find a SCCP User registered for given PC+SSN or SSN only.
+ * First search all users with a valid PC for a full PC+SSN match.
+ * If no match was found, search all users with an invalid PC for an SSN-only match.
+ * \param[in] inst SCCP Instance in which to search.
+ * \param[in] ssn Sub-System Number to search for.
+ * \param[in] pc Point Code to search for.
+ * \returns Matching SCCP User; NULL if none found.
+ */
+struct osmo_sccp_user *
+osmo_sccp_user_find(struct osmo_sccp_instance *inst, uint16_t ssn, uint32_t pc)
+{
+ return sccp_user_find(inst, ssn, pc);
+}
+
+/*! \brief Bind a SCCP User to a given Point Code
+ * \param[in] inst SCCP Instance
+ * \param[in] name human-readable name
+ * \param[in] prim_cb User provided callback to pass a primitive/msg up the stack
+ * \param[in] ssn Sub-System Number to bind to
+ * \param[in] pc Point Code to bind to, or OSMO_SS7_PC_INVALID if none.
+ * \returns Callee-allocated SCCP User on success; negative otherwise
+ *
+ * Ownership of oph->msg in prim_cb is transferred to the user of the
+ * registered callback when called.
+ */
+static struct osmo_sccp_user *
+sccp_user_bind_pc(struct osmo_sccp_instance *inst, const char *name,
+ osmo_prim_cb prim_cb, uint16_t ssn, uint32_t pc)
+{
+ struct osmo_sccp_user *scu;
+
+ scu = sccp_user_find(inst, ssn, pc);
+ if (scu) {
+ LOGPSCI(inst, LOGL_ERROR,
+ "Cannot bind user '%s' to SSN=%u PC=%s, this SSN and PC"
+ " is already bound by '%s'\n",
+ name, ssn, osmo_ss7_pointcode_print(inst->ss7, pc), scu->name);
+ return NULL;
+ }
+
+ LOGPSCI(inst, LOGL_INFO, "Binding user '%s' to SSN=%u PC=%s\n",
+ name, ssn, osmo_ss7_pointcode_print(inst->ss7, pc));
+
+ scu = sccp_user_alloc(inst, name, prim_cb, ssn, pc);
+ return scu;
+}
+
+/*! \brief Bind a given SCCP User to a given SSN+PC
+ * \param[in] inst SCCP Instance
+ * \param[in] name human-readable name
+ * \param[in] prim_cb User provided callback to pass a primitive/msg up the stack
+ * \param[in] ssn Sub-System Number to bind to
+ * \param[in] pc Point Code to bind to
+ * \returns Callee-allocated SCCP User on success; negative otherwise
+ *
+ * Ownership of oph->msg in prim_cb is transferred to the user of the
+ * registered callback when called.
+ */
+struct osmo_sccp_user *
+osmo_sccp_user_bind_pc(struct osmo_sccp_instance *inst, const char *name,
+ osmo_prim_cb prim_cb, uint16_t ssn, uint32_t pc)
+{
+ return sccp_user_bind_pc(inst, name, prim_cb, ssn, pc);
+}
+
+/*! \brief Bind a given SCCP User to a given SSN (at any PC)
+ * \param[in] inst SCCP Instance
+ * \param[in] name human-readable name
+ * \param[in] prim_cb User provided callback to pass a primitive/msg up the stack
+ * \param[in] ssn Sub-System Number to bind to
+ * \returns Callee-allocated SCCP User on success; negative otherwise
+ *
+ * Ownership of oph->msg in prim_cb is transferred to the user of the
+ * registered callback when called.
+ */
+struct osmo_sccp_user *
+osmo_sccp_user_bind(struct osmo_sccp_instance *inst, const char *name,
+ osmo_prim_cb prim_cb, uint16_t ssn)
+{
+ return sccp_user_bind_pc(inst, name, prim_cb, ssn, OSMO_SS7_PC_INVALID);
+}
+
+
+/* prim_cb handed to MTP code for incoming MTP-TRANSFER.ind */
+static int mtp_user_prim_cb(struct osmo_prim_hdr *oph, void *ctx)
+{
+ struct osmo_sccp_instance *inst = ctx;
+ struct osmo_mtp_prim *omp = (struct osmo_mtp_prim *)oph;
+ struct xua_msg *xua;
+ int rc;
+
+ OSMO_ASSERT(oph->sap == MTP_SAP_USER);
+
+ switch (OSMO_PRIM(oph->primitive, oph->operation)) {
+ case OSMO_PRIM(OSMO_MTP_PRIM_TRANSFER, PRIM_OP_INDICATION):
+ /* Convert from SCCP to SUA in xua_msg format */
+ xua = osmo_sccp_to_xua(oph->msg);
+ if (!xua) {
+ LOGPSCI(inst, LOGL_ERROR, "Couldn't convert SCCP to SUA: %s\n",
+ msgb_hexdump(oph->msg));
+ rc = -1;
+ break;
+ }
+ xua->mtp = omp->u.transfer;
+ /* hand this primitive into SCCP via the SCRC code */
+ rc = scrc_rx_mtp_xfer_ind_xua(inst, xua);
+ xua_msg_free(xua);
+ break;
+ default:
+ LOGPSCI(inst, LOGL_ERROR, "Unknown primitive %u:%u receivd\n",
+ oph->primitive, oph->operation);
+ rc = -1;
+ }
+ msgb_free(oph->msg);
+ return rc;
+}
+
+static LLIST_HEAD(sccp_instances);
+
+/*! \brief create a SCCP Instance and register it as user with SS7 inst
+ * \param[in] ss7 SS7 instance to which this SCCP instance belongs
+ * \param[in] priv private data to be stored within SCCP instance
+ * \returns callee-allocated SCCP instance on success; NULL on error */
+struct osmo_sccp_instance *
+osmo_sccp_instance_create(struct osmo_ss7_instance *ss7, void *priv)
+{
+ struct osmo_sccp_instance *inst;
+ int rc;
+
+ inst = talloc_zero(ss7, struct osmo_sccp_instance);
+ if (!inst)
+ return NULL;
+
+ inst->ss7 = ss7;
+ inst->priv = priv;
+ INIT_LLIST_HEAD(&inst->users);
+
+ inst->max_optional_data = SCCP_MAX_OPTIONAL_DATA;
+
+ inst->tdefs = talloc_memdup(inst, osmo_sccp_timer_defaults,
+ sizeof(osmo_sccp_timer_defaults));
+ osmo_tdefs_reset(inst->tdefs);
+
+ rc = sccp_scmg_init(inst);
+ if (rc < 0) {
+ talloc_free(inst);
+ return NULL;
+ }
+
+ 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);
+
+ return inst;
+}
+
+void osmo_sccp_instance_destroy(struct osmo_sccp_instance *inst)
+{
+ 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_destroy(inst->ss7_user);
+ inst->ss7_user = NULL;
+
+ llist_for_each_entry_safe(scu, scu2, &inst->users, list) {
+ osmo_sccp_user_unbind(scu);
+ }
+ sccp_scoc_flush_connections(inst);
+ llist_del(&inst->list);
+ talloc_free(inst);
+}
+
+void osmo_sccp_set_priv(struct osmo_sccp_instance *sccp, void *priv)
+{
+ sccp->priv = priv;
+}
+
+void *osmo_sccp_get_priv(struct osmo_sccp_instance *sccp)
+{
+ return sccp->priv;
+}
+
+/*! \brief derive a basic local SCCP-Address from a given SCCP instance.
+ * \param[out] dest_addr pointer to output address memory
+ * \param[in] inst SCCP instance
+ * \param[in] ssn Subsystem Number */
+void osmo_sccp_local_addr_by_instance(struct osmo_sccp_addr *dest_addr,
+ const struct osmo_sccp_instance *inst,
+ uint32_t ssn)
+{
+ struct osmo_ss7_instance *ss7;
+
+ OSMO_ASSERT(dest_addr);
+ OSMO_ASSERT(inst);
+ ss7 = inst->ss7;
+ OSMO_ASSERT(ss7);
+
+ *dest_addr = (struct osmo_sccp_addr){};
+
+ osmo_sccp_make_addr_pc_ssn(dest_addr, ss7->cfg.primary_pc, ssn);
+}
+
+/*! \brief check whether a given SCCP-Address is consistent.
+ * \param[in] addr SCCP address to check
+ * \param[in] presence mask with minimum required address components
+ * \returns true when address data seems plausible */
+bool osmo_sccp_check_addr(struct osmo_sccp_addr *addr, uint32_t presence)
+{
+ /* Minimum requirements do not match */
+ if ((addr->presence & presence) != presence)
+ return false;
+
+ /* GT ranges */
+ if (addr->presence & OSMO_SCCP_ADDR_T_GT) {
+ if (addr->gt.gti > 15)
+ return false;
+ if (addr->gt.npi > 15)
+ return false;
+ if (addr->gt.nai > 127)
+ return false;
+ }
+
+ /* Routing by GT, but no GT present */
+ if (addr->ri == OSMO_SCCP_RI_GT
+ && !(addr->presence & OSMO_SCCP_ADDR_T_GT))
+ return false;
+
+ /* Routing by PC/SSN, but no PC/SSN present */
+ if (addr->ri == OSMO_SCCP_RI_SSN_PC) {
+ if ((addr->presence & OSMO_SCCP_ADDR_T_PC) == 0)
+ return false;
+ if ((addr->presence & OSMO_SCCP_ADDR_T_SSN) == 0)
+ return false;
+ }
+
+ if (addr->ri == OSMO_SCCP_RI_SSN_IP) {
+ if ((addr->presence & OSMO_SCCP_ADDR_T_IPv4) == 0 &&
+ (addr->presence & OSMO_SCCP_ADDR_T_IPv6) == 0)
+ return false;
+ }
+
+ return true;
+}
+
+/*! Compare two SCCP Global Titles.
+ * \param[in] a left side.
+ * \param[in] b right side.
+ * \return -1 if a < b, 1 if a > b, and 0 if a == b.
+ */
+int osmo_sccp_gt_cmp(const struct osmo_sccp_gt *a, const struct osmo_sccp_gt *b)
+{
+ if (a == b)
+ return 0;
+ if (!a)
+ return -1;
+ if (!b)
+ return 1;
+ return memcmp(a, b, sizeof(*a));
+}
+
+/*! Compare two SCCP addresses by given presence criteria.
+ * Any OSMO_SCCP_ADDR_T_* type not set in presence_criteria is ignored.
+ * In case all bits are set in presence_criteria, the comparison is in the order of:
+ * OSMO_SCCP_ADDR_T_GT, OSMO_SCCP_ADDR_T_PC, OSMO_SCCP_ADDR_T_IPv4, OSMO_SCCP_ADDR_T_IPv6, OSMO_SCCP_ADDR_T_SSN.
+ * The SCCP addresses' Routing Indicator is not compared, see osmo_sccp_addr_ri_cmp().
+ * \param[in] a left side.
+ * \param[in] b right side.
+ * \param[in] presence_criteria A bitmask of OSMO_SCCP_ADDR_T_* values, or OSMO_SCCP_ADDR_T_MASK to compare all parts,
+ * except the routing indicator.
+ * \return -1 if a < b, 1 if a > b, and 0 if all checked values match.
+ */
+int osmo_sccp_addr_cmp(const struct osmo_sccp_addr *a, const struct osmo_sccp_addr *b, uint32_t presence_criteria)
+{
+ int rc;
+ if (a == b)
+ return 0;
+ if (!a)
+ return -1;
+ if (!b)
+ return 1;
+
+ if (presence_criteria & OSMO_SCCP_ADDR_T_GT) {
+ if ((a->presence & OSMO_SCCP_ADDR_T_GT) != (b->presence & OSMO_SCCP_ADDR_T_GT))
+ return (b->presence & OSMO_SCCP_ADDR_T_GT) ? -1 : 1;
+ rc = osmo_sccp_gt_cmp(&a->gt, &b->gt);
+ if (rc)
+ return rc;
+ }
+
+ if (presence_criteria & OSMO_SCCP_ADDR_T_PC) {
+ if ((a->presence & OSMO_SCCP_ADDR_T_PC) != (b->presence & OSMO_SCCP_ADDR_T_PC))
+ return (b->presence & OSMO_SCCP_ADDR_T_PC) ? -1 : 1;
+
+ if ((a->presence & OSMO_SCCP_ADDR_T_PC)
+ && a->pc != b->pc)
+ return (a->pc < b->pc) ? -1 : 1;
+ }
+
+ if (presence_criteria & OSMO_SCCP_ADDR_T_IPv4) {
+ if ((a->presence & OSMO_SCCP_ADDR_T_IPv4) != (b->presence & OSMO_SCCP_ADDR_T_IPv4))
+ return (b->presence & OSMO_SCCP_ADDR_T_IPv4) ? -1 : 1;
+ rc = memcmp(&a->ip.v4, &b->ip.v4, sizeof(a->ip.v4));
+ if (rc)
+ return rc;
+ }
+
+ if (presence_criteria & OSMO_SCCP_ADDR_T_IPv6) {
+ if ((a->presence & OSMO_SCCP_ADDR_T_IPv6) != (b->presence & OSMO_SCCP_ADDR_T_IPv6))
+ return (b->presence & OSMO_SCCP_ADDR_T_IPv6) ? -1 : 1;
+ rc = memcmp(&a->ip.v6, &b->ip.v6, sizeof(a->ip.v6));
+ if (rc)
+ return rc;
+ }
+
+ if (presence_criteria & OSMO_SCCP_ADDR_T_SSN) {
+ if ((a->presence & OSMO_SCCP_ADDR_T_SSN) != (b->presence & OSMO_SCCP_ADDR_T_SSN))
+ return (b->presence & OSMO_SCCP_ADDR_T_SSN) ? -1 : 1;
+ if (a->ssn != b->ssn)
+ return (a->ssn < b->ssn) ? -1 : 1;
+ }
+
+ return 0;
+}
+
+/*! Compare the routing information of two SCCP addresses.
+ * Compare the ri of a and b, and, if equal, return osmo_sccp_addr_cmp() with presence criteria selected according to
+ * ri.
+ * \param[in] a left side.
+ * \param[in] b right side.
+ * \return -1 if a < b, 1 if a > b, and 0 if a == b.
+ */
+int osmo_sccp_addr_ri_cmp(const struct osmo_sccp_addr *a, const struct osmo_sccp_addr *b)
+{
+ uint32_t presence_criteria;
+ if (a == b)
+ return 0;
+ if (!a)
+ return -1;
+ if (!b)
+ return 1;
+ if (a->ri != b->ri)
+ return (a->ri < b->ri) ? -1 : 1;
+ switch (a->ri) {
+ case OSMO_SCCP_RI_NONE:
+ return 0;
+ case OSMO_SCCP_RI_GT:
+ presence_criteria = OSMO_SCCP_ADDR_T_GT;
+ break;
+ case OSMO_SCCP_RI_SSN_PC:
+ presence_criteria = OSMO_SCCP_ADDR_T_SSN | OSMO_SCCP_ADDR_T_PC;
+ break;
+ case OSMO_SCCP_RI_SSN_IP:
+ /* Pick IPv4 or v6 depending on what a->presence indicates. */
+ presence_criteria = OSMO_SCCP_ADDR_T_SSN | (a->presence & (OSMO_SCCP_ADDR_T_IPv4 | OSMO_SCCP_ADDR_T_IPv6));
+ break;
+ default:
+ return 0;
+ }
+
+ return osmo_sccp_addr_cmp(a, b, presence_criteria);
+}
+
+/***********************************************************************
+ * Convenience function for CLIENT
+ ***********************************************************************/
+
+ /* Returns whether AS is already associated to any AS.
+ * Helper function for osmo_sccp_simple_client_on_ss7_id(). */
+static bool asp_serves_some_as(const struct osmo_ss7_asp *asp)
+{
+ struct osmo_ss7_as *as_i;
+ llist_for_each_entry(as_i, &asp->inst->as_list, list) {
+ if (osmo_ss7_as_has_asp(as_i, asp))
+ return true;
+ }
+ return false;
+}
+
+/*! \brief request an sccp client instance
+ * \param[in] ctx talloc context
+ * \param[in] ss7_id of the SS7/CS7 instance
+ * \param[in] name human readable name
+ * \param[in] default_pc pointcode to be used on missing VTY setting
+ * \param[in] prot protocol to be used (e.g OSMO_SS7_ASP_PROT_M3UA)
+ * \param[in] default_local_port local port to be used on missing VTY setting
+ * \param[in] default_local_ip local IP-address to be used on missing VTY setting (NULL: use library own defaults)
+ * \param[in] default_remote_port remote port to be used on missing VTY setting
+ * \param[in] default_remote_ip remote IP-address to be used on missing VTY setting (NULL: use library own defaults)
+ * \returns callee-allocated SCCP instance on success; NULL on error */
+
+struct osmo_sccp_instance *
+osmo_sccp_simple_client_on_ss7_id(void *ctx, uint32_t ss7_id, const char *name,
+ uint32_t default_pc,
+ enum osmo_ss7_asp_protocol prot,
+ int default_local_port,
+ const char *default_local_ip,
+ int default_remote_port,
+ const char *default_remote_ip)
+{
+ struct osmo_ss7_instance *ss7;
+ bool ss7_created = false;
+ struct osmo_ss7_as *as;
+ bool as_created = false;
+ struct osmo_ss7_route *rt;
+ bool rt_created = false;
+ struct osmo_ss7_asp *asp;
+ bool asp_created = false;
+ char *as_name, *asp_name = NULL;
+ int trans_proto;
+
+ trans_proto = ss7_default_trans_proto_for_asp_proto(prot);
+
+ /*! The function will examine the given CS7 instance and its sub
+ * components (as, asp, etc.). If necessary it will allocate
+ * the missing components. If no CS7 instance can be detected
+ * under the caller supplied ID, a new instance will be created
+ * beforehand. */
+
+ /* Choose default ports when the caller does not supply valid port
+ * numbers. */
+ if (!default_remote_port || default_remote_port < 0)
+ default_remote_port = osmo_ss7_asp_protocol_port(prot);
+ if (default_local_port < 0)
+ default_local_port = osmo_ss7_asp_protocol_port(prot);
+
+ /* Check if there is already an ss7 instance present under
+ * the given id. If not, we will create a new one. */
+ ss7 = osmo_ss7_instance_find(ss7_id);
+ if (!ss7) {
+ LOGP(DLSCCP, LOGL_NOTICE, "%s: Creating SS7 instance\n",
+ name);
+
+ /* Create a new ss7 instance */
+ ss7 = osmo_ss7_instance_find_or_create(ctx, ss7_id);
+ if (!ss7) {
+ LOGP(DLSCCP, LOGL_ERROR,
+ "Failed to find or create SS7 instance\n");
+ return NULL;
+ }
+
+ /* Setup primary pointcode
+ * NOTE: This means that the user must set the pointcode to a
+ * proper value when a cs7 instance is defined via the VTY. */
+ ss7->cfg.primary_pc = default_pc;
+ ss7_created = true;
+ }
+
+ /* In case no valid point-code has been configured via the VTY, we
+ * will fall back to the default pointcode. */
+ if (!osmo_ss7_pc_is_valid(ss7->cfg.primary_pc)) {
+ LOGP(DLSCCP, LOGL_ERROR,
+ "SS7 instance %u: no primary point-code set, using default point-code\n",
+ ss7->cfg.id);
+ ss7->cfg.primary_pc = default_pc;
+ }
+
+ LOGP(DLSCCP, LOGL_NOTICE, "%s: Using SS7 instance %u, pc:%s\n", name,
+ ss7->cfg.id, osmo_ss7_pointcode_print(ss7, ss7->cfg.primary_pc));
+
+ /* Check if there is already an application server that matches
+ * the protocol we intend to use. If not, we will create one. */
+ as = osmo_ss7_as_find_by_proto(ss7, prot);
+ if (!as) {
+ LOGP(DLSCCP, LOGL_NOTICE, "%s: Creating AS instance\n",
+ name);
+ as_name = talloc_asprintf(ctx, "as-clnt-%s", name);
+ as = osmo_ss7_as_find_or_create(ss7, as_name, prot);
+ talloc_free(as_name);
+ if (!as)
+ goto out_ss7;
+ as_created = true;
+ as->cfg.routing_key.pc = ss7->cfg.primary_pc;
+ as->simple_client_allocated = true;
+ }
+ LOGP(DLSCCP, LOGL_NOTICE, "%s: Using AS instance %s\n", name,
+ as->cfg.name);
+
+ /* Create a default dynamic route if necessary */
+ rt = ss7_route_table_find_route_by_dpc_mask(ss7->rtable_system, 0, 0, true);
+ if (!rt) {
+ LOGP(DLSCCP, LOGL_NOTICE, "%s: Creating default route\n", name);
+ rt = ss7_route_create(ss7->rtable_system, 0, 0,
+ true, as->cfg.name);
+ if (!rt)
+ goto out_as;
+ rt_created = true;
+ }
+
+ /* Check if we do already have an application server process
+ * that is associated with the application server we have chosen
+ * the application server process must also match the protocol
+ * we intend to use. */
+ asp = osmo_ss7_asp_find_by_proto(as, prot);
+ if (!asp) {
+ /* Check if the user has created an ASP for this proto that is not added on any AS yet. */
+ struct osmo_ss7_asp *asp_i;
+ llist_for_each_entry(asp_i, &ss7->asp_list, list) {
+ if (asp_i->cfg.proto != prot)
+ continue;
+ if (asp_serves_some_as(asp_i)) {
+ /* This ASP is already on another AS.
+ * If it was on this AS, we'd have found it above. */
+ continue;
+ }
+ /* This ASP matches the protocol and is not yet associated to any AS. Use it. */
+ asp = asp_i;
+ LOGP(DLSCCP, LOGL_NOTICE, "%s: ASP %s for %s is not associated with any AS, using it\n",
+ name, asp->cfg.name, osmo_ss7_asp_protocol_name(prot));
+ ss7_as_add_asp(as, asp);
+ /* ASP became associated to a new AS, hence it needs to be
+ * restarted to announce/register its Routing Context.
+ * Make sure proper defaults are applied if app didn't
+ * provide specific default values, then restart the ASP: */
+ ss7_asp_restart_after_reconfigure(asp);
+ break;
+ }
+ if (!asp) {
+ asp_name = talloc_asprintf(ctx, "asp-clnt-%s", name);
+ LOGP(DLSCCP, LOGL_NOTICE, "%s: No unassociated ASP for %s, creating new ASP %s\n",
+ name, osmo_ss7_asp_protocol_name(prot), asp_name);
+ asp = osmo_ss7_asp_find_or_create2(ss7, asp_name,
+ default_remote_port,
+ default_local_port,
+ trans_proto, prot);
+ talloc_free(asp_name);
+ if (!asp)
+ goto out_rt;
+ asp_created = true;
+ asp->simple_client_allocated = true;
+ /* Ensure that the ASP we use is set to operate as a client. */
+ asp->cfg.is_server = false;
+ /* Ensure that the ASP we use is set to role ASP. */
+ asp->cfg.role = OSMO_SS7_ASP_ROLE_ASP;
+ if (default_local_ip)
+ ss7_asp_peer_set_hosts(&asp->cfg.local, asp, &default_local_ip, 1);
+ if (default_remote_ip)
+ ss7_asp_peer_set_hosts(&asp->cfg.remote, asp, &default_remote_ip, 1);
+ ss7_as_add_asp(as, asp);
+ /* Make sure proper defaults are applied if app didn't
+ provide specific default values, then restart the ASP: */
+ ss7_asp_restart_after_reconfigure(asp);
+ }
+ }
+
+ /* Extra sanity checks if the ASP asp-clnt-* was pre-configured over VTY: */
+ if (!asp->simple_client_allocated) {
+ /* Forbid ASPs defined through VTY that are not entirely
+ * configured. "role" and "transport-role" must be explicitly provided:
+ */
+ if (!asp->cfg.role_set_by_vty) {
+ LOGP(DLSCCP, LOGL_ERROR,
+ "%s: ASP %s defined in VTY but 'role' was not set there, please set it.\n",
+ name, asp->cfg.name);
+ goto out_asp;
+ }
+ if (!asp->cfg.trans_role_set_by_vty) {
+ LOGP(DLSCCP, LOGL_ERROR,
+ "%s: ASP %s defined in VTY but 'transport-role' was not set there, please set it.\n",
+ name, asp->cfg.name);
+ goto out_asp;
+ }
+
+ /* If ASP was configured through VTY it may be explicitly configured as
+ * SCTP server. It may be a bit confusing since this function is to create
+ * a "SCCP simple client", but this allows users of this API such as
+ * osmo-hnbgw to support transport-role server if properly configured through VTY.
+ */
+ if (asp->cfg.is_server) {
+ struct osmo_xua_server *xs;
+ LOGP(DLSCCP, LOGL_NOTICE,
+ "%s: Requesting an SCCP simple client on ASP %s configured with 'transport-role server'\n",
+ name, asp->cfg.name);
+ xs = ss7_xua_server_find2(ss7,
+ asp->cfg.trans_proto, prot,
+ asp->cfg.local.port);
+ if (!xs) {
+ LOGP(DLSCCP, LOGL_ERROR, "%s: Requesting an SCCP simple client on ASP %s configured "
+ "with 'transport-role server' but no matching xUA server was configured!\n",
+ name, asp->cfg.name);
+ goto out_asp;
+ }
+ }
+ /* ASP was already started here previously by VTY go_parent. */
+ }
+
+ LOGP(DLSCCP, LOGL_NOTICE, "%s: Using ASP instance %s\n", name,
+ asp->cfg.name);
+
+ osmo_ss7_ensure_sccp(ss7);
+ if (!ss7->sccp)
+ goto out_asp;
+
+ return ss7->sccp;
+
+out_asp:
+ if (asp_created)
+ osmo_ss7_asp_destroy(asp);
+out_rt:
+ if (rt_created)
+ ss7_route_destroy(rt);
+out_as:
+ if (as_created)
+ osmo_ss7_as_destroy(as);
+out_ss7:
+ if (ss7_created)
+ osmo_ss7_instance_destroy(ss7);
+
+ return NULL;
+}
+
+/*! \brief request an sccp client instance
+ * \param[in] ctx talloc context
+ * \param[in] name human readable name
+ * \param[in] default_pc pointcode to be used on missing VTY setting
+ * \param[in] prot protocol to be used (e.g OSMO_SS7_ASP_PROT_M3UA)
+ * \param[in] default_local_port local port to be used on missing VTY setting
+ * \param[in] default_local_ip local IP-address to be used on missing VTY setting
+ * \param[in] default_remote_port remote port to be used on missing VTY setting
+ * \param[in] default_remote_ip remote IP-address to be used on missing VTY setting
+ * \returns callee-allocated SCCP instance on success; NULL on error */
+struct osmo_sccp_instance *
+osmo_sccp_simple_client(void *ctx, const char *name, uint32_t default_pc,
+ enum osmo_ss7_asp_protocol prot, int default_local_port,
+ const char *default_local_ip, int default_remote_port,
+ const char *default_remote_ip)
+{
+ /*! This is simplified version of osmo_sccp_simple_client_on_ss7_id().
+ * the only difference is that the ID of the CS7 instance will be
+ * set to 0 statically */
+
+ return osmo_sccp_simple_client_on_ss7_id(ctx, 0, name, default_pc, prot,
+ default_local_port,
+ default_local_ip,
+ default_remote_port,
+ default_remote_ip);
+}
+
+/***********************************************************************
+ * Convenience function for SERVER
+ ***********************************************************************/
+
+struct osmo_sccp_instance *
+osmo_sccp_simple_server_on_ss7_id(void *ctx, uint32_t ss7_id, uint32_t pc,
+ enum osmo_ss7_asp_protocol prot,
+ int local_port, const char *local_ip)
+{
+ struct osmo_ss7_instance *ss7;
+ struct osmo_xua_server *xs;
+ int trans_proto;
+ int rc;
+
+ trans_proto = ss7_default_trans_proto_for_asp_proto(prot);
+
+ if (local_port < 0)
+ local_port = osmo_ss7_asp_protocol_port(prot);
+
+ /* allocate + initialize SS7 instance */
+ ss7 = osmo_ss7_instance_find_or_create(ctx, ss7_id);
+ if (!ss7)
+ return NULL;
+ ss7->cfg.primary_pc = pc;
+
+ xs = ss7_xua_server_create2(ss7, trans_proto, prot, local_port, local_ip);
+ if (!xs)
+ goto out_ss7;
+
+ rc = ss7_xua_server_bind(xs);
+ if (rc < 0)
+ goto out_xs;
+
+ /* Allocate SCCP stack */
+ osmo_ss7_ensure_sccp(ss7);
+ if (!ss7->sccp)
+ goto out_xs;
+
+ return ss7->sccp;
+
+out_xs:
+ ss7_xua_server_destroy(xs);
+out_ss7:
+ osmo_ss7_instance_destroy(ss7);
+
+ return NULL;
+}
+
+struct osmo_sccp_instance *
+osmo_sccp_simple_server(void *ctx, uint32_t pc,
+ enum osmo_ss7_asp_protocol prot, int local_port,
+ const char *local_ip)
+{
+ return osmo_sccp_simple_server_on_ss7_id(ctx, 0, pc, prot,
+ local_port, local_ip);
+}
+
+struct osmo_sccp_instance *
+osmo_sccp_simple_server_add_clnt(struct osmo_sccp_instance *inst,
+ enum osmo_ss7_asp_protocol prot,
+ const char *name, uint32_t pc,
+ int local_port, int remote_port,
+ const char *remote_ip)
+{
+ struct osmo_ss7_instance *ss7 = inst->ss7;
+ struct osmo_ss7_as *as;
+ struct osmo_ss7_route *rt;
+ struct osmo_ss7_asp *asp;
+ struct osmo_xua_server *oxs;
+ char *as_name, *asp_name;
+ int trans_proto;
+
+ trans_proto = ss7_default_trans_proto_for_asp_proto(prot);
+
+ if (local_port < 0)
+ local_port = osmo_ss7_asp_protocol_port(prot);
+
+ if (remote_port < 0)
+ remote_port = osmo_ss7_asp_protocol_port(prot);
+
+ as_name = talloc_asprintf(ss7, "as-srv-%s", name);
+ asp_name = talloc_asprintf(ss7, "asp-srv-%s", name);
+
+ /* application server */
+ as = osmo_ss7_as_find_or_create(ss7, as_name, prot);
+ if (!as)
+ goto out_strings;
+
+ /* route only selected PC to the client */
+ rt = ss7_route_create(ss7->rtable_system, pc, 0xffff, true, as_name);
+ if (!rt)
+ goto out_as;
+
+ asp = osmo_ss7_asp_find_or_create2(ss7, asp_name,
+ remote_port, local_port,
+ trans_proto, prot);
+ if (!asp)
+ goto out_rt;
+ oxs = ss7_xua_server_find2(ss7, asp->cfg.trans_proto, prot, local_port);
+ if (!oxs)
+ goto out_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 (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;
+ ss7_as_add_asp(as, asp);
+ talloc_free(asp_name);
+ talloc_free(as_name);
+ osmo_ss7_asp_restart(asp);
+
+ return ss7->sccp;
+
+out_asp:
+ osmo_ss7_asp_destroy(asp);
+out_rt:
+ ss7_route_destroy(rt);
+out_as:
+ osmo_ss7_as_destroy(as);
+out_strings:
+ talloc_free(as_name);
+ talloc_free(asp_name);
+
+ return NULL;
+}
+
+/*! Adjust the upper bound for the optional data length (the payload) for CR, CC, CREF and RLSD messages.
+ * For any Optional Data part larger than this value in octets, send CR, CC, CREF and RLSD messages without any payload,
+ * and send the data payload in a separate Data Form 1 message. ITU-T Q.713 sections 4.2 thru 4.5 define a limit of 130
+ * bytes for the 'Data' parameter. This limit can be adjusted here. May be useful for interop with nonstandard SCCP
+ * peers.
+ * \param[in] sccp SCCP instance to reconfigure.
+ * \param[in] val Number of bytes to set as upper bound for the optional data length, or pass a negative value to set
+ * the standard value of SCCP_MAX_OPTIONAL_DATA == 130, which conforms to ITU-T Q.713.
+ */
+void osmo_sccp_set_max_optional_data(struct osmo_sccp_instance *inst, int val)
+{
+ if (!inst)
+ return;
+ if (val < 0)
+ val = SCCP_MAX_OPTIONAL_DATA;
+ inst->max_optional_data = val;
+}
+
+/*! \brief get the SS7 instance that is related to the given SCCP instance
+ * \param[in] sccp SCCP instance
+ * \returns SS7 instance; NULL if sccp was NULL */
+struct osmo_ss7_instance *osmo_sccp_get_ss7(const struct osmo_sccp_instance *sccp)
+{
+ if (!sccp)
+ return NULL;
+ return sccp->ss7;
+}
diff --git a/src/sccp_instance.h b/src/sccp_instance.h
new file mode 100644
index 0000000..a3f6750
--- /dev/null
+++ b/src/sccp_instance.h
@@ -0,0 +1,67 @@
+#pragma once
+
+#include <inttypes.h>
+
+#include <osmocom/core/fsm.h>
+#include <osmocom/core/prim.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/linuxrbtree.h>
+#include <osmocom/core/tdef.h>
+#include <osmocom/sigtran/sccp_sap.h>
+#include <osmocom/sigtran/osmo_ss7.h>
+#include <osmocom/sigtran/protocol/mtp.h>
+
+struct osmo_ss7_user;
+
+/* Appendix C.4 of Q.714 */
+enum osmo_sccp_timer {
+ /* 0 kept unused on purpose since it's handled specially by osmo_fsm */
+ OSMO_SCCP_TIMER_CONN_EST = 1,
+ OSMO_SCCP_TIMER_IAS,
+ OSMO_SCCP_TIMER_IAR,
+ OSMO_SCCP_TIMER_REL,
+ OSMO_SCCP_TIMER_REPEAT_REL,
+ OSMO_SCCP_TIMER_INT,
+ OSMO_SCCP_TIMER_GUARD,
+ OSMO_SCCP_TIMER_RESET,
+ OSMO_SCCP_TIMER_REASSEMBLY,
+ /* This must remain the last item: */
+ OSMO_SCCP_TIMERS_LEN
+};
+
+extern const struct osmo_tdef osmo_sccp_timer_defaults[OSMO_SCCP_TIMERS_LEN];
+
+extern const struct value_string osmo_sccp_timer_names[];
+static inline const char *osmo_sccp_timer_name(enum osmo_sccp_timer val)
+{ return get_value_string(osmo_sccp_timer_names, val); }
+
+/* an instance of the SCCP stack */
+struct osmo_sccp_instance {
+ /* entry in global list of ss7 instances */
+ struct llist_head list;
+ /* rbtree root of 'struct sccp_connection' in this instance */
+ struct rb_root connections;
+ /* list of SCCP users in this instance */
+ struct llist_head users;
+ /* routing context to be used in all outbound messages */
+ uint32_t route_ctx;
+ /* next connection ID to allocate */
+ uint32_t next_id;
+ struct osmo_ss7_instance *ss7;
+ void *priv;
+
+ struct osmo_ss7_user *ss7_user;
+
+ struct osmo_tdef *tdefs;
+
+ uint32_t max_optional_data;
+};
+
+struct osmo_sccp_user *
+sccp_user_find(struct osmo_sccp_instance *inst, uint16_t ssn, uint32_t pc);
+
+#define _LOGPSCI(sci, subsys, level, fmt, args ...) \
+ _LOGSS7((sci)->ss7, subsys, level, "SCCP(rctx=%" PRIu32 ") " fmt, (sci)->route_ctx, ## args)
+#define LOGPSCI(sci, level, fmt, args ...) \
+ _LOGPSCI(sci, DLSCCP, level, fmt, ## args)
+
diff --git a/src/sccp_internal.h b/src/sccp_internal.h
index 5490fdb..a9ffa51 100644
--- a/src/sccp_internal.h
+++ b/src/sccp_internal.h
@@ -11,11 +11,10 @@
#include <osmocom/sigtran/osmo_ss7.h>
#include <osmocom/sigtran/protocol/mtp.h>
-#include "ss7_user.h"
-
#define SCCP_STR "Signalling Connection Control Part\n"
-struct xua_msg;
+struct osmo_sccp_instance;
+struct osmo_sccp_user;
/* SCCP addressbook */
extern struct llist_head sccp_address_book_global;
@@ -30,62 +29,11 @@
const struct osmo_ss7_instance *inst);
struct osmo_sccp_addr_entry *addr_entry_by_name_global(const char *name);
-/* Appendix C.4 of Q.714 */
-enum osmo_sccp_timer {
- /* 0 kept unused on purpose since it's handled specially by osmo_fsm */
- OSMO_SCCP_TIMER_CONN_EST = 1,
- OSMO_SCCP_TIMER_IAS,
- OSMO_SCCP_TIMER_IAR,
- OSMO_SCCP_TIMER_REL,
- OSMO_SCCP_TIMER_REPEAT_REL,
- OSMO_SCCP_TIMER_INT,
- OSMO_SCCP_TIMER_GUARD,
- OSMO_SCCP_TIMER_RESET,
- OSMO_SCCP_TIMER_REASSEMBLY,
- /* This must remain the last item: */
- OSMO_SCCP_TIMERS_LEN
-};
-
-extern const struct osmo_tdef osmo_sccp_timer_defaults[OSMO_SCCP_TIMERS_LEN];
-
-extern const struct value_string osmo_sccp_timer_names[];
-static inline const char *osmo_sccp_timer_name(enum osmo_sccp_timer val)
-{ return get_value_string(osmo_sccp_timer_names, val); }
-
-/* an instance of the SCCP stack */
-struct osmo_sccp_instance {
- /* entry in global list of ss7 instances */
- struct llist_head list;
- /* rbtree root of 'struct sccp_connection' in this instance */
- struct rb_root connections;
- /* list of SCCP users in this instance */
- struct llist_head users;
- /* routing context to be used in all outbound messages */
- uint32_t route_ctx;
- /* next connection ID to allocate */
- uint32_t next_id;
- struct osmo_ss7_instance *ss7;
- void *priv;
-
- struct osmo_ss7_user *ss7_user;
-
- struct osmo_tdef *tdefs;
-
- uint32_t max_optional_data;
-};
-struct sccp_connection *sccp_find_conn_by_id(const struct osmo_sccp_instance *inst, uint32_t id);
-#define _LOGPSCI(sci, subsys, level, fmt, args ...) \
- _LOGSS7((sci)->ss7, subsys, level, "SCCP(rctx=%" PRIu32 ") " fmt, (sci)->route_ctx, ## args)
-#define LOGPSCI(sci, level, fmt, args ...) \
- _LOGPSCI(sci, DLSCCP, level, fmt, ## args)
-
-
extern int DSCCP;
struct xua_msg;
-struct osmo_sccp_user *
-sccp_user_find(struct osmo_sccp_instance *inst, uint16_t ssn, uint32_t pc);
+struct sccp_connection *sccp_find_conn_by_id(const struct osmo_sccp_instance *inst, uint32_t id);
/* Message from SCOC -> SCRC */
int sccp_scrc_rx_scoc_conn_msg(struct osmo_sccp_instance *inst,
diff --git a/src/sccp_lbcs.c b/src/sccp_lbcs.c
index 34b6181..8dd636f 100644
--- a/src/sccp_lbcs.c
+++ b/src/sccp_lbcs.c
@@ -33,6 +33,7 @@
#include <osmocom/sccp/sccp_types.h>
#include "xua_internal.h"
+#include "sccp_instance.h"
#include "sccp_internal.h"
#include "sccp_user.h"
diff --git a/src/sccp_sap.c b/src/sccp_sap.c
index 45e4dfc..00b2563 100644
--- a/src/sccp_sap.c
+++ b/src/sccp_sap.c
@@ -29,6 +29,7 @@
#include "sccp_connection.h"
#include "sccp_scoc_fsm.h"
#include "sccp_internal.h"
+#include "sccp_instance.h"
#include "sccp_user.h"
const struct value_string osmo_scu_prim_type_names[] = {
diff --git a/src/sccp_sclc.c b/src/sccp_sclc.c
index b8df996..88574c0 100644
--- a/src/sccp_sclc.c
+++ b/src/sccp_sclc.c
@@ -58,6 +58,7 @@
#include "xua_internal.h"
#include "ss7_internal.h"
+#include "sccp_instance.h"
#include "sccp_internal.h"
#include "sccp_user.h"
diff --git a/src/sccp_scmg.c b/src/sccp_scmg.c
index ee86954..2ffedce 100644
--- a/src/sccp_scmg.c
+++ b/src/sccp_scmg.c
@@ -34,6 +34,7 @@
#include <osmocom/sccp/sccp_types.h>
#include "xua_internal.h"
+#include "sccp_instance.h"
#include "ss7_internal.h"
#include "sccp_internal.h"
#include "sccp_user.h"
diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c
index b460d7d..a90dc71 100644
--- a/src/sccp_scoc.c
+++ b/src/sccp_scoc.c
@@ -64,6 +64,7 @@
#include "xua_internal.h"
#include "sccp_connection.h"
#include "sccp_scoc_fsm.h"
+#include "sccp_instance.h"
#include "sccp_internal.h"
#include "sccp_user.h"
#include "ss7_internal.h"
@@ -86,53 +87,6 @@
};
/***********************************************************************
- * Timer Handling
- ***********************************************************************/
-
-/* Mostly pasted from Appendix C.4 of ITU-T Q.714 (05/2001) -- some of their descriptions are quite
- * unintelligible out of context, for which we have our own description here. */
-const struct osmo_tdef osmo_sccp_timer_defaults[OSMO_SCCP_TIMERS_LEN] = {
- { .T = OSMO_SCCP_TIMER_CONN_EST, .default_val = 1*60, .unit = OSMO_TDEF_S,
- .desc = "Waiting for connection confirm message, 1 to 2 minutes" },
- { .T = OSMO_SCCP_TIMER_IAS, .default_val = 7*60, .unit = OSMO_TDEF_S,
- .desc = "Send keep-alive: on an idle connection, delay before sending an Idle Timer message, 5 to 10 minutes" }, /* RFC 3868 Ch. 8. */
- { .T = OSMO_SCCP_TIMER_IAR, .default_val = 15*60, .unit = OSMO_TDEF_S,
- .desc = "Receive keep-alive: on an idle connection, delay until considering a connection as stale, 11 to 21 minutes" }, /* RFC 3868 Ch. 8. */
- { .T = OSMO_SCCP_TIMER_REL, .default_val = 10, .unit = OSMO_TDEF_S,
- .desc = "Waiting for release complete message, 10 to 20 seconds" },
- { .T = OSMO_SCCP_TIMER_REPEAT_REL, .default_val = 10, .unit = OSMO_TDEF_S,
- .desc = "Waiting for release complete message; or to repeat sending released message after the initial expiry, 10 to 20 seconds" },
- { .T = OSMO_SCCP_TIMER_INT, .default_val = 1*60, .unit = OSMO_TDEF_S,
- .desc = "Waiting for release complete message; or to release connection resources, freeze the LRN and "
- "alert a maintenance function after the initial expiry, extending to 1 minute" },
- { .T = OSMO_SCCP_TIMER_GUARD, .default_val = 23*60, .unit = OSMO_TDEF_S,
- .desc = "Waiting to resume normal procedure for temporary connection sections during the restart procedure, 23 to 25 minutes" },
- { .T = OSMO_SCCP_TIMER_RESET, .default_val = 10, .unit = OSMO_TDEF_S,
- .desc = "Waiting to release temporary connection section or alert maintenance function after reset request message is sent, 10 to 20 seconds" },
- { .T = OSMO_SCCP_TIMER_REASSEMBLY, .default_val = 10, .unit = OSMO_TDEF_S,
- .desc = "Waiting to receive all the segments of the remaining segments, single segmented message after receiving the first segment, 10 to 20 seconds" },
- {}
-};
-
-/* Appendix C.4 of ITU-T Q.714 */
-const struct value_string osmo_sccp_timer_names[] = {
- { OSMO_SCCP_TIMER_CONN_EST, "conn_est" },
- { OSMO_SCCP_TIMER_IAS, "ias" },
- { OSMO_SCCP_TIMER_IAR, "iar" },
- { OSMO_SCCP_TIMER_REL, "rel" },
- { OSMO_SCCP_TIMER_REPEAT_REL, "repeat_rel" },
- { OSMO_SCCP_TIMER_INT, "int" },
- { OSMO_SCCP_TIMER_GUARD, "guard" },
- { OSMO_SCCP_TIMER_RESET, "reset" },
- { OSMO_SCCP_TIMER_REASSEMBLY, "reassembly" },
- {}
-};
-
-osmo_static_assert(ARRAY_SIZE(osmo_sccp_timer_defaults) == (OSMO_SCCP_TIMERS_LEN) &&
- ARRAY_SIZE(osmo_sccp_timer_names) == (OSMO_SCCP_TIMERS_LEN),
- assert_osmo_sccp_timers_count);
-
-/***********************************************************************
* SUA Instance and Connection handling
***********************************************************************/
diff --git a/src/sccp_scoc_fsm.c b/src/sccp_scoc_fsm.c
index dbee91e..ce186a8 100644
--- a/src/sccp_scoc_fsm.c
+++ b/src/sccp_scoc_fsm.c
@@ -45,8 +45,9 @@
#include "xua_internal.h"
#include "sccp_connection.h"
-#include "sccp_scoc_fsm.h"
+#include "sccp_instance.h"
#include "sccp_internal.h"
+#include "sccp_scoc_fsm.h"
#include "sccp_user.h"
#include "ss7_internal.h"
#include "ss7_instance.h"
diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c
index d7a6428..fdbfd3c 100644
--- a/src/sccp_scrc.c
+++ b/src/sccp_scrc.c
@@ -33,6 +33,7 @@
#include <osmocom/sigtran/protocol/sua.h>
#include <osmocom/sigtran/protocol/mtp.h>
+#include "sccp_instance.h"
#include "sccp_internal.h"
#include "ss7_as.h"
#include "ss7_instance.h"
diff --git a/src/sccp_user.c b/src/sccp_user.c
index 8219829..2ec2f28 100644
--- a/src/sccp_user.c
+++ b/src/sccp_user.c
@@ -37,6 +37,7 @@
#include <osmocom/sigtran/sccp_helpers.h>
#include <osmocom/sccp/sccp_types.h>
+#include "sccp_instance.h"
#include "sccp_internal.h"
#include "sccp_user.h"
#include "xua_internal.h"
@@ -47,78 +48,11 @@
#include "ss7_internal.h"
#include "ss7_xua_srv.h"
-/*! \brief Find a SCCP User registered for given PC+SSN or SSN only
- * First search all users with a valid PC for a full PC+SSN match.
- * If no such match was found, search all users with an invalid PC for an SSN-only match.
- * \param[in] inst SCCP Instance in which to search
- * \param[in] ssn Sub-System Number to search for
- * \param[in] pc Point Code to search for
- * \returns Matching SCCP User; NULL if none found */
-struct osmo_sccp_user *
-sccp_user_find(struct osmo_sccp_instance *inst, uint16_t ssn, uint32_t pc)
+struct osmo_sccp_user *sccp_user_alloc(struct osmo_sccp_instance *inst, const char *name,
+ osmo_prim_cb prim_cb, uint16_t ssn, uint32_t pc)
{
struct osmo_sccp_user *scu;
- if (osmo_ss7_pc_is_valid(pc)) {
- /* First try to find match for PC + SSN */
- llist_for_each_entry(scu, &inst->users, list) {
- if (osmo_ss7_pc_is_valid(scu->pc) && scu->pc == pc && scu->ssn == ssn)
- return scu;
- }
- }
-
- /* Then try to match on SSN only */
- llist_for_each_entry(scu, &inst->users, list) {
- if (!osmo_ss7_pc_is_valid(scu->pc) && scu->ssn == ssn)
- return scu;
- }
-
- return NULL;
-}
-
-/*! Find a SCCP User registered for given PC+SSN or SSN only.
- * First search all users with a valid PC for a full PC+SSN match.
- * If no match was found, search all users with an invalid PC for an SSN-only match.
- * \param[in] inst SCCP Instance in which to search.
- * \param[in] ssn Sub-System Number to search for.
- * \param[in] pc Point Code to search for.
- * \returns Matching SCCP User; NULL if none found.
- */
-struct osmo_sccp_user *
-osmo_sccp_user_find(struct osmo_sccp_instance *inst, uint16_t ssn, uint32_t pc)
-{
- return sccp_user_find(inst, ssn, pc);
-}
-
-/*! \brief Bind a SCCP User to a given Point Code
- * \param[in] inst SCCP Instance
- * \param[in] name human-readable name
- * \param[in] prim_cb User provided callback to pass a primitive/msg up the stack
- * \param[in] ssn Sub-System Number to bind to
- * \param[in] pc Point Code to bind to, or OSMO_SS7_PC_INVALID if none.
- * \returns Callee-allocated SCCP User on success; negative otherwise
- *
- * Ownership of oph->msg in prim_cb is transferred to the user of the
- * registered callback when called.
- */
-static struct osmo_sccp_user *
-sccp_user_bind_pc(struct osmo_sccp_instance *inst, const char *name,
- osmo_prim_cb prim_cb, uint16_t ssn, uint32_t pc)
-{
- struct osmo_sccp_user *scu;
-
- scu = sccp_user_find(inst, ssn, pc);
- if (scu) {
- LOGPSCI(inst, LOGL_ERROR,
- "Cannot bind user '%s' to SSN=%u PC=%s, this SSN and PC"
- " is already bound by '%s'\n",
- name, ssn, osmo_ss7_pointcode_print(inst->ss7, pc), scu->name);
- return NULL;
- }
-
- LOGPSCI(inst, LOGL_INFO, "Binding user '%s' to SSN=%u PC=%s\n",
- name, ssn, osmo_ss7_pointcode_print(inst->ss7, pc));
-
scu = talloc_zero(inst, struct osmo_sccp_user);
scu->name = talloc_strdup(scu, name);
scu->inst = inst;
@@ -130,41 +64,6 @@
return scu;
}
-/*! \brief Bind a given SCCP User to a given SSN+PC
- * \param[in] inst SCCP Instance
- * \param[in] name human-readable name
- * \param[in] prim_cb User provided callback to pass a primitive/msg up the stack
- * \param[in] ssn Sub-System Number to bind to
- * \param[in] pc Point Code to bind to
- * \returns Callee-allocated SCCP User on success; negative otherwise
- *
- * Ownership of oph->msg in prim_cb is transferred to the user of the
- * registered callback when called.
- */
-struct osmo_sccp_user *
-osmo_sccp_user_bind_pc(struct osmo_sccp_instance *inst, const char *name,
- osmo_prim_cb prim_cb, uint16_t ssn, uint32_t pc)
-{
- return sccp_user_bind_pc(inst, name, prim_cb, ssn, pc);
-}
-
-/*! \brief Bind a given SCCP User to a given SSN (at any PC)
- * \param[in] inst SCCP Instance
- * \param[in] name human-readable name
- * \param[in] prim_cb User provided callback to pass a primitive/msg up the stack
- * \param[in] ssn Sub-System Number to bind to
- * \returns Callee-allocated SCCP User on success; negative otherwise
- *
- * Ownership of oph->msg in prim_cb is transferred to the user of the
- * registered callback when called.
- */
-struct osmo_sccp_user *
-osmo_sccp_user_bind(struct osmo_sccp_instance *inst, const char *name,
- osmo_prim_cb prim_cb, uint16_t ssn)
-{
- return sccp_user_bind_pc(inst, name, prim_cb, ssn, OSMO_SS7_PC_INVALID);
-}
-
/*! \brief Unbind a given SCCP user
* \param[in] scu SCCP User which is to be un-bound. Will be destroyed
* at the time this function returns. */
@@ -200,289 +99,6 @@
return scu->prim_cb(&prim->oph, scu);
}
-/* prim_cb handed to MTP code for incoming MTP-TRANSFER.ind */
-static int mtp_user_prim_cb(struct osmo_prim_hdr *oph, void *ctx)
-{
- struct osmo_sccp_instance *inst = ctx;
- struct osmo_mtp_prim *omp = (struct osmo_mtp_prim *)oph;
- struct xua_msg *xua;
- int rc;
-
- OSMO_ASSERT(oph->sap == MTP_SAP_USER);
-
- switch OSMO_PRIM(oph->primitive, oph->operation) {
- case OSMO_PRIM(OSMO_MTP_PRIM_TRANSFER, PRIM_OP_INDICATION):
- /* Convert from SCCP to SUA in xua_msg format */
- xua = osmo_sccp_to_xua(oph->msg);
- if (!xua) {
- LOGPSCI(inst, LOGL_ERROR, "Couldn't convert SCCP to SUA: %s\n",
- msgb_hexdump(oph->msg));
- rc = -1;
- break;
- }
- xua->mtp = omp->u.transfer;
- /* hand this primitive into SCCP via the SCRC code */
- rc = scrc_rx_mtp_xfer_ind_xua(inst, xua);
- xua_msg_free(xua);
- break;
- default:
- LOGPSCI(inst, LOGL_ERROR, "Unknown primitive %u:%u receivd\n",
- oph->primitive, oph->operation);
- rc = -1;
- }
- msgb_free(oph->msg);
- return rc;
-}
-
-static LLIST_HEAD(sccp_instances);
-
-/*! \brief create a SCCP Instance and register it as user with SS7 inst
- * \param[in] ss7 SS7 instance to which this SCCP instance belongs
- * \param[in] priv private data to be stored within SCCP instance
- * \returns callee-allocated SCCP instance on success; NULL on error */
-struct osmo_sccp_instance *
-osmo_sccp_instance_create(struct osmo_ss7_instance *ss7, void *priv)
-{
- struct osmo_sccp_instance *inst;
- int rc;
-
- inst = talloc_zero(ss7, struct osmo_sccp_instance);
- if (!inst)
- return NULL;
-
- inst->ss7 = ss7;
- inst->priv = priv;
- INIT_LLIST_HEAD(&inst->users);
-
- inst->max_optional_data = SCCP_MAX_OPTIONAL_DATA;
-
- inst->tdefs = talloc_memdup(inst, osmo_sccp_timer_defaults,
- sizeof(osmo_sccp_timer_defaults));
- osmo_tdefs_reset(inst->tdefs);
-
- rc = sccp_scmg_init(inst);
- if (rc < 0) {
- talloc_free(inst);
- return NULL;
- }
-
- 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);
-
- return inst;
-}
-
-void osmo_sccp_instance_destroy(struct osmo_sccp_instance *inst)
-{
- 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_destroy(inst->ss7_user);
- inst->ss7_user = NULL;
-
- llist_for_each_entry_safe(scu, scu2, &inst->users, list) {
- osmo_sccp_user_unbind(scu);
- }
- sccp_scoc_flush_connections(inst);
- llist_del(&inst->list);
- talloc_free(inst);
-}
-
-void osmo_sccp_set_priv(struct osmo_sccp_instance *sccp, void *priv)
-{
- sccp->priv = priv;
-}
-
-void *osmo_sccp_get_priv(struct osmo_sccp_instance *sccp)
-{
- return sccp->priv;
-}
-
-/*! \brief derive a basic local SCCP-Address from a given SCCP instance.
- * \param[out] dest_addr pointer to output address memory
- * \param[in] inst SCCP instance
- * \param[in] ssn Subsystem Number */
-void osmo_sccp_local_addr_by_instance(struct osmo_sccp_addr *dest_addr,
- const struct osmo_sccp_instance *inst,
- uint32_t ssn)
-{
- struct osmo_ss7_instance *ss7;
-
- OSMO_ASSERT(dest_addr);
- OSMO_ASSERT(inst);
- ss7 = inst->ss7;
- OSMO_ASSERT(ss7);
-
- *dest_addr = (struct osmo_sccp_addr){};
-
- osmo_sccp_make_addr_pc_ssn(dest_addr, ss7->cfg.primary_pc, ssn);
-}
-
-/*! \brief check whether a given SCCP-Address is consistent.
- * \param[in] addr SCCP address to check
- * \param[in] presence mask with minimum required address components
- * \returns true when address data seems plausible */
-bool osmo_sccp_check_addr(struct osmo_sccp_addr *addr, uint32_t presence)
-{
- /* Minimum requirements do not match */
- if ((addr->presence & presence) != presence)
- return false;
-
- /* GT ranges */
- if (addr->presence & OSMO_SCCP_ADDR_T_GT) {
- if (addr->gt.gti > 15)
- return false;
- if (addr->gt.npi > 15)
- return false;
- if (addr->gt.nai > 127)
- return false;
- }
-
- /* Routing by GT, but no GT present */
- if (addr->ri == OSMO_SCCP_RI_GT
- && !(addr->presence & OSMO_SCCP_ADDR_T_GT))
- return false;
-
- /* Routing by PC/SSN, but no PC/SSN present */
- if (addr->ri == OSMO_SCCP_RI_SSN_PC) {
- if ((addr->presence & OSMO_SCCP_ADDR_T_PC) == 0)
- return false;
- if ((addr->presence & OSMO_SCCP_ADDR_T_SSN) == 0)
- return false;
- }
-
- if (addr->ri == OSMO_SCCP_RI_SSN_IP) {
- if ((addr->presence & OSMO_SCCP_ADDR_T_IPv4) == 0 &&
- (addr->presence & OSMO_SCCP_ADDR_T_IPv6) == 0)
- return false;
- }
-
- return true;
-}
-
-/*! Compare two SCCP Global Titles.
- * \param[in] a left side.
- * \param[in] b right side.
- * \return -1 if a < b, 1 if a > b, and 0 if a == b.
- */
-int osmo_sccp_gt_cmp(const struct osmo_sccp_gt *a, const struct osmo_sccp_gt *b)
-{
- if (a == b)
- return 0;
- if (!a)
- return -1;
- if (!b)
- return 1;
- return memcmp(a, b, sizeof(*a));
-}
-
-/*! Compare two SCCP addresses by given presence criteria.
- * Any OSMO_SCCP_ADDR_T_* type not set in presence_criteria is ignored.
- * In case all bits are set in presence_criteria, the comparison is in the order of:
- * OSMO_SCCP_ADDR_T_GT, OSMO_SCCP_ADDR_T_PC, OSMO_SCCP_ADDR_T_IPv4, OSMO_SCCP_ADDR_T_IPv6, OSMO_SCCP_ADDR_T_SSN.
- * The SCCP addresses' Routing Indicator is not compared, see osmo_sccp_addr_ri_cmp().
- * \param[in] a left side.
- * \param[in] b right side.
- * \param[in] presence_criteria A bitmask of OSMO_SCCP_ADDR_T_* values, or OSMO_SCCP_ADDR_T_MASK to compare all parts,
- * except the routing indicator.
- * \return -1 if a < b, 1 if a > b, and 0 if all checked values match.
- */
-int osmo_sccp_addr_cmp(const struct osmo_sccp_addr *a, const struct osmo_sccp_addr *b, uint32_t presence_criteria)
-{
- int rc;
- if (a == b)
- return 0;
- if (!a)
- return -1;
- if (!b)
- return 1;
-
- if (presence_criteria & OSMO_SCCP_ADDR_T_GT) {
- if ((a->presence & OSMO_SCCP_ADDR_T_GT) != (b->presence & OSMO_SCCP_ADDR_T_GT))
- return (b->presence & OSMO_SCCP_ADDR_T_GT) ? -1 : 1;
- rc = osmo_sccp_gt_cmp(&a->gt, &b->gt);
- if (rc)
- return rc;
- }
-
- if (presence_criteria & OSMO_SCCP_ADDR_T_PC) {
- if ((a->presence & OSMO_SCCP_ADDR_T_PC) != (b->presence & OSMO_SCCP_ADDR_T_PC))
- return (b->presence & OSMO_SCCP_ADDR_T_PC) ? -1 : 1;
-
- if ((a->presence & OSMO_SCCP_ADDR_T_PC)
- && a->pc != b->pc)
- return (a->pc < b->pc)? -1 : 1;
- }
-
- if (presence_criteria & OSMO_SCCP_ADDR_T_IPv4) {
- if ((a->presence & OSMO_SCCP_ADDR_T_IPv4) != (b->presence & OSMO_SCCP_ADDR_T_IPv4))
- return (b->presence & OSMO_SCCP_ADDR_T_IPv4) ? -1 : 1;
- rc = memcmp(&a->ip.v4, &b->ip.v4, sizeof(a->ip.v4));
- if (rc)
- return rc;
- }
-
- if (presence_criteria & OSMO_SCCP_ADDR_T_IPv6) {
- if ((a->presence & OSMO_SCCP_ADDR_T_IPv6) != (b->presence & OSMO_SCCP_ADDR_T_IPv6))
- return (b->presence & OSMO_SCCP_ADDR_T_IPv6) ? -1 : 1;
- rc = memcmp(&a->ip.v6, &b->ip.v6, sizeof(a->ip.v6));
- if (rc)
- return rc;
- }
-
- if (presence_criteria & OSMO_SCCP_ADDR_T_SSN) {
- if ((a->presence & OSMO_SCCP_ADDR_T_SSN) != (b->presence & OSMO_SCCP_ADDR_T_SSN))
- return (b->presence & OSMO_SCCP_ADDR_T_SSN) ? -1 : 1;
- if (a->ssn != b->ssn)
- return (a->ssn < b->ssn) ? -1 : 1;
- }
-
- return 0;
-}
-
-/*! Compare the routing information of two SCCP addresses.
- * Compare the ri of a and b, and, if equal, return osmo_sccp_addr_cmp() with presence criteria selected according to
- * ri.
- * \param[in] a left side.
- * \param[in] b right side.
- * \return -1 if a < b, 1 if a > b, and 0 if a == b.
- */
-int osmo_sccp_addr_ri_cmp(const struct osmo_sccp_addr *a, const struct osmo_sccp_addr *b)
-{
- uint32_t presence_criteria;
- if (a == b)
- return 0;
- if (!a)
- return -1;
- if (!b)
- return 1;
- if (a->ri != b->ri)
- return (a->ri < b->ri) ? -1 : 1;
- switch (a->ri) {
- case OSMO_SCCP_RI_NONE:
- return 0;
- case OSMO_SCCP_RI_GT:
- presence_criteria = OSMO_SCCP_ADDR_T_GT;
- break;
- case OSMO_SCCP_RI_SSN_PC:
- presence_criteria = OSMO_SCCP_ADDR_T_SSN | OSMO_SCCP_ADDR_T_PC;
- break;
- case OSMO_SCCP_RI_SSN_IP:
- /* Pick IPv4 or v6 depending on what a->presence indicates. */
- presence_criteria = OSMO_SCCP_ADDR_T_SSN | (a->presence & (OSMO_SCCP_ADDR_T_IPv4 | OSMO_SCCP_ADDR_T_IPv6));
- break;
- default:
- return 0;
- }
-
- return osmo_sccp_addr_cmp(a, b, presence_criteria);
-}
-
/*! Compose a human readable string to describe the SCCP user's connection.
* The output follows ['<scu.name>':]<local-sccp-addr>, e.g. "'OsmoHNBW':RI=SSN_PC,PC=0.23.5,SSN=RANAP",
* or just "RI=SSN_PC,PC=0.23.5,SSN=RANAP" if no scu->name is set.
@@ -504,438 +120,6 @@
return buf;
}
-/***********************************************************************
- * Convenience function for CLIENT
- ***********************************************************************/
-
- /* Returns whether AS is already associated to any AS.
- * Helper function for osmo_sccp_simple_client_on_ss7_id(). */
-static bool asp_serves_some_as(const struct osmo_ss7_asp *asp)
-{
- struct osmo_ss7_as *as_i;
- llist_for_each_entry(as_i, &asp->inst->as_list, list) {
- if (osmo_ss7_as_has_asp(as_i, asp))
- return true;
- }
- return false;
-}
-
-/*! \brief request an sccp client instance
- * \param[in] ctx talloc context
- * \param[in] ss7_id of the SS7/CS7 instance
- * \param[in] name human readable name
- * \param[in] default_pc pointcode to be used on missing VTY setting
- * \param[in] prot protocol to be used (e.g OSMO_SS7_ASP_PROT_M3UA)
- * \param[in] default_local_port local port to be used on missing VTY setting
- * \param[in] default_local_ip local IP-address to be used on missing VTY setting (NULL: use library own defaults)
- * \param[in] default_remote_port remote port to be used on missing VTY setting
- * \param[in] default_remote_ip remote IP-address to be used on missing VTY setting (NULL: use library own defaults)
- * \returns callee-allocated SCCP instance on success; NULL on error */
-
-struct osmo_sccp_instance *
-osmo_sccp_simple_client_on_ss7_id(void *ctx, uint32_t ss7_id, const char *name,
- uint32_t default_pc,
- enum osmo_ss7_asp_protocol prot,
- int default_local_port,
- const char *default_local_ip,
- int default_remote_port,
- const char *default_remote_ip)
-{
- struct osmo_ss7_instance *ss7;
- bool ss7_created = false;
- struct osmo_ss7_as *as;
- bool as_created = false;
- struct osmo_ss7_route *rt;
- bool rt_created = false;
- struct osmo_ss7_asp *asp;
- bool asp_created = false;
- char *as_name, *asp_name = NULL;
- int trans_proto;
-
- trans_proto = ss7_default_trans_proto_for_asp_proto(prot);
-
- /*! The function will examine the given CS7 instance and its sub
- * components (as, asp, etc.). If necessary it will allocate
- * the missing components. If no CS7 instance can be detected
- * under the caller supplied ID, a new instance will be created
- * beforehand. */
-
- /* Choose default ports when the caller does not supply valid port
- * numbers. */
- if (!default_remote_port || default_remote_port < 0)
- default_remote_port = osmo_ss7_asp_protocol_port(prot);
- if (default_local_port < 0)
- default_local_port = osmo_ss7_asp_protocol_port(prot);
-
- /* Check if there is already an ss7 instance present under
- * the given id. If not, we will create a new one. */
- ss7 = osmo_ss7_instance_find(ss7_id);
- if (!ss7) {
- LOGP(DLSCCP, LOGL_NOTICE, "%s: Creating SS7 instance\n",
- name);
-
- /* Create a new ss7 instance */
- ss7 = osmo_ss7_instance_find_or_create(ctx, ss7_id);
- if (!ss7) {
- LOGP(DLSCCP, LOGL_ERROR,
- "Failed to find or create SS7 instance\n");
- return NULL;
- }
-
- /* Setup primary pointcode
- * NOTE: This means that the user must set the pointcode to a
- * proper value when a cs7 instance is defined via the VTY. */
- ss7->cfg.primary_pc = default_pc;
- ss7_created = true;
- }
-
- /* In case no valid point-code has been configured via the VTY, we
- * will fall back to the default pointcode. */
- if (!osmo_ss7_pc_is_valid(ss7->cfg.primary_pc)) {
- LOGP(DLSCCP, LOGL_ERROR,
- "SS7 instance %u: no primary point-code set, using default point-code\n",
- ss7->cfg.id);
- ss7->cfg.primary_pc = default_pc;
- }
-
- LOGP(DLSCCP, LOGL_NOTICE, "%s: Using SS7 instance %u, pc:%s\n", name,
- ss7->cfg.id, osmo_ss7_pointcode_print(ss7, ss7->cfg.primary_pc));
-
- /* Check if there is already an application server that matches
- * the protocol we intend to use. If not, we will create one. */
- as = osmo_ss7_as_find_by_proto(ss7, prot);
- if (!as) {
- LOGP(DLSCCP, LOGL_NOTICE, "%s: Creating AS instance\n",
- name);
- as_name = talloc_asprintf(ctx, "as-clnt-%s", name);
- as = osmo_ss7_as_find_or_create(ss7, as_name, prot);
- talloc_free(as_name);
- if (!as)
- goto out_ss7;
- as_created = true;
- as->cfg.routing_key.pc = ss7->cfg.primary_pc;
- as->simple_client_allocated = true;
- }
- LOGP(DLSCCP, LOGL_NOTICE, "%s: Using AS instance %s\n", name,
- as->cfg.name);
-
- /* Create a default dynamic route if necessary */
- rt = ss7_route_table_find_route_by_dpc_mask(ss7->rtable_system, 0, 0, true);
- if (!rt) {
- LOGP(DLSCCP, LOGL_NOTICE, "%s: Creating default route\n", name);
- rt = ss7_route_create(ss7->rtable_system, 0, 0,
- true, as->cfg.name);
- if (!rt)
- goto out_as;
- rt_created = true;
- }
-
- /* Check if we do already have an application server process
- * that is associated with the application server we have choosen
- * the application server process must also match the protocol
- * we intend to use. */
- asp = osmo_ss7_asp_find_by_proto(as, prot);
- if (!asp) {
- /* Check if the user has created an ASP for this proto that is not added on any AS yet. */
- struct osmo_ss7_asp *asp_i;
- llist_for_each_entry(asp_i, &ss7->asp_list, list) {
- if (asp_i->cfg.proto != prot)
- continue;
- if (asp_serves_some_as(asp_i)) {
- /* This ASP is already on another AS.
- * If it was on this AS, we'd have found it above. */
- continue;
- }
- /* This ASP matches the protocol and is not yet associated to any AS. Use it. */
- asp = asp_i;
- LOGP(DLSCCP, LOGL_NOTICE, "%s: ASP %s for %s is not associated with any AS, using it\n",
- name, asp->cfg.name, osmo_ss7_asp_protocol_name(prot));
- ss7_as_add_asp(as, asp);
- /* ASP became associated to a new AS, hence it needs to be
- * restarted to announce/register its Routing Context.
- * Make sure proper defaults are applied if app didn't
- * provide specific default values, then restart the ASP: */
- ss7_asp_restart_after_reconfigure(asp);
- break;
- }
- if (!asp) {
- asp_name = talloc_asprintf(ctx, "asp-clnt-%s", name);
- LOGP(DLSCCP, LOGL_NOTICE, "%s: No unassociated ASP for %s, creating new ASP %s\n",
- name, osmo_ss7_asp_protocol_name(prot), asp_name);
- asp = osmo_ss7_asp_find_or_create2(ss7, asp_name,
- default_remote_port,
- default_local_port,
- trans_proto, prot);
- talloc_free(asp_name);
- if (!asp)
- goto out_rt;
- asp_created = true;
- asp->simple_client_allocated = true;
- /* Ensure that the ASP we use is set to operate as a client. */
- asp->cfg.is_server = false;
- /* Ensure that the ASP we use is set to role ASP. */
- asp->cfg.role = OSMO_SS7_ASP_ROLE_ASP;
- if (default_local_ip)
- ss7_asp_peer_set_hosts(&asp->cfg.local, asp, &default_local_ip, 1);
- if (default_remote_ip)
- ss7_asp_peer_set_hosts(&asp->cfg.remote, asp, &default_remote_ip, 1);
- ss7_as_add_asp(as, asp);
- /* Make sure proper defaults are applied if app didn't
- provide specific default values, then restart the ASP: */
- ss7_asp_restart_after_reconfigure(asp);
- }
- }
-
- /* Extra sanity checks if the ASP asp-clnt-* was pre-configured over VTY: */
- if (!asp->simple_client_allocated) {
- /* Forbid ASPs defined through VTY that are not entirely
- * configured. "role" and "transport-role" must be explicitly provided:
- */
- if (!asp->cfg.role_set_by_vty) {
- LOGP(DLSCCP, LOGL_ERROR,
- "%s: ASP %s defined in VTY but 'role' was not set there, please set it.\n",
- name, asp->cfg.name);
- goto out_asp;
- }
- if (!asp->cfg.trans_role_set_by_vty) {
- LOGP(DLSCCP, LOGL_ERROR,
- "%s: ASP %s defined in VTY but 'transport-role' was not set there, please set it.\n",
- name, asp->cfg.name);
- goto out_asp;
- }
-
- /* If ASP was configured through VTY it may be explicitly configured as
- * SCTP server. It may be a bit confusing since this function is to create
- * a "SCCP simple client", but this allows users of this API such as
- * osmo-hnbgw to support transport-role server if properly configured through VTY.
- */
- if (asp->cfg.is_server) {
- struct osmo_xua_server *xs;
- LOGP(DLSCCP, LOGL_NOTICE,
- "%s: Requesting an SCCP simple client on ASP %s configured with 'transport-role server'\n",
- name, asp->cfg.name);
- xs = ss7_xua_server_find2(ss7,
- asp->cfg.trans_proto, prot,
- asp->cfg.local.port);
- if (!xs) {
- LOGP(DLSCCP, LOGL_ERROR, "%s: Requesting an SCCP simple client on ASP %s configured "
- "with 'transport-role server' but no matching xUA server was configured!\n",
- name, asp->cfg.name);
- goto out_asp;
- }
- }
- /* ASP was already started here previously by VTY go_parent. */
- }
-
- LOGP(DLSCCP, LOGL_NOTICE, "%s: Using ASP instance %s\n", name,
- asp->cfg.name);
-
- osmo_ss7_ensure_sccp(ss7);
- if (!ss7->sccp)
- goto out_asp;
-
- return ss7->sccp;
-
-out_asp:
- if (asp_created)
- osmo_ss7_asp_destroy(asp);
-out_rt:
- if (rt_created)
- ss7_route_destroy(rt);
-out_as:
- if (as_created)
- osmo_ss7_as_destroy(as);
-out_ss7:
- if (ss7_created)
- osmo_ss7_instance_destroy(ss7);
-
- return NULL;
-}
-
-/*! \brief request an sccp client instance
- * \param[in] ctx talloc context
- * \param[in] name human readable name
- * \param[in] default_pc pointcode to be used on missing VTY setting
- * \param[in] prot protocol to be used (e.g OSMO_SS7_ASP_PROT_M3UA)
- * \param[in] default_local_port local port to be used on missing VTY setting
- * \param[in] default_local_ip local IP-address to be used on missing VTY setting
- * \param[in] default_remote_port remote port to be used on missing VTY setting
- * \param[in] default_remote_ip remote IP-address to be used on missing VTY setting
- * \returns callee-allocated SCCP instance on success; NULL on error */
-struct osmo_sccp_instance *
-osmo_sccp_simple_client(void *ctx, const char *name, uint32_t default_pc,
- enum osmo_ss7_asp_protocol prot, int default_local_port,
- const char *default_local_ip, int default_remote_port,
- const char *default_remote_ip)
-{
- /*! This is simplified version of osmo_sccp_simple_client_on_ss7_id().
- * the only difference is that the ID of the CS7 instance will be
- * set to 0 statically */
-
- return osmo_sccp_simple_client_on_ss7_id(ctx, 0, name, default_pc, prot,
- default_local_port,
- default_local_ip,
- default_remote_port,
- default_remote_ip);
-}
-
-/***********************************************************************
- * Convenience function for SERVER
- ***********************************************************************/
-
-struct osmo_sccp_instance *
-osmo_sccp_simple_server_on_ss7_id(void *ctx, uint32_t ss7_id, uint32_t pc,
- enum osmo_ss7_asp_protocol prot,
- int local_port, const char *local_ip)
-{
- struct osmo_ss7_instance *ss7;
- struct osmo_xua_server *xs;
- int trans_proto;
- int rc;
-
- trans_proto = ss7_default_trans_proto_for_asp_proto(prot);
-
- if (local_port < 0)
- local_port = osmo_ss7_asp_protocol_port(prot);
-
- /* allocate + initialize SS7 instance */
- ss7 = osmo_ss7_instance_find_or_create(ctx, ss7_id);
- if (!ss7)
- return NULL;
- ss7->cfg.primary_pc = pc;
-
- xs = ss7_xua_server_create2(ss7, trans_proto, prot, local_port, local_ip);
- if (!xs)
- goto out_ss7;
-
- rc = ss7_xua_server_bind(xs);
- if (rc < 0)
- goto out_xs;
-
- /* Allocate SCCP stack */
- osmo_ss7_ensure_sccp(ss7);
- if (!ss7->sccp)
- goto out_xs;
-
- return ss7->sccp;
-
-out_xs:
- ss7_xua_server_destroy(xs);
-out_ss7:
- osmo_ss7_instance_destroy(ss7);
-
- return NULL;
-}
-
-struct osmo_sccp_instance *
-osmo_sccp_simple_server(void *ctx, uint32_t pc,
- enum osmo_ss7_asp_protocol prot, int local_port,
- const char *local_ip)
-{
- return osmo_sccp_simple_server_on_ss7_id(ctx, 0, pc, prot,
- local_port, local_ip);
-}
-
-struct osmo_sccp_instance *
-osmo_sccp_simple_server_add_clnt(struct osmo_sccp_instance *inst,
- enum osmo_ss7_asp_protocol prot,
- const char *name, uint32_t pc,
- int local_port, int remote_port,
- const char *remote_ip)
-{
- struct osmo_ss7_instance *ss7 = inst->ss7;
- struct osmo_ss7_as *as;
- struct osmo_ss7_route *rt;
- struct osmo_ss7_asp *asp;
- struct osmo_xua_server *oxs;
- char *as_name, *asp_name;
- int trans_proto;
-
- trans_proto = ss7_default_trans_proto_for_asp_proto(prot);
-
- if (local_port < 0)
- local_port = osmo_ss7_asp_protocol_port(prot);
-
- if (remote_port < 0)
- remote_port = osmo_ss7_asp_protocol_port(prot);
-
- as_name = talloc_asprintf(ss7, "as-srv-%s", name);
- asp_name = talloc_asprintf(ss7, "asp-srv-%s", name);
-
- /* application server */
- as = osmo_ss7_as_find_or_create(ss7, as_name, prot);
- if (!as)
- goto out_strings;
-
- /* route only selected PC to the client */
- rt = ss7_route_create(ss7->rtable_system, pc, 0xffff, true, as_name);
- if (!rt)
- goto out_as;
-
- asp = osmo_ss7_asp_find_or_create2(ss7, asp_name,
- remote_port, local_port,
- trans_proto, prot);
- if (!asp)
- goto out_rt;
- oxs = ss7_xua_server_find2(ss7, asp->cfg.trans_proto, prot, local_port);
- if (!oxs)
- goto out_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 (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;
- ss7_as_add_asp(as, asp);
- talloc_free(asp_name);
- talloc_free(as_name);
- osmo_ss7_asp_restart(asp);
-
- return ss7->sccp;
-
-out_asp:
- osmo_ss7_asp_destroy(asp);
-out_rt:
- ss7_route_destroy(rt);
-out_as:
- osmo_ss7_as_destroy(as);
-out_strings:
- talloc_free(as_name);
- talloc_free(asp_name);
-
- return NULL;
-}
-
-/*! Adjust the upper bound for the optional data length (the payload) for CR, CC, CREF and RLSD messages.
- * For any Optional Data part larger than this value in octets, send CR, CC, CREF and RLSD messages without any payload,
- * and send the data payload in a separate Data Form 1 message. ITU-T Q.713 sections 4.2 thru 4.5 define a limit of 130
- * bytes for the 'Data' parameter. This limit can be adjusted here. May be useful for interop with nonstandard SCCP
- * peers.
- * \param[in] sccp SCCP instance to reconfigure.
- * \param[in] val Number of bytes to set as upper bound for the optional data length, or pass a negative value to set
- * the standard value of SCCP_MAX_OPTIONAL_DATA == 130, which conforms to ITU-T Q.713.
- */
-void osmo_sccp_set_max_optional_data(struct osmo_sccp_instance *inst, int val)
-{
- if (!inst)
- return;
- if (val < 0)
- val = SCCP_MAX_OPTIONAL_DATA;
- inst->max_optional_data = val;
-}
-
-/*! \brief get the SS7 instance that is related to the given SCCP instance
- * \param[in] sccp SCCP instance
- * \returns SS7 instance; NULL if sccp was NULL */
-struct osmo_ss7_instance *osmo_sccp_get_ss7(const struct osmo_sccp_instance *sccp)
-{
- if (!sccp)
- return NULL;
- return sccp->ss7;
-}
-
/*! \brief get the SCCP instance that is related to the given sccp user
* \param[in] scu SCCP user
* \returns SCCP instance; NULL if scu was NULL */
diff --git a/src/sccp_user.h b/src/sccp_user.h
index b0b73fe..95b37ee 100644
--- a/src/sccp_user.h
+++ b/src/sccp_user.h
@@ -32,6 +32,8 @@
struct osmo_fsm_inst *as_fi;
};
+struct osmo_sccp_user *sccp_user_alloc(struct osmo_sccp_instance *inst, const char *name,
+ osmo_prim_cb prim_cb, uint16_t ssn, uint32_t pc);
int sccp_user_prim_up(struct osmo_sccp_user *scut, struct osmo_scu_prim *prim);
diff --git a/src/sccp_vty.c b/src/sccp_vty.c
index c8d143f..5243346 100644
--- a/src/sccp_vty.c
+++ b/src/sccp_vty.c
@@ -41,6 +41,7 @@
#include "xua_internal.h"
#include "sccp_connection.h"
+#include "sccp_instance.h"
#include "sccp_internal.h"
#include "sccp_user.h"
#include "ss7_instance.h"
diff --git a/src/ss7_vty.c b/src/ss7_vty.c
index a8869d4..d774236 100644
--- a/src/ss7_vty.c
+++ b/src/ss7_vty.c
@@ -45,6 +45,7 @@
#include "ss7_route.h"
#include "ss7_route_table.h"
#include "ss7_internal.h"
+#include "ss7_user.h"
#include "ss7_vty.h"
#include "ss7_xua_srv.h"
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40582?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: I632f1825fe696bf73c0f9220dc8e8463337d8ba8
Gerrit-Change-Number: 40582
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
3 weeks, 6 days
- 1
- 0
[XL] Change in libosmo-sigtran[master]: sccp: Split sccp_scoc into multiple files
by pespin
Attention is currently required from: pespin.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/libosmo-sigtran/+/40581?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Verified-1 by Jenkins Builder
Change subject: sccp: Split sccp_scoc into multiple files
......................................................................
sccp: Split sccp_scoc into multiple files
The previous state was really messy with sccp_scoc.c containing lots
of different not-directly-related modules, which made it very
difficult to find all the parts and gasp the whole picture.
It also makes it easier to extend the code in the future as we plan to
be adding more features from time to time.
This commit moves (splits) sccp_scoc.c + sccp_internal.h out to
different modules:
* sccp_user.h is added since there already existed sccp_user.c,
operating on struct sccp_user.
* sccp_connection.{c,h} is added to contain all the struct
sccp_connection data domain logic.
* sccp_scoc_fsm.{c,h} is added to have all the related FSM code
self-contained in a file.
* sccp_sap.c: Some code related to the SCU primitive is moved here,
where it belongs.
* sccp_vty: Some related vty code is moved here, where it belongs.
The SCOC handling logic is kept in the sccp_scoc.c file.
Some functions are properly prefixed when moved to the correct file.
Change-Id: I51e9bf60bc4c4b2babd3f408daed914eaf398e82
---
M src/Makefile.am
A src/sccp_connection.c
A src/sccp_connection.h
M src/sccp_helpers.c
M src/sccp_internal.h
M src/sccp_lbcs.c
M src/sccp_sap.c
M src/sccp_sclc.c
M src/sccp_scmg.c
M src/sccp_scoc.c
A src/sccp_scoc_fsm.c
A src/sccp_scoc_fsm.h
M src/sccp_user.c
A src/sccp_user.h
M src/sccp_vty.c
M src/ss7.c
16 files changed, 1,403 insertions(+), 1,236 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/81/40581/2
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40581?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: I51e9bf60bc4c4b2babd3f408daed914eaf398e82
Gerrit-Change-Number: 40581
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
3 weeks, 6 days
- 1
- 0
[S] Change in osmo-remsim[master]: bankd: implicit remove a client mapping when creating a new mapping
by pespin
Attention is currently required from: Hoernchen, laforge, lynxis lazus.
pespin has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-remsim/+/40570?usp=email )
Change subject: bankd: implicit remove a client mapping when creating a new mapping
......................................................................
Patch Set 4: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/40570?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-remsim
Gerrit-Branch: master
Gerrit-Change-Id: Iae3f86a6e695e2d6580151b203df1dd0e2db625b
Gerrit-Change-Number: 40570
Gerrit-PatchSet: 4
Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Comment-Date: Thu, 03 Jul 2025 19:14:16 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
3 weeks, 6 days
- 1
- 0
[XL] Change in libosmo-sigtran[master]: sccp: Split sccp_scoc into multiple files
by pespin
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40581?usp=email )
Change subject: sccp: Split sccp_scoc into multiple files
......................................................................
sccp: Split sccp_scoc into multiple files
The previous state was really messy with sccp_scoc.c containing lots
of different not-directly-related modules, which made it very
difficult to find all the parts and gasp the whole picture.
It also makes it easier to extend the code in the future as we plan to
be adding more features from time to time.
This commit moves (splits) sccp_scoc.c + sccp_internal.h out to
different modules:
* sccp_user.h is added since there already existed sccp_user.c,
operating on struct sccp_user.
* sccp_connection.{c,h} is added to contain all the struct
sccp_connection data domain logic.
* sccp_scoc_fsm.{c,h} is added to have all the related FSM code
self-contained in a file.
* sccp_sap.c: Some code related to the SCU primitive is moved here,
where it belongs.
* sccp_vty: Some related vty code is moved here, where it belongs.
The SCOC handling logic is kept in the sccp_scoc.c file.
Some functions are properly prefixed when moved to the correct file.
Change-Id: I51e9bf60bc4c4b2babd3f408daed914eaf398e82
---
M src/Makefile.am
A src/sccp_connection.c
A src/sccp_connection.h
M src/sccp_helpers.c
M src/sccp_internal.h
M src/sccp_lbcs.c
M src/sccp_sap.c
M src/sccp_sclc.c
M src/sccp_scmg.c
M src/sccp_scoc.c
A src/sccp_scoc_fsm.c
A src/sccp_scoc_fsm.h
M src/sccp_user.c
A src/sccp_user.h
M src/sccp_vty.c
M src/ss7.c
16 files changed, 1,402 insertions(+), 1,236 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/81/40581/1
diff --git a/src/Makefile.am b/src/Makefile.am
index 53b80c0..e1cd9cb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,9 @@
$(LIBOSMONETIF_CFLAGS)
noinst_HEADERS = \
+ sccp_scoc_fsm.h \
sccp_internal.h \
+ sccp_user.h \
ss7_as.h \
ss7_asp.h \
ss7_asp_peer.h \
@@ -43,6 +45,7 @@
ipa.c \
m3ua.c \
sccp2sua.c \
+ sccp_connection.c \
sccp_helpers.c \
sccp_lbcs.c \
sccp_sap.c \
@@ -50,6 +53,7 @@
sccp_scmg.c \
sccp_scrc.c \
sccp_scoc.c \
+ sccp_scoc_fsm.c \
sccp_types.c \
sccp_user.c \
sccp_vty.c \
diff --git a/src/sccp_connection.c b/src/sccp_connection.c
new file mode 100644
index 0000000..3a01121
--- /dev/null
+++ b/src/sccp_connection.c
@@ -0,0 +1,417 @@
+/* SCCP User related routines */
+
+/* (C) 2025 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de>
+ * (C) 2017 by Harald Welte <laforge(a)gnumonks.org>
+ * All Rights Reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * based on my 2011 Erlang implementation osmo_ss7/src/sua_sccp_conv.erl
+ *
+ * References: ITU-T Q.713 and IETF RFC 3868
+ *
+ * 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 <stdbool.h>
+#include <string.h>
+#include <limits.h>
+
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/logging.h>
+
+#include <osmocom/sigtran/osmo_ss7.h>
+#include <osmocom/sigtran/sccp_sap.h>
+#include <osmocom/sigtran/mtp_sap.h>
+#include <osmocom/sigtran/protocol/mtp.h>
+#include <osmocom/sigtran/protocol/sua.h>
+#include <osmocom/sigtran/sccp_helpers.h>
+#include <osmocom/sccp/sccp_types.h>
+
+#include "sccp_internal.h"
+#include "sccp_connection.h"
+#include "sccp_scoc_fsm.h"
+#include "sccp_user.h"
+#include "ss7_instance.h"
+#include "xua_msg.h"
+#include "xua_internal.h"
+
+static void sccp_conn_opt_data_clear_cache(struct sccp_connection *conn);
+
+#define INIT_TIMER(x, fn, priv) do { (x)->cb = fn; (x)->data = priv; } while (0)
+
+/* T(ias) has expired, send a COIT message to the peer */
+static void tx_inact_tmr_cb(void *data)
+{
+ struct sccp_connection *conn = data;
+ osmo_fsm_inst_dispatch(conn->fi, SCOC_E_T_IAS_EXP, NULL);
+}
+
+/* T(iar) has expired, notify the FSM about it */
+static void rx_inact_tmr_cb(void *data)
+{
+ struct sccp_connection *conn = data;
+ osmo_fsm_inst_dispatch(conn->fi, SCOC_E_T_IAR_EXP, NULL);
+}
+
+/* T(rel) has expired, notify the FSM about it */
+static void rel_tmr_cb(void *data)
+{
+ struct sccp_connection *conn = data;
+ osmo_fsm_inst_dispatch(conn->fi, SCOC_E_T_REL_EXP, NULL);
+}
+
+/* T(int) has expired, notify the FSM about it */
+static void int_tmr_cb(void *data)
+{
+ struct sccp_connection *conn = data;
+ osmo_fsm_inst_dispatch(conn->fi, SCOC_E_T_INT_EXP, NULL);
+}
+
+/* T(repeat_rel) has expired, notify the FSM about it */
+static void rep_rel_tmr_cb(void *data)
+{
+ struct sccp_connection *conn = data;
+ osmo_fsm_inst_dispatch(conn->fi, SCOC_E_T_REP_REL_EXP, NULL);
+}
+
+/* T(conn) has expired, notify the FSM about it */
+static void conn_tmr_cb(void *data)
+{
+ struct sccp_connection *conn = data;
+ osmo_fsm_inst_dispatch(conn->fi, SCOC_E_CONN_TMR_EXP, NULL);
+}
+
+/* Generate an SLS to be used for Connection-oriented messages on this SCCP connection.
+ * SLS is 4 bits, as described in ITU Q.704 Figure 3.
+ * ITU-T Q.714 1.1.2.3 Protocol class 2:
+ * "Messages belonging to a given signalling connection shall contain the same
+ * value of the SLS field to ensure sequencing as described in 1.1.2.2"
+ */
+static uint8_t sccp_conn_gen_tx_co_mtp_sls(const struct sccp_connection *conn)
+{
+ /* Implementation: Derive the SLS from conn->conn_id. */
+ const uint32_t id = conn->conn_id;
+ uint8_t sls;
+
+ /* First shrink it to 1 byte: */
+ sls = ((id >> (3*8)) ^ (id >> (2*8)) ^ (id >> (1*8)) ^ (id)) & 0xff;
+ /* Now shrink it 8 -> 4 bits: */
+ sls = ((sls >> 4) ^ sls) & 0x0f;
+
+ return sls;
+}
+
+static int conn_add_node(struct osmo_sccp_instance *inst, struct sccp_connection *conn)
+{
+ struct rb_node **n = &(inst->connections.rb_node);
+ struct rb_node *parent = NULL;
+
+ while (*n) {
+ struct sccp_connection *it;
+
+ it = container_of(*n, struct sccp_connection, node);
+
+ parent = *n;
+ if (conn->conn_id < it->conn_id) {
+ n = &((*n)->rb_left);
+ } else if (conn->conn_id > it->conn_id) {
+ n = &((*n)->rb_right);
+ } else {
+ LOGPSCI(inst, LOGL_ERROR, "Trying to reserve already reserved conn_id %u\n",
+ conn->conn_id);
+ return -EEXIST;
+ }
+ }
+
+ rb_link_node(&conn->node, parent, n);
+ rb_insert_color(&conn->node, &inst->connections);
+ return 0;
+}
+
+/* allocate + init a SCCP Connection with given ID */
+struct sccp_connection *sccp_conn_alloc(struct osmo_sccp_user *user, uint32_t conn_id)
+{
+ struct sccp_connection *conn = talloc_zero(user->inst, struct sccp_connection);
+ char name[16];
+
+ conn->conn_id = conn_id;
+ conn->inst = user->inst;
+ conn->user = user;
+
+ if (conn_add_node(user->inst, conn) < 0) {
+ talloc_free(conn);
+ return NULL;
+ }
+
+ INIT_TIMER(&conn->t_conn, conn_tmr_cb, conn);
+ INIT_TIMER(&conn->t_ias, tx_inact_tmr_cb, conn);
+ INIT_TIMER(&conn->t_iar, rx_inact_tmr_cb, conn);
+ INIT_TIMER(&conn->t_rel, rel_tmr_cb, conn);
+ INIT_TIMER(&conn->t_int, int_tmr_cb, conn);
+ INIT_TIMER(&conn->t_rep_rel, rep_rel_tmr_cb, conn);
+
+ conn->tx_co_mtp_sls = sccp_conn_gen_tx_co_mtp_sls(conn);
+
+ /* this might change at runtime, as it is not a constant :/ */
+ sccp_scoc_fsm.log_subsys = DLSCCP;
+
+ /* we simply use the connection ID as FSM instance name */
+ snprintf(name, sizeof(name), "%u", conn->conn_id);
+ conn->fi = osmo_fsm_inst_alloc(&sccp_scoc_fsm, conn, conn,
+ LOGL_DEBUG, name);
+ if (!conn->fi) {
+ rb_erase(&conn->node, &user->inst->connections);
+ talloc_free(conn);
+ return NULL;
+ }
+
+ return conn;
+}
+
+/* destroy a SCCP connection state, releasing all timers, terminating
+ * FSM and releasing associated memory */
+void sccp_conn_free(struct sccp_connection *conn)
+{
+ if (!conn)
+ return;
+ sccp_conn_opt_data_clear_cache(conn);
+
+ sccp_conn_stop_connect_timer(conn);
+ sccp_conn_stop_inact_timers(conn);
+ sccp_conn_stop_release_timers(conn);
+ rb_erase(&conn->node, &conn->inst->connections);
+
+ osmo_fsm_inst_term(conn->fi, OSMO_FSM_TERM_REQUEST, NULL);
+
+ talloc_free(conn);
+}
+
+/* allocate a message buffer for an SCCP User Primitive */
+static struct msgb *scu_msgb_alloc(void)
+{
+ #define SCU_MSGB_SIZE 1024
+ return msgb_alloc(SCU_MSGB_SIZE, "SCCP User Primitive");
+}
+
+/* allocate a SCU primitive to be sent to the user */
+static struct osmo_scu_prim *scu_prim_alloc(unsigned int primitive, enum osmo_prim_operation operation)
+{
+ struct msgb *upmsg = scu_msgb_alloc();
+ struct osmo_scu_prim *prim;
+
+ prim = (struct osmo_scu_prim *) msgb_put(upmsg, sizeof(*prim));
+ osmo_prim_init(&prim->oph, SCCP_SAP_USER,
+ primitive, operation, upmsg);
+ upmsg->l2h = upmsg->tail;
+ return prim;
+}
+
+/* high-level function to generate a SCCP User primitive of requested
+ * type based on the connection and currently processed XUA message */
+void sccp_conn_scu_gen_encode_and_send(struct sccp_connection *conn, uint32_t event,
+ struct xua_msg *xua, unsigned int primitive,
+ enum osmo_prim_operation operation)
+{
+ struct osmo_scu_prim *scu_prim;
+ struct osmo_scu_disconn_param *udisp;
+ struct osmo_scu_connect_param *uconp;
+ struct osmo_scu_data_param *udatp;
+ struct xua_msg_part *data_ie;
+
+ scu_prim = scu_prim_alloc(primitive, operation);
+
+ switch (OSMO_PRIM_HDR(&scu_prim->oph)) {
+ case OSMO_PRIM(OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION):
+ udisp = &scu_prim->u.disconnect;
+ udisp->conn_id = conn->conn_id;
+ udisp->responding_addr = conn->called_addr;
+ udisp->importance = conn->importance;
+ udisp->originator = OSMO_SCCP_ORIG_UNDEFINED;
+ //udisp->in_sequence_control;
+ if (xua) {
+ udisp->cause = xua_msg_get_u32(xua, SUA_IEI_CAUSE);
+ if (xua_msg_find_tag(xua, SUA_IEI_SRC_ADDR)) {
+ if (sua_addr_parse(&udisp->responding_addr, xua, SUA_IEI_SRC_ADDR) < 0) {
+ LOGPSCC(conn, LOGL_ERROR, "XUA Message %s without valid SRC_ADDR\n",
+ xua_hdr_dump(xua, &xua_dialect_sua));
+ talloc_free(scu_prim->oph.msg);
+ return;
+ }
+ }
+ data_ie = xua_msg_find_tag(xua, SUA_IEI_DATA);
+ udisp->importance = xua_msg_get_u32(xua, SUA_IEI_IMPORTANCE);
+ if (data_ie) {
+ struct msgb *upmsg = scu_prim->oph.msg;
+ upmsg->l2h = msgb_put(upmsg, data_ie->len);
+ memcpy(upmsg->l2h, data_ie->dat, data_ie->len);
+ }
+ }
+ break;
+ case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION):
+ uconp = &scu_prim->u.connect;
+ uconp->conn_id = conn->conn_id;
+ uconp->called_addr = conn->called_addr;
+ uconp->calling_addr = conn->calling_addr;
+ uconp->sccp_class = conn->sccp_class;
+ uconp->importance = conn->importance;
+ if (xua) {
+ data_ie = xua_msg_find_tag(xua, SUA_IEI_DATA);
+ if (data_ie) {
+ struct msgb *upmsg = scu_prim->oph.msg;
+ upmsg->l2h = msgb_put(upmsg, data_ie->len);
+ memcpy(upmsg->l2h, data_ie->dat, data_ie->len);
+ }
+ }
+ break;
+ case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_CONFIRM):
+ uconp = &scu_prim->u.connect;
+ uconp->conn_id = conn->conn_id;
+ uconp->called_addr = conn->called_addr;
+ uconp->calling_addr = conn->calling_addr;
+ //scu_prim->u.connect.in_sequence_control
+ uconp->sccp_class = xua_msg_get_u32(xua, SUA_IEI_PROTO_CLASS) & 3;
+ uconp->importance = xua_msg_get_u32(xua, SUA_IEI_IMPORTANCE);
+ data_ie = xua_msg_find_tag(xua, SUA_IEI_DATA);
+ if (data_ie) {
+ struct msgb *upmsg = scu_prim->oph.msg;
+ upmsg->l2h = msgb_put(upmsg, data_ie->len);
+ memcpy(upmsg->l2h, data_ie->dat, data_ie->len);
+ }
+ break;
+ case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION):
+ udatp = &scu_prim->u.data;
+ udatp->conn_id = conn->conn_id;
+ udatp->importance = conn->importance;
+ data_ie = xua_msg_find_tag(xua, SUA_IEI_DATA);
+ if (data_ie) {
+ struct msgb *upmsg = scu_prim->oph.msg;
+ upmsg->l2h = msgb_put(upmsg, data_ie->len);
+ memcpy(upmsg->l2h, data_ie->dat, data_ie->len);
+ }
+ break;
+ default:
+ LOGPFSML(conn->fi, LOGL_ERROR, "Unsupported primitive %u:%u\n",
+ scu_prim->oph.primitive, scu_prim->oph.operation);
+ talloc_free(scu_prim->oph.msg);
+ return;
+ }
+
+ sccp_user_prim_up(conn->user, scu_prim);
+}
+
+static void sccp_timer_schedule(const struct sccp_connection *conn,
+ struct osmo_timer_list *timer,
+ enum osmo_sccp_timer timer_name)
+{
+ const unsigned long val_sec = osmo_tdef_get(conn->inst->tdefs, timer_name, OSMO_TDEF_S, -1);
+ osmo_timer_schedule(timer, val_sec, 0);
+}
+
+/* Re-start the Tx inactivity timer */
+void sccp_conn_restart_tx_inact_timer(struct sccp_connection *conn)
+{
+ sccp_timer_schedule(conn, &conn->t_ias, OSMO_SCCP_TIMER_IAS);
+}
+
+/* Re-start the Rx inactivity timer */
+void sccp_conn_restart_rx_inact_timer(struct sccp_connection *conn)
+{
+ sccp_timer_schedule(conn, &conn->t_iar, OSMO_SCCP_TIMER_IAR);
+}
+
+/* Re-start both Rx and Tx inactivity timers */
+void sccp_conn_start_inact_timers(struct sccp_connection *conn)
+{
+ sccp_conn_restart_tx_inact_timer(conn);
+ sccp_conn_restart_rx_inact_timer(conn);
+}
+
+/* Stop both Rx and Tx inactivity timers */
+void sccp_conn_stop_inact_timers(struct sccp_connection *conn)
+{
+ osmo_timer_del(&conn->t_ias);
+ osmo_timer_del(&conn->t_iar);
+}
+
+/* Start release timer T(rel) */
+void sccp_conn_start_rel_timer(struct sccp_connection *conn)
+{
+ sccp_timer_schedule(conn, &conn->t_rel, OSMO_SCCP_TIMER_REL);
+}
+
+/* Start repeat release timer T(rep_rel) */
+void sccp_conn_start_rep_rel_timer(struct sccp_connection *conn)
+{
+ sccp_timer_schedule(conn, &conn->t_rep_rel, OSMO_SCCP_TIMER_REPEAT_REL);
+}
+
+/* Start interval timer T(int) */
+void sccp_conn_start_int_timer(struct sccp_connection *conn)
+{
+ sccp_timer_schedule(conn, &conn->t_int, OSMO_SCCP_TIMER_INT);
+}
+
+/* Stop all release related timers: T(rel), T(int) and T(rep_rel) */
+void sccp_conn_stop_release_timers(struct sccp_connection *conn)
+{
+ osmo_timer_del(&conn->t_rel);
+ osmo_timer_del(&conn->t_int);
+ osmo_timer_del(&conn->t_rep_rel);
+}
+
+/* Start connect timer T(conn) */
+void sccp_conn_start_connect_timer(struct sccp_connection *conn)
+{
+ sccp_timer_schedule(conn, &conn->t_conn, OSMO_SCCP_TIMER_CONN_EST);
+}
+
+/* Stop connect timer T(conn) */
+void sccp_conn_stop_connect_timer(struct sccp_connection *conn)
+{
+ osmo_timer_del(&conn->t_conn);
+}
+
+static void sccp_conn_opt_data_clear_cache(struct sccp_connection *conn)
+{
+ if (conn->opt_data_cache) {
+ msgb_free(conn->opt_data_cache);
+ conn->opt_data_cache = NULL;
+ }
+}
+
+/* Send cached optional data (if any) from expected message type and clear cache */
+void sccp_conn_opt_data_send_cache(struct sccp_connection *conn, int exp_type, uint8_t msg_class)
+{
+ const struct xua_dialect *dialect = &xua_dialect_sua;
+ const struct xua_msg_class *xmc = dialect->class[msg_class];
+
+ if (!conn->opt_data_cache)
+ return;
+
+ if (conn->opt_data_cache->cb[0] != exp_type) {
+ /* Caller (from the FSM) knows what was the source of Optional Data we're sending.
+ * Compare this information with source of Optional Data recorded while caching
+ * to make sure we're on the same page.
+ */
+ LOGPSCC(conn, LOGL_ERROR, "unexpected message type %s != cache source %s\n",
+ xua_class_msg_name(xmc, exp_type),
+ xua_class_msg_name(xmc, conn->opt_data_cache->cb[0]));
+ } else {
+ osmo_sccp_tx_data(conn->user, conn->conn_id, msgb_data(conn->opt_data_cache), msgb_length(conn->opt_data_cache));
+ }
+
+ sccp_conn_opt_data_clear_cache(conn);
+}
diff --git a/src/sccp_connection.h b/src/sccp_connection.h
new file mode 100644
index 0000000..82b707f
--- /dev/null
+++ b/src/sccp_connection.h
@@ -0,0 +1,95 @@
+#pragma once
+#include <inttypes.h>
+
+#include <osmocom/core/fsm.h>
+#include <osmocom/sigtran/sccp_sap.h>
+
+struct xua_msg;
+
+/* a logical connection within the SCCP instance */
+struct sccp_connection {
+ /* entry in (struct sccp_instance)->connections */
+ struct rb_node node;
+ /* which instance are we part of? */
+ struct osmo_sccp_instance *inst;
+ /* which user owns us? */
+ struct osmo_sccp_user *user;
+
+ /* remote point code */
+ uint32_t remote_pc;
+
+ /* local/remote addresses and identities */
+ struct osmo_sccp_addr calling_addr;
+ struct osmo_sccp_addr called_addr;
+ /* SCCP connection identifier. Only relevant across the SCCP User SAP,
+ * i.e. between the local application using the SCCP stack provided by
+ * libosmo-sccp. Never transmitted over the wire! */
+ uint32_t conn_id;
+ /* SCCP Remote Connection Reference. Allocated by the remote
+ * SCCP stack to uniquely identify a SCCP connection on its end.
+ * We don't interpret it, but simply cache it here so we can use
+ * it whenever sending data to the peer. Only relevant over the
+ * wire, not to be used across the SCCP user SAP */
+ uint32_t remote_ref;
+
+ uint32_t importance;
+ uint32_t sccp_class;
+ uint32_t release_cause; /* WAIT_CONN_CONF */
+
+ /* SLS to be used to transmit all Connection-oriented messages
+ * (ITU-T Q.714 1.1.2.3 Protocol class 2).
+ * SLS is 4 bits, as described in ITU Q.704 Figure 3 */
+ uint8_t tx_co_mtp_sls;
+
+ struct msgb *opt_data_cache;
+
+ /* incoming (true) or outgoing (false) */
+ bool incoming;
+
+ /* Osmo FSM Instance of sccp_scoc_fsm */
+ struct osmo_fsm_inst *fi;
+
+ /* Connect timer */
+ struct osmo_timer_list t_conn;
+
+ /* inactivity timers */
+ struct osmo_timer_list t_ias;
+ struct osmo_timer_list t_iar;
+
+ /* release timers */
+ struct osmo_timer_list t_rel;
+ struct osmo_timer_list t_int;
+ struct osmo_timer_list t_rep_rel;
+};
+
+struct sccp_connection *sccp_conn_alloc(struct osmo_sccp_user *user, uint32_t conn_id);
+void sccp_conn_free(struct sccp_connection *conn);
+
+/* timer related: */
+void sccp_conn_restart_tx_inact_timer(struct sccp_connection *conn);
+void sccp_conn_restart_rx_inact_timer(struct sccp_connection *conn);
+void sccp_conn_start_inact_timers(struct sccp_connection *conn);
+void sccp_conn_stop_inact_timers(struct sccp_connection *conn);
+void sccp_conn_start_rel_timer(struct sccp_connection *conn);
+void sccp_conn_start_rep_rel_timer(struct sccp_connection *conn);
+void sccp_conn_start_int_timer(struct sccp_connection *conn);
+void sccp_conn_stop_release_timers(struct sccp_connection *conn);
+void sccp_conn_start_connect_timer(struct sccp_connection *conn);
+void sccp_conn_stop_connect_timer(struct sccp_connection *conn);
+
+void sccp_conn_opt_data_send_cache(struct sccp_connection *conn, int exp_type, uint8_t msg_class);
+
+int sccp_conn_xua_gen_encode_and_send(struct sccp_connection *conn, uint32_t event,
+ const struct osmo_scu_prim *prim, int msg_type);
+int sccp_conn_xua_gen_relre_and_send(struct sccp_connection *conn, uint32_t cause,
+ struct osmo_scu_prim *prim);
+void sccp_conn_scu_gen_encode_and_send(struct sccp_connection *conn, uint32_t event,
+ struct xua_msg *xua, unsigned int primitive,
+ enum osmo_prim_operation operation);
+
+
+#define _LOGPSCC(scc, subsys, level, fmt, args ...) \
+ _LOGPSCU((scc)->user, subsys, level, "CONN(%d,remPC=%u=%s) " fmt, \
+ (conn)->conn_id, (conn)->remote_pc, osmo_ss7_pointcode_print((conn)->inst->ss7, (conn)->remote_pc), ## args)
+#define LOGPSCC(scc, level, fmt, args ...) \
+ _LOGPSCC(scc, DLSCCP, level, fmt, ## args)
diff --git a/src/sccp_helpers.c b/src/sccp_helpers.c
index 39099fd..e86aa32 100644
--- a/src/sccp_helpers.c
+++ b/src/sccp_helpers.c
@@ -35,6 +35,7 @@
#include "ss7_internal.h"
#include "sccp_internal.h"
+#include "sccp_user.h"
#define SCU_MSG_SIZE 2048
#define SCU_MSG_HEADROOM 512
diff --git a/src/sccp_internal.h b/src/sccp_internal.h
index 298ef3e..5490fdb 100644
--- a/src/sccp_internal.h
+++ b/src/sccp_internal.h
@@ -11,9 +11,11 @@
#include <osmocom/sigtran/osmo_ss7.h>
#include <osmocom/sigtran/protocol/mtp.h>
+#include "ss7_user.h"
+
#define SCCP_STR "Signalling Connection Control Part\n"
-#include "ss7_user.h"
+struct xua_msg;
/* SCCP addressbook */
extern struct llist_head sccp_address_book_global;
@@ -71,39 +73,13 @@
uint32_t max_optional_data;
};
+struct sccp_connection *sccp_find_conn_by_id(const struct osmo_sccp_instance *inst, uint32_t id);
#define _LOGPSCI(sci, subsys, level, fmt, args ...) \
_LOGSS7((sci)->ss7, subsys, level, "SCCP(rctx=%" PRIu32 ") " fmt, (sci)->route_ctx, ## args)
#define LOGPSCI(sci, level, fmt, args ...) \
_LOGPSCI(sci, DLSCCP, level, fmt, ## args)
-struct osmo_sccp_user {
- /*! \brief entry in list of sccp users of \ref osmo_sccp_instance */
- struct llist_head list;
- /*! \brief pointer back to SCCP instance */
- struct osmo_sccp_instance *inst;
- /*! \brief human-readable name of this user */
- char *name;
-
- /*! \brief SSN and/or point code to which we are bound */
- uint16_t ssn;
- uint32_t pc;
-
- /* set if we are a server */
- struct llist_head links;
-
- /* user call-back function in case of incoming primitives */
- osmo_prim_cb prim_cb;
- void *priv;
-
- /* Application Server FSM Instance */
- struct osmo_fsm_inst *as_fi;
-};
-#define _LOGPSCU(scu, subsys, level, fmt, args ...) \
- _LOGPSCI((scu)->inst, subsys, level, "SCU(%s) " fmt, osmo_sccp_user_name(scu), ## args)
-#define LOGPSCU(scu, level, fmt, args ...) \
- _LOGPSCU(scu, DLSCCP, level, fmt, ## args)
-
extern int DSCCP;
struct xua_msg;
@@ -136,18 +112,12 @@
void sccp_sclc_rx_scrc_rout_fail(struct osmo_sccp_instance *inst,
struct xua_msg *xua, uint32_t cause);
-int sccp_user_prim_up(struct osmo_sccp_user *scut, struct osmo_scu_prim *prim);
-
/* SCU -> SCLC */
int sccp_sclc_user_sap_down(struct osmo_sccp_user *scu, struct osmo_prim_hdr *oph);
int sccp_sclc_user_sap_down_nofree(struct osmo_sccp_user *scu, struct osmo_prim_hdr *oph);
struct msgb *sccp_msgb_alloc(const char *name);
-extern struct osmo_fsm sccp_scoc_fsm;
-
-void sccp_scoc_show_connections(struct vty *vty, struct osmo_sccp_instance *inst);
-
void osmo_sccp_vty_write_cs7_node(struct vty *vty, const char *indent, struct osmo_sccp_instance *inst);
/* Local Broadcast (LBCS) */
diff --git a/src/sccp_lbcs.c b/src/sccp_lbcs.c
index 3aa4f7a..34b6181 100644
--- a/src/sccp_lbcs.c
+++ b/src/sccp_lbcs.c
@@ -34,6 +34,7 @@
#include "xua_internal.h"
#include "sccp_internal.h"
+#include "sccp_user.h"
/* perform a "local broadcast" of a N-PCSTATE.ind */
void sccp_lbcs_local_bcast_pcstate(struct osmo_sccp_instance *inst,
diff --git a/src/sccp_sap.c b/src/sccp_sap.c
index b3bc3e8..45e4dfc 100644
--- a/src/sccp_sap.c
+++ b/src/sccp_sap.c
@@ -25,6 +25,12 @@
#include <osmocom/sigtran/sccp_sap.h>
+#include "ss7_instance.h"
+#include "sccp_connection.h"
+#include "sccp_scoc_fsm.h"
+#include "sccp_internal.h"
+#include "sccp_user.h"
+
const struct value_string osmo_scu_prim_type_names[] = {
{ OSMO_SCU_PRIM_N_CONNECT, "N-CONNECT" },
{ OSMO_SCU_PRIM_N_DATA, "N-DATA" },
@@ -166,3 +172,106 @@
{ OSMO_SCCP_SSN_BSSAP, "BSSAP" },
{ 0, NULL }
};
+
+/* get the Connection ID of the given SCU primitive */
+static uint32_t scu_prim_conn_id(const struct osmo_scu_prim *prim)
+{
+ switch (prim->oph.primitive) {
+ case OSMO_SCU_PRIM_N_CONNECT:
+ return prim->u.connect.conn_id;
+ case OSMO_SCU_PRIM_N_DATA:
+ return prim->u.data.conn_id;
+ case OSMO_SCU_PRIM_N_DISCONNECT:
+ return prim->u.disconnect.conn_id;
+ case OSMO_SCU_PRIM_N_RESET:
+ return prim->u.reset.conn_id;
+ default:
+ return 0;
+ }
+}
+
+/* map from SCU-primitives to SCOC FSM events */
+static const struct osmo_prim_event_map scu_scoc_event_map[] = {
+ { SCCP_SAP_USER, OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_REQUEST,
+ SCOC_E_SCU_N_CONN_REQ },
+ { SCCP_SAP_USER, OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_RESPONSE,
+ SCOC_E_SCU_N_CONN_RESP },
+ { SCCP_SAP_USER, OSMO_SCU_PRIM_N_DATA, PRIM_OP_REQUEST,
+ SCOC_E_SCU_N_DATA_REQ },
+ { SCCP_SAP_USER, OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_REQUEST,
+ SCOC_E_SCU_N_DISC_REQ },
+ { SCCP_SAP_USER, OSMO_SCU_PRIM_N_EXPEDITED_DATA, PRIM_OP_REQUEST,
+ SCOC_E_SCU_N_EXP_DATA_REQ },
+ { 0, 0, 0, OSMO_NO_EVENT }
+};
+
+/*! Main entrance function for primitives from SCCP User.
+ * The caller is required to free oph->msg, otherwise the same as osmo_sccp_user_sap_down().
+ * \param[in] scu SCCP User sending us the primitive
+ * \param[in] oph Osmocom primitive sent by the user
+ * \returns 0 on success; negative on error */
+int osmo_sccp_user_sap_down_nofree(struct osmo_sccp_user *scu, struct osmo_prim_hdr *oph)
+{
+ struct osmo_scu_prim *prim = (struct osmo_scu_prim *) oph;
+ struct osmo_sccp_instance *inst = scu->inst;
+ struct sccp_connection *conn;
+ int rc = 0;
+ int event;
+
+ LOGPSCU(scu, LOGL_DEBUG, "Received SCCP User Primitive (%s)\n",
+ osmo_scu_prim_name(&prim->oph));
+
+ switch (OSMO_PRIM_HDR(&prim->oph)) {
+ case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_REQUEST):
+ /* other CL primitives? */
+ /* Connectionless by-passes this altogether */
+ return sccp_sclc_user_sap_down_nofree(scu, oph);
+ case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_REQUEST):
+ /* Allocate new connection structure */
+ conn = sccp_conn_alloc(scu, prim->u.connect.conn_id);
+ if (!conn) {
+ /* FIXME: inform SCCP user with proper reply */
+ LOGPSCU(scu, LOGL_ERROR, "Cannot create conn-id for primitive %s\n",
+ osmo_scu_prim_name(&prim->oph));
+ return rc;
+ }
+ break;
+ case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_RESPONSE):
+ case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_REQUEST):
+ case OSMO_PRIM(OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_REQUEST):
+ case OSMO_PRIM(OSMO_SCU_PRIM_N_RESET, PRIM_OP_REQUEST):
+ /* Resolve existing connection structure */
+ conn = sccp_find_conn_by_id(inst, scu_prim_conn_id(prim));
+ if (!conn) {
+ /* FIXME: inform SCCP user with proper reply */
+ LOGPSCU(scu, LOGL_ERROR, "Received unknown conn-id %u for primitive %s\n",
+ scu_prim_conn_id(prim), osmo_scu_prim_name(&prim->oph));
+ return rc;
+ }
+ break;
+ default:
+ LOGPSCU(scu, LOGL_ERROR, "Received unknown primitive %s\n",
+ osmo_scu_prim_name(&prim->oph));
+ return -1;
+ }
+
+ /* Map from primitive to event */
+ event = osmo_event_for_prim(oph, scu_scoc_event_map);
+
+ /* Dispatch event into connection */
+ return osmo_fsm_inst_dispatch(conn->fi, event, prim);
+}
+
+/*! Main entrance function for primitives from SCCP User.
+ * Implies a msgb_free(oph->msg), otherwise the same as osmo_sccp_user_sap().
+ * \param[in] scu SCCP User sending us the primitive
+ * \param[in] oph Osmocom primitive sent by the user
+ * \returns 0 on success; negative on error */
+int osmo_sccp_user_sap_down(struct osmo_sccp_user *scu, struct osmo_prim_hdr *oph)
+{
+ struct osmo_scu_prim *prim = (struct osmo_scu_prim *) oph;
+ struct msgb *msg = prim->oph.msg;
+ int rc = osmo_sccp_user_sap_down_nofree(scu, oph);
+ msgb_free(msg);
+ return rc;
+}
diff --git a/src/sccp_sclc.c b/src/sccp_sclc.c
index 7fee2a3..b8df996 100644
--- a/src/sccp_sclc.c
+++ b/src/sccp_sclc.c
@@ -59,6 +59,7 @@
#include "xua_internal.h"
#include "ss7_internal.h"
#include "sccp_internal.h"
+#include "sccp_user.h"
/* generate a 'struct xua_msg' of requested type from primitive data */
static struct xua_msg *xua_gen_msg_cl(uint32_t event,
diff --git a/src/sccp_scmg.c b/src/sccp_scmg.c
index 6f7383c..ee86954 100644
--- a/src/sccp_scmg.c
+++ b/src/sccp_scmg.c
@@ -36,6 +36,7 @@
#include "xua_internal.h"
#include "ss7_internal.h"
#include "sccp_internal.h"
+#include "sccp_user.h"
/* ITU-T Q.714 5.3.3 Subsystem allowed */
void sccp_scmg_rx_ssn_allowed(struct osmo_sccp_instance *inst, uint32_t dpc, uint32_t ssn, uint32_t smi)
diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c
index a725a02..b460d7d 100644
--- a/src/sccp_scoc.c
+++ b/src/sccp_scoc.c
@@ -62,158 +62,17 @@
#include <osmocom/sccp/sccp_types.h>
#include "xua_internal.h"
+#include "sccp_connection.h"
+#include "sccp_scoc_fsm.h"
#include "sccp_internal.h"
+#include "sccp_user.h"
#include "ss7_internal.h"
#include "ss7_instance.h"
-#define S(x) (1 << (x))
-#define SCU_MSGB_SIZE 1024
-
/***********************************************************************
* SCCP connection table
***********************************************************************/
-/* a logical connection within the SCCP instance */
-struct sccp_connection {
- /* entry in (struct sccp_instance)->connections */
- struct rb_node node;
- /* which instance are we part of? */
- struct osmo_sccp_instance *inst;
- /* which user owns us? */
- struct osmo_sccp_user *user;
-
- /* remote point code */
- uint32_t remote_pc;
-
- /* local/remote addresses and identities */
- struct osmo_sccp_addr calling_addr;
- struct osmo_sccp_addr called_addr;
- /* SCCP connection identifier. Only relevant across the SCCP User SAP,
- * i.e. between the local application using the SCCP stack provided by
- * libosmo-sccp. Never transmitted over the wire! */
- uint32_t conn_id;
- /* SCCP Remote Connection Reference. Allocated by the remote
- * SCCP stack to uniquely identify a SCCP connection on its end.
- * We don't interpret it, but simply cache it here so we can use
- * it whenever sending data to the peer. Only relevant over the
- * wire, not to be used across the SCCP user SAP */
- uint32_t remote_ref;
-
- uint32_t importance;
- uint32_t sccp_class;
- uint32_t release_cause; /* WAIT_CONN_CONF */
-
- /* SLS to be used to transmit all Connection-oriented messages
- * (ITU-T Q.714 1.1.2.3 Protocol class 2).
- * SLS is 4 bits, as described in ITU Q.704 Figure 3 */
- uint8_t tx_co_mtp_sls;
-
- struct msgb *opt_data_cache;
-
- /* incoming (true) or outgoing (false) */
- bool incoming;
-
- /* Osmo FSM Instance of sccp_scoc_fsm */
- struct osmo_fsm_inst *fi;
-
- /* Connect timer */
- struct osmo_timer_list t_conn;
-
- /* inactivity timers */
- struct osmo_timer_list t_ias;
- struct osmo_timer_list t_iar;
-
- /* release timers */
- struct osmo_timer_list t_rel;
- struct osmo_timer_list t_int;
- struct osmo_timer_list t_rep_rel;
-};
-#define _LOGPSCC(scc, subsys, level, fmt, args ...) \
- _LOGPSCU((scc)->user, subsys, level, "CONN(%d,remPC=%u=%s) " fmt, \
- (conn)->conn_id, (conn)->remote_pc, osmo_ss7_pointcode_print((conn)->inst->ss7, (conn)->remote_pc), ## args)
-#define LOGPSCC(scc, level, fmt, args ...) \
- _LOGPSCC(scc, DLSCCP, level, fmt, ## args)
-
-/***********************************************************************
- * various helper functions
- ***********************************************************************/
-
-enum sccp_connection_state {
- S_IDLE,
- S_CONN_PEND_IN,
- S_CONN_PEND_OUT,
- S_ACTIVE,
- S_DISCONN_PEND,
- S_RESET_IN,
- S_RESET_OUT,
- S_BOTHWAY_RESET,
- S_WAIT_CONN_CONF,
-};
-
-/* Events that this FSM can process */
-enum sccp_scoc_event {
- /* Primitives from SCCP-User */
- SCOC_E_SCU_N_CONN_REQ,
- SCOC_E_SCU_N_CONN_RESP,
- SCOC_E_SCU_N_DISC_REQ,
- SCOC_E_SCU_N_DATA_REQ,
- SCOC_E_SCU_N_EXP_DATA_REQ,
-
- /* Events from RCOC (Routing for Connection Oriented) */
- SCOC_E_RCOC_CONN_IND,
- SCOC_E_RCOC_ROUT_FAIL_IND,
- SCOC_E_RCOC_RLSD_IND,
- SCOC_E_RCOC_REL_COMPL_IND,
- SCOC_E_RCOC_CREF_IND,
- SCOC_E_RCOC_CC_IND,
- SCOC_E_RCOC_DT1_IND,
- SCOC_E_RCOC_DT2_IND,
- SCOC_E_RCOC_IT_IND,
- SCOC_E_RCOC_OTHER_NPDU,
- SCOC_E_RCOC_ERROR_IND,
-
- /* Timer Events */
- SCOC_E_T_IAR_EXP,
- SCOC_E_T_IAS_EXP,
-
- SCOC_E_CONN_TMR_EXP,
-
- SCOC_E_T_REL_EXP,
- SCOC_E_T_INT_EXP,
- SCOC_E_T_REP_REL_EXP,
-};
-
-static const struct value_string scoc_event_names[] = {
- /* Primitives from SCCP-User */
- { SCOC_E_SCU_N_CONN_REQ, "N-CONNECT.req" },
- { SCOC_E_SCU_N_CONN_RESP, "N-CONNECT.resp" },
- { SCOC_E_SCU_N_DISC_REQ, "N-DISCONNECT.req" },
- { SCOC_E_SCU_N_DATA_REQ, "N-DATA.req" },
- { SCOC_E_SCU_N_EXP_DATA_REQ, "N-EXPEDITED_DATA.req" },
-
- /* Events from RCOC (Routing for Connection Oriented) */
- { SCOC_E_RCOC_CONN_IND, "RCOC-CONNECT.ind" },
- { SCOC_E_RCOC_ROUT_FAIL_IND, "RCOC-ROUT_FAIL.ind" },
- { SCOC_E_RCOC_RLSD_IND, "RCOC-RELEASED.ind" },
- { SCOC_E_RCOC_REL_COMPL_IND, "RCOC-RELEASE_COMPLETE.ind" },
- { SCOC_E_RCOC_CREF_IND, "RCOC-CONNECT_REFUSED.ind" },
- { SCOC_E_RCOC_CC_IND, "RCOC-CONNECT_CONFIRM.ind" },
- { SCOC_E_RCOC_DT1_IND, "RCOC-DT1.ind" },
- { SCOC_E_RCOC_DT2_IND, "RCOC-DT2.ind" },
- { SCOC_E_RCOC_IT_IND, "RCOC-IT.ind" },
- { SCOC_E_RCOC_OTHER_NPDU, "RCOC-OTHER_NPDU.ind" },
- { SCOC_E_RCOC_ERROR_IND, "RCOC-ERROR.ind" },
-
- { SCOC_E_T_IAR_EXP, "T(iar)_expired" },
- { SCOC_E_T_IAS_EXP, "T(ias)_expired" },
- { SCOC_E_CONN_TMR_EXP, "T(conn)_expired" },
- { SCOC_E_T_REL_EXP, "T(rel)_expired" },
- { SCOC_E_T_INT_EXP, "T(int)_expired" },
- { SCOC_E_T_REP_REL_EXP, "T(rep_rel)_expired" },
-
- { 0, NULL }
-};
-
/* how to map a SCCP CO message to an event */
static const struct xua_msg_event_map sua_scoc_event_map[] = {
{ SUA_MSGC_CO, SUA_CO_CORE, SCOC_E_RCOC_CONN_IND },
@@ -226,22 +85,6 @@
{ SUA_MSGC_CO, SUA_CO_COERR, SCOC_E_RCOC_ERROR_IND },
};
-
-/* map from SCU-primitives to SCOC FSM events */
-static const struct osmo_prim_event_map scu_scoc_event_map[] = {
- { SCCP_SAP_USER, OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_REQUEST,
- SCOC_E_SCU_N_CONN_REQ },
- { SCCP_SAP_USER, OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_RESPONSE,
- SCOC_E_SCU_N_CONN_RESP },
- { SCCP_SAP_USER, OSMO_SCU_PRIM_N_DATA, PRIM_OP_REQUEST,
- SCOC_E_SCU_N_DATA_REQ },
- { SCCP_SAP_USER, OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_REQUEST,
- SCOC_E_SCU_N_DISC_REQ },
- { SCCP_SAP_USER, OSMO_SCU_PRIM_N_EXPEDITED_DATA, PRIM_OP_REQUEST,
- SCOC_E_SCU_N_EXP_DATA_REQ },
- { 0, 0, 0, OSMO_NO_EVENT }
-};
-
/***********************************************************************
* Timer Handling
***********************************************************************/
@@ -289,128 +132,11 @@
ARRAY_SIZE(osmo_sccp_timer_names) == (OSMO_SCCP_TIMERS_LEN),
assert_osmo_sccp_timers_count);
-static void sccp_timer_schedule(const struct sccp_connection *conn,
- struct osmo_timer_list *timer,
- enum osmo_sccp_timer timer_name)
-{
- const unsigned long val_sec = osmo_tdef_get(conn->inst->tdefs, timer_name, OSMO_TDEF_S, -1);
- osmo_timer_schedule(timer, val_sec, 0);
-}
-
-/* T(ias) has expired, send a COIT message to the peer */
-static void tx_inact_tmr_cb(void *data)
-{
- struct sccp_connection *conn = data;
- osmo_fsm_inst_dispatch(conn->fi, SCOC_E_T_IAS_EXP, NULL);
-}
-
-/* T(iar) has expired, notify the FSM about it */
-static void rx_inact_tmr_cb(void *data)
-{
- struct sccp_connection *conn = data;
- osmo_fsm_inst_dispatch(conn->fi, SCOC_E_T_IAR_EXP, NULL);
-}
-
-/* T(rel) has expired, notify the FSM about it */
-static void rel_tmr_cb(void *data)
-{
- struct sccp_connection *conn = data;
- osmo_fsm_inst_dispatch(conn->fi, SCOC_E_T_REL_EXP, NULL);
-}
-
-/* T(int) has expired, notify the FSM about it */
-static void int_tmr_cb(void *data)
-{
- struct sccp_connection *conn = data;
- osmo_fsm_inst_dispatch(conn->fi, SCOC_E_T_INT_EXP, NULL);
-}
-
-/* T(repeat_rel) has expired, notify the FSM about it */
-static void rep_rel_tmr_cb(void *data)
-{
- struct sccp_connection *conn = data;
- osmo_fsm_inst_dispatch(conn->fi, SCOC_E_T_REP_REL_EXP, NULL);
-}
-
-/* T(conn) has expired, notify the FSM about it */
-static void conn_tmr_cb(void *data)
-{
- struct sccp_connection *conn = data;
- osmo_fsm_inst_dispatch(conn->fi, SCOC_E_CONN_TMR_EXP, NULL);
-}
-
-/* Re-start the Tx inactivity timer */
-static void conn_restart_tx_inact_timer(struct sccp_connection *conn)
-{
- sccp_timer_schedule(conn, &conn->t_ias, OSMO_SCCP_TIMER_IAS);
-}
-
-/* Re-start the Rx inactivity timer */
-static void conn_restart_rx_inact_timer(struct sccp_connection *conn)
-{
- sccp_timer_schedule(conn, &conn->t_iar, OSMO_SCCP_TIMER_IAR);
-}
-
-/* Re-start both Rx and Tx inactivity timers */
-static void conn_start_inact_timers(struct sccp_connection *conn)
-{
- conn_restart_tx_inact_timer(conn);
- conn_restart_rx_inact_timer(conn);
-}
-
-/* Stop both Rx and Tx inactivity timers */
-static void conn_stop_inact_timers(struct sccp_connection *conn)
-{
- osmo_timer_del(&conn->t_ias);
- osmo_timer_del(&conn->t_iar);
-}
-
-/* Start release timer T(rel) */
-static void conn_start_rel_timer(struct sccp_connection *conn)
-{
- sccp_timer_schedule(conn, &conn->t_rel, OSMO_SCCP_TIMER_REL);
-}
-
-/* Start repeat release timer T(rep_rel) */
-static void conn_start_rep_rel_timer(struct sccp_connection *conn)
-{
- sccp_timer_schedule(conn, &conn->t_rep_rel, OSMO_SCCP_TIMER_REPEAT_REL);
-}
-
-/* Start interval timer T(int) */
-static void conn_start_int_timer(struct sccp_connection *conn)
-{
- sccp_timer_schedule(conn, &conn->t_int, OSMO_SCCP_TIMER_INT);
-}
-
-/* Stop all release related timers: T(rel), T(int) and T(rep_rel) */
-static void conn_stop_release_timers(struct sccp_connection *conn)
-{
- osmo_timer_del(&conn->t_rel);
- osmo_timer_del(&conn->t_int);
- osmo_timer_del(&conn->t_rep_rel);
-}
-
-/* Start connect timer T(conn) */
-static void conn_start_connect_timer(struct sccp_connection *conn)
-{
- sccp_timer_schedule(conn, &conn->t_conn, OSMO_SCCP_TIMER_CONN_EST);
-}
-
-/* Stop connect timer T(conn) */
-static void conn_stop_connect_timer(struct sccp_connection *conn)
-{
- osmo_timer_del(&conn->t_conn);
-}
-
-
/***********************************************************************
* SUA Instance and Connection handling
***********************************************************************/
-static void conn_destroy(struct sccp_connection *conn);
-
-static struct sccp_connection *conn_find_by_id(const struct osmo_sccp_instance *inst, uint32_t id)
+struct sccp_connection *sccp_find_conn_by_id(const struct osmo_sccp_instance *inst, uint32_t id)
{
struct sccp_connection *conn;
const struct rb_node *node = inst->connections.rb_node;
@@ -427,98 +153,9 @@
return NULL;
}
-static int conn_add_node(struct osmo_sccp_instance *inst, struct sccp_connection *conn)
-{
- struct rb_node **n = &(inst->connections.rb_node);
- struct rb_node *parent = NULL;
-
- while (*n) {
- struct sccp_connection *it;
-
- it = container_of(*n, struct sccp_connection, node);
-
- parent = *n;
- if (conn->conn_id < it->conn_id) {
- n = &((*n)->rb_left);
- } else if (conn->conn_id > it->conn_id) {
- n = &((*n)->rb_right);
- } else {
- LOGPSCI(inst, LOGL_ERROR, "Trying to reserve already reserved conn_id %u\n",
- conn->conn_id);
- return -EEXIST;
- }
- }
-
- rb_link_node(&conn->node, parent, n);
- rb_insert_color(&conn->node, &inst->connections);
- return 0;
-}
-
bool osmo_sccp_conn_id_exists(const struct osmo_sccp_instance *inst, uint32_t id)
{
- return conn_find_by_id(inst, id) ? true : false;
-}
-
-#define INIT_TIMER(x, fn, priv) do { (x)->cb = fn; (x)->data = priv; } while (0)
-
-/* Generate an SLS to be used for Connection-oriented messages on this SCCP connection.
- * SLS is 4 bits, as described in ITU Q.704 Figure 3.
- * ITU-T Q.714 1.1.2.3 Protocol class 2:
- * "Messages belonging to a given signalling connection shall contain the same
- * value of the SLS field to ensure sequencing as described in 1.1.2.2"
- */
-static uint8_t sccp_conn_gen_tx_co_mtp_sls(const struct sccp_connection *conn)
-{
- /* Implementation: Derive the SLS from conn->conn_id. */
- const uint32_t id = conn->conn_id;
- uint8_t sls;
-
- /* First shrink it to 1 byte: */
- sls = ((id >> (3*8)) ^ (id >> (2*8)) ^ (id >> (1*8)) ^ (id)) & 0xff;
- /* Now shrink it 8 -> 4 bits: */
- sls = ((sls >> 4) ^ sls) & 0x0f;
-
- return sls;
-}
-
-/* allocate + init a SCCP Connection with given ID */
-static struct sccp_connection *conn_create_id(struct osmo_sccp_user *user, uint32_t conn_id)
-{
- struct sccp_connection *conn = talloc_zero(user->inst, struct sccp_connection);
- char name[16];
-
- conn->conn_id = conn_id;
- conn->inst = user->inst;
- conn->user = user;
-
- if (conn_add_node(user->inst, conn) < 0) {
- talloc_free(conn);
- return NULL;
- }
-
- INIT_TIMER(&conn->t_conn, conn_tmr_cb, conn);
- INIT_TIMER(&conn->t_ias, tx_inact_tmr_cb, conn);
- INIT_TIMER(&conn->t_iar, rx_inact_tmr_cb, conn);
- INIT_TIMER(&conn->t_rel, rel_tmr_cb, conn);
- INIT_TIMER(&conn->t_int, int_tmr_cb, conn);
- INIT_TIMER(&conn->t_rep_rel, rep_rel_tmr_cb, conn);
-
- conn->tx_co_mtp_sls = sccp_conn_gen_tx_co_mtp_sls(conn);
-
- /* this might change at runtime, as it is not a constant :/ */
- sccp_scoc_fsm.log_subsys = DLSCCP;
-
- /* we simply use the connection ID as FSM instance name */
- snprintf(name, sizeof(name), "%u", conn->conn_id);
- conn->fi = osmo_fsm_inst_alloc(&sccp_scoc_fsm, conn, conn,
- LOGL_DEBUG, name);
- if (!conn->fi) {
- rb_erase(&conn->node, &user->inst->connections);
- talloc_free(conn);
- return NULL;
- }
-
- return conn;
+ return sccp_find_conn_by_id(inst, id) ? true : false;
}
/* Return an unused SCCP connection ID.
@@ -547,7 +184,7 @@
if (OSMO_UNLIKELY(sccp->next_id == 0x00FFFFFF))
sccp->next_id = 0;
- if (!conn_find_by_id(sccp, sccp->next_id))
+ if (!sccp_find_conn_by_id(sccp, sccp->next_id))
return sccp->next_id;
}
@@ -560,37 +197,7 @@
int conn_id = osmo_sccp_instance_next_conn_id(user->inst);
if (conn_id < 0)
return NULL;
- return conn_create_id(user, conn_id);
-}
-
-static void conn_opt_data_clear_cache(struct sccp_connection *conn)
-{
- if (conn->opt_data_cache) {
- msgb_free(conn->opt_data_cache);
- conn->opt_data_cache = NULL;
- }
-}
-
-/* destroy a SCCP connection state, releasing all timers, terminating
- * FSM and releasing associated memory */
-static void conn_destroy(struct sccp_connection *conn)
-{
- conn_opt_data_clear_cache(conn);
-
- conn_stop_connect_timer(conn);
- conn_stop_inact_timers(conn);
- conn_stop_release_timers(conn);
- rb_erase(&conn->node, &conn->inst->connections);
-
- osmo_fsm_inst_term(conn->fi, OSMO_FSM_TERM_REQUEST, NULL);
-
- talloc_free(conn);
-}
-
-/* allocate a message buffer for an SCCP User Primitive */
-static struct msgb *scu_msgb_alloc(void)
-{
- return msgb_alloc(SCU_MSGB_SIZE, "SCCP User Primitive");
+ return sccp_conn_alloc(user, conn_id);
}
/* generate a RELRE (release request) xua_msg for given conn */
@@ -617,8 +224,8 @@
}
/* generate xua_msg, encode it and send it to SCRC */
-static int xua_gen_relre_and_send(struct sccp_connection *conn, uint32_t cause,
- struct osmo_scu_prim *prim)
+int sccp_conn_xua_gen_relre_and_send(struct sccp_connection *conn, uint32_t cause,
+ struct osmo_scu_prim *prim)
{
struct xua_msg *xua;
@@ -634,32 +241,8 @@
return 0;
}
-/* Send cached optional data (if any) from expected message type and clear cache */
-static void xua_opt_data_send_cache(struct sccp_connection *conn, int exp_type, uint8_t msg_class)
-{
- const struct xua_dialect *dialect = &xua_dialect_sua;
- const struct xua_msg_class *xmc = dialect->class[msg_class];
-
- if (!conn->opt_data_cache)
- return;
-
- if (conn->opt_data_cache->cb[0] != exp_type) {
- /* Caller (from the FSM) knows what was the source of Optional Data we're sending.
- * Compare this information with source of Optional Data recorded while caching
- * to make sure we're on the same page.
- */
- LOGPSCC(conn, LOGL_ERROR, "unexpected message type %s != cache source %s\n",
- xua_class_msg_name(xmc, exp_type),
- xua_class_msg_name(xmc, conn->opt_data_cache->cb[0]));
- } else {
- osmo_sccp_tx_data(conn->user, conn->conn_id, msgb_data(conn->opt_data_cache), msgb_length(conn->opt_data_cache));
- }
-
- conn_opt_data_clear_cache(conn);
-}
-
/* Check if optional data should be dropped, log given error message if so */
-static bool xua_drop_data_check_drop(const struct osmo_scu_prim *prim, unsigned lim, const char *message)
+static bool xua_opt_data_check_drop(const struct osmo_scu_prim *prim, unsigned lim, const char *message)
{
if (msgb_l2len(prim->oph.msg) > lim) {
LOGP(DLSCCP, LOGL_ERROR,
@@ -677,7 +260,7 @@
uint8_t *buf;
uint32_t max_optional_data = conn->inst->max_optional_data;
- if (xua_drop_data_check_drop(prim, SCCP_MAX_DATA, "cache overrun"))
+ if (xua_opt_data_check_drop(prim, SCCP_MAX_DATA, "cache overrun"))
return false;
if (msgb_l2len(prim->oph.msg) > max_optional_data) {
@@ -713,7 +296,7 @@
case SUA_CO_COAK: /* §4.3 Connection confirm (CC) */
return xua_opt_data_cache_keep(conn, prim, msg_type);
case SUA_CO_COREF: /* §4.4 Connection refused (CREF) */
- if (xua_drop_data_check_drop(prim, max_optional_data, "over ITU-T Rec. Q.713 §4.4 limit")) {
+ if (xua_opt_data_check_drop(prim, max_optional_data, "over ITU-T Rec. Q.713 §4.4 limit")) {
/* From the state diagrams in ITU-T Rec Q.714, there's no way to send DT1 neither before nor after CREF
* at this point, so the only option we have is to drop optional data:
* see Figure C.3 / Q.714 (sheet 2 of 6) */
@@ -722,7 +305,7 @@
break;
case SUA_CO_RELRE: /* §4.5 Released (RLSD) */
if (msgb_l2len(prim->oph.msg) > max_optional_data) {
- if (xua_drop_data_check_drop(prim, SCCP_MAX_DATA, "protocol error"))
+ if (xua_opt_data_check_drop(prim, SCCP_MAX_DATA, "protocol error"))
return false;
/* There's no need to cache the optional data since the connection is still active at this point:
* Send the Optional Data in a DT1 ahead of the RLSD, because it is too large to be sent in one message.
@@ -867,8 +450,8 @@
/* generate xua_msg, encode it and send it to SCRC
* returns 0 on success, negative on error
*/
-static int xua_gen_encode_and_send(struct sccp_connection *conn, uint32_t event,
- const struct osmo_scu_prim *prim, int msg_type)
+int sccp_conn_xua_gen_encode_and_send(struct sccp_connection *conn, uint32_t event,
+ const struct osmo_scu_prim *prim, int msg_type)
{
struct xua_msg *xua;
@@ -881,643 +464,6 @@
return 0;
}
-/* allocate a SCU primitive to be sent to the user */
-static struct osmo_scu_prim *scu_prim_alloc(unsigned int primitive, enum osmo_prim_operation operation)
-{
- struct msgb *upmsg = scu_msgb_alloc();
- struct osmo_scu_prim *prim;
-
- prim = (struct osmo_scu_prim *) msgb_put(upmsg, sizeof(*prim));
- osmo_prim_init(&prim->oph, SCCP_SAP_USER,
- primitive, operation, upmsg);
- upmsg->l2h = upmsg->tail;
- return prim;
-}
-
-/* high-level function to generate a SCCP User primitive of requested
- * type based on the connection and currently processed XUA message */
-static void scu_gen_encode_and_send(struct sccp_connection *conn, uint32_t event,
- struct xua_msg *xua, unsigned int primitive,
- enum osmo_prim_operation operation)
-{
- struct osmo_scu_prim *scu_prim;
- struct osmo_scu_disconn_param *udisp;
- struct osmo_scu_connect_param *uconp;
- struct osmo_scu_data_param *udatp;
- struct xua_msg_part *data_ie;
-
- scu_prim = scu_prim_alloc(primitive, operation);
-
- switch (OSMO_PRIM_HDR(&scu_prim->oph)) {
- case OSMO_PRIM(OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION):
- udisp = &scu_prim->u.disconnect;
- udisp->conn_id = conn->conn_id;
- udisp->responding_addr = conn->called_addr;
- udisp->importance = conn->importance;
- udisp->originator = OSMO_SCCP_ORIG_UNDEFINED;
- //udisp->in_sequence_control;
- if (xua) {
- udisp->cause = xua_msg_get_u32(xua, SUA_IEI_CAUSE);
- if (xua_msg_find_tag(xua, SUA_IEI_SRC_ADDR)) {
- if (sua_addr_parse(&udisp->responding_addr, xua, SUA_IEI_SRC_ADDR) < 0) {
- LOGPSCC(conn, LOGL_ERROR, "XUA Message %s without valid SRC_ADDR\n",
- xua_hdr_dump(xua, &xua_dialect_sua));
- talloc_free(scu_prim->oph.msg);
- return;
- }
- }
- data_ie = xua_msg_find_tag(xua, SUA_IEI_DATA);
- udisp->importance = xua_msg_get_u32(xua, SUA_IEI_IMPORTANCE);
- if (data_ie) {
- struct msgb *upmsg = scu_prim->oph.msg;
- upmsg->l2h = msgb_put(upmsg, data_ie->len);
- memcpy(upmsg->l2h, data_ie->dat, data_ie->len);
- }
- }
- break;
- case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION):
- uconp = &scu_prim->u.connect;
- uconp->conn_id = conn->conn_id;
- uconp->called_addr = conn->called_addr;
- uconp->calling_addr = conn->calling_addr;
- uconp->sccp_class = conn->sccp_class;
- uconp->importance = conn->importance;
- if (xua) {
- data_ie = xua_msg_find_tag(xua, SUA_IEI_DATA);
- if (data_ie) {
- struct msgb *upmsg = scu_prim->oph.msg;
- upmsg->l2h = msgb_put(upmsg, data_ie->len);
- memcpy(upmsg->l2h, data_ie->dat, data_ie->len);
- }
- }
- break;
- case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_CONFIRM):
- uconp = &scu_prim->u.connect;
- uconp->conn_id = conn->conn_id;
- uconp->called_addr = conn->called_addr;
- uconp->calling_addr = conn->calling_addr;
- //scu_prim->u.connect.in_sequence_control
- uconp->sccp_class = xua_msg_get_u32(xua, SUA_IEI_PROTO_CLASS) & 3;
- uconp->importance = xua_msg_get_u32(xua, SUA_IEI_IMPORTANCE);
- data_ie = xua_msg_find_tag(xua, SUA_IEI_DATA);
- if (data_ie) {
- struct msgb *upmsg = scu_prim->oph.msg;
- upmsg->l2h = msgb_put(upmsg, data_ie->len);
- memcpy(upmsg->l2h, data_ie->dat, data_ie->len);
- }
- break;
- case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION):
- udatp = &scu_prim->u.data;
- udatp->conn_id = conn->conn_id;
- udatp->importance = conn->importance;
- data_ie = xua_msg_find_tag(xua, SUA_IEI_DATA);
- if (data_ie) {
- struct msgb *upmsg = scu_prim->oph.msg;
- upmsg->l2h = msgb_put(upmsg, data_ie->len);
- memcpy(upmsg->l2h, data_ie->dat, data_ie->len);
- }
- break;
- default:
- LOGPFSML(conn->fi, LOGL_ERROR, "Unsupported primitive %u:%u\n",
- scu_prim->oph.primitive, scu_prim->oph.operation);
- talloc_free(scu_prim->oph.msg);
- return;
- }
-
- sccp_user_prim_up(conn->user, scu_prim);
-}
-
-
-/***********************************************************************
- * Actual SCCP Connection Oriented Control (SCOC) Finite State Machine
- ***********************************************************************/
-
-/* Figure C.2/Q.714 (sheet 1 of 7) and C.3/Q.714 (sheet 1 of 6) */
-static void scoc_fsm_idle(struct osmo_fsm_inst *fi, uint32_t event, void *data)
-{
- struct sccp_connection *conn = fi->priv;
- struct osmo_scu_prim *prim = NULL;
- struct osmo_scu_connect_param *uconp;
- struct xua_msg *xua = NULL;
- int rc;
-
- switch (event) {
- case SCOC_E_SCU_N_CONN_REQ:
- prim = data;
- uconp = &prim->u.connect;
- /* copy relevant parameters from prim to conn */
- conn->called_addr = uconp->called_addr;
- conn->calling_addr = uconp->calling_addr;
- conn->sccp_class = uconp->sccp_class;
- /* generate + send CR PDU to SCRC */
- rc = xua_gen_encode_and_send(conn, event, prim, SUA_CO_CORE);
- if (rc < 0)
- LOGPFSML(fi, LOGL_ERROR, "Failed to initiate connection: %s\n", strerror(-rc));
- else {
- /* start connection timer */
- conn_start_connect_timer(conn);
- osmo_fsm_inst_state_chg(fi, S_CONN_PEND_OUT, 0, 0);
- }
- break;
-#if 0
- case SCOC_E_SCU_N_TYPE1_REQ:
- /* ?!? */
- break;
-#endif
- case SCOC_E_RCOC_RLSD_IND:
- /* send release complete to SCRC */
- xua_gen_encode_and_send(conn, event, NULL, SUA_CO_RELCO);
- break;
- case SCOC_E_RCOC_REL_COMPL_IND:
- /* do nothing */
- break;
- case SCOC_E_RCOC_OTHER_NPDU:
-#if 0
- if (src_ref) {
- /* FIXME: send ERROR to SCRC */
- }
-#endif
- break;
- /* destination node / incoming connection */
- /* Figure C.3 / Q.714 (sheet 1 of 6) */
- case SCOC_E_RCOC_CONN_IND:
- xua = data;
- /* copy relevant parameters from xua to conn */
- conn->remote_ref = xua_msg_get_u32(xua, SUA_IEI_SRC_REF);
- conn->sccp_class = xua_msg_get_u32(xua, SUA_IEI_PROTO_CLASS) & 3;
- conn->importance = xua_msg_get_u32(xua, SUA_IEI_IMPORTANCE);
-
- rc = sua_addr_parse(&conn->calling_addr, xua, SUA_IEI_SRC_ADDR);
- if (rc < 0) {
- LOGPSCC(conn, LOGL_ERROR, "XUA Message %s without valid SRC_ADDR\n",
- xua_hdr_dump(xua, &xua_dialect_sua));
- goto refuse_destroy_conn;
- }
- /* 3.1.6.1 The originating node of the CR message
- * (identified by the OPC in the calling party address
- * or by default by the OPC in the MTP label, [and the
- * MTP-SAP instance]) is associated with the incoming
- * connection section. */
- if (conn->calling_addr.presence & OSMO_SCCP_ADDR_T_PC)
- conn->remote_pc = conn->calling_addr.pc;
- else {
- /* Hack to get the MTP label here ?!? */
- conn->remote_pc = xua->mtp.opc;
- }
-
- rc = sua_addr_parse(&conn->called_addr, xua, SUA_IEI_DEST_ADDR);
- if (rc < 0) {
- LOGPSCC(conn, LOGL_ERROR, "XUA Message %s without valid DEST_ADDR\n",
- xua_hdr_dump(xua, &xua_dialect_sua));
- goto refuse_destroy_conn;
- }
-
- osmo_fsm_inst_state_chg(fi, S_CONN_PEND_IN, 0, 0);
- /* N-CONNECT.ind to User */
- scu_gen_encode_and_send(conn, event, xua, OSMO_SCU_PRIM_N_CONNECT,
- PRIM_OP_INDICATION);
- break;
- }
- return;
-
-refuse_destroy_conn:
- xua_gen_encode_and_send(conn, event, NULL, SUA_CO_COREF);
- osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);
-}
-
-static void scoc_fsm_idle_onenter(struct osmo_fsm_inst *fi, uint32_t old_state)
-{
- conn_destroy(fi->priv);
-}
-
-/* Figure C.3 / Q.714 (sheet 2 of 6) */
-static void scoc_fsm_conn_pend_in(struct osmo_fsm_inst *fi, uint32_t event, void *data)
-{
- struct sccp_connection *conn = fi->priv;
- struct osmo_scu_prim *prim = NULL;
-
- switch (event) {
- case SCOC_E_SCU_N_CONN_RESP:
- prim = data;
- /* FIXME: assign local reference (only now?) */
- /* FIXME: assign sls, protocol class and credit */
- xua_gen_encode_and_send(conn, event, prim, SUA_CO_COAK);
- /* start inactivity timers */
- conn_start_inact_timers(conn);
- osmo_fsm_inst_state_chg(fi, S_ACTIVE, 0, 0);
- xua_opt_data_send_cache(conn, SUA_CO_COAK, SUA_MSGC_CO);
- break;
- case SCOC_E_SCU_N_DISC_REQ:
- prim = data;
- /* release resources: implicit */
- xua_gen_encode_and_send(conn, event, prim, SUA_CO_COREF);
- /* N. B: we've ignored CREF sending errors as there's no recovery option anyway */
- osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);
- break;
- }
-}
-
-/* Figure C.2/Q.714 (sheet 2 of 7) */
-static void scoc_fsm_conn_pend_out(struct osmo_fsm_inst *fi, uint32_t event, void *data)
-{
- struct sccp_connection *conn = fi->priv;
- struct osmo_scu_prim *prim = NULL;
- struct xua_msg *xua = NULL;
-
- switch (event) {
- case SCOC_E_SCU_N_DISC_REQ:
- prim = data;
- conn->release_cause = prim->u.disconnect.cause;
- osmo_fsm_inst_state_chg(fi, S_WAIT_CONN_CONF, 0, 0);
- /* keep conn timer running(!) */
- break;
- case SCOC_E_CONN_TMR_EXP:
- /* N-DISCONNECT.ind to user */
- scu_gen_encode_and_send(conn, event, NULL, OSMO_SCU_PRIM_N_DISCONNECT,
- PRIM_OP_INDICATION);
- /* below implicitly releases resources + local ref */
- osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);
- break;
- case SCOC_E_RCOC_ROUT_FAIL_IND:
- case SCOC_E_RCOC_CREF_IND:
- xua = data;
- /* stop conn timer */
- conn_stop_connect_timer(conn);
- /* release local res + ref (implicit by going to idle) */
- /* N-DISCONNECT.ind to user */
- scu_gen_encode_and_send(conn, event, xua, OSMO_SCU_PRIM_N_DISCONNECT,
- PRIM_OP_INDICATION);
- /* below implicitly releases resources + local ref */
- osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);
- break;
- case SCOC_E_RCOC_RLSD_IND:
- xua = data;
- /* RLC to SCRC */
- xua_gen_encode_and_send(conn, event, NULL, SUA_CO_RELCO);
- /* stop conn timer */
- conn_stop_connect_timer(conn);
- /* release local res + ref (implicit) */
- /* N-DISCONNECT.ind to user */
- scu_gen_encode_and_send(conn, event, xua, OSMO_SCU_PRIM_N_DISCONNECT,
- PRIM_OP_INDICATION);
- osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);
- break;
- case SCOC_E_RCOC_OTHER_NPDU:
- xua = data;
- conn_start_connect_timer(conn);
- /* release local res + ref (implicit) */
- /* N-DISCONNECT.ind to user */
- scu_gen_encode_and_send(conn, event, xua, OSMO_SCU_PRIM_N_DISCONNECT,
- PRIM_OP_INDICATION);
- osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);
- break;
- case SCOC_E_RCOC_CC_IND:
- xua = data;
- /* stop conn timer */
- conn_stop_connect_timer(conn);
- /* start inactivity timers */
- conn_start_inact_timers(conn);
- /* TODO: assign PCU and credit */
- /* associate remote ref to conn */
- conn->remote_ref = xua_msg_get_u32(xua, SUA_IEI_SRC_REF);
- /* 3.1.4.2 The node sending the CC message (identified
- * by the parameter OPC contained in the
- * MTP-TRANSFER.indication primitive which conveyed the
- * CC message [plus the MTP-SAP instance]) is associated
- * with the connection section. */
- conn->remote_pc = xua->mtp.opc;
-
- osmo_fsm_inst_state_chg(fi, S_ACTIVE, 0, 0);
- /* If CR which was used to initiate this connection had excessive Optional Data which we had to cache,
- * now is the time to send it: the connection is already active but we hadn't notified upper layers about it
- * so we have the connection all to ourselves and can use it to transmit "leftover" data via DT1 */
- xua_opt_data_send_cache(conn, SUA_CO_CORE, xua->hdr.msg_class);
-
- /* N-CONNECT.conf to user */
- scu_gen_encode_and_send(conn, event, xua, OSMO_SCU_PRIM_N_CONNECT,
- PRIM_OP_CONFIRM);
- break;
- }
-}
-
-/* Figure C.2/Q.714 (sheet 3 of 7) */
-static void scoc_fsm_wait_conn_conf(struct osmo_fsm_inst *fi, uint32_t event, void *data)
-{
- struct sccp_connection *conn = fi->priv;
- struct xua_msg *xua = NULL;
-
- switch (event) {
- case SCOC_E_RCOC_RLSD_IND:
- xua = data;
- /* release complete to SCRC */
- xua_gen_encode_and_send(conn, event, NULL, SUA_CO_RELCO);
- /* stop conn timer */
- conn_stop_connect_timer(conn);
- /* release local res + ref (implicit) */
- osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);
- break;
- case SCOC_E_RCOC_CC_IND:
- xua = data;
- /* stop conn timer */
- conn_stop_connect_timer(conn);
- /* associate rem ref to conn */
- conn->remote_ref = xua_msg_get_u32(xua, SUA_IEI_SRC_REF);
- /* 3.1.4.2 The node sending the CC message (identified
- * by the parameter OPC contained in the
- * MTP-TRANSFER.indication primitive which conveyed the
- * CC message [plus the MTP-SAP instance]) is associated
- * with the connection section. */
- conn->remote_pc = xua->mtp.opc;
-
- /* released to SCRC */
- xua_gen_relre_and_send(conn, conn->release_cause, NULL);
- /* start rel timer */
- conn_start_rel_timer(conn);
- osmo_fsm_inst_state_chg(fi, S_DISCONN_PEND, 0, 0);
- break;
- case SCOC_E_RCOC_OTHER_NPDU:
- case SCOC_E_RCOC_CREF_IND:
- case SCOC_E_RCOC_ROUT_FAIL_IND:
- xua = data;
- /* stop conn timer */
- conn_stop_connect_timer(conn);
- /* release local res + ref */
- osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);
- break;
- case SCOC_E_CONN_TMR_EXP:
- /* release local res + ref */
- osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);
- break;
- }
-}
-
-/* C.2/Q.714 (sheet 4+5 of 7) and C.3/Q714 (sheet 3+4 of 6) */
-static void scoc_fsm_active(struct osmo_fsm_inst *fi, uint32_t event, void *data)
-{
- struct xua_msg *xua = data;
- struct sccp_connection *conn = fi->priv;
- struct osmo_scu_prim *prim = NULL;
-
- switch (event) {
-#pragma message ("TODO: internal disco: send N-DISCONNECT.ind to user")
- /* send N-DISCONNECT.ind to user */
- /*scu_gen_encode_and_send(conn, event, xua, OSMO_SCU_PRIM_N_DISCONNECT,
- PRIM_OP_INDICATION);*/
- /* fall-through */
- case SCOC_E_SCU_N_DISC_REQ:
- prim = data;
- /* stop inact timers */
- conn_stop_inact_timers(conn);
- /* send RLSD to SCRC */
- xua_gen_encode_and_send(conn, event, prim, SUA_CO_RELRE);
- /* start rel timer */
- conn_start_rel_timer(conn);
- osmo_fsm_inst_state_chg(fi, S_DISCONN_PEND, 0, 0);
- break;
- case SCOC_E_RCOC_CREF_IND:
- case SCOC_E_RCOC_CC_IND:
- case SCOC_E_RCOC_REL_COMPL_IND:
- /* do nothing */
- break;
- case SCOC_E_RCOC_RLSD_IND:
- /* send N-DISCONNECT.ind to user */
- scu_gen_encode_and_send(conn, event, xua, OSMO_SCU_PRIM_N_DISCONNECT,
- PRIM_OP_INDICATION);
- /* release res + local ref (implicit) */
- /* stop inact timers */
- conn_stop_inact_timers(conn);
- /* RLC to SCRC */
- xua_gen_encode_and_send(conn, event, NULL, SUA_CO_RELCO);
- osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);
- break;
- case SCOC_E_RCOC_ERROR_IND:
- xua = data;
- /* FIXME: check for cause service_class_mismatch */
- /* release res + local ref (implicit) */
- /* send N-DISCONNECT.ind to user */
- scu_gen_encode_and_send(conn, event, xua, OSMO_SCU_PRIM_N_DISCONNECT,
- PRIM_OP_INDICATION);
- /* stop inact timers */
- conn_stop_inact_timers(conn);
- osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);
- break;
- case SCOC_E_T_IAR_EXP:
- /* stop inact timers */
- conn_stop_inact_timers(conn);
- xua = xua_msg_alloc();
- xua_msg_add_u32(xua, SUA_IEI_CAUSE,
- SUA_CAUSE_T_RELEASE | SCCP_RELEASE_CAUSE_EXPIRATION_INACTIVE);
- xua_msg_add_u32(xua, SUA_IEI_IMPORTANCE, conn->importance);
- /* Send N-DISCONNECT.ind to local user */
- scu_gen_encode_and_send(conn, event, xua, OSMO_SCU_PRIM_N_DISCONNECT,
- PRIM_OP_INDICATION);
- talloc_free(xua);
- /* Send RLSD to peer */
- xua_gen_relre_and_send(conn, SCCP_RELEASE_CAUSE_EXPIRATION_INACTIVE, NULL);
- /* start release timer */
- conn_start_rel_timer(conn);
- osmo_fsm_inst_state_chg(fi, S_DISCONN_PEND, 0, 0);
- break;
- case SCOC_E_RCOC_ROUT_FAIL_IND:
- /* send N-DISCONNECT.ind to user */
- scu_gen_encode_and_send(conn, event, NULL, OSMO_SCU_PRIM_N_DISCONNECT,
- PRIM_OP_INDICATION);
- /* stop inact timers */
- conn_stop_inact_timers(conn);
- /* start release timer */
- conn_start_rel_timer(conn);
- osmo_fsm_inst_state_chg(fi, S_DISCONN_PEND, 0, 0);
- break;
- /* Figure C.4/Q.714 */
- case SCOC_E_SCU_N_DATA_REQ:
- case SCOC_E_SCU_N_EXP_DATA_REQ:
- prim = data;
- xua_gen_encode_and_send(conn, event, prim, SUA_CO_CODT);
- conn_restart_tx_inact_timer(conn);
- break;
- case SCOC_E_RCOC_DT1_IND:
- /* restart receive inactivity timer */
- conn_restart_rx_inact_timer(conn);
- /* TODO: M-bit */
- scu_gen_encode_and_send(conn, event, xua, OSMO_SCU_PRIM_N_DATA,
- PRIM_OP_INDICATION);
- break;
- /* Figure C.4/Q.714 (sheet 4 of 4) */
- case SCOC_E_RCOC_IT_IND:
- xua = data;
- /* check if remote reference is what we expect */
- /* check class is what we expect */
- if (xua_msg_get_u32(xua, SUA_IEI_SRC_REF) != conn->remote_ref ||
- xua_msg_get_u32(xua, SUA_IEI_PROTO_CLASS) != conn->sccp_class) {
- /* Release connection */
- /* Stop inactivity Timers */
- conn_stop_inact_timers(conn);
- xua = xua_msg_alloc();
- xua_msg_add_u32(xua, SUA_IEI_CAUSE,
- SUA_CAUSE_T_RELEASE | SCCP_RELEASE_CAUSE_INCONSISTENT_CONN_DATA);
- xua_msg_add_u32(xua, SUA_IEI_IMPORTANCE, conn->importance);
- /* send N-DISCONNECT.ind to user */
- scu_gen_encode_and_send(conn, event, xua,
- OSMO_SCU_PRIM_N_DISCONNECT,
- PRIM_OP_INDICATION);
- talloc_free(xua);
- /* Send RLSD to SCRC */
- xua_gen_relre_and_send(conn, SCCP_RELEASE_CAUSE_INCONSISTENT_CONN_DATA, NULL);
- talloc_free(xua);
- /* Start release timer */
- conn_start_rel_timer(conn);
- osmo_fsm_inst_state_chg(fi, S_DISCONN_PEND, 0, 0);
- }
- conn_restart_rx_inact_timer(conn);
- break;
- case SCOC_E_T_IAS_EXP:
- /* Send IT to peer */
- xua_gen_encode_and_send(conn, event, NULL, SUA_CO_COIT);
- conn_restart_tx_inact_timer(conn);
- break;
- }
-}
-
-/* C.2/Q.714 (sheet 6+7 of 7) and C.3/Q.714 (sheet 5+6 of 6) */
-static void scoc_fsm_disconn_pend(struct osmo_fsm_inst *fi, uint32_t event, void *data)
-{
- struct sccp_connection *conn = fi->priv;
-
- switch (event) {
- case SCOC_E_RCOC_REL_COMPL_IND:
- case SCOC_E_RCOC_RLSD_IND:
- /* release res + local ref (implicit) */
- /* freeze local ref */
- /* stop release + interval timers */
- conn_stop_release_timers(conn);
- osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);
- break;
- case SCOC_E_RCOC_ROUT_FAIL_IND:
- case SCOC_E_RCOC_OTHER_NPDU:
- /* do nothing */
- break;
- case SCOC_E_T_REL_EXP: /* release timer exp */
- /* send RLSD */
- xua_gen_relre_and_send(conn, SCCP_RELEASE_CAUSE_UNQUALIFIED, NULL);
- /* start interval timer */
- conn_start_int_timer(conn);
- /* start repeat release timer */
- conn_start_rep_rel_timer(conn);
- break;
- case SCOC_E_T_INT_EXP: /* interval timer exp */
- /* TODO: Inform maintenance */
- /* stop release and interval timers */
- conn_stop_release_timers(conn);
- osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);
- break;
- case SCOC_E_T_REP_REL_EXP: /* repeat release timer exp */
- /* send RLSD */
- xua_gen_relre_and_send(conn, SCCP_RELEASE_CAUSE_UNQUALIFIED, NULL);
- /* re-start repeat release timer */
- conn_start_rep_rel_timer(conn);
- break;
- }
-}
-
-static const struct osmo_fsm_state sccp_scoc_states[] = {
- [S_IDLE] = {
- .name = "IDLE",
- .action = scoc_fsm_idle,
- .onenter= scoc_fsm_idle_onenter,
- .in_event_mask = S(SCOC_E_SCU_N_CONN_REQ) |
- //S(SCOC_E_SCU_N_TYPE1_REQ) |
- S(SCOC_E_RCOC_CONN_IND) |
- S(SCOC_E_RCOC_RLSD_IND) |
- S(SCOC_E_RCOC_REL_COMPL_IND) |
- S(SCOC_E_RCOC_OTHER_NPDU),
- .out_state_mask = S(S_IDLE) |
- S(S_CONN_PEND_OUT) |
- S(S_CONN_PEND_IN),
- },
- [S_CONN_PEND_IN] = {
- .name = "CONN_PEND_IN",
- .action = scoc_fsm_conn_pend_in,
- .in_event_mask = S(SCOC_E_SCU_N_CONN_RESP) |
- S(SCOC_E_SCU_N_DISC_REQ),
- .out_state_mask = S(S_IDLE) |
- S(S_ACTIVE),
- },
- [S_CONN_PEND_OUT] = {
- .name = "CONN_PEND_OUT",
- .action = scoc_fsm_conn_pend_out,
- .in_event_mask = S(SCOC_E_SCU_N_DISC_REQ) |
- S(SCOC_E_CONN_TMR_EXP) |
- S(SCOC_E_RCOC_ROUT_FAIL_IND) |
- S(SCOC_E_RCOC_RLSD_IND) |
- S(SCOC_E_RCOC_OTHER_NPDU) |
- S(SCOC_E_RCOC_CREF_IND) |
- S(SCOC_E_RCOC_CC_IND),
- .out_state_mask = S(S_IDLE) |
- S(S_ACTIVE) |
- S(S_WAIT_CONN_CONF),
- },
- [S_ACTIVE] = {
- .name = "ACTIVE",
- .action = scoc_fsm_active,
- .in_event_mask = S(SCOC_E_SCU_N_DISC_REQ) |
- /* internal disconnect */
- S(SCOC_E_RCOC_CREF_IND) |
- S(SCOC_E_RCOC_REL_COMPL_IND) |
- S(SCOC_E_RCOC_RLSD_IND) |
- S(SCOC_E_RCOC_ERROR_IND) |
- S(SCOC_E_T_IAR_EXP) |
- S(SCOC_E_T_IAS_EXP) |
- S(SCOC_E_RCOC_ROUT_FAIL_IND) |
- S(SCOC_E_SCU_N_DATA_REQ) |
- S(SCOC_E_SCU_N_EXP_DATA_REQ) |
- S(SCOC_E_RCOC_DT1_IND) |
- S(SCOC_E_RCOC_IT_IND),
- .out_state_mask = S(S_IDLE) |
- S(S_DISCONN_PEND),
- },
- [S_DISCONN_PEND] = {
- .name = "DISCONN_PEND",
- .action = scoc_fsm_disconn_pend,
- .in_event_mask = S(SCOC_E_RCOC_REL_COMPL_IND) |
- S(SCOC_E_RCOC_RLSD_IND) |
- S(SCOC_E_RCOC_ROUT_FAIL_IND) |
- S(SCOC_E_RCOC_OTHER_NPDU) |
- S(SCOC_E_T_REL_EXP) |
- S(SCOC_E_T_INT_EXP) |
- S(SCOC_E_T_REP_REL_EXP),
- .out_state_mask = S(S_IDLE),
- },
- [S_RESET_IN] = {
- .name = "RESET_IN",
- },
- [S_RESET_OUT] = {
- .name = "RESET_OUT",
- },
- [S_BOTHWAY_RESET] = {
- .name = "BOTHWAY_RESET",
- },
- [S_WAIT_CONN_CONF] = {
- .name = "WAIT_CONN_CONF",
- .action = scoc_fsm_wait_conn_conf,
- .in_event_mask = S(SCOC_E_RCOC_RLSD_IND) |
- S(SCOC_E_RCOC_CC_IND) |
- S(SCOC_E_RCOC_OTHER_NPDU) |
- S(SCOC_E_CONN_TMR_EXP) |
- S(SCOC_E_RCOC_CREF_IND) |
- S(SCOC_E_RCOC_ROUT_FAIL_IND),
- .out_state_mask = S(S_IDLE) |
- S(S_DISCONN_PEND),
- },
-};
-
-struct osmo_fsm sccp_scoc_fsm = {
- .name = "SCCP-SCOC",
- .states = sccp_scoc_states,
- .num_states = ARRAY_SIZE(sccp_scoc_states),
- /* ".log_subsys = DLSCCP" doesn't work as DLSCCP is not a constant */
- .event_names = scoc_event_names,
-};
-
/* map from SCCP return cause to SCCP Refusal cause */
static const uint8_t cause_map_cref[] = {
[SCCP_RETURN_CAUSE_SUBSYSTEM_CONGESTION] =
@@ -1609,7 +555,7 @@
/* try to dispatch to connection FSM (if any) */
conn_id = xua_msg_get_u32(xua, SUA_IEI_SRC_REF);
- conn = conn_find_by_id(inst, conn_id);
+ conn = sccp_find_conn_by_id(inst, conn_id);
if (conn) {
osmo_fsm_inst_dispatch(conn->fi,
SCOC_E_RCOC_ROUT_FAIL_IND, xua);
@@ -1873,7 +819,7 @@
uint32_t conn_id;
/* Resolve existing connection */
conn_id = xua_msg_get_u32(xua, SUA_IEI_DEST_REF);
- conn = conn_find_by_id(inst, conn_id);
+ conn = sccp_find_conn_by_id(inst, conn_id);
if (!conn) {
LOGPSCI(inst, LOGL_NOTICE, "Received %s: Cannot find connection for "
"local reference %u\n", xua_hdr_dump(xua, &xua_dialect_sua), conn_id);
@@ -1920,142 +866,13 @@
osmo_fsm_inst_dispatch(conn->fi, event, xua);
}
-/* get the Connection ID of the given SCU primitive */
-static uint32_t scu_prim_conn_id(const struct osmo_scu_prim *prim)
-{
- switch (prim->oph.primitive) {
- case OSMO_SCU_PRIM_N_CONNECT:
- return prim->u.connect.conn_id;
- case OSMO_SCU_PRIM_N_DATA:
- return prim->u.data.conn_id;
- case OSMO_SCU_PRIM_N_DISCONNECT:
- return prim->u.disconnect.conn_id;
- case OSMO_SCU_PRIM_N_RESET:
- return prim->u.reset.conn_id;
- default:
- return 0;
- }
-}
-
-/*! Main entrance function for primitives from SCCP User.
- * The caller is required to free oph->msg, otherwise the same as osmo_sccp_user_sap_down().
- * \param[in] scu SCCP User sending us the primitive
- * \param[in] oph Osmocom primitive sent by the user
- * \returns 0 on success; negative on error */
-int osmo_sccp_user_sap_down_nofree(struct osmo_sccp_user *scu, struct osmo_prim_hdr *oph)
-{
- struct osmo_scu_prim *prim = (struct osmo_scu_prim *) oph;
- struct osmo_sccp_instance *inst = scu->inst;
- struct sccp_connection *conn;
- int rc = 0;
- int event;
-
- LOGPSCU(scu, LOGL_DEBUG, "Received SCCP User Primitive (%s)\n",
- osmo_scu_prim_name(&prim->oph));
-
- switch (OSMO_PRIM_HDR(&prim->oph)) {
- case OSMO_PRIM(OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_REQUEST):
- /* other CL primitives? */
- /* Connectionless by-passes this altogether */
- return sccp_sclc_user_sap_down_nofree(scu, oph);
- case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_REQUEST):
- /* Allocate new connection structure */
- conn = conn_create_id(scu, prim->u.connect.conn_id);
- if (!conn) {
- /* FIXME: inform SCCP user with proper reply */
- LOGPSCU(scu, LOGL_ERROR, "Cannot create conn-id for primitive %s\n",
- osmo_scu_prim_name(&prim->oph));
- return rc;
- }
- break;
- case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_RESPONSE):
- case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_REQUEST):
- case OSMO_PRIM(OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_REQUEST):
- case OSMO_PRIM(OSMO_SCU_PRIM_N_RESET, PRIM_OP_REQUEST):
- /* Resolve existing connection structure */
- conn = conn_find_by_id(inst, scu_prim_conn_id(prim));
- if (!conn) {
- /* FIXME: inform SCCP user with proper reply */
- LOGPSCU(scu, LOGL_ERROR, "Received unknown conn-id %u for primitive %s\n",
- scu_prim_conn_id(prim), osmo_scu_prim_name(&prim->oph));
- return rc;
- }
- break;
- default:
- LOGPSCU(scu, LOGL_ERROR, "Received unknown primitive %s\n",
- osmo_scu_prim_name(&prim->oph));
- return -1;
- }
-
- /* Map from primitive to event */
- event = osmo_event_for_prim(oph, scu_scoc_event_map);
-
- /* Dispatch event into connection */
- return osmo_fsm_inst_dispatch(conn->fi, event, prim);
-}
-
-/*! Main entrance function for primitives from SCCP User.
- * Implies a msgb_free(oph->msg), otherwise the same as osmo_sccp_user_sap().
- * \param[in] scu SCCP User sending us the primitive
- * \param[in] oph Osmocom primitive sent by the user
- * \returns 0 on success; negative on error */
-int osmo_sccp_user_sap_down(struct osmo_sccp_user *scu, struct osmo_prim_hdr *oph)
-{
- struct osmo_scu_prim *prim = (struct osmo_scu_prim *) oph;
- struct msgb *msg = prim->oph.msg;
- int rc = osmo_sccp_user_sap_down_nofree(scu, oph);
- msgb_free(msg);
- return rc;
-}
-
void sccp_scoc_flush_connections(struct osmo_sccp_instance *inst)
{
struct rb_node *node;
while ((node = rb_first(&inst->connections))) {
struct sccp_connection *conn = container_of(node, struct sccp_connection, node);
- conn_destroy(conn);
+ sccp_conn_free(conn);
}
}
-#include <osmocom/vty/vty.h>
-
-static void vty_show_connection(struct vty *vty, struct sccp_connection *conn)
-{
- struct osmo_ss7_instance *s7i = conn->inst->ss7;
- struct osmo_sccp_addr *remote_addr;
- uint32_t local_pc = OSMO_SS7_PC_INVALID;
-
- if (osmo_ss7_pc_is_valid(conn->user->pc))
- local_pc = conn->user->pc;
- else if (osmo_ss7_pc_is_valid(s7i->cfg.primary_pc))
- local_pc = s7i->cfg.primary_pc;
-
- if (conn->incoming)
- remote_addr = &conn->calling_addr;
- else
- remote_addr = &conn->called_addr;
-
- vty_out(vty, "%c %06x %3u %7s ", conn->incoming ? 'I' : 'O',
- conn->conn_id, conn->user->ssn,
- osmo_ss7_pointcode_print(s7i, local_pc));
- vty_out(vty, "%16s %06x %3u %7s%s",
- osmo_fsm_inst_state_name(conn->fi), conn->remote_ref, remote_addr->ssn,
- osmo_ss7_pointcode_print(s7i, conn->remote_pc),
- VTY_NEWLINE);
-}
-
-void sccp_scoc_show_connections(struct vty *vty, struct osmo_sccp_instance *inst)
-{
- struct sccp_connection *conn;
- struct rb_node *node;
-
- vty_out(vty, "I Local Conn. Remote %s", VTY_NEWLINE);
- vty_out(vty, "O Ref SSN PC State Ref SSN PC %s", VTY_NEWLINE);
- vty_out(vty, "- ------ --- ------- ---------------- ------ --- -------%s", VTY_NEWLINE);
-
- for (node = rb_first(&inst->connections); node; node = rb_next(node)) {
- conn = container_of(node, struct sccp_connection, node);
- vty_show_connection(vty, conn);
- }
-}
diff --git a/src/sccp_scoc_fsm.c b/src/sccp_scoc_fsm.c
new file mode 100644
index 0000000..dbee91e
--- /dev/null
+++ b/src/sccp_scoc_fsm.c
@@ -0,0 +1,615 @@
+/* SCCP Connection Oriented (SCOC) FSM according to ITU-T Q.713/Q.714 */
+
+/* (C) 2025 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de>
+ * (C) 2015-2017 by Harald Welte <laforge(a)gnumonks.org>
+ * 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/>.
+ *
+ */
+
+/* This code is a bit of a hybrid between the ITU-T Q.71x specifications
+ * for SCCP (particularly its connection-oriented part), and the IETF
+ * RFC 3868 (SUA). The idea here is to have one shared code base of the
+ * state machines for SCCP Connection Oriented, and use those both from
+ * SCCP and SUA.
+ */
+
+#include <errno.h>
+#include <string.h>
+
+#include <osmocom/core/msgb.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/linuxrbtree.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/core/timer.h>
+#include <osmocom/core/fsm.h>
+#include <osmocom/sigtran/sccp_helpers.h>
+#include <osmocom/sigtran/sccp_sap.h>
+#include <osmocom/sigtran/protocol/sua.h>
+#include <osmocom/sccp/sccp_types.h>
+
+#include "xua_internal.h"
+#include "sccp_connection.h"
+#include "sccp_scoc_fsm.h"
+#include "sccp_internal.h"
+#include "sccp_user.h"
+#include "ss7_internal.h"
+#include "ss7_instance.h"
+
+/***********************************************************************
+ * Actual SCCP Connection Oriented Control (SCOC) Finite State Machine
+ ***********************************************************************/
+
+#define S(x) (1 << (x))
+
+static const struct value_string scoc_event_names[] = {
+ /* Primitives from SCCP-User */
+ { SCOC_E_SCU_N_CONN_REQ, "N-CONNECT.req" },
+ { SCOC_E_SCU_N_CONN_RESP, "N-CONNECT.resp" },
+ { SCOC_E_SCU_N_DISC_REQ, "N-DISCONNECT.req" },
+ { SCOC_E_SCU_N_DATA_REQ, "N-DATA.req" },
+ { SCOC_E_SCU_N_EXP_DATA_REQ, "N-EXPEDITED_DATA.req" },
+
+ /* Events from RCOC (Routing for Connection Oriented) */
+ { SCOC_E_RCOC_CONN_IND, "RCOC-CONNECT.ind" },
+ { SCOC_E_RCOC_ROUT_FAIL_IND, "RCOC-ROUT_FAIL.ind" },
+ { SCOC_E_RCOC_RLSD_IND, "RCOC-RELEASED.ind" },
+ { SCOC_E_RCOC_REL_COMPL_IND, "RCOC-RELEASE_COMPLETE.ind" },
+ { SCOC_E_RCOC_CREF_IND, "RCOC-CONNECT_REFUSED.ind" },
+ { SCOC_E_RCOC_CC_IND, "RCOC-CONNECT_CONFIRM.ind" },
+ { SCOC_E_RCOC_DT1_IND, "RCOC-DT1.ind" },
+ { SCOC_E_RCOC_DT2_IND, "RCOC-DT2.ind" },
+ { SCOC_E_RCOC_IT_IND, "RCOC-IT.ind" },
+ { SCOC_E_RCOC_OTHER_NPDU, "RCOC-OTHER_NPDU.ind" },
+ { SCOC_E_RCOC_ERROR_IND, "RCOC-ERROR.ind" },
+
+ { SCOC_E_T_IAR_EXP, "T(iar)_expired" },
+ { SCOC_E_T_IAS_EXP, "T(ias)_expired" },
+ { SCOC_E_CONN_TMR_EXP, "T(conn)_expired" },
+ { SCOC_E_T_REL_EXP, "T(rel)_expired" },
+ { SCOC_E_T_INT_EXP, "T(int)_expired" },
+ { SCOC_E_T_REP_REL_EXP, "T(rep_rel)_expired" },
+
+ { 0, NULL }
+};
+
+/* Figure C.2/Q.714 (sheet 1 of 7) and C.3/Q.714 (sheet 1 of 6) */
+static void scoc_fsm_idle(struct osmo_fsm_inst *fi, uint32_t event, void *data)
+{
+ struct sccp_connection *conn = fi->priv;
+ struct osmo_scu_prim *prim = NULL;
+ struct osmo_scu_connect_param *uconp;
+ struct xua_msg *xua = NULL;
+ int rc;
+
+ switch (event) {
+ case SCOC_E_SCU_N_CONN_REQ:
+ prim = data;
+ uconp = &prim->u.connect;
+ /* copy relevant parameters from prim to conn */
+ conn->called_addr = uconp->called_addr;
+ conn->calling_addr = uconp->calling_addr;
+ conn->sccp_class = uconp->sccp_class;
+ /* generate + send CR PDU to SCRC */
+ rc = sccp_conn_xua_gen_encode_and_send(conn, event, prim, SUA_CO_CORE);
+ if (rc < 0)
+ LOGPFSML(fi, LOGL_ERROR, "Failed to initiate connection: %s\n", strerror(-rc));
+ else {
+ /* start connection timer */
+ sccp_conn_start_connect_timer(conn);
+ osmo_fsm_inst_state_chg(fi, S_CONN_PEND_OUT, 0, 0);
+ }
+ break;
+#if 0
+ case SCOC_E_SCU_N_TYPE1_REQ:
+ /* ?!? */
+ break;
+#endif
+ case SCOC_E_RCOC_RLSD_IND:
+ /* send release complete to SCRC */
+ sccp_conn_xua_gen_encode_and_send(conn, event, NULL, SUA_CO_RELCO);
+ break;
+ case SCOC_E_RCOC_REL_COMPL_IND:
+ /* do nothing */
+ break;
+ case SCOC_E_RCOC_OTHER_NPDU:
+#if 0
+ if (src_ref) {
+ (void)src_ref;
+ /* FIXME: send ERROR to SCRC */
+ }
+#endif
+ break;
+ /* destination node / incoming connection */
+ /* Figure C.3 / Q.714 (sheet 1 of 6) */
+ case SCOC_E_RCOC_CONN_IND:
+ xua = data;
+ /* copy relevant parameters from xua to conn */
+ conn->remote_ref = xua_msg_get_u32(xua, SUA_IEI_SRC_REF);
+ conn->sccp_class = xua_msg_get_u32(xua, SUA_IEI_PROTO_CLASS) & 3;
+ conn->importance = xua_msg_get_u32(xua, SUA_IEI_IMPORTANCE);
+
+ rc = sua_addr_parse(&conn->calling_addr, xua, SUA_IEI_SRC_ADDR);
+ if (rc < 0) {
+ LOGPSCC(conn, LOGL_ERROR, "XUA Message %s without valid SRC_ADDR\n",
+ xua_hdr_dump(xua, &xua_dialect_sua));
+ goto refuse_destroy_conn;
+ }
+ /* 3.1.6.1 The originating node of the CR message
+ * (identified by the OPC in the calling party address
+ * or by default by the OPC in the MTP label, [and the
+ * MTP-SAP instance]) is associated with the incoming
+ * connection section. */
+ if (conn->calling_addr.presence & OSMO_SCCP_ADDR_T_PC)
+ conn->remote_pc = conn->calling_addr.pc;
+ else {
+ /* Hack to get the MTP label here ?!? */
+ conn->remote_pc = xua->mtp.opc;
+ }
+
+ rc = sua_addr_parse(&conn->called_addr, xua, SUA_IEI_DEST_ADDR);
+ if (rc < 0) {
+ LOGPSCC(conn, LOGL_ERROR, "XUA Message %s without valid DEST_ADDR\n",
+ xua_hdr_dump(xua, &xua_dialect_sua));
+ goto refuse_destroy_conn;
+ }
+
+ osmo_fsm_inst_state_chg(fi, S_CONN_PEND_IN, 0, 0);
+ /* N-CONNECT.ind to User */
+ sccp_conn_scu_gen_encode_and_send(conn, event, xua,
+ OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION);
+ break;
+ }
+ return;
+
+refuse_destroy_conn:
+ sccp_conn_xua_gen_encode_and_send(conn, event, NULL, SUA_CO_COREF);
+ osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);
+}
+
+static void scoc_fsm_idle_onenter(struct osmo_fsm_inst *fi, uint32_t old_state)
+{
+ sccp_conn_free(fi->priv);
+}
+
+/* Figure C.3 / Q.714 (sheet 2 of 6) */
+static void scoc_fsm_conn_pend_in(struct osmo_fsm_inst *fi, uint32_t event, void *data)
+{
+ struct sccp_connection *conn = fi->priv;
+ struct osmo_scu_prim *prim = NULL;
+
+ switch (event) {
+ case SCOC_E_SCU_N_CONN_RESP:
+ prim = data;
+ /* FIXME: assign local reference (only now?) */
+ /* FIXME: assign sls, protocol class and credit */
+ sccp_conn_xua_gen_encode_and_send(conn, event, prim, SUA_CO_COAK);
+ /* start inactivity timers */
+ sccp_conn_start_inact_timers(conn);
+ osmo_fsm_inst_state_chg(fi, S_ACTIVE, 0, 0);
+ sccp_conn_opt_data_send_cache(conn, SUA_CO_COAK, SUA_MSGC_CO);
+ break;
+ case SCOC_E_SCU_N_DISC_REQ:
+ prim = data;
+ /* release resources: implicit */
+ sccp_conn_xua_gen_encode_and_send(conn, event, prim, SUA_CO_COREF);
+ /* N. B: we've ignored CREF sending errors as there's no recovery option anyway */
+ osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);
+ break;
+ }
+}
+
+/* Figure C.2/Q.714 (sheet 2 of 7) */
+static void scoc_fsm_conn_pend_out(struct osmo_fsm_inst *fi, uint32_t event, void *data)
+{
+ struct sccp_connection *conn = fi->priv;
+ struct osmo_scu_prim *prim = NULL;
+ struct xua_msg *xua = NULL;
+
+ switch (event) {
+ case SCOC_E_SCU_N_DISC_REQ:
+ prim = data;
+ conn->release_cause = prim->u.disconnect.cause;
+ osmo_fsm_inst_state_chg(fi, S_WAIT_CONN_CONF, 0, 0);
+ /* keep conn timer running(!) */
+ break;
+ case SCOC_E_CONN_TMR_EXP:
+ /* N-DISCONNECT.ind to user */
+ sccp_conn_scu_gen_encode_and_send(conn, event, NULL,
+ OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION);
+ /* below implicitly releases resources + local ref */
+ osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);
+ break;
+ case SCOC_E_RCOC_ROUT_FAIL_IND:
+ case SCOC_E_RCOC_CREF_IND:
+ xua = data;
+ /* stop conn timer */
+ sccp_conn_stop_connect_timer(conn);
+ /* release local res + ref (implicit by going to idle) */
+ /* N-DISCONNECT.ind to user */
+ sccp_conn_scu_gen_encode_and_send(conn, event, xua,
+ OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION);
+ /* below implicitly releases resources + local ref */
+ osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);
+ break;
+ case SCOC_E_RCOC_RLSD_IND:
+ xua = data;
+ /* RLC to SCRC */
+ sccp_conn_xua_gen_encode_and_send(conn, event, NULL, SUA_CO_RELCO);
+ /* stop conn timer */
+ sccp_conn_stop_connect_timer(conn);
+ /* release local res + ref (implicit) */
+ /* N-DISCONNECT.ind to user */
+ sccp_conn_scu_gen_encode_and_send(conn, event, xua,
+ OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION);
+ osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);
+ break;
+ case SCOC_E_RCOC_OTHER_NPDU:
+ xua = data;
+ sccp_conn_start_connect_timer(conn);
+ /* release local res + ref (implicit) */
+ /* N-DISCONNECT.ind to user */
+ sccp_conn_scu_gen_encode_and_send(conn, event, xua,
+ OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION);
+ osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);
+ break;
+ case SCOC_E_RCOC_CC_IND:
+ xua = data;
+ /* stop conn timer */
+ sccp_conn_stop_connect_timer(conn);
+ /* start inactivity timers */
+ sccp_conn_start_inact_timers(conn);
+ /* TODO: assign PCU and credit */
+ /* associate remote ref to conn */
+ conn->remote_ref = xua_msg_get_u32(xua, SUA_IEI_SRC_REF);
+ /* 3.1.4.2 The node sending the CC message (identified
+ * by the parameter OPC contained in the
+ * MTP-TRANSFER.indication primitive which conveyed the
+ * CC message [plus the MTP-SAP instance]) is associated
+ * with the connection section. */
+ conn->remote_pc = xua->mtp.opc;
+
+ osmo_fsm_inst_state_chg(fi, S_ACTIVE, 0, 0);
+ /* If CR which was used to initiate this connection had excessive Optional Data which we had to cache,
+ * now is the time to send it: the connection is already active but we hadn't notified upper layers about it
+ * so we have the connection all to ourselves and can use it to transmit "leftover" data via DT1 */
+ sccp_conn_opt_data_send_cache(conn, SUA_CO_CORE, xua->hdr.msg_class);
+
+ /* N-CONNECT.conf to user */
+ sccp_conn_scu_gen_encode_and_send(conn, event, xua,
+ OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_CONFIRM);
+ break;
+ }
+}
+
+/* Figure C.2/Q.714 (sheet 3 of 7) */
+static void scoc_fsm_wait_conn_conf(struct osmo_fsm_inst *fi, uint32_t event, void *data)
+{
+ struct sccp_connection *conn = fi->priv;
+ struct xua_msg *xua = NULL;
+
+ switch (event) {
+ case SCOC_E_RCOC_RLSD_IND:
+ xua = data;
+ /* release complete to SCRC */
+ sccp_conn_xua_gen_encode_and_send(conn, event, NULL, SUA_CO_RELCO);
+ /* stop conn timer */
+ sccp_conn_stop_connect_timer(conn);
+ /* release local res + ref (implicit) */
+ osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);
+ break;
+ case SCOC_E_RCOC_CC_IND:
+ xua = data;
+ /* stop conn timer */
+ sccp_conn_stop_connect_timer(conn);
+ /* associate rem ref to conn */
+ conn->remote_ref = xua_msg_get_u32(xua, SUA_IEI_SRC_REF);
+ /* 3.1.4.2 The node sending the CC message (identified
+ * by the parameter OPC contained in the
+ * MTP-TRANSFER.indication primitive which conveyed the
+ * CC message [plus the MTP-SAP instance]) is associated
+ * with the connection section. */
+ conn->remote_pc = xua->mtp.opc;
+
+ /* released to SCRC */
+ sccp_conn_xua_gen_relre_and_send(conn, conn->release_cause, NULL);
+ /* start rel timer */
+ sccp_conn_start_rel_timer(conn);
+ osmo_fsm_inst_state_chg(fi, S_DISCONN_PEND, 0, 0);
+ break;
+ case SCOC_E_RCOC_OTHER_NPDU:
+ case SCOC_E_RCOC_CREF_IND:
+ case SCOC_E_RCOC_ROUT_FAIL_IND:
+ xua = data;
+ /* stop conn timer */
+ sccp_conn_stop_connect_timer(conn);
+ /* release local res + ref */
+ osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);
+ break;
+ case SCOC_E_CONN_TMR_EXP:
+ /* release local res + ref */
+ osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);
+ break;
+ }
+}
+
+/* C.2/Q.714 (sheet 4+5 of 7) and C.3/Q714 (sheet 3+4 of 6) */
+static void scoc_fsm_active(struct osmo_fsm_inst *fi, uint32_t event, void *data)
+{
+ struct xua_msg *xua = data;
+ struct sccp_connection *conn = fi->priv;
+ struct osmo_scu_prim *prim = NULL;
+
+ switch (event) {
+#pragma message("TODO: internal disco: send N-DISCONNECT.ind to user")
+ /* send N-DISCONNECT.ind to user */
+ /*sccp_conn_scu_gen_encode_and_send(conn, event, xua,
+ OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION);*/
+ /* fall-through */
+ case SCOC_E_SCU_N_DISC_REQ:
+ prim = data;
+ /* stop inact timers */
+ sccp_conn_stop_inact_timers(conn);
+ /* send RLSD to SCRC */
+ sccp_conn_xua_gen_encode_and_send(conn, event, prim, SUA_CO_RELRE);
+ /* start rel timer */
+ sccp_conn_start_rel_timer(conn);
+ osmo_fsm_inst_state_chg(fi, S_DISCONN_PEND, 0, 0);
+ break;
+ case SCOC_E_RCOC_CREF_IND:
+ case SCOC_E_RCOC_CC_IND:
+ case SCOC_E_RCOC_REL_COMPL_IND:
+ /* do nothing */
+ break;
+ case SCOC_E_RCOC_RLSD_IND:
+ /* send N-DISCONNECT.ind to user */
+ sccp_conn_scu_gen_encode_and_send(conn, event, xua,
+ OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION);
+ /* release res + local ref (implicit) */
+ /* stop inact timers */
+ sccp_conn_stop_inact_timers(conn);
+ /* RLC to SCRC */
+ sccp_conn_xua_gen_encode_and_send(conn, event, NULL, SUA_CO_RELCO);
+ osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);
+ break;
+ case SCOC_E_RCOC_ERROR_IND:
+ xua = data;
+ /* FIXME: check for cause service_class_mismatch */
+ /* release res + local ref (implicit) */
+ /* send N-DISCONNECT.ind to user */
+ sccp_conn_scu_gen_encode_and_send(conn, event, xua,
+ OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION);
+ /* stop inact timers */
+ sccp_conn_stop_inact_timers(conn);
+ osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);
+ break;
+ case SCOC_E_T_IAR_EXP:
+ /* stop inact timers */
+ sccp_conn_stop_inact_timers(conn);
+ xua = xua_msg_alloc();
+ xua_msg_add_u32(xua, SUA_IEI_CAUSE,
+ SUA_CAUSE_T_RELEASE | SCCP_RELEASE_CAUSE_EXPIRATION_INACTIVE);
+ xua_msg_add_u32(xua, SUA_IEI_IMPORTANCE, conn->importance);
+ /* Send N-DISCONNECT.ind to local user */
+ sccp_conn_scu_gen_encode_and_send(conn, event, xua,
+ OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION);
+ talloc_free(xua);
+ /* Send RLSD to peer */
+ sccp_conn_xua_gen_relre_and_send(conn, SCCP_RELEASE_CAUSE_EXPIRATION_INACTIVE, NULL);
+ /* start release timer */
+ sccp_conn_start_rel_timer(conn);
+ osmo_fsm_inst_state_chg(fi, S_DISCONN_PEND, 0, 0);
+ break;
+ case SCOC_E_RCOC_ROUT_FAIL_IND:
+ /* send N-DISCONNECT.ind to user */
+ sccp_conn_scu_gen_encode_and_send(conn, event, NULL,
+ OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION);
+ /* stop inact timers */
+ sccp_conn_stop_inact_timers(conn);
+ /* start release timer */
+ sccp_conn_start_rel_timer(conn);
+ osmo_fsm_inst_state_chg(fi, S_DISCONN_PEND, 0, 0);
+ break;
+ /* Figure C.4/Q.714 */
+ case SCOC_E_SCU_N_DATA_REQ:
+ case SCOC_E_SCU_N_EXP_DATA_REQ:
+ prim = data;
+ sccp_conn_xua_gen_encode_and_send(conn, event, prim, SUA_CO_CODT);
+ sccp_conn_restart_tx_inact_timer(conn);
+ break;
+ case SCOC_E_RCOC_DT1_IND:
+ /* restart receive inactivity timer */
+ sccp_conn_restart_rx_inact_timer(conn);
+ /* TODO: M-bit */
+ sccp_conn_scu_gen_encode_and_send(conn, event, xua,
+ OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION);
+ break;
+ /* Figure C.4/Q.714 (sheet 4 of 4) */
+ case SCOC_E_RCOC_IT_IND:
+ xua = data;
+ /* check if remote reference is what we expect */
+ /* check class is what we expect */
+ if (xua_msg_get_u32(xua, SUA_IEI_SRC_REF) != conn->remote_ref ||
+ xua_msg_get_u32(xua, SUA_IEI_PROTO_CLASS) != conn->sccp_class) {
+ /* Release connection */
+ /* Stop inactivity Timers */
+ sccp_conn_stop_inact_timers(conn);
+ xua = xua_msg_alloc();
+ xua_msg_add_u32(xua, SUA_IEI_CAUSE,
+ SUA_CAUSE_T_RELEASE | SCCP_RELEASE_CAUSE_INCONSISTENT_CONN_DATA);
+ xua_msg_add_u32(xua, SUA_IEI_IMPORTANCE, conn->importance);
+ /* send N-DISCONNECT.ind to user */
+ sccp_conn_scu_gen_encode_and_send(conn, event, xua,
+ OSMO_SCU_PRIM_N_DISCONNECT, PRIM_OP_INDICATION);
+ talloc_free(xua);
+ /* Send RLSD to SCRC */
+ sccp_conn_xua_gen_relre_and_send(conn, SCCP_RELEASE_CAUSE_INCONSISTENT_CONN_DATA, NULL);
+ talloc_free(xua);
+ /* Start release timer */
+ sccp_conn_start_rel_timer(conn);
+ osmo_fsm_inst_state_chg(fi, S_DISCONN_PEND, 0, 0);
+ }
+ sccp_conn_restart_rx_inact_timer(conn);
+ break;
+ case SCOC_E_T_IAS_EXP:
+ /* Send IT to peer */
+ sccp_conn_xua_gen_encode_and_send(conn, event, NULL, SUA_CO_COIT);
+ sccp_conn_restart_tx_inact_timer(conn);
+ break;
+ }
+}
+
+/* C.2/Q.714 (sheet 6+7 of 7) and C.3/Q.714 (sheet 5+6 of 6) */
+static void scoc_fsm_disconn_pend(struct osmo_fsm_inst *fi, uint32_t event, void *data)
+{
+ struct sccp_connection *conn = fi->priv;
+
+ switch (event) {
+ case SCOC_E_RCOC_REL_COMPL_IND:
+ case SCOC_E_RCOC_RLSD_IND:
+ /* release res + local ref (implicit) */
+ /* freeze local ref */
+ /* stop release + interval timers */
+ sccp_conn_stop_release_timers(conn);
+ osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);
+ break;
+ case SCOC_E_RCOC_ROUT_FAIL_IND:
+ case SCOC_E_RCOC_OTHER_NPDU:
+ /* do nothing */
+ break;
+ case SCOC_E_T_REL_EXP: /* release timer exp */
+ /* send RLSD */
+ sccp_conn_xua_gen_relre_and_send(conn, SCCP_RELEASE_CAUSE_UNQUALIFIED, NULL);
+ /* start interval timer */
+ sccp_conn_start_int_timer(conn);
+ /* start repeat release timer */
+ sccp_conn_start_rep_rel_timer(conn);
+ break;
+ case SCOC_E_T_INT_EXP: /* interval timer exp */
+ /* TODO: Inform maintenance */
+ /* stop release and interval timers */
+ sccp_conn_stop_release_timers(conn);
+ osmo_fsm_inst_state_chg(fi, S_IDLE, 0, 0);
+ break;
+ case SCOC_E_T_REP_REL_EXP: /* repeat release timer exp */
+ /* send RLSD */
+ sccp_conn_xua_gen_relre_and_send(conn, SCCP_RELEASE_CAUSE_UNQUALIFIED, NULL);
+ /* re-start repeat release timer */
+ sccp_conn_start_rep_rel_timer(conn);
+ break;
+ }
+}
+
+static const struct osmo_fsm_state sccp_scoc_states[] = {
+ [S_IDLE] = {
+ .name = "IDLE",
+ .action = scoc_fsm_idle,
+ .onenter = scoc_fsm_idle_onenter,
+ .in_event_mask = S(SCOC_E_SCU_N_CONN_REQ) |
+ //S(SCOC_E_SCU_N_TYPE1_REQ) |
+ S(SCOC_E_RCOC_CONN_IND) |
+ S(SCOC_E_RCOC_RLSD_IND) |
+ S(SCOC_E_RCOC_REL_COMPL_IND) |
+ S(SCOC_E_RCOC_OTHER_NPDU),
+ .out_state_mask = S(S_IDLE) |
+ S(S_CONN_PEND_OUT) |
+ S(S_CONN_PEND_IN),
+ },
+ [S_CONN_PEND_IN] = {
+ .name = "CONN_PEND_IN",
+ .action = scoc_fsm_conn_pend_in,
+ .in_event_mask = S(SCOC_E_SCU_N_CONN_RESP) |
+ S(SCOC_E_SCU_N_DISC_REQ),
+ .out_state_mask = S(S_IDLE) |
+ S(S_ACTIVE),
+ },
+ [S_CONN_PEND_OUT] = {
+ .name = "CONN_PEND_OUT",
+ .action = scoc_fsm_conn_pend_out,
+ .in_event_mask = S(SCOC_E_SCU_N_DISC_REQ) |
+ S(SCOC_E_CONN_TMR_EXP) |
+ S(SCOC_E_RCOC_ROUT_FAIL_IND) |
+ S(SCOC_E_RCOC_RLSD_IND) |
+ S(SCOC_E_RCOC_OTHER_NPDU) |
+ S(SCOC_E_RCOC_CREF_IND) |
+ S(SCOC_E_RCOC_CC_IND),
+ .out_state_mask = S(S_IDLE) |
+ S(S_ACTIVE) |
+ S(S_WAIT_CONN_CONF),
+ },
+ [S_ACTIVE] = {
+ .name = "ACTIVE",
+ .action = scoc_fsm_active,
+ .in_event_mask = S(SCOC_E_SCU_N_DISC_REQ) |
+ /* internal disconnect */
+ S(SCOC_E_RCOC_CREF_IND) |
+ S(SCOC_E_RCOC_REL_COMPL_IND) |
+ S(SCOC_E_RCOC_RLSD_IND) |
+ S(SCOC_E_RCOC_ERROR_IND) |
+ S(SCOC_E_T_IAR_EXP) |
+ S(SCOC_E_T_IAS_EXP) |
+ S(SCOC_E_RCOC_ROUT_FAIL_IND) |
+ S(SCOC_E_SCU_N_DATA_REQ) |
+ S(SCOC_E_SCU_N_EXP_DATA_REQ) |
+ S(SCOC_E_RCOC_DT1_IND) |
+ S(SCOC_E_RCOC_IT_IND),
+ .out_state_mask = S(S_IDLE) |
+ S(S_DISCONN_PEND),
+ },
+ [S_DISCONN_PEND] = {
+ .name = "DISCONN_PEND",
+ .action = scoc_fsm_disconn_pend,
+ .in_event_mask = S(SCOC_E_RCOC_REL_COMPL_IND) |
+ S(SCOC_E_RCOC_RLSD_IND) |
+ S(SCOC_E_RCOC_ROUT_FAIL_IND) |
+ S(SCOC_E_RCOC_OTHER_NPDU) |
+ S(SCOC_E_T_REL_EXP) |
+ S(SCOC_E_T_INT_EXP) |
+ S(SCOC_E_T_REP_REL_EXP),
+ .out_state_mask = S(S_IDLE),
+ },
+ [S_RESET_IN] = {
+ .name = "RESET_IN",
+ },
+ [S_RESET_OUT] = {
+ .name = "RESET_OUT",
+ },
+ [S_BOTHWAY_RESET] = {
+ .name = "BOTHWAY_RESET",
+ },
+ [S_WAIT_CONN_CONF] = {
+ .name = "WAIT_CONN_CONF",
+ .action = scoc_fsm_wait_conn_conf,
+ .in_event_mask = S(SCOC_E_RCOC_RLSD_IND) |
+ S(SCOC_E_RCOC_CC_IND) |
+ S(SCOC_E_RCOC_OTHER_NPDU) |
+ S(SCOC_E_CONN_TMR_EXP) |
+ S(SCOC_E_RCOC_CREF_IND) |
+ S(SCOC_E_RCOC_ROUT_FAIL_IND),
+ .out_state_mask = S(S_IDLE) |
+ S(S_DISCONN_PEND),
+ },
+};
+
+struct osmo_fsm sccp_scoc_fsm = {
+ .name = "SCCP-SCOC",
+ .states = sccp_scoc_states,
+ .num_states = ARRAY_SIZE(sccp_scoc_states),
+ /* ".log_subsys = DLSCCP" doesn't work as DLSCCP is not a constant */
+ .event_names = scoc_event_names,
+};
diff --git a/src/sccp_scoc_fsm.h b/src/sccp_scoc_fsm.h
new file mode 100644
index 0000000..4da09e9
--- /dev/null
+++ b/src/sccp_scoc_fsm.h
@@ -0,0 +1,50 @@
+#pragma once
+
+#include <osmocom/core/fsm.h>
+
+enum sccp_scoc_fsm_state {
+ S_IDLE,
+ S_CONN_PEND_IN,
+ S_CONN_PEND_OUT,
+ S_ACTIVE,
+ S_DISCONN_PEND,
+ S_RESET_IN,
+ S_RESET_OUT,
+ S_BOTHWAY_RESET,
+ S_WAIT_CONN_CONF,
+};
+
+/* Events that this FSM can process */
+enum sccp_scoc_fsm_event {
+ /* Primitives from SCCP-User */
+ SCOC_E_SCU_N_CONN_REQ,
+ SCOC_E_SCU_N_CONN_RESP,
+ SCOC_E_SCU_N_DISC_REQ,
+ SCOC_E_SCU_N_DATA_REQ,
+ SCOC_E_SCU_N_EXP_DATA_REQ,
+
+ /* Events from RCOC (Routing for Connection Oriented) */
+ SCOC_E_RCOC_CONN_IND,
+ SCOC_E_RCOC_ROUT_FAIL_IND,
+ SCOC_E_RCOC_RLSD_IND,
+ SCOC_E_RCOC_REL_COMPL_IND,
+ SCOC_E_RCOC_CREF_IND,
+ SCOC_E_RCOC_CC_IND,
+ SCOC_E_RCOC_DT1_IND,
+ SCOC_E_RCOC_DT2_IND,
+ SCOC_E_RCOC_IT_IND,
+ SCOC_E_RCOC_OTHER_NPDU,
+ SCOC_E_RCOC_ERROR_IND,
+
+ /* Timer Events */
+ SCOC_E_T_IAR_EXP,
+ SCOC_E_T_IAS_EXP,
+
+ SCOC_E_CONN_TMR_EXP,
+
+ SCOC_E_T_REL_EXP,
+ SCOC_E_T_INT_EXP,
+ SCOC_E_T_REP_REL_EXP,
+};
+
+extern struct osmo_fsm sccp_scoc_fsm;
diff --git a/src/sccp_user.c b/src/sccp_user.c
index bf92c1a..8219829 100644
--- a/src/sccp_user.c
+++ b/src/sccp_user.c
@@ -38,6 +38,7 @@
#include <osmocom/sccp/sccp_types.h>
#include "sccp_internal.h"
+#include "sccp_user.h"
#include "xua_internal.h"
#include "ss7_as.h"
#include "ss7_asp.h"
diff --git a/src/sccp_user.h b/src/sccp_user.h
new file mode 100644
index 0000000..b0b73fe
--- /dev/null
+++ b/src/sccp_user.h
@@ -0,0 +1,41 @@
+#pragma once
+#include <inttypes.h>
+
+#include <osmocom/core/fsm.h>
+#include <osmocom/core/prim.h>
+#include <osmocom/core/linuxlist.h>
+
+#include <osmocom/sigtran/sccp_sap.h>
+
+struct osmo_sccp_instance;
+
+struct osmo_sccp_user {
+ /*! \brief entry in list of sccp users of \ref osmo_sccp_instance */
+ struct llist_head list;
+ /*! \brief pointer back to SCCP instance */
+ struct osmo_sccp_instance *inst;
+ /*! \brief human-readable name of this user */
+ char *name;
+
+ /*! \brief SSN and/or point code to which we are bound */
+ uint16_t ssn;
+ uint32_t pc;
+
+ /* set if we are a server */
+ struct llist_head links;
+
+ /* user call-back function in case of incoming primitives */
+ osmo_prim_cb prim_cb;
+ void *priv;
+
+ /* Application Server FSM Instance */
+ struct osmo_fsm_inst *as_fi;
+};
+
+
+int sccp_user_prim_up(struct osmo_sccp_user *scut, struct osmo_scu_prim *prim);
+
+#define _LOGPSCU(scu, subsys, level, fmt, args ...) \
+ _LOGPSCI((scu)->inst, subsys, level, "SCU(%s) " fmt, osmo_sccp_user_name(scu), ## args)
+#define LOGPSCU(scu, level, fmt, args ...) \
+ _LOGPSCU(scu, DLSCCP, level, fmt, ## args)
diff --git a/src/sccp_vty.c b/src/sccp_vty.c
index d809c1f..c8d143f 100644
--- a/src/sccp_vty.c
+++ b/src/sccp_vty.c
@@ -40,10 +40,52 @@
#include <osmocom/sccp/sccp_types.h>
#include "xua_internal.h"
+#include "sccp_connection.h"
#include "sccp_internal.h"
+#include "sccp_user.h"
#include "ss7_instance.h"
#include "ss7_vty.h"
+static void vty_show_connection(struct vty *vty, struct sccp_connection *conn)
+{
+ struct osmo_ss7_instance *s7i = conn->inst->ss7;
+ struct osmo_sccp_addr *remote_addr;
+ uint32_t local_pc = OSMO_SS7_PC_INVALID;
+
+ if (osmo_ss7_pc_is_valid(conn->user->pc))
+ local_pc = conn->user->pc;
+ else if (osmo_ss7_pc_is_valid(s7i->cfg.primary_pc))
+ local_pc = s7i->cfg.primary_pc;
+
+ if (conn->incoming)
+ remote_addr = &conn->calling_addr;
+ else
+ remote_addr = &conn->called_addr;
+
+ vty_out(vty, "%c %06x %3u %7s ", conn->incoming ? 'I' : 'O',
+ conn->conn_id, conn->user->ssn,
+ osmo_ss7_pointcode_print(s7i, local_pc));
+ vty_out(vty, "%16s %06x %3u %7s%s",
+ osmo_fsm_inst_state_name(conn->fi), conn->remote_ref, remote_addr->ssn,
+ osmo_ss7_pointcode_print(s7i, conn->remote_pc),
+ VTY_NEWLINE);
+}
+
+void sccp_show_connections(struct vty *vty, struct osmo_sccp_instance *inst)
+{
+ struct sccp_connection *conn;
+ struct rb_node *node;
+
+ vty_out(vty, "I Local Conn. Remote %s", VTY_NEWLINE);
+ vty_out(vty, "O Ref SSN PC State Ref SSN PC %s", VTY_NEWLINE);
+ vty_out(vty, "- ------ --- ------- ---------------- ------ --- -------%s", VTY_NEWLINE);
+
+ for (node = rb_first(&inst->connections); node; node = rb_next(node)) {
+ conn = container_of(node, struct sccp_connection, node);
+ vty_show_connection(vty, conn);
+ }
+}
+
static void show_user(struct vty *vty, struct osmo_sccp_user *user)
{
struct osmo_sccp_instance *sccp = user->inst;
@@ -140,7 +182,7 @@
return CMD_WARNING;
};
- sccp_scoc_show_connections(vty, sccp);
+ sccp_show_connections(vty, sccp);
return CMD_SUCCESS;
}
diff --git a/src/ss7.c b/src/ss7.c
index e2f2ca9..3476ee2 100644
--- a/src/ss7.c
+++ b/src/ss7.c
@@ -48,6 +48,7 @@
#include <osmocom/netif/ipa.h>
#include <osmocom/netif/sctp.h>
+#include "sccp_scoc_fsm.h"
#include "sccp_internal.h"
#include "xua_internal.h"
#include "ss7_as.h"
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40581?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: I51e9bf60bc4c4b2babd3f408daed914eaf398e82
Gerrit-Change-Number: 40581
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
3 weeks, 6 days
- 1
- 0
[S] Change in osmo-remsim[master]: bankd: implicit remove a client mapping when creating a new mapping
by lynxis lazus
Attention is currently required from: Hoernchen, laforge, pespin.
lynxis lazus has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-remsim/+/40570?usp=email )
Change subject: bankd: implicit remove a client mapping when creating a new mapping
......................................................................
Patch Set 4:
(2 comments)
Commit Message:
https://gerrit.osmocom.org/c/osmo-remsim/+/40570/comment/ab06688d_8645810d?… :
PS3, Line 9: After a desynchronisation between the server and bankd happen (e.g. restart the server),
> cosmetic: commit log line length. […]
No. I'm using a plain `git commit` for that.
File src/bankd/bankd_main.c:
https://gerrit.osmocom.org/c/osmo-remsim/+/40570/comment/b0a0bd3f_815f1a14?… :
PS3, Line 219: LOGPFSML(srvc->fi, LOGL_NOTICE, "slot already conntect to client %d:%d. Removing old mapping.\n",
> s/connctect/connected.
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/40570?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-remsim
Gerrit-Branch: master
Gerrit-Change-Id: Iae3f86a6e695e2d6580151b203df1dd0e2db625b
Gerrit-Change-Number: 40570
Gerrit-PatchSet: 4
Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 03 Jul 2025 19:12:06 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
3 weeks, 6 days
- 1
- 0
[S] Change in osmo-remsim[master]: bankd: implicit remove a client mapping when creating a new mapping
by lynxis lazus
Attention is currently required from: Hoernchen, laforge, lynxis lazus.
Hello Hoernchen, Jenkins Builder, laforge,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-remsim/+/40570?usp=email
to look at the new patch set (#4).
The following approvals got outdated and were removed:
Code-Review+1 by laforge, Verified+1 by Jenkins Builder
Change subject: bankd: implicit remove a client mapping when creating a new mapping
......................................................................
bankd: implicit remove a client mapping when creating a new mapping
After a desynchronisation between the server and bankd happen (e.g. restart
the server), the server might request a mapping between a client slot and a
bankd slot while the bankd still has a different mapping for the same client
slot.
Example before this commit:
* server -> bankd: New Mapping (client 1/0, bankd 1/0)
* server <- bankd: Ack
* Restart server
* server -> bankd: New Mapping (client 1/0, bankd 2/0)
* server <- bankd: Reject (commit change to Ack)
Previous the second mapping got rejected, while the server
had no chance of knowing or asking the bankd about the old mapping.
Related: SYS#7470
Change-Id: Iae3f86a6e695e2d6580151b203df1dd0e2db625b
---
M src/bankd/bankd_main.c
1 file changed, 13 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-remsim refs/changes/70/40570/4
--
To view, visit https://gerrit.osmocom.org/c/osmo-remsim/+/40570?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: osmo-remsim
Gerrit-Branch: master
Gerrit-Change-Id: Iae3f86a6e695e2d6580151b203df1dd0e2db625b
Gerrit-Change-Number: 40570
Gerrit-PatchSet: 4
Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
3 weeks, 6 days
- 1
- 0
[M] Change in pysim[master]: smdpp: less verbose by default
by laforge
Attention is currently required from: Hoernchen, dexter, lynxis lazus.
laforge has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/pysim/+/40468?usp=email )
Change subject: smdpp: less verbose by default
......................................................................
Patch Set 11:
(1 comment)
File osmo-smdpp.py:
https://gerrit.osmocom.org/c/pysim/+/40468/comment/a91458ea_95a41cde?usp=em… :
PS6, Line 370: logger.debug("Tx JSON: %s" % json.dumps(output)[:200])
> Done
I still see % being used and no "if clause". I think @lynxis point was to either move from % to comma or use the if-clause?
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/40468?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I04a72b8f52417862d4dcba1f0743700dd942ef49
Gerrit-Change-Number: 40468
Gerrit-PatchSet: 11
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Thu, 03 Jul 2025 18:41:02 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Hoernchen <ewild(a)sysmocom.de>
Comment-In-Reply-To: lynxis lazus <lynxis(a)fe80.eu>
3 weeks, 6 days
- 1
- 0
[M] Change in libosmo-sigtran[master]: as: Avoid adding dyn route when IPA AS becomes active
by pespin
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40580?usp=email )
Change subject: as: Avoid adding dyn route when IPA AS becomes active
......................................................................
as: Avoid adding dyn route when IPA AS becomes active
It makes no sense to do so nowadays:
* ASP role: the routing-key PC points to a local PC, and hence it's not
really used during routing.
* SG role: This would only make sense if we somehow supported dynamic IP
AS, which we don't support (only IPA ASP). Hence, the AS is always
configured and hence the user is responsible of filling the routing
table with an appropriate entry towards the peer's DPC.
Change-Id: I8997d40f2a779734432b40d27f9345d9a739d36f
---
M src/xua_as_fsm.c
1 file changed, 0 insertions(+), 78 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/80/40580/1
diff --git a/src/xua_as_fsm.c b/src/xua_as_fsm.c
index 71049d5..7d8e302 100644
--- a/src/xua_as_fsm.c
+++ b/src/xua_as_fsm.c
@@ -265,7 +265,6 @@
struct osmo_timer_list t_r;
struct llist_head queued_xua_msgs;
} recovery;
- bool ipa_route_created;
};
static void fill_notify_statchg_pars(const struct osmo_fsm_inst *fi, struct osmo_xlm_prim_notify *npar)
@@ -291,79 +290,6 @@
}
}
-/* is the given AS one with a single ASP of IPA type? */
-static bool is_single_ipa_asp(struct osmo_ss7_as *as)
-{
- unsigned int asp_count = 0;
- int i;
-
- for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) {
- struct osmo_ss7_asp *asp = as->cfg.asps[i];
- if (!asp)
- continue;
- asp_count++;
- if (asp->cfg.proto != OSMO_SS7_ASP_PROT_IPA)
- return false;
- }
- if (asp_count == 1)
- return true;
- return false;
-}
-
-static void ipa_add_route(struct osmo_fsm_inst *fi)
-{
- struct xua_as_fsm_priv *xafp = (struct xua_as_fsm_priv *) fi->priv;
- struct osmo_ss7_as *as = xafp->as;
- struct osmo_ss7_instance *inst = as->inst;
-
- if (ss7_route_table_find_route_by_dpc_mask(inst->rtable_system,
- as->cfg.routing_key.pc, 0xffffff,
- true))
- return;
-
- /* As opposed to M3UA, there is no RKM and we have to implicitly
- * automatically add a dynamic route once an IPA connection has come up */
- if (ss7_route_create(inst->rtable_system, as->cfg.routing_key.pc, 0xffffff, true, as->cfg.name))
- xafp->ipa_route_created = true;
-}
-
-static void ipa_del_route(struct osmo_fsm_inst *fi)
-{
- struct xua_as_fsm_priv *xafp = (struct xua_as_fsm_priv *) fi->priv;
- struct osmo_ss7_as *as = xafp->as;
- struct osmo_ss7_instance *inst = as->inst;
- struct osmo_ss7_route *rt;
-
- /* don't delete a route if we added none */
- if (!xafp->ipa_route_created)
- return;
-
- /* find the route which we have created if we ever reached ipa_asp_fsm_wait_id_ack2 */
- rt = ss7_route_table_find_route_by_dpc_mask(inst->rtable_system,
- as->cfg.routing_key.pc, 0xffffff,
- true);
- /* no route found, bail out */
- if (!rt) {
- LOGPFSML(fi, LOGL_NOTICE, "Attempting to delete route for this IPA AS, but cannot "
- "find route for DPC %s. Did you manually delete it?\n",
- osmo_ss7_pointcode_print(inst, as->cfg.routing_key.pc));
- return;
- }
-
- /* route points to different AS, bail out */
- if (rt->dest.as != as) {
- LOGPFSML(fi, LOGL_NOTICE, "Attempting to delete route for this IPA ASP, but found "
- "route for DPC %s points to different AS (%s)\n",
- osmo_ss7_pointcode_print(inst, as->cfg.routing_key.pc), rt->dest.as->cfg.name);
- return;
- }
-
- ss7_route_destroy(rt);
- xafp->ipa_route_created = false;
-}
-
-
-
/* is any other ASP in this AS in state != DOWN? */
static bool check_any_other_asp_not_down(struct osmo_ss7_as *as, struct osmo_ss7_asp *asp_cmp)
{
@@ -583,16 +509,12 @@
/* continue below */
break;
case XUA_AS_S_ACTIVE:
- if (is_single_ipa_asp(as))
- ipa_add_route(fi);
/* continue below */
break;
case XUA_AS_S_PENDING:
/* continue below */
break;
case XUA_AS_S_DOWN:
- if (is_single_ipa_asp(as))
- ipa_del_route(fi);
/* RFC4666 sec 4.3.2 AS States:
If we end up here, it means no ASP is ACTIVE or INACTIVE,
meaning no ASP can have already configured the traffic mode
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40580?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: I8997d40f2a779734432b40d27f9345d9a739d36f
Gerrit-Change-Number: 40580
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
3 weeks, 6 days
- 1
- 0
[S] Change in libosmo-sigtran[master]: ss7_vty: Avoid adding rote to local PC in role ASP
by pespin
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/40579?usp=email )
Change subject: ss7_vty: Avoid adding rote to local PC in role ASP
......................................................................
ss7_vty: Avoid adding rote to local PC in role ASP
This commit basically reverts b4f1b2cb8bd404f08601dc8ca700b672a455846c
from ~4 years ago.
In ASP role, the routing-key is configured with a local PC, since that's
what's announced during RKM towards the SG.
Hence, it makes no sense adding a route pointing to a local PCm because
the M3UA routing decisions first check if the DPC is local, and only then
otherwise tries to route it.
Change-Id: Ic602de42e37c4579f530823bb41e0a8193ce73bb
---
M src/ss7_as_vty.c
M src/ss7_vty.c
M src/ss7_vty.h
3 files changed, 1 insertion(+), 25 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sigtran refs/changes/79/40579/1
diff --git a/src/ss7_as_vty.c b/src/ss7_as_vty.c
index 6ea170e..0b0ddc1 100644
--- a/src/ss7_as_vty.c
+++ b/src/ss7_as_vty.c
@@ -288,7 +288,6 @@
{
struct osmo_ss7_as *as = vty->index;
struct osmo_ss7_routing_key *rkey = &as->cfg.routing_key;
- struct osmo_ss7_route *rt;
int pc;
if (as->cfg.proto == OSMO_SS7_ASP_PROT_IPA && atoi(rcontext) != 0) {
@@ -303,34 +302,12 @@
return CMD_WARNING;
}
- /* When libosmo-sigtran is used in ASP role, the VTY routing table node
- * (config-cs7-rt) is not available. However, when we add a routing key
- * to an AS we still have to put a matching dynamic route into the routing
- * table. This is done automatically by first removing the old dynamic route
- * (users may change the routing key via VTY during runtime) and then
- * putting a new dynamic route (see below). */
- if (cs7_role == CS7_ROLE_ASP) {
- rt = ss7_route_table_find_route_by_dpc_mask(as->inst->rtable_system,
- rkey->pc, 0xffffff,
- true);
- if (rt)
- ss7_route_destroy(rt);
- }
-
rkey->pc = pc;
rkey->context = atoi(rcontext); /* FIXME: input validation */
rkey->si = si ? get_string_value(mtp_si_vals, si) : 0; /* FIXME: input validation */
rkey->ssn = ssn ? atoi(ssn) : 0; /* FIXME: input validation */
- /* automatically add new dynamic route (see also comment above) */
- if (cs7_role == CS7_ROLE_ASP) {
- if (!ss7_route_create(as->inst->rtable_system, rkey->pc, 0xffffff, true, as->cfg.name)) {
- vty_out(vty, "Cannot create route (pc=%s, linkset=%s) to AS %s", dpc, as->cfg.name, VTY_NEWLINE);
- return CMD_WARNING;
- }
- }
-
return CMD_SUCCESS;
}
diff --git a/src/ss7_vty.c b/src/ss7_vty.c
index 9916185..a8869d4 100644
--- a/src/ss7_vty.c
+++ b/src/ss7_vty.c
@@ -75,7 +75,7 @@
* Core CS7 Configuration
***********************************************************************/
-enum cs7_role_t cs7_role;
+static enum cs7_role_t cs7_role;
void *g_ctx;
static struct cmd_node cs7_node = {
diff --git a/src/ss7_vty.h b/src/ss7_vty.h
index 18dc5a6..3bafffd 100644
--- a/src/ss7_vty.h
+++ b/src/ss7_vty.h
@@ -18,7 +18,6 @@
};
extern void *g_ctx;
-extern enum cs7_role_t cs7_role;
extern const struct value_string ipproto_vals[];
#define CS7_STR "ITU-T Signaling System 7\n"
--
To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/40579?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: libosmo-sigtran
Gerrit-Branch: master
Gerrit-Change-Id: Ic602de42e37c4579f530823bb41e0a8193ce73bb
Gerrit-Change-Number: 40579
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
3 weeks, 6 days
- 1
- 0