Osmocom Open Build Service

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 59

commit_d543892ee1e0f72c9c24c7a9422856d256924140.txt Added

commit_dfccd989dbffe418d9ab7b4d3087345636da762d.txt Deleted

libosmo-sigtran_2.1.0.94.dfcc.dsc -> libosmo-sigtran_2.1.0.97.d543.dsc Changed

@@ -2,7 +2,7 @@
 Source: libosmo-sigtran
 Binary: libosmo-sigtran11, libosmo-sigtran-dbg, libosmo-sigtran-doc, libosmo-sigtran-dev, osmo-stp, osmo-stp-dbg, osmo-stp-doc
 Architecture: any all
-Version: 2.1.0.94.dfcc
+Version: 2.1.0.97.d543
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/libosmo-sccp
 Standards-Version: 3.9.7
@@ -18,8 +18,8 @@
  osmo-stp-dbg deb debug optional arch=any
  osmo-stp-doc deb doc optional arch=all
 Checksums-Sha1:
- 893df9dc16f16bf4287027cd9a2097ce94315965 243768 libosmo-sigtran_2.1.0.94.dfcc.tar.xz
+ 0e9572f51b44fd6649e14cca30748d8a24c8351b 244364 libosmo-sigtran_2.1.0.97.d543.tar.xz
 Checksums-Sha256:
- 8599fe566bda6aeb0bc6afbe4eeeebeddbd94bf6b201ca7ae7461296b72880e9 243768 libosmo-sigtran_2.1.0.94.dfcc.tar.xz
+ 892ed1ea355a1872962713ff85d2678939c54910a5fab2ea346c5e6d4e6846d0 244364 libosmo-sigtran_2.1.0.97.d543.tar.xz
 Files:
- 10bb25438f8409c2526d025170f56519 243768 libosmo-sigtran_2.1.0.94.dfcc.tar.xz
+ 21ac50b8f1c0403fb96a9fb24d10255c 244364 libosmo-sigtran_2.1.0.97.d543.tar.xz

libosmo-sigtran_2.1.0.94.dfcc.tar.xz/.tarball-version -> libosmo-sigtran_2.1.0.97.d543.tar.xz/.tarball-version Changed

libosmo-sigtran_2.1.0.94.dfcc.tar.xz/debian/changelog -> libosmo-sigtran_2.1.0.97.d543.tar.xz/debian/changelog Changed

libosmo-sigtran_2.1.0.94.dfcc.tar.xz/src/Makefile.am -> libosmo-sigtran_2.1.0.97.d543.tar.xz/src/Makefile.am Changed

libosmo-sigtran_2.1.0.97.d543.tar.xz/src/ss7_as_vty.c Added

