[MERGED] osmo-sgsn[master]: non-iu-build: guard vty libosmo-sigtran function calls.

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: non-iu-build: guard vty libosmo-sigtran function calls.
......................................................................


non-iu-build: guard vty libosmo-sigtran function calls.

The function calls osmo_ss7_vty_go_parent() and gtphub_vty_is_config_node()
are not guarded by an ifdef. The functions are only needed for IU
support where libosmo-sigtran is used.

Guard the function calls with a BUILD_IU

Change-Id: I1c609ef0c344ce825c313335c7e084bf97159262
---
M src/gprs/gtphub_main.c
1 file changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Neels Hofmeyr: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/gprs/gtphub_main.c b/src/gprs/gtphub_main.c
index 782afb3..c3e25d5 100644
--- a/src/gprs/gtphub_main.c
+++ b/src/gprs/gtphub_main.c
@@ -115,6 +115,7 @@
 	}
 }
 
+#if BUILD_IU
 int gtphub_vty_go_parent(struct vty *vty)
 {
 	switch (vty->node) {
@@ -124,13 +125,16 @@
 
 	return vty->node;
 }
+#endif
 
 int gtphub_vty_is_config_node(struct vty *vty, int node)
 {
 	/* Check if libosmo-sccp declares the node in
 	 * question as config node */
+#if BUILD_IU
 	if (osmo_ss7_is_config_node(vty, node))
 		return 1;
+#endif
 
 	switch (node) {
 	/* add items that are not config */
@@ -145,7 +149,9 @@
 static struct vty_app_info vty_info = {
 	.name 		= "OsmoGTPhub",
 	.version	= PACKAGE_VERSION,
+#if BUILD_IU
 	.go_parent_cb	= gtphub_vty_go_parent,
+#endif
 	.is_config_node	= gtphub_vty_is_config_node,
 };
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1c609ef0c344ce825c313335c7e084bf97159262
Gerrit-PatchSet: 4
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Owner: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de>