[MERGED] libosmo-sccp[master]: vty: make addressbook available for _sg and _asp

2017-07-19 Thread Neels Hofmeyr 
Neels 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(_node, NULL);
+   vty_install_default(L_CS7_SCCPADDR_NODE);
+   install_element(L_CS7_NODE, _show_sccpaddr_cmd);
+   install_element(L_CS7_NODE, _sccpaddr_cmd);
+   install_element(L_CS7_NODE, _sccpaddr_del_cmd);
+   install_element(L_CS7_SCCPADDR_NODE, _sccpaddr_pc_del_cmd);
+   install_element(L_CS7_SCCPADDR_NODE, _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, _sccpaddr_ip_del_cmd);
+#endif
+   install_element(L_CS7_SCCPADDR_NODE, _sccpaddr_gt_del_cmd);
+   install_element(L_CS7_SCCPADDR_NODE, _sccpaddr_ri_cmd);
+   install_element(L_CS7_SCCPADDR_NODE, _sccpaddr_pc_cmd);
+   install_element(L_CS7_SCCPADDR_NODE, _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, _sccpaddr_ipv4_cmd);
+   install_element(L_CS7_SCCPADDR_NODE, _sccpaddr_ipv6_cmd);
+#endif
+   install_element(L_CS7_SCCPADDR_NODE, _sccpaddr_gt_cmd);
+   install_node(_gt_node, NULL);
+   vty_install_default(L_CS7_SCCPADDR_GT_NODE);
+   install_element(L_CS7_SCCPADDR_GT_NODE, _sccpaddr_gt_gti_cmd);
+   install_element(L_CS7_SCCPADDR_GT_NODE, _sccpaddr_gt_tt_cmd);
+   install_element(L_CS7_SCCPADDR_GT_NODE, _sccpaddr_gt_npi_cmd);
+   install_element(L_CS7_SCCPADDR_GT_NODE, _sccpaddr_gt_nai_cmd);
+   install_element(L_CS7_SCCPADDR_GT_NODE, _sccpaddr_gt_digits_cmd);
+}
+
 static void vty_init_shared(void)
 {
install_element_ve(_cs7_user_cmd);
@@ -1628,6 +1663,8 @@
install_element(L_CS7_AS_NODE, _qos_class_cmd);
install_element(L_CS7_AS_NODE, _rout_key_cmd);
install_element(L_CS7_AS_NODE, _pc_override_cmd);
+
+   vty_init_addr();
 }
 
 void osmo_ss7_vty_init_asp(void)
@@ -1653,38 +1690,6 @@
install_element(L_CS7_NODE, _cs7_xua_cmd);
install_element(L_CS7_XUA_NODE, _local_ip_cmd);
install_element(L_CS7_XUA_NODE, _accept_dyn_asp_cmd);
-
-   /* Commands for SCCP-Addressbook */
-   install_node(_node, NULL);
-   vty_install_default(L_CS7_SCCPADDR_NODE);
-   install_element(L_CS7_NODE, _show_sccpaddr_cmd);
-   install_element(L_CS7_NODE, _sccpaddr_cmd);
-   install_element(L_CS7_NODE, _sccpaddr_del_cmd);
-   install_element(L_CS7_SCCPADDR_NODE, _sccpaddr_pc_del_cmd);
-   install_element(L_CS7_SCCPADDR_NODE, _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, _sccpaddr_ip_del_cmd);
-#endif
-   install_element(L_CS7_SCCPADDR_NODE, _sccpaddr_gt_del_cmd);
-   install_element(L_CS7_SCCPADDR_NODE, _sccpaddr_ri_cmd);
-   install_element(L_CS7_SCCPADDR_NODE, _sccpaddr_pc_cmd);
-   install_element(L_CS7_SCCPADDR_NODE, _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, _sccpaddr_ipv4_cmd);
-   install_element(L_CS7_SCCPADDR_NODE, _sccpaddr_ipv6_cmd);
-#endif
-   install_element(L_CS7_SCCPADDR_NODE, _sccpaddr_gt_cmd);
-   install_node(_gt_node, NULL);
-   vty_install_default(L_CS7_SCCPADDR_GT_NODE);
-   install_element(L_CS7_SCCPADDR_GT_NODE, _sccpaddr_gt_gti_cmd);
-   install_element(L_CS7_SCCPADDR_GT_NODE, _sccpaddr_gt_tt_cmd);
-   install_element(L_CS7_SCCPADDR_GT_NODE, _sccpaddr_gt_npi_cmd);
-   install_element(L_CS7_SCCPADDR_GT_NODE, _sccpaddr_gt_nai_cmd);
-   install_element(L_CS7_SCCPADDR_GT_NODE, _sccpaddr_gt_digits_cmd);
 }
 
 void osmo_ss7_set_vty_alloc_ctx(void *ctx)

-- 
To view, visit https://gerrit.osmocom.org/3103

libosmo-sccp[master]: vty: make addressbook available for _sg and _asp

2017-07-19 Thread Neels Hofmeyr 

Patch Set 6: Code-Review+2

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib49ab623055e9ada7f95e0163ba7e33c5f6f99cb
Gerrit-PatchSet: 6
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Owner: dexter 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: No

libosmo-sccp[master]: vty: make addressbook available for _sg and _asp

2017-07-18 Thread Harald Welte 

Patch Set 5: Code-Review+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib49ab623055e9ada7f95e0163ba7e33c5f6f99cb
Gerrit-PatchSet: 5
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Owner: dexter 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: No

libosmo-sccp[master]: vty: make addressbook available for _sg and _asp