@@ -0,0 +1,627 @@
+/* SS7 AS VTY Interface */
+
+/* (C) 2015-2021 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2025 by sysmocom s.f.m.c. GmbH <info@sysmocom.de>
+ * All Rights Reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <stdint.h>
+#include <string.h>
+
+#include <osmocom/vty/vty.h>
+#include <osmocom/vty/command.h>
+#include <osmocom/vty/logging.h>
+#include <osmocom/vty/telnet_interface.h>
+#include <osmocom/vty/misc.h>
+
+#include <osmocom/sigtran/protocol/mtp.h>
+
+#include "ss7_as.h"
+#include "ss7_asp.h"
+#include "ss7_route.h"
+#include "ss7_route_table.h"
+#include "ss7_internal.h"
+#include "ss7_vty.h"
+
+/***********************************************************************
+ * Application Server
+ ***********************************************************************/
+
+static struct cmd_node as_node = {
+	L_CS7_AS_NODE,
+	"%s(config-cs7-as)# ",
+	1,
+};
+
+DEFUN_ATTR(cs7_as, cs7_as_cmd,
+	   "as NAME " XUA_VAR_STR,
+	   "Configure an Application Server\n"
+	   "Name of the Application Server\n"
+	   XUA_VAR_HELP_STR,
+	   CMD_ATTR_IMMEDIATE)
+{
+	struct osmo_ss7_instance *inst = vty->index;
+	struct osmo_ss7_as *as;
+	const char *name = argv0;
+	enum osmo_ss7_asp_protocol protocol = parse_asp_proto(argv1);
+
+	if (protocol == OSMO_SS7_ASP_PROT_NONE) {
+		vty_out(vty, "invalid protocol '%s'%s", argv1, VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	as = osmo_ss7_as_find_or_create(inst, name, protocol);
+	if (!as) {
+		vty_out(vty, "cannot create AS '%s'%s", name, VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	as->cfg.name = talloc_strdup(as, name);
+
+	vty->node = L_CS7_AS_NODE;
+	vty->index = as;
+	vty->index_sub = &as->cfg.description;
+
+	return CMD_SUCCESS;
+}
+
+DEFUN_ATTR(no_cs7_as, no_cs7_as_cmd,
+	   "no as NAME",
+	   NO_STR "Disable Application Server\n"
+	   "Name of AS\n",
+	   CMD_ATTR_IMMEDIATE)
+{
+	struct osmo_ss7_instance *inst = vty->index;
+	const char *name = argv0;
+	struct osmo_ss7_as *as;
+
+	as = osmo_ss7_as_find_by_name(inst, name);
+	if (!as) {
+		vty_out(vty, "No AS named '%s' found%s", name, VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+	osmo_ss7_as_destroy(as);
+	return CMD_SUCCESS;
+}
+
+/* TODO: routing-key */
+DEFUN_ATTR(as_asp, as_asp_cmd,
+	   "asp NAME",
+	   "Specify that a given ASP is part of this AS\n"
+	   "Name of ASP to be added to AS\n",
+	   CMD_ATTR_IMMEDIATE)
+{
+	struct osmo_ss7_as *as = vty->index;
+
+	if (osmo_ss7_as_add_asp(as, argv0)) {
+		vty_out(vty, "cannot find ASP '%s'%s", argv0, VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	return CMD_SUCCESS;
+}
+
+DEFUN_ATTR(as_no_asp, as_no_asp_cmd,
+	   "no asp NAME",
+	   NO_STR "Specify ASP to be removed from this AS\n"
+	   "Name of ASP to be removed\n",
+	   CMD_ATTR_IMMEDIATE)
+{
+	struct osmo_ss7_as *as = vty->index;
+
+	if (osmo_ss7_as_del_asp(as, argv0)) {
+		vty_out(vty, "cannot find ASP '%s'%s", argv0, VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	return CMD_SUCCESS;
+}
+
+DEFUN_USRATTR(as_traf_mode, as_traf_mode_cmd,
+	      OSMO_SCCP_LIB_ATTR_RSTRT_ASP,
+	      "traffic-mode (broadcast | roundrobin | override)",
+	      "Specifies traffic mode of operation of the ASP within the AS\n"
+	      "Broadcast to all ASP within AS\n"
+	      "Round-Robin between all ASP within AS\n"
+	      "Override\n")
+{
+	struct osmo_ss7_as *as = vty->index;
+
+	as->cfg.mode = get_string_value(osmo_ss7_as_traffic_mode_vals, argv0);
+	as->cfg.mode_set_by_vty = true;
+	return CMD_SUCCESS;
+}
+
+DEFUN_USRATTR(as_traf_mode_loadshare, as_traf_mode_loadshare_cmd,
+	      OSMO_SCCP_LIB_ATTR_RSTRT_ASP,
+	      "traffic-mode loadshare bindings sls opc-sls opc-shift <0-2>",
+	      "Specifies traffic mode of operation of the ASP within the AS\n"
+	      "Share Load among all ASP within AS\n"
+	      "Configure Loadshare parameters\n"
+	      "Configure Loadshare SLS generation parameters\n"
+	      "Generate extended SLS with OPC information\n"
+	      "Shift OPC bits used during routing decision\n"
+	      "How many bits from ITU OPC field (starting from least-significant-bit) to skip (default=0). 6 bits are always used\n"
+	      )
+{
+	struct osmo_ss7_as *as = vty->index;
+
+	as->cfg.mode = OSMO_SS7_AS_TMOD_LOADSHARE;
+	as->cfg.mode_set_by_vty = true;
+	if (argc < 3) {
+		as->cfg.loadshare.opc_sls = false;
+		as->cfg.loadshare.opc_shift = 0;
+		return CMD_SUCCESS;
+	}
+	as->cfg.loadshare.opc_sls = true;
+	if (argc < 5) {
+		as->cfg.loadshare.opc_shift = 0;
+		return CMD_SUCCESS;
+	}
+	as->cfg.loadshare.opc_shift = atoi(argv4);
+	return CMD_SUCCESS;
+}
+
+DEFUN_USRATTR(as_no_traf_mode, as_no_traf_mode_cmd,
+	      OSMO_SCCP_LIB_ATTR_RSTRT_ASP,
+	      "no traffic-mode",
+	      NO_STR "Remove explicit traffic mode of operation of this AS\n")
+{
+	struct osmo_ss7_as *as = vty->index;
+
+	as->cfg.mode = 0;
+	as->cfg.mode_set_by_vty = false;
+
+	as->cfg.loadshare.sls_shift = 0;
+	as->cfg.loadshare.opc_sls = false;
+	as->cfg.loadshare.opc_shift = 0;
+	return CMD_SUCCESS;
+}
+

libosmo-sigtran_2.1.0.97.d543.tar.xz/src/ss7_asp_vty.c Added

@@ -0,0 +1,1163 @@
+/* SS7 ASP VTY Interface */
+
+/* (C) 2015-2021 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2025 by sysmocom s.f.m.c. GmbH <info@sysmocom.de>
+ * All Rights Reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <stdint.h>
+#include <string.h>
+
+#include <netdb.h>
+#include <arpa/inet.h>
+#include <sys/ioctl.h>
+
+#include <osmocom/core/sockaddr_str.h>
+
+#include <osmocom/vty/vty.h>
+#include <osmocom/vty/command.h>
+#include <osmocom/vty/logging.h>
+#include <osmocom/vty/telnet_interface.h>
+#include <osmocom/vty/misc.h>
+
+#include <osmocom/netif/stream.h>
+
+#include <osmocom/sigtran/osmo_ss7.h>
+
+#include "xua_internal.h"
+#include "ss7_as.h"
+#include "ss7_asp.h"
+#include "ss7_combined_linkset.h"
+#include <ss7_linkset.h>
+#include "ss7_internal.h"
+#include "ss7_vty.h"
+
+#include <netinet/tcp.h>
+
+#ifdef HAVE_LIBSCTP
+#include <netinet/sctp.h>
+#include <osmocom/netif/sctp.h>
+#endif
+
+/***********************************************************************
+ * Application Server Process
+ ***********************************************************************/
+
+static struct cmd_node asp_node = {
+	L_CS7_ASP_NODE,
+	"%s(config-cs7-asp)# ",
+	1,
+};
+
+/* netinet/tcp.h */
+static const struct value_string tcp_info_state_values = {
+	{ TCP_ESTABLISHED,	"ESTABLISHED" },
+	{ TCP_SYN_SENT,		"SYN_SENT" },
+	{ TCP_SYN_RECV,		"SYN_RECV" },
+	{ TCP_FIN_WAIT1,	"FIN_WAIT1" },
+	{ TCP_FIN_WAIT2,	"FIN_WAIT2" },
+	{ TCP_TIME_WAIT,	"TIME_WAIT" },
+	{ TCP_CLOSE,		"CLOSE" },
+	{ TCP_CLOSE_WAIT,	"CLOSE_WAIT" },
+	{ TCP_LAST_ACK,		"LAST_ACK" },
+	{ TCP_LISTEN,		"LISTEN" },
+	{ TCP_CLOSING,		"CLOSING" },
+	{}
+};
+
+
+static const struct value_string asp_quirk_names = {
+	{ OSMO_SS7_ASP_QUIRK_NO_NOTIFY,		"no_notify" },
+	{ OSMO_SS7_ASP_QUIRK_DAUD_IN_ASP,	"daud_in_asp" },
+	{ OSMO_SS7_ASP_QUIRK_SNM_INACTIVE,	"snm_inactive" },
+	{ 0, NULL }
+};
+
+static const struct value_string asp_quirk_descs = {
+	{ OSMO_SS7_ASP_QUIRK_NO_NOTIFY, "Peer SG doesn't send NTFY(AS-INACTIVE) after ASP-UP" },
+	{ OSMO_SS7_ASP_QUIRK_DAUD_IN_ASP, "Allow Rx of DAUD in ASP role" },
+	{ OSMO_SS7_ASP_QUIRK_SNM_INACTIVE, "Allow Rx of SSNM in AS-INACTIVE state" },
+	{ 0, NULL }
+};
+
+DEFUN_ATTR(cs7_asp, cs7_asp_cmd,
+	   "asp NAME <0-65535> <0-65535> " XUA_VAR_STR,
+	   "Configure Application Server Process\n"
+	   "Name of ASP\n"
+	   "Remote port number\n"
+	   "Local port number\n"
+	   XUA_VAR_HELP_STR,
+	   CMD_ATTR_NODE_EXIT)
+{
+	struct osmo_ss7_instance *inst = vty->index;
+	const char *name = argv0;
+	uint16_t remote_port = atoi(argv1);
+	uint16_t local_port = atoi(argv2);
+	enum osmo_ss7_asp_protocol proto = parse_asp_proto(argv3);
+	struct osmo_ss7_asp *asp;
+	int trans_proto;
+
+	if (proto == OSMO_SS7_ASP_PROT_NONE) {
+		vty_out(vty, "invalid protocol '%s'%s", argv3, VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	/* argv4 can be supplied by an alias (see below) */
+	if (argc > 4)
+		trans_proto = parse_trans_proto(argv4);
+	else /* default transport protocol */
+		trans_proto = ss7_default_trans_proto_for_asp_proto(proto);
+	if (trans_proto < 0)
+		return CMD_WARNING;
+
+	asp = osmo_ss7_asp_find2(inst, name,
+				 remote_port, local_port,
+				 trans_proto, proto);
+	if (!asp) {
+		asp = osmo_ss7_asp_find_or_create2(inst, name,
+						   remote_port, local_port,
+						   trans_proto, proto);
+		if (!asp) {
+			vty_out(vty, "cannot create ASP '%s'%s", name, VTY_NEWLINE);
+			return CMD_WARNING;
+		}
+		asp->cfg.is_server = true;
+		asp->cfg.role = OSMO_SS7_ASP_ROLE_SG;
+	}
+
+	/* Reset value, will be checked at osmo_ss7_vty_go_parent() */
+	asp->cfg.explicit_shutdown_state_by_vty_since_node_enter = false;
+
+	vty->node = L_CS7_ASP_NODE;
+	vty->index = asp;
+	vty->index_sub = &asp->cfg.description;
+	return CMD_SUCCESS;
+}
+
+/* XXX: workaround for https://osmocom.org/issues/6360, can be removed once it's fixed.
+ * Currently we hit an assert if we make the IPPROTO_VAR_STR optional in cs7_asp_cmd. */
+ALIAS_ATTR(cs7_asp, cs7_asp_trans_proto_cmd,
+	   "asp NAME <0-65535> <0-65535> " XUA_VAR_STR " " IPPROTO_VAR_STR,
+	   "Configure Application Server Process\n"
+	   "Name of ASP\n"
+	   "Remote port number\n"
+	   "Local port number\n"
+	   XUA_VAR_HELP_STR
+	   IPPROTO_VAR_HELP_STR,
+	   CMD_ATTR_NODE_EXIT);
+
+DEFUN_ATTR(no_cs7_asp, no_cs7_asp_cmd,
+	   "no asp NAME",
+	   NO_STR "Disable Application Server Process\n"
+	   "Name of ASP\n",
+	   CMD_ATTR_IMMEDIATE)
+{
+	struct osmo_ss7_instance *inst = vty->index;
+	const char *name = argv0;
+	struct osmo_ss7_asp *asp;
+
+	asp = osmo_ss7_asp_find_by_name(inst, name);
+	if (!asp) {
+		vty_out(vty, "No ASP named '%s' found%s", name, VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+	osmo_ss7_asp_destroy(asp);
+	return CMD_SUCCESS;
+}
+
+DEFUN_ATTR(asp_local_ip, asp_local_ip_cmd,
+	   "local-ip " VTY_IPV46_CMD " primary",
+	   "Specify Local IP Address from which to contact ASP\n"
+	   "Local IPv4 Address from which to contact of ASP\n"
+	   "Local IPv6 Address from which to contact of ASP\n"
+	   "Signal the SCTP peer to use this address as Primary Address\n",
+	   CMD_ATTR_NODE_EXIT)
+{
+	struct osmo_ss7_asp *asp = vty->index;
+	bool is_primary = argc > 1;
+	int old_idx_primary = asp->cfg.local.idx_primary;
+	int old_host_count = asp->cfg.local.host_cnt;
+	int rc;

libosmo-sigtran_2.1.0.94.dfcc.tar.xz/src/ss7_internal.h -> libosmo-sigtran_2.1.0.97.d543.tar.xz/src/ss7_internal.h Changed

libosmo-sigtran_2.1.0.94.dfcc.tar.xz/src/ss7_vty.c -> libosmo-sigtran_2.1.0.97.d543.tar.xz/src/ss7_vty.c Changed

@@ -1,4 +1,4 @@
-/* Core SS7 Instance/Linkset/Link/AS/ASP VTY Interface */
+/* Core SS7 Instance/Linkset/Link VTY Interface */
 
 /* (C) 2015-2021 by Harald Welte <laforge@gnumonks.org>
  * All Rights Reserved
@@ -26,20 +26,12 @@
 #include <stdint.h>
 #include <string.h>
 
-#include <netdb.h>
-#include <arpa/inet.h>
-#include <sys/ioctl.h>
-
-#include <osmocom/core/sockaddr_str.h>
-
 #include <osmocom/vty/vty.h>
 #include <osmocom/vty/command.h>
 #include <osmocom/vty/logging.h>
 #include <osmocom/vty/telnet_interface.h>
 #include <osmocom/vty/misc.h>
 
-#include <osmocom/netif/stream.h>
-
 #include <osmocom/sigtran/osmo_ss7.h>
 #include <osmocom/sigtran/protocol/mtp.h>
 
@@ -53,34 +45,9 @@
 #include "ss7_route.h"
 #include "ss7_route_table.h"
 #include "ss7_internal.h"
+#include "ss7_vty.h"
 #include "ss7_xua_srv.h"
 
-#include <netinet/tcp.h>
-
-#ifdef HAVE_LIBSCTP
-#include <netinet/sctp.h>
-#include <osmocom/netif/sctp.h>
-#endif
-
-#define XUA_VAR_STR	"(sua|m3ua|ipa)"
-
-#define XUA_VAR_HELP_STR		\
-	"SCCP User Adaptation\n"	 \
-	"MTP3 User Adaptation\n"	\
-	"IPA Multiplex (SCCP Lite)\n"
-
-#define IPPROTO_VAR_STR "(sctp|tcp)"
-#define IPPROTO_VAR_HELP_STR \
-	"SCTP (Stream Control Transmission Protocol)\n" \
-	"TCP (Transmission Control Protocol)\n"
-
-#define QOS_CLASS_RANGE_STR "<0-7>"
-#define QOS_CLASS_RANGE_HELP_STR "QoS Class\n"
-#define QOS_CLASS_VAR_STR "(" QOS_CLASS_RANGE_STR "|default)"
-#define QOS_CLASS_VAR_HELP_STR \
-	QOS_CLASS_RANGE_HELP_STR \
-	"Default QoS Class (0)\n"
-
 #define ROUTE_PRIO_RANGE_STR "<1-9>"
 #define ROUTE_PRIO_RANGE_HELP_STR "Priority\n"
 #define ROUTE_PRIO_VAR_STR "(" ROUTE_PRIO_RANGE_STR "|default)"
@@ -88,43 +55,28 @@
 	ROUTE_PRIO_RANGE_HELP_STR \
 	"Default Priority (5)\n"
 
-/* netinet/tcp.h */
-static const struct value_string tcp_info_state_values = {
-	{ TCP_ESTABLISHED,	"ESTABLISHED" },
-	{ TCP_SYN_SENT,		"SYN_SENT" },
-	{ TCP_SYN_RECV,		"SYN_RECV" },
-	{ TCP_FIN_WAIT1,	"FIN_WAIT1" },
-	{ TCP_FIN_WAIT2,	"FIN_WAIT2" },
-	{ TCP_TIME_WAIT,	"TIME_WAIT" },
-	{ TCP_CLOSE,		"CLOSE" },
-	{ TCP_CLOSE_WAIT,	"CLOSE_WAIT" },
-	{ TCP_LAST_ACK,		"LAST_ACK" },
-	{ TCP_LISTEN,		"LISTEN" },
-	{ TCP_CLOSING,		"CLOSING" },
-	{}
+const struct value_string ipproto_vals = {
+	{ IPPROTO_SCTP,		"sctp" },
+	{ IPPROTO_TCP,		"tcp" },
+	{ 0, NULL },
 };
 
-static const struct value_string asp_quirk_names = {
-	{ OSMO_SS7_ASP_QUIRK_NO_NOTIFY,		"no_notify" },
-	{ OSMO_SS7_ASP_QUIRK_DAUD_IN_ASP,	"daud_in_asp" },
-	{ OSMO_SS7_ASP_QUIRK_SNM_INACTIVE,	"snm_inactive" },
-	{ 0, NULL }
-};
+int parse_trans_proto(const char *protocol)
+{
+	return get_string_value(ipproto_vals, protocol);
+}
 
-static const struct value_string asp_quirk_descs = {
-	{ OSMO_SS7_ASP_QUIRK_NO_NOTIFY, "Peer SG doesn't send NTFY(AS-INACTIVE) after ASP-UP" },
-	{ OSMO_SS7_ASP_QUIRK_DAUD_IN_ASP, "Allow Rx of DAUD in ASP role" },
-	{ OSMO_SS7_ASP_QUIRK_SNM_INACTIVE, "Allow Rx of SSNM in AS-INACTIVE state" },
-	{ 0, NULL }
-};
+enum osmo_ss7_asp_protocol parse_asp_proto(const char *protocol)
+{
+	return get_string_value(osmo_ss7_asp_protocol_vals, protocol);
+}
 
 /***********************************************************************
  * Core CS7 Configuration
  ***********************************************************************/
 
-enum cs7_role_t {CS7_ROLE_SG, CS7_ROLE_ASP};
-static enum cs7_role_t cs7_role;
-static void *g_ctx;
+enum cs7_role_t cs7_role;
+void *g_ctx;
 
 static struct cmd_node cs7_node = {
 	L_CS7_NODE,
@@ -737,293 +689,6 @@
 	return CMD_SUCCESS;
 }
 
-/***********************************************************************
- * xUA Listener Configuration (SG)
- ***********************************************************************/
-
-static const struct value_string ipproto_vals = {
-	{ IPPROTO_SCTP,		"sctp" },
-	{ IPPROTO_TCP,		"tcp" },
-	{ 0, NULL },
-};
-
-static int parse_trans_proto(const char *protocol)
-{
-	return get_string_value(ipproto_vals, protocol);
-}
-
-static enum osmo_ss7_asp_protocol parse_asp_proto(const char *protocol)
-{
-	return get_string_value(osmo_ss7_asp_protocol_vals, protocol);
-}
-
-static struct cmd_node xua_node = {
-	L_CS7_XUA_NODE,
-	"%s(config-cs7-listen)# ",
-	1,
-};
-
-DEFUN_ATTR(cs7_xua, cs7_xua_cmd,
-	   "listen " XUA_VAR_STR " <0-65534> " IPPROTO_VAR_STR "",
-	   "Configure/Enable xUA Listener\n"
-	   XUA_VAR_HELP_STR
-	   "Port number\n"
-	   IPPROTO_VAR_HELP_STR,
-	   CMD_ATTR_IMMEDIATE)
-{
-	struct osmo_ss7_instance *inst = vty->index;
-	struct osmo_xua_server *xs;
-	enum osmo_ss7_asp_protocol proto = parse_asp_proto(argv0);
-	uint16_t port = atoi(argv1);
-	int trans_proto;
-
-	if (argc > 2)
-		trans_proto = parse_trans_proto(argv2);
-	else /* default transport protocol */
-		trans_proto = ss7_default_trans_proto_for_asp_proto(proto);
-	if (trans_proto < 0)
-		return CMD_WARNING;
-
-	xs = ss7_xua_server_find2(inst, trans_proto, proto, port);
-	if (!xs) {
-		xs = ss7_xua_server_create2(inst, trans_proto, proto, port, NULL);
-		if (!xs)
-			return CMD_WARNING;
-		/* Drop first dummy address created automatically by _create(): */
-		ss7_xua_server_set_local_hosts(xs, NULL, 0);
-	}
-
-	vty->node = L_CS7_XUA_NODE;
-	vty->index = xs;
-	return CMD_SUCCESS;
-}
-
-DEFUN_ATTR(no_cs7_xua, no_cs7_xua_cmd,
-	   "no listen " XUA_VAR_STR " <0-65534> " IPPROTO_VAR_STR "",
-	   NO_STR "Disable xUA Listener on given port\n"
-	   XUA_VAR_HELP_STR
-	   "Port number\n"
-	   IPPROTO_VAR_HELP_STR,
-	   CMD_ATTR_IMMEDIATE)
-{
-	struct osmo_ss7_instance *inst = vty->index;
-	struct osmo_xua_server *xs;
-	enum osmo_ss7_asp_protocol proto = parse_asp_proto(argv0);
-	uint16_t port = atoi(argv1);
-	int trans_proto;
-

libosmo-sigtran_2.1.0.97.d543.tar.xz/src/ss7_vty.h Added

@@ -0,0 +1,64 @@
+#pragma once
+
+/* Internal header used by libosmo-sccp, not available publicly for lib users */
+
+#include <stdbool.h>
+#include <stdint.h>
+
+#include <osmocom/vty/vty.h>
+
+#include <osmocom/netif/stream.h>
+#include <osmocom/sigtran/osmo_ss7.h>
+
+#include "ss7_instance.h"
+
+enum cs7_role_t {
+	CS7_ROLE_SG,
+	CS7_ROLE_ASP
+};
+
+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"
+#define PC_STR	"Point Code\n"
+#define INST_STR "An instance of the SS7 stack\n"
+
+#define XUA_VAR_STR	"(sua|m3ua|ipa)"
+
+#define XUA_VAR_HELP_STR		\
+	"SCCP User Adaptation\n"	 \
+	"MTP3 User Adaptation\n"	\
+	"IPA Multiplex (SCCP Lite)\n"
+
+#define IPPROTO_VAR_STR "(sctp|tcp)"
+#define IPPROTO_VAR_HELP_STR \
+	"SCTP (Stream Control Transmission Protocol)\n" \
+	"TCP (Transmission Control Protocol)\n"
+
+#define QOS_CLASS_RANGE_STR "<0-7>"
+#define QOS_CLASS_RANGE_HELP_STR "QoS Class\n"
+#define QOS_CLASS_VAR_STR "(" QOS_CLASS_RANGE_STR "|default)"
+#define QOS_CLASS_VAR_HELP_STR \
+	QOS_CLASS_RANGE_HELP_STR \
+	"Default QoS Class (0)\n"
+
+int parse_trans_proto(const char *protocol);
+enum osmo_ss7_asp_protocol parse_asp_proto(const char *protocol);
+
+/* ss7_asp_vty.c */
+void ss7_vty_init_node_asp(void);
+void ss7_vty_write_one_asp(struct vty *vty, struct osmo_ss7_asp *asp, bool show_dyn_config);
+int ss7_vty_node_asp_go_parent(struct vty *vty);
+
+/* ss7_as_vty.c */
+void ss7_vty_init_node_as(void);
+void ss7_vty_write_one_as(struct vty *vty, struct osmo_ss7_as *as, bool show_dyn_config);
+int ss7_vty_node_as_go_parent(struct vty *vty);
+
+/* ss7_xua_srv_vty.c */
+void ss7_vty_init_node_oxs(void);
+void ss7_vty_init_show_oxs(void);
+void ss7_vty_write_one_oxs(struct vty *vty, struct osmo_xua_server *xs);
+int ss7_vty_node_oxs_go_parent(struct vty *vty);

libosmo-sigtran_2.1.0.97.d543.tar.xz/src/ss7_xua_srv_vty.c Added

@@ -0,0 +1,347 @@
+/* SS7 xua_srv VTY Interface */
+
+/* (C) 2015-2021 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2025 by sysmocom s.f.m.c. GmbH <info@sysmocom.de>
+ * All Rights Reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <stdint.h>
+#include <string.h>
+
+#include <osmocom/vty/vty.h>
+#include <osmocom/vty/command.h>
+#include <osmocom/vty/logging.h>
+#include <osmocom/vty/telnet_interface.h>
+#include <osmocom/vty/misc.h>
+
+#include <osmocom/netif/stream.h>
+
+#include <osmocom/sigtran/osmo_ss7.h>
+
+#include "xua_internal.h"
+#include "ss7_asp.h"
+#include "ss7_internal.h"
+#include "ss7_vty.h"
+#include "ss7_xua_srv.h"
+
+/***********************************************************************
+ * xUA Listener Configuration (SG)
+ ***********************************************************************/
+
+static struct cmd_node xua_node = {
+	L_CS7_XUA_NODE,
+	"%s(config-cs7-listen)# ",
+	1,
+};
+
+DEFUN_ATTR(cs7_xua, cs7_xua_cmd,
+	   "listen " XUA_VAR_STR " <0-65534> " IPPROTO_VAR_STR "",
+	   "Configure/Enable xUA Listener\n"
+	   XUA_VAR_HELP_STR
+	   "Port number\n"
+	   IPPROTO_VAR_HELP_STR,
+	   CMD_ATTR_IMMEDIATE)
+{
+	struct osmo_ss7_instance *inst = vty->index;
+	struct osmo_xua_server *xs;
+	enum osmo_ss7_asp_protocol proto = parse_asp_proto(argv0);
+	uint16_t port = atoi(argv1);
+	int trans_proto;
+
+	if (argc > 2)
+		trans_proto = parse_trans_proto(argv2);
+	else /* default transport protocol */
+		trans_proto = ss7_default_trans_proto_for_asp_proto(proto);
+	if (trans_proto < 0)
+		return CMD_WARNING;
+
+	xs = ss7_xua_server_find2(inst, trans_proto, proto, port);
+	if (!xs) {
+		xs = ss7_xua_server_create2(inst, trans_proto, proto, port, NULL);
+		if (!xs)
+			return CMD_WARNING;
+		/* Drop first dummy address created automatically by _create(): */
+		ss7_xua_server_set_local_hosts(xs, NULL, 0);
+	}
+
+	vty->node = L_CS7_XUA_NODE;
+	vty->index = xs;
+	return CMD_SUCCESS;
+}
+
+DEFUN_ATTR(no_cs7_xua, no_cs7_xua_cmd,
+	   "no listen " XUA_VAR_STR " <0-65534> " IPPROTO_VAR_STR "",
+	   NO_STR "Disable xUA Listener on given port\n"
+	   XUA_VAR_HELP_STR
+	   "Port number\n"
+	   IPPROTO_VAR_HELP_STR,
+	   CMD_ATTR_IMMEDIATE)
+{
+	struct osmo_ss7_instance *inst = vty->index;
+	struct osmo_xua_server *xs;
+	enum osmo_ss7_asp_protocol proto = parse_asp_proto(argv0);
+	uint16_t port = atoi(argv1);
+	int trans_proto;
+
+	if (argc > 2)
+		trans_proto = parse_trans_proto(argv2);
+	else /* default transport protocol */
+		trans_proto = ss7_default_trans_proto_for_asp_proto(proto);
+	if (trans_proto < 0)
+		return CMD_WARNING;
+
+	xs = ss7_xua_server_find2(inst, trans_proto, proto, port);
+	if (!xs) {
+		vty_out(vty, "No xUA server for port %u found%s", port, VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+	ss7_xua_server_destroy(xs);
+	return CMD_SUCCESS;
+}
+
+DEFUN_ATTR(xua_local_ip, xua_local_ip_cmd,
+	   "local-ip " VTY_IPV46_CMD,
+	   "Configure the Local IP Address for xUA\n"
+	   "IPv4 Address to use for XUA\n"
+	   "IPv6 Address to use for XUA\n",
+	   CMD_ATTR_IMMEDIATE)
+{
+	struct osmo_xua_server *xs = vty->index;
+
+	ss7_xua_server_add_local_host(xs, argv0);
+
+	return CMD_SUCCESS;
+}
+
+DEFUN_ATTR(xua_no_local_ip, xua_no_local_ip_cmd,
+	   "no local-ip " VTY_IPV46_CMD,
+	   NO_STR "Configure the Local IP Address for xUA\n"
+	   "IPv4 Address to use for XUA\n"
+	   "IPv6 Address to use for XUA\n",
+	   CMD_ATTR_NODE_EXIT)
+{
+	struct osmo_xua_server *xs = vty->index;
+
+	if (ss7_xua_server_del_local_host(xs, argv0) != 0) {
+		vty_out(vty, "%% Failed deleting local address '%s' from set%s", argv0, VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+	return CMD_SUCCESS;
+}
+
+DEFUN_ATTR(xua_accept_dyn_asp, xua_accept_dyn_asp_cmd,
+	   "accept-asp-connections (pre-configured|dynamic-permitted)",
+	   "Define what kind of ASP connections to accept\n"
+	   "Accept only pre-configured ASPs (source IP/port)\n"
+	   "Accept any connection and dynamically create an ASP definition\n",
+	   CMD_ATTR_IMMEDIATE)
+{
+	struct osmo_xua_server *xs = vty->index;
+
+	if (!strcmp(argv0, "dynamic-permitted"))
+		xs->cfg.accept_dyn_reg = true;
+	else
+		xs->cfg.accept_dyn_reg = false;
+
+	return CMD_SUCCESS;
+}
+
+#define XUA_SRV_SCTP_PARAM_INIT_DESC \
+	"Configure SCTP parameters\n" \
+	"Configure INIT related parameters\n" \
+	"Configure INIT Number of Outbound Streams\n" \
+	"Configure INIT Maximum Inboud Streams\n"
+#define XUA_SRV_SCTP_PARAM_INIT_FIELDS "(num-ostreams|max-instreams)"
+
+DEFUN_ATTR(xua_sctp_param_init, xua_sctp_param_init_cmd,
+	   "sctp-param init " XUA_SRV_SCTP_PARAM_INIT_FIELDS " <0-65535>",
+	   XUA_SRV_SCTP_PARAM_INIT_DESC
+	   "Value of the parameter\n",
+	   CMD_ATTR_NODE_EXIT)
+{
+	struct osmo_xua_server *xs = vty->index;
+
+	uint16_t val = atoi(argv1);
+
+	if (strcmp(argv0, "num-ostreams") == 0) {
+		xs->cfg.sctp_init.num_ostreams_present = true;
+		xs->cfg.sctp_init.num_ostreams_value = val;
+	} else if (strcmp(argv0, "max-instreams") == 0) {
+		xs->cfg.sctp_init.max_instreams_present = true;
+		xs->cfg.sctp_init.max_instreams_value = val;
+	} else {
+		OSMO_ASSERT(0);
+	}
+	return CMD_SUCCESS;
+}
+
+DEFUN_ATTR(xua_no_sctp_param_init, xua_no_sctp_param_init_cmd,
+	   "no sctp-param init " XUA_SRV_SCTP_PARAM_INIT_FIELDS,
+	   NO_STR XUA_SRV_SCTP_PARAM_INIT_DESC,

libosmo-sigtran_2.1.0.94.dfcc.tar.xz/src/xua_as_fsm.c -> libosmo-sigtran_2.1.0.97.d543.tar.xz/src/xua_as_fsm.c Changed

libosmo-sigtran_2.1.0.94.dfcc.tar.xz/src/xua_asp_fsm.c -> libosmo-sigtran_2.1.0.97.d543.tar.xz/src/xua_asp_fsm.c Changed

libosmo-sigtran_2.1.0.94.dfcc.tar.xz/tests/vty/osmo_stp_test.vty -> libosmo-sigtran_2.1.0.97.d543.tar.xz/tests/vty/osmo_stp_test.vty Changed