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/.
Neels Hofmeyr gerrit-no-reply at lists.osmocom.orgNeels Hofmeyr has submitted this change and it was merged.
Change subject: vty: make addressbook available for _sg and _asp
......................................................................
vty: make addressbook available for _sg and _asp
The installation of the vty commands for the sccp addressbook is
currently located in osmo_ss7_vty_init_sg(), which is normally
only used in signalling gateway applications. An ASP would lack
the addressbook functionality.
Make SCCP addressbook available for both SG and ASP
Change-Id: Ib49ab623055e9ada7f95e0163ba7e33c5f6f99cb
---
M src/osmo_ss7_vty.c
1 file changed, 37 insertions(+), 32 deletions(-)
Approvals:
Neels Hofmeyr: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c
index b06f554..9a4e963 100644
--- a/src/osmo_ss7_vty.c
+++ b/src/osmo_ss7_vty.c
@@ -1587,6 +1587,41 @@
}
}
+/* Commands for SCCP-Addressbook */
+static void vty_init_addr(void)
+{
+ 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);
+}
+
static void vty_init_shared(void)
{
install_element_ve(&show_cs7_user_cmd);
@@ -1628,6 +1663,8 @@
install_element(L_CS7_AS_NODE, &as_qos_class_cmd);
install_element(L_CS7_AS_NODE, &as_rout_key_cmd);
install_element(L_CS7_AS_NODE, &as_pc_override_cmd);
+
+ vty_init_addr();
}
void osmo_ss7_vty_init_asp(void)
@@ -1653,38 +1690,6 @@
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/3103
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib49ab623055e9ada7f95e0163ba7e33c5f6f99cb
Gerrit-PatchSet: 6
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Owner: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>