2017-07-18 Thread Harald Welte 

Patch Set 5:

waiting for neels to see if his comments are adressed.

The global list for globally unique name lookup will be a separate patch, or 
what is the plan here?

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ib49ab623055e9ada7f95e0163ba7e33c5f6f99cb
Gerrit-PatchSet: 5
Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Owner: dexter 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr 
Gerrit-HasComments: No

[PATCH] libosmo-sccp[master]: vty: make addressbook available for _sg and _asp

2017-07-07 Thread dexter 
Hello Neels Hofmeyr, Jenkins Builder,

I'd like you to reexamine a change.  Please visit

https://gerrit.osmocom.org/3103

to look at the new patch set (#4).

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 bos SG and ASP

Change-Id: Ib49ab623055e9ada7f95e0163ba7e33c5f6f99cb
---
M src/osmo_ss7_vty.c
1 file changed, 37 insertions(+), 32 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/03/3103/4

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(_node, NULL);
+   vty_install_default(L_CS7_SCCPADDR_NODE);
+   install_element(L_CS7_NODE, _show_sccpaddr_cmd);
+   install_element(L_CS7_NODE, _sccpaddr_cmd);
+   install_element(L_CS7_NODE, _sccpaddr_del_cmd);
+   install_element(L_CS7_SCCPADDR_NODE, _sccpaddr_pc_del_cmd);
+   install_element(L_CS7_SCCPADDR_NODE, _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, _sccpaddr_ip_del_cmd);
+#endif
+   install_element(L_CS7_SCCPADDR_NODE, _sccpaddr_gt_del_cmd);
+   install_element(L_CS7_SCCPADDR_NODE, _sccpaddr_ri_cmd);
+   install_element(L_CS7_SCCPADDR_NODE, _sccpaddr_pc_cmd);
+   install_element(L_CS7_SCCPADDR_NODE, _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, _sccpaddr_ipv4_cmd);
+   install_element(L_CS7_SCCPADDR_NODE, _sccpaddr_ipv6_cmd);
+#endif
+   install_element(L_CS7_SCCPADDR_NODE, _sccpaddr_gt_cmd);
+   install_node(_gt_node, NULL);
+   vty_install_default(L_CS7_SCCPADDR_GT_NODE);
+   install_element(L_CS7_SCCPADDR_GT_NODE, _sccpaddr_gt_gti_cmd);
+   install_element(L_CS7_SCCPADDR_GT_NODE, _sccpaddr_gt_tt_cmd);
+   install_element(L_CS7_SCCPADDR_GT_NODE, _sccpaddr_gt_npi_cmd);
+   install_element(L_CS7_SCCPADDR_GT_NODE, _sccpaddr_gt_nai_cmd);
+   install_element(L_CS7_SCCPADDR_GT_NODE, _sccpaddr_gt_digits_cmd);
+}
+
 static void vty_init_shared(void)
 {
install_element_ve(_cs7_user_cmd);
@@ -1628,6 +1663,8 @@
install_element(L_CS7_AS_NODE, _qos_class_cmd);
install_element(L_CS7_AS_NODE, _rout_key_cmd);
install_element(L_CS7_AS_NODE, _pc_override_cmd);
+
+   vty_init_addr();
 }
 
 void osmo_ss7_vty_init_asp(void)
@@ -1653,38 +1690,6 @@
install_element(L_CS7_NODE, _cs7_xua_cmd);
install_element(L_CS7_XUA_NODE, _local_ip_cmd);
install_element(L_CS7_XUA_NODE, _accept_dyn_asp_cmd);
-
-   /* Commands for SCCP-Addressbook */
-   install_node(_node, NULL);
-   vty_install_default(L_CS7_SCCPADDR_NODE);
-   install_element(L_CS7_NODE, _show_sccpaddr_cmd);
-   install_element(L_CS7_NODE, _sccpaddr_cmd);
-   install_element(L_CS7_NODE, _sccpaddr_del_cmd);
-   install_element(L_CS7_SCCPADDR_NODE, _sccpaddr_pc_del_cmd);
-   install_element(L_CS7_SCCPADDR_NODE, _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, _sccpaddr_ip_del_cmd);
-#endif
-   install_element(L_CS7_SCCPADDR_NODE, _sccpaddr_gt_del_cmd);
-   install_element(L_CS7_SCCPADDR_NODE, _sccpaddr_ri_cmd);
-   install_element(L_CS7_SCCPADDR_NODE, _sccpaddr_pc_cmd);
-   install_element(L_CS7_SCCPADDR_NODE, _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, _sccpaddr_ipv4_cmd);
-   install_element(L_CS7_SCCPADDR_NODE, _sccpaddr_ipv6_cmd);
-#endif
-   install_element(L_CS7_SCCPADDR_NODE, _sccpaddr_gt_cmd);
-   install_node(_gt_node, NULL);
-   vty_install_default(L_CS7_SCCPADDR_GT_NODE);
-   install_element(L_CS7_SCCPADDR_GT_NODE, _sccpaddr_gt_gti_cmd);
-   install_element(L_CS7_SCCPADDR_GT_NODE, _sccpaddr_gt_tt_cmd);
-   install_element(L_CS7_SCCPADDR_GT_NODE, _sccpaddr_gt_npi_cmd);
-   install_element(L_CS7_SCCPADDR_GT_NODE, _sccpaddr_gt_nai_cmd);
-   install_element(L_CS7_SCCPADDR_GT_NODE, _sccpaddr_gt_digits_cmd);
 }
 
 void osmo_ss7_set_vty_alloc_ctx(void *ctx)

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