[MERGED] libosmo-sccp[master]: osmo_ss7_vty: Merge the SUA and M3UA VTY nodes

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Fri Apr 14 12:59:48 UTC 2017 

Harald Welte has submitted this change and it was merged.

Change subject: osmo_ss7_vty: Merge the SUA and M3UA VTY nodes
......................................................................


osmo_ss7_vty: Merge the SUA and M3UA VTY nodes

The xUA servers have pretty much everything in common, there's no point
in introducing a separate VTY note for each xUA flavor.

Change-Id: I5b842b7f10d94957398cf0c0406c440c495a0bdc
---
M stp/internal.h
M stp/osmo_ss7_vty.c
2 files changed, 41 insertions(+), 106 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved; Verified



diff --git a/stp/internal.h b/stp/internal.h
index 31d95ba..cbd6bac 100644
--- a/stp/internal.h
+++ b/stp/internal.h
@@ -6,8 +6,7 @@
 	L_CS7_NODE = _LAST_OSMOVTY_NODE + 1,
 	L_CS7_AS_NODE,
 	L_CS7_ASP_NODE,
-	L_CS7_SUA_NODE,
-	L_CS7_M3UA_NODE,
+	L_CS7_XUA_NODE,
 	L_CS7_RTABLE_NODE,
 };
 
diff --git a/stp/osmo_ss7_vty.c b/stp/osmo_ss7_vty.c
index 29693a8..fe7bc41 100644
--- a/stp/osmo_ss7_vty.c
+++ b/stp/osmo_ss7_vty.c
@@ -328,58 +328,67 @@
 }
 
 /***********************************************************************
- * SUA Configuration (SG)
+ * xUA Listener Configuration (SG)
  ***********************************************************************/
 
-static struct cmd_node sua_node = {
-	L_CS7_SUA_NODE,
-	"%s(config-cs7-sua)# ",
+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(cs7_sua, cs7_sua_cmd,
-	"sua <0-65534>",
-	"Configure/Enable SUA\n"
-	"SCTP Port number for SUA\n")
+#define XUA_STR	"SCCP User Adaptation\n" "MTP3 User Adaptation\n"
+
+DEFUN(cs7_xua, cs7_xua_cmd,
+	"listen (sua|m3ua) <0-65534>",
+	"Configure/Enable xUA Listener\n"
+	XUA_STR "SCTP Port number\n")
 {
 	struct osmo_ss7_instance *inst = vty->index;
 	struct osmo_xua_server *xs;
-	uint16_t port = atoi(argv[0]);
+	enum osmo_ss7_asp_protocol proto = parse_asp_proto(argv[0]);
+	uint16_t port = atoi(argv[1]);
 
-	xs = osmo_ss7_xua_server_find(inst, OSMO_SS7_ASP_PROT_SUA, port);
+	xs = osmo_ss7_xua_server_find(inst, proto, port);
 	if (!xs) {
-		xs = osmo_ss7_xua_server_create(inst, OSMO_SS7_ASP_PROT_SUA, port, NULL);
+		xs = osmo_ss7_xua_server_create(inst, proto, port, NULL);
 		if (!xs)
 			return CMD_SUCCESS;
 	}
 
-	vty->node = L_CS7_SUA_NODE;
+	vty->node = L_CS7_XUA_NODE;
 	vty->index = xs;
 	return CMD_SUCCESS;
 }
 
-DEFUN(no_cs7_sua, no_cs7_sua_cmd,
-	"no sua <0-65534>",
-	NO_STR "Disable SUA on given SCTP Port\n"
-	"SCTP Port number for SUA\n")
+DEFUN(no_cs7_xua, no_cs7_xua_cmd,
+	"no listen (sua|m3ua) <0-65534>",
+	NO_STR "Disable xUA Listener on given SCTP Port\n"
+	XUA_STR "SCTP Port number\n")
 {
 	struct osmo_ss7_instance *inst = vty->index;
 	struct osmo_xua_server *xs;
-	uint16_t port = atoi(argv[0]);
+	enum osmo_ss7_asp_protocol proto = parse_asp_proto(argv[0]);
+	uint16_t port = atoi(argv[1]);
 
-	xs = osmo_ss7_xua_server_find(inst, OSMO_SS7_ASP_PROT_SUA, port);
+	xs = osmo_ss7_xua_server_find(inst, proto, port);
 	if (!xs) {
-		vty_out(vty, "No SUA server for port %u found%s", port, VTY_NEWLINE);
+		vty_out(vty, "No xUA server for port %u found%s", port, VTY_NEWLINE);
 		return CMD_WARNING;
 	}
 	osmo_ss7_xua_server_destroy(xs);
 	return CMD_SUCCESS;
 }
 
-DEFUN(sua_local_ip, sua_local_ip_cmd,
+DEFUN(xua_local_ip, xua_local_ip_cmd,
 	"local-ip A.B.C.D",
-	"Configure the Local IP Address for SUA\n"
-	"IP Address to use for SUA\n")
+	"Configure the Local IP Address for xUA\n"
+	"IP Address to use for XUA\n")
 {
 	struct osmo_xua_server *xs = vty->index;
 
@@ -387,12 +396,7 @@
 	return CMD_SUCCESS;
 }
 
-enum osmo_ss7_asp_protocol parse_asp_proto(const char *protocol)
-{
-	return get_string_value(osmo_ss7_asp_protocol_vals, protocol);
-}
-
-static void write_one_sua(struct vty *vty, struct osmo_xua_server *xs)
+static void write_one_xua(struct vty *vty, struct osmo_xua_server *xs)
 {
 	vty_out(vty, " %s %u%s",
 		get_value_string(osmo_ss7_asp_protocol_vals, xs->cfg.proto),
@@ -400,66 +404,6 @@
 	vty_out(vty, "  local-ip %s%s", xs->cfg.local.host, VTY_NEWLINE);
 }
 
-
-/***********************************************************************
- * M3UA Configuration (SG)
- ***********************************************************************/
-
-static struct cmd_node m3ua_node = {
-	L_CS7_M3UA_NODE,
-	"%s(config-cs7-m3ua)# ",
-	1,
-};
-
-DEFUN(cs7_m3ua, cs7_m3ua_cmd,
-	"m3ua <0-65534>",
-	"Configure/Enable M3UA\n"
-	"SCTP Port number for M3UA\n")
-{
-	struct osmo_ss7_instance *inst = vty->index;
-	struct osmo_xua_server *xs;
-	uint16_t port = atoi(argv[0]);
-
-	xs = osmo_ss7_xua_server_find(inst, OSMO_SS7_ASP_PROT_M3UA, port);
-	if (!xs) {
-		xs = osmo_ss7_xua_server_create(inst, OSMO_SS7_ASP_PROT_M3UA, port, NULL);
-		if (!xs)
-			return CMD_SUCCESS;
-	}
-
-	vty->node = L_CS7_M3UA_NODE;
-	vty->index = xs;
-	return CMD_SUCCESS;
-}
-
-DEFUN(no_cs7_m3ua, no_cs7_m3ua_cmd,
-	"no m3ua <0-65534>",
-	NO_STR "Disable M3UA on given SCTP Port\n"
-	"SCTP Port number for M3UA\n")
-{
-	struct osmo_ss7_instance *inst = vty->index;
-	struct osmo_xua_server *xs;
-	uint16_t port = atoi(argv[0]);
-
-	xs = osmo_ss7_xua_server_find(inst, OSMO_SS7_ASP_PROT_M3UA, port);
-	if (!xs) {
-		vty_out(vty, "No M3UA server for port %u found%s", port, VTY_NEWLINE);
-		return CMD_WARNING;
-	}
-	osmo_ss7_xua_server_destroy(xs);
-	return CMD_SUCCESS;
-}
-
-DEFUN(m3ua_local_ip, m3ua_local_ip_cmd,
-	"local-ip A.B.C.D",
-	"Configure the Local IP Address for M3UA\n"
-	"IP Address to use for M3UA\n")
-{
-	struct osmo_xua_server *xs = vty->index;
-
-	osmo_ss7_xua_server_set_local_host(xs, argv[0]);
-	return CMD_SUCCESS;
-}
 
 /***********************************************************************
  * Application Server Process
@@ -906,7 +850,7 @@
 		write_one_rtable(vty, rtable);
 
 	llist_for_each_entry(oxs, &osmo_ss7_xua_servers, list)
-		write_one_sua(vty, oxs);
+		write_one_xua(vty, oxs);
 }
 
 
@@ -934,8 +878,7 @@
 		vty->node = L_CS7_NODE;
 		vty->index = as->inst;
 		break;
-	case L_CS7_SUA_NODE:
-	case L_CS7_M3UA_NODE:
+	case L_CS7_XUA_NODE:
 		oxs = vty->index;
 		vty->node = L_CS7_NODE;
 		vty->index = oxs->inst;
@@ -954,8 +897,7 @@
 	case L_CS7_NODE:
 	case L_CS7_ASP_NODE:
 	case L_CS7_RTABLE_NODE:
-	case L_CS7_SUA_NODE:
-	case L_CS7_M3UA_NODE:
+	case L_CS7_XUA_NODE:
 	case L_CS7_AS_NODE:
 		return 1;
 	default:
@@ -1018,17 +960,11 @@
 	install_element(L_CS7_RTABLE_NODE, &cs7_rt_upd_cmd);
 	install_element(L_CS7_RTABLE_NODE, &cs7_rt_rem_cmd);
 
-	install_node(&sua_node, NULL);
-	vty_install_default(L_CS7_SUA_NODE);
-	install_element(L_CS7_NODE, &cs7_sua_cmd);
-	install_element(L_CS7_NODE, &no_cs7_sua_cmd);
-	install_element(L_CS7_SUA_NODE, &sua_local_ip_cmd);
-
-	install_node(&m3ua_node, NULL);
-	vty_install_default(L_CS7_M3UA_NODE);
-	install_element(L_CS7_NODE, &cs7_m3ua_cmd);
-	install_element(L_CS7_NODE, &no_cs7_m3ua_cmd);
-	install_element(L_CS7_M3UA_NODE, &m3ua_local_ip_cmd);
+	install_node(&xua_node, NULL);
+	vty_install_default(L_CS7_XUA_NODE);
+	install_element(L_CS7_NODE, &cs7_xua_cmd);
+	install_element(L_CS7_NODE, &no_cs7_xua_cmd);
+	install_element(L_CS7_XUA_NODE, &xua_local_ip_cmd);
 }
 
 void osmo_ss7_set_vty_alloc_ctx(void *ctx)

-- 
To view, visit https://gerrit.osmocom.org/2329
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b842b7f10d94957398cf0c0406c440c495a0bdc
Gerrit-PatchSet: 1
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>

More information about the gerrit-log mailing list