Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/2924
to look at the new patch set (#2).
sccp: add addressbook functionality for sccp addresses
SCCP addresses are defined through a number of compoinents, not
just an IP-Address, there is also point code, ssn and more. To
simplify and unify the handling of such objects, this patch
introduces an addressbook functionality. The user can set up
multiple addresses per ss7 instance and give them names. Later
that name can be used to reference the address at a later point
in the config. This means that the usage of sccp-addresses from
the programmers point of view boils down to a VTX function that
reads the string name of a previously defined address. The
programmer can then use the API to get a pointer to the SCCP
address struct and use it normally.
Change-Id: I068ed7f7d113dab88424a9d47bab7fc703bb7942
---
M include/osmocom/sigtran/osmo_ss7.h
M include/osmocom/sigtran/sccp_sap.h
M src/osmo_ss7.c
M src/osmo_ss7_vty.c
4 files changed, 533 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/24/2924/2
diff --git a/include/osmocom/sigtran/osmo_ss7.h
b/include/osmocom/sigtran/osmo_ss7.h
index 7b0a607..741a7e3 100644
--- a/include/osmocom/sigtran/osmo_ss7.h
+++ b/include/osmocom/sigtran/osmo_ss7.h
@@ -89,6 +89,7 @@
uint8_t network_indicator;
struct osmo_ss7_pc_fmt pc_fmt;
bool permit_dyn_rkm_alloc;
+ struct llist_head sccp_address_book;
} cfg;
};
diff --git a/include/osmocom/sigtran/sccp_sap.h
b/include/osmocom/sigtran/sccp_sap.h
index f378e5c..ccadba7 100644
--- a/include/osmocom/sigtran/sccp_sap.h
+++ b/include/osmocom/sigtran/sccp_sap.h
@@ -247,3 +247,7 @@
osmo_prim_cb prim_cb, uint16_t ssn);
int osmo_sccp_user_sap_down(struct osmo_sccp_user *scu, struct osmo_prim_hdr
*oph);
+
+/*! \brief Pick an SCCP address from the addressbook by its name */
+struct osmo_sccp_addr_list *
+osmo_sccp_addr_by_name(const char *name, const struct osmo_ss7_instance *ss7);
diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c
index d952ecd..78b22a7 100644
--- a/src/osmo_ss7.c
+++ b/src/osmo_ss7.c
@@ -352,6 +352,8 @@
llist_add(&inst->list, &osmo_ss7_instances);
+ INIT_LLIST_HEAD(&inst->cfg.sccp_address_book);
+
return inst;
}
diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c
index 97b5cf0..6e48828 100644
--- a/src/osmo_ss7_vty.c
+++ b/src/osmo_ss7_vty.c
@@ -36,6 +36,7 @@
#include <osmocom/sigtran/protocol/mtp.h>
#include "xua_internal.h"
+#include <osmocom/sigtran/sccp_sap.h>
#define XUA_VAR_STR "(sua|m3ua|ipa)"
@@ -891,6 +892,485 @@
return CMD_SUCCESS;
}
+/***********************************************************************
+ * SCCP addressbook handling
+ ***********************************************************************/
+
+/* SCCP addressbook */
+struct osmo_sccp_addr_list {
+ struct llist_head list;
+ struct osmo_ss7_instance *inst;
+ char *name;
+ struct osmo_sccp_addr *addr;
+};
+
+static struct cmd_node sccpaddr_node = {
+ L_CS7_SCCPADDR_NODE,
+ "%s(config-cs7-sccpaddr)# ",
+ 1,
+};
+
+static struct cmd_node sccpaddr_gt_node = {
+ L_CS7_SCCPADDR_GT_NODE,
+ "%s(config-cs7-sccpaddr-gt)# ",
+ 1,
+};
+
+/*! \brief Pick an SCCP address from the addressbook by its name */
+struct osmo_sccp_addr_list *
+osmo_sccp_addr_by_name(const char *name, const struct osmo_ss7_instance *ss7)
+{
+ struct osmo_sccp_addr_list *addr;
+ llist_for_each_entry(addr, &ss7->cfg.sccp_address_book, list) {
+ if (strcmp(addr->name, name) == 0)
+ return addr;
+ }
+ return NULL;
+}
+
+/* Generate VTY configuration file snippet */
+static void write_sccp_addressbook(struct vty *vty,
+ const struct osmo_ss7_instance *inst)
+{
+ struct osmo_sccp_addr_list *addr;
+
+ if (llist_empty(&inst->cfg.sccp_address_book))
+ return;
+
+ /* FIXME: Add code to write IP-Addresses */
+
+ llist_for_each_entry(addr, &inst->cfg.sccp_address_book, list) {
+ vty_out(vty, " sccp-address %s%s", addr->name, VTY_NEWLINE);
+ switch (addr->addr->ri) {
+ case OSMO_SCCP_RI_GT:
+ vty_out(vty, " routing-indicator GT%s", VTY_NEWLINE);
+ break;
+ case OSMO_SCCP_RI_SSN_PC:
+ vty_out(vty, " routing-indicator PC%s", VTY_NEWLINE);
+ break;
+ case OSMO_SCCP_RI_SSN_IP:
+ vty_out(vty, " routing-indicator IP%s", VTY_NEWLINE);
+ break;
+ }
+ if (addr->addr->presence & OSMO_SCCP_ADDR_T_PC)
+ vty_out(vty, " point-code %s%s",
+ osmo_ss7_pointcode_print(addr->inst,
+ addr->addr->pc),
+ VTY_NEWLINE);
+ if (addr->addr->presence & OSMO_SCCP_ADDR_T_SSN)
+ vty_out(vty, " subsystem-number %u%s", addr->addr->ssn,
+ VTY_NEWLINE);
+ if (addr->addr->presence & OSMO_SCCP_ADDR_T_GT) {
+ vty_out(vty, " global-title%s", VTY_NEWLINE);
+ vty_out(vty, " global-title-indicator %u%s",
+ addr->addr->gt.gti, VTY_NEWLINE);
+ vty_out(vty, " translation-type %u%s",
+ addr->addr->gt.tt, VTY_NEWLINE);
+ vty_out(vty, " numbering-plan-indicator %u%s",
+ addr->addr->gt.npi, VTY_NEWLINE);
+ vty_out(vty, " nature-of-address-indicator %u%s",
+ addr->addr->gt.nai, VTY_NEWLINE);
+ if (strlen(addr->addr->gt.digits))
+ vty_out(vty, " digits %s%s",
+ addr->addr->gt.digits, VTY_NEWLINE);
+ }
+ }
+}
+
+/* List all addressbook entries */
+DEFUN(cs7_show_sccpaddr, cs7_show_sccpaddr_cmd,
+ "show cs7 instance <0-15> sccp-addressbook",
+ SHOW_STR CS7_STR INST_STR INST_STR "List all SCCP addressbook entries\n")
+{
+ struct osmo_ss7_instance *inst;
+ struct osmo_sccp_addr_list *addr;
+ int id = atoi(argv[0]);
+#if 0
+ /* FIXME: IP-Address based SCCP-Routing is currently not supported,
+ * so we leave the related VTY options out for now */
+ char ip_addr_str[INET6_ADDRSTRLEN];
+#endif
+
+ inst = osmo_ss7_instance_find(id);
+ if (!inst) {
+ vty_out(vty, "No SS7 instance %d found%s", id, VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+
+ if (inst->cfg.description)
+ vty_out(vty, " description %s%s", inst->cfg.description,
+ VTY_NEWLINE);
+
+ if (llist_empty(&inst->cfg.sccp_address_book)) {
+ vty_out(vty, "SCCP addressbook empty!%s", VTY_NEWLINE);
+ return CMD_SUCCESS;
+ }
+
+ vty_out(vty, "%s", VTY_NEWLINE);
+
+ vty_out(vty, "Name ");
+ vty_out(vty, "RI: ");
+ vty_out(vty, "PC: ");
+ vty_out(vty, "SSN: ");
+#if 0
+ /* FIXME: IP-Address based SCCP-Routing is currently not supported,
+ * so we leave the related VTY options out for now */
+ vty_out(vty, "IP-Address: ");
+#endif
+ vty_out(vty, "GT:");
+ vty_out(vty, "%s", VTY_NEWLINE);
+
+ vty_out(vty, "------------ ");
+ vty_out(vty, "--- ");
+ vty_out(vty, "--------- ");
+ vty_out(vty, "---------- ");
+#if 0
+ /* FIXME: IP-Address based SCCP-Routing is currently not supported,
+ * so we leave the related VTY options out for now */
+ vty_out(vty, "--------------------------------------- ");
+#endif
+ vty_out(vty, "--------------------------------------- ");
+ vty_out(vty, "%s", VTY_NEWLINE);
+
+ llist_for_each_entry(addr, &inst->cfg.sccp_address_book, list) {
+ vty_out(vty, "%-12s ", addr->name);
+
+ /* RI */
+ switch (addr->addr->ri) {
+ case OSMO_SCCP_RI_GT:
+ vty_out(vty, "GT ");
+ break;
+ case OSMO_SCCP_RI_SSN_PC:
+ vty_out(vty, "PC ");
+ break;
+ case OSMO_SCCP_RI_SSN_IP:
+ vty_out(vty, "IP ");
+ break;
+ default:
+ vty_out(vty, "ERR ");
+ break;
+ }
+
+ /* PC */
+ if (addr->addr->presence & OSMO_SCCP_ADDR_T_PC)
+ vty_out(vty, "%-9s ",
+ osmo_ss7_pointcode_print(addr->inst,
+ addr->addr->pc));
+ else
+ vty_out(vty, "(none) ");
+
+ /* SSN */
+ if (addr->addr->presence & OSMO_SCCP_ADDR_T_SSN)
+ vty_out(vty, "%-10u ", addr->addr->ssn);
+ else
+ vty_out(vty, "(none) ");
+#if 0
+ /* FIXME: IP-Address based SCCP-Routing is currently not
+ * supported, so we leave the related VTY options out for now */
+ /* IP-Address */
+ if (addr->addr->presence & OSMO_SCCP_ADDR_T_IPv4) {
+ inet_ntop(AF_INET, &addr->addr->ip.v4, ip_addr_str,
+ INET6_ADDRSTRLEN);
+ vty_out(vty, "%-39s ", ip_addr_str);
+ } else if (addr->addr->presence & OSMO_SCCP_ADDR_T_IPv6) {
+ inet_ntop(AF_INET6, &addr->addr->ip.v6, ip_addr_str,
+ INET6_ADDRSTRLEN);
+ vty_out(vty, "%-39s ", ip_addr_str);
+ } else
+ vty_out(vty, "(none) ");
+#endif
+ /* GT */
+ if (addr->addr->presence & OSMO_SCCP_ADDR_T_GT) {
+ vty_out(vty, "GTI:%u ", addr->addr->gt.gti);
+ vty_out(vty, "TT:%u ", addr->addr->gt.tt);
+ vty_out(vty, "NPI:%u ", addr->addr->gt.npi);
+ vty_out(vty, "NAI:%u ", addr->addr->gt.nai);
+ if (strlen(addr->addr->gt.digits))
+ vty_out(vty, "%s ", addr->addr->gt.digits);
+ } else
+ vty_out(vty, "(none)");
+ vty_out(vty, "%s", VTY_NEWLINE);
+ }
+ return CMD_SUCCESS;
+}
+
+/* Create a new addressbook entry and switch nodes */
+DEFUN(cs7_sccpaddr, cs7_sccpaddr_cmd,
+ "sccp-address .NAME",
+ "Create/Modify an SCCP addressbook entry\n" "Name of the SCCP Address\n")
+{
+ struct osmo_ss7_instance *inst = (struct osmo_ss7_instance *)vty->index;
+ struct osmo_sccp_addr_list *addr;
+ const char *name = argv[0];
+
+ addr = osmo_sccp_addr_by_name(name, inst);
+
+ /* Create a new addressbook entry if we can not find an
+ * already existing entry */
+ if (!addr) {
+ addr = talloc_zero(inst, struct osmo_sccp_addr_list);
+ addr->name = talloc_strdup(addr, name);
+ addr->addr = talloc_zero(addr, struct osmo_sccp_addr);
+ llist_add_tail(&addr->list, &inst->cfg.sccp_address_book);
+ addr->addr->ri = OSMO_SCCP_RI_SSN_PC;
+ }
+
+ addr->inst = (struct osmo_ss7_instance *)vty->index;
+ vty->node = L_CS7_SCCPADDR_NODE;
+ vty->index = addr;
+
+ return CMD_SUCCESS;
+}
+
+/* Create a new addressbook entry and switch nodes */
+DEFUN(cs7_sccpaddr_del, cs7_sccpaddr_del_cmd,
+ "no sccp-address .NAME",
+ NO_STR "Delete an SCCP addressbook entry\n" "Name of the SCCP Address\n")
+{
+ struct osmo_ss7_instance *inst = (struct osmo_ss7_instance *)vty->index;
+ struct osmo_sccp_addr_list *addr;
+ const char *name = argv[0];
+
+ addr = osmo_sccp_addr_by_name(name, inst);
+ if (addr) {
+ llist_del(&addr->list);
+ talloc_free(addr);
+ } else {
+ vty_out(vty, "Addressbook entry not found!%s", VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+
+ return CMD_SUCCESS;
+}
+
+/* Set routing indicator of sccp address */
+DEFUN(cs7_sccpaddr_ri, cs7_sccpaddr_ri_cmd,
+ "routing-indicator (GT|PC|IP)",
+ "Add Routing Indicator\n"
+ "by global-title\n" "by point-code\n" "by ip-address\n")
+{
+ struct osmo_sccp_addr_list *addr =
+ (struct osmo_sccp_addr_list *)vty->index;
+ OSMO_ASSERT(addr);
+ switch (argv[0][0]) {
+ case 'G':
+ addr->addr->ri = OSMO_SCCP_RI_GT;
+ break;
+ case 'P':
+ addr->addr->ri = OSMO_SCCP_RI_SSN_PC;
+ break;
+ case 'I':
+ addr->addr->ri = OSMO_SCCP_RI_SSN_IP;
+ break;
+ }
+ return CMD_SUCCESS;
+}
+
+/* Set point-code number of sccp address */
+DEFUN(cs7_sccpaddr_pc, cs7_sccpaddr_pc_cmd,
+ "point-code POINT_CODE", "Add point-code Number\n" "PC\n")
+{
+ struct osmo_sccp_addr_list *addr =
+ (struct osmo_sccp_addr_list *)vty->index;
+ OSMO_ASSERT(addr);
+ addr->addr->presence |= OSMO_SCCP_ADDR_T_PC;
+ addr->addr->pc = osmo_ss7_pointcode_parse(addr->inst, argv[0]);
+ return CMD_SUCCESS;
+}
+
+/* Remove point-code number from sccp address */
+DEFUN(cs7_sccpaddr_pc_del, cs7_sccpaddr_pc_del_cmd,
+ "no point-code", NO_STR "Remove point-code Number\n")
+{
+ struct osmo_sccp_addr_list *addr =
+ (struct osmo_sccp_addr_list *)vty->index;
+ OSMO_ASSERT(addr);
+ addr->addr->presence &= ~OSMO_SCCP_ADDR_T_PC;
+ addr->addr->pc = 0;
+ return CMD_SUCCESS;
+}
+
+/* Set subsystem number of sccp address */
+DEFUN(cs7_sccpaddr_ssn, cs7_sccpaddr_ssn_cmd,
+ "subsystem-number <0-4294967295>", "Add Subsystem Number\n" "SSN\n")
+{
+ struct osmo_sccp_addr_list *addr =
+ (struct osmo_sccp_addr_list *)vty->index;
+ OSMO_ASSERT(addr);
+ addr->addr->presence |= OSMO_SCCP_ADDR_T_SSN;
+ addr->addr->ssn = atoi(argv[0]);
+ return CMD_SUCCESS;
+}
+
+/* Remove subsystem number from sccp address */
+DEFUN(cs7_sccpaddr_ssn_del, cs7_sccpaddr_ssn_del_cmd,
+ "no subsystem-number", NO_STR "Remove Subsystem Number\n")
+{
+ struct osmo_sccp_addr_list *addr =
+ (struct osmo_sccp_addr_list *)vty->index;
+ OSMO_ASSERT(addr);
+ addr->addr->presence &= ~OSMO_SCCP_ADDR_T_SSN;
+ addr->addr->ssn = 0;
+ return CMD_SUCCESS;
+}
+
+#if 0
+/* FIXME: IP-Address based SCCP-Routing is currently not supported,
+ * so we leave the related VTY options out for now */
+
+/* Set IP Address (V4) of sccp address */
+DEFUN(cs7_sccpaddr_ipv4, cs7_sccpaddr_ipv4_cmd,
+ "ip-address V4 A.B.C.D",
+ "Add IP-Address\n" "Protocol version 4\n" "IP-Address digits\n")
+{
+ struct osmo_sccp_addr_list *addr =
+ (struct osmo_sccp_addr_list *)vty->index;
+ unsigned int rc;
+ OSMO_ASSERT(addr);
+
+ addr->addr->presence |= OSMO_SCCP_ADDR_T_IPv4;
+ addr->addr->presence &= ~OSMO_SCCP_ADDR_T_IPv6;
+ memset(&addr->addr->ip, 0, sizeof(addr->addr->ip));
+ rc = inet_pton(AF_INET, argv[1], &addr->addr->ip.v4);
+ if (rc <= 0) {
+ vty_out(vty, "Invalid IP-Address format!%s", VTY_NEWLINE);
+ memset(&addr->addr->ip, 0, sizeof(addr->addr->ip));
+ addr->addr->presence &= ~OSMO_SCCP_ADDR_T_IPv4;
+ addr->addr->presence &= ~OSMO_SCCP_ADDR_T_IPv6;
+ return CMD_WARNING;
+ }
+ return CMD_SUCCESS;
+}
+
+/* Set IP Address (V6) of sccp address */
+DEFUN(cs7_sccpaddr_ipv6, cs7_sccpaddr_ipv6_cmd,
+ "ip-address V6 A:B:C:D:E:F:G:H",
+ "Add IP-Address\n" "Protocol version 6\n" "IP-Address digits\n")
+{
+ struct osmo_sccp_addr_list *addr =
+ (struct osmo_sccp_addr_list *)vty->index;
+ unsigned int rc;
+ OSMO_ASSERT(addr);
+
+ addr->addr->presence |= OSMO_SCCP_ADDR_T_IPv6;
+ addr->addr->presence &= ~OSMO_SCCP_ADDR_T_IPv4;
+ memset(&addr->addr->ip, 0, sizeof(addr->addr->ip));
+ rc = inet_pton(AF_INET6, argv[1], &addr->addr->ip.v4);
+ if (rc <= 0) {
+ vty_out(vty, "Invalid IP-Address format!%s", VTY_NEWLINE);
+ memset(&addr->addr->ip, 0, sizeof(addr->addr->ip));
+ addr->addr->presence &= ~OSMO_SCCP_ADDR_T_IPv4;
+ addr->addr->presence &= ~OSMO_SCCP_ADDR_T_IPv6;
+ return CMD_WARNING;
+ }
+ return CMD_SUCCESS;
+}
+
+/* Remove IP Address from sccp address */
+DEFUN(cs7_sccpaddr_ip_del, cs7_sccpaddr_ip_del_cmd,
+ "no ip-address", NO_STR "Remove IP-Address\n")
+{
+ struct osmo_sccp_addr_list *addr =
+ (struct osmo_sccp_addr_list *)vty->index;
+ OSMO_ASSERT(addr);
+ addr->addr->presence &= ~OSMO_SCCP_ADDR_T_IPv4;
+ addr->addr->presence &= ~OSMO_SCCP_ADDR_T_IPv6;
+ memset(&addr->addr->ip, 0, sizeof(addr->addr->ip));
+ return CMD_SUCCESS;
+}
+#endif
+
+/* Configure global title and switch nodes */
+DEFUN(cs7_sccpaddr_gt, cs7_sccpaddr_gt_cmd,
+ "global-title", "Add/Modify Global Title\n")
+{
+ struct osmo_sccp_addr_list *addr =
+ (struct osmo_sccp_addr_list *)vty->index;
+ addr->addr->presence |= OSMO_SCCP_ADDR_T_GT;
+ vty->node = L_CS7_SCCPADDR_GT_NODE;
+ return CMD_SUCCESS;
+}
+
+/* Remove IP Address from sccp address */
+DEFUN(cs7_sccpaddr_gt_del, cs7_sccpaddr_gt_del_cmd,
+ "no global-title", NO_STR "Remove Global Title\n")
+{
+ struct osmo_sccp_addr_list *addr =
+ (struct osmo_sccp_addr_list *)vty->index;
+ OSMO_ASSERT(addr);
+ addr->addr->presence &= ~OSMO_SCCP_ADDR_T_GT;
+ memset(&addr->addr->gt, 0, sizeof(addr->addr->gt));
+ return CMD_SUCCESS;
+}
+
+/* Set global title inicator of the sccp address gt */
+DEFUN(cs7_sccpaddr_gt_gti, cs7_sccpaddr_gt_gti_cmd,
+ "global-title-indicator <0-255>", "Set Global Title Indicator\n" "GTI\n")
+{
+ struct osmo_sccp_addr_list *addr =
+ (struct osmo_sccp_addr_list *)vty->index;
+ OSMO_ASSERT(addr);
+ addr->addr->gt.gti = atoi(argv[0]);
+ return CMD_SUCCESS;
+}
+
+/* Set global title translation type of the sccp address gt */
+DEFUN(cs7_sccpaddr_gt_tt, cs7_sccpaddr_gt_tt_cmd,
+ "translation-type <0-255>", "Set Global Title Translation Type\n" "TT\n")
+{
+ struct osmo_sccp_addr_list *addr =
+ (struct osmo_sccp_addr_list *)vty->index;
+ OSMO_ASSERT(addr);
+ addr->addr->gt.tt = atoi(argv[0]);
+ return CMD_SUCCESS;
+}
+
+/* Set global title numbering plan indicator of the sccp address gt */
+DEFUN(cs7_sccpaddr_gt_npi, cs7_sccpaddr_gt_npi_cmd,
+ "numbering-plan-indicator <0-4294967295>",
+ "Set Global Title Numbering Plan Indicator\n" "NPI\n")
+{
+ struct osmo_sccp_addr_list *addr =
+ (struct osmo_sccp_addr_list *)vty->index;
+ OSMO_ASSERT(addr);
+ addr->addr->gt.npi = atoi(argv[0]);
+ return CMD_SUCCESS;
+}
+
+/* Set global title nature of address indicator of the sccp address gt */
+DEFUN(cs7_sccpaddr_gt_nai, cs7_sccpaddr_gt_nai_cmd,
+ "nature-of-address-indicator <0-4294967295>",
+ "Set Global Title Nature of Address Indicator\n" "NAI\n")
+{
+ struct osmo_sccp_addr_list *addr =
+ (struct osmo_sccp_addr_list *)vty->index;
+ OSMO_ASSERT(addr);
+ addr->addr->gt.nai = atoi(argv[0]);
+ return CMD_SUCCESS;
+}
+
+/* Set global title nature of address indicator of the sccp address gt */
+DEFUN(cs7_sccpaddr_gt_digits, cs7_sccpaddr_gt_digits_cmd,
+ "digits .DIGITS", "Set Global Title Digits\n" "Number digits\n")
+{
+ struct osmo_sccp_addr_list *addr =
+ (struct osmo_sccp_addr_list *)vty->index;
+ OSMO_ASSERT(addr);
+
+ if (strlen(argv[0]) > sizeof(addr->addr->gt.digits)) {
+ vty_out(vty, "Number too long!%s", VTY_NEWLINE);
+ return CMD_WARNING;
+ }
+
+ memset(addr->addr->gt.digits, 0, sizeof(addr->addr->gt.digits));
+ strcpy(addr->addr->gt.digits, argv[0]);
+ return CMD_SUCCESS;
+}
+
+/***********************************************************************
+ * Common
+ ***********************************************************************/
+
static void write_one_cs7(struct vty *vty, struct osmo_ss7_instance *inst)
{
struct osmo_ss7_asp *asp;
@@ -944,6 +1424,9 @@
llist_for_each_entry(oxs, &inst->xua_servers, list)
write_one_xua(vty, oxs);
+
+ /* Append SCCP Addressbook */
+ write_sccp_addressbook(vty, inst);
}
@@ -953,6 +1436,7 @@
struct osmo_ss7_asp *asp;
struct osmo_ss7_route_table *rtbl;
struct osmo_xua_server *oxs;
+ struct osmo_sccp_addr_list *addr;
switch (vty->node) {
case L_CS7_ASP_NODE:
@@ -976,6 +1460,14 @@
vty->node = L_CS7_NODE;
vty->index = oxs->inst;
break;
+ case L_CS7_SCCPADDR_NODE:
+ addr = vty->index;
+ vty->node = L_CS7_NODE;
+ vty->index = addr->inst;
+ break;
+ case L_CS7_SCCPADDR_GT_NODE:
+ vty->node = L_CS7_SCCPADDR_NODE;
+ break;
case L_CS7_NODE:
default:
vty->node = CONFIG_NODE;
@@ -992,6 +1484,8 @@
case L_CS7_RTABLE_NODE:
case L_CS7_XUA_NODE:
case L_CS7_AS_NODE:
+ case L_CS7_SCCPADDR_NODE:
+ case L_CS7_SCCPADDR_GT_NODE:
return 1;
default:
return 0;
@@ -1064,6 +1558,38 @@
install_element(L_CS7_NODE, &no_cs7_xua_cmd);
install_element(L_CS7_XUA_NODE, &xua_local_ip_cmd);
install_element(L_CS7_XUA_NODE, &xua_accept_dyn_asp_cmd);
+
+ /* Commands for SCCP-Addressbook */
+ install_node(&sccpaddr_node, NULL);
+ vty_install_default(L_CS7_SCCPADDR_NODE);
+ install_element(L_CS7_NODE, &cs7_show_sccpaddr_cmd);
+ install_element(L_CS7_NODE, &cs7_sccpaddr_cmd);
+ install_element(L_CS7_NODE, &cs7_sccpaddr_del_cmd);
+ install_element(L_CS7_SCCPADDR_NODE, &cs7_sccpaddr_pc_del_cmd);
+ install_element(L_CS7_SCCPADDR_NODE, &cs7_sccpaddr_ssn_del_cmd);
+#if 0
+ /* FIXME: IP-Address based SCCP-Routing is currently not supported,
+ * so we leave the related VTY options out for now */
+ install_element(L_CS7_SCCPADDR_NODE, &cs7_sccpaddr_ip_del_cmd);
+#endif
+ install_element(L_CS7_SCCPADDR_NODE, &cs7_sccpaddr_gt_del_cmd);
+ install_element(L_CS7_SCCPADDR_NODE, &cs7_sccpaddr_ri_cmd);
+ install_element(L_CS7_SCCPADDR_NODE, &cs7_sccpaddr_pc_cmd);
+ install_element(L_CS7_SCCPADDR_NODE, &cs7_sccpaddr_ssn_cmd);
+#if 0
+ /* FIXME: IP-Address based SCCP-Routing is currently not supported,
+ * so we leave the related VTY options out for now */
+ install_element(L_CS7_SCCPADDR_NODE, &cs7_sccpaddr_ipv4_cmd);
+ install_element(L_CS7_SCCPADDR_NODE, &cs7_sccpaddr_ipv6_cmd);
+#endif
+ install_element(L_CS7_SCCPADDR_NODE, &cs7_sccpaddr_gt_cmd);
+ install_node(&sccpaddr_gt_node, NULL);
+ vty_install_default(L_CS7_SCCPADDR_GT_NODE);
+ install_element(L_CS7_SCCPADDR_GT_NODE, &cs7_sccpaddr_gt_gti_cmd);
+ install_element(L_CS7_SCCPADDR_GT_NODE, &cs7_sccpaddr_gt_tt_cmd);
+ install_element(L_CS7_SCCPADDR_GT_NODE, &cs7_sccpaddr_gt_npi_cmd);
+ install_element(L_CS7_SCCPADDR_GT_NODE, &cs7_sccpaddr_gt_nai_cmd);
+ install_element(L_CS7_SCCPADDR_GT_NODE, &cs7_sccpaddr_gt_digits_cmd);
}
void osmo_ss7_set_vty_alloc_ctx(void *ctx)
--
To view, visit https://gerrit.osmocom.org/2924
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I068ed7f7d113dab88424a9d47bab7fc703bb7942
Gerrit-PatchSet: 2
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Owner: dexter <pma...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
