[PATCH] osmo-msc[master]: cosmetic: use enum ranap_nsap_addr_enc instead of int

[Neels Hofmeyr]

Hello Harald Welte, Jenkins Builder,

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

    https://gerrit.osmocom.org/7296

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

cosmetic: use enum ranap_nsap_addr_enc instead of int

The only reason to use int instead of the enum was the lack of header
iu_client.h when not building with Iu support. Rather use the configure result
properly, include the header when Iu support is built and use the proper enum.

Omit the entire iu sub-struct when building without Iu.

Add LIBOSMORANAP_CFLAGS to libcommon in order to find the iu_client.h header.

Rationale: Instead of using a questionable typecast from int* to enum*, we can
now use the enum member directly without needing to silence compiler warnings.

Change-Id: Ic9f8bf53f4b605c166e84cd7edd90c10fe7d7a1f
---
M include/osmocom/msc/gsm_data.h
M src/libgsupclient/Makefile.am
M src/libmsc/msc_vty.c
3 files changed, 12 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/96/7296/3

diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h
index c5e7aaf..73047ee 100644
--- a/include/osmocom/msc/gsm_data.h
+++ b/include/osmocom/msc/gsm_data.h
@@ -23,6 +23,11 @@
 /* TS 48.008 DLCI containing DCCH/ACCH + SAPI */
 #define OMSC_LINKID_CB(__msgb)   (__msgb)->cb[3]
 
+#include "../../bscconfig.h"
+#if BUILD_IU
+#include <osmocom/ranap/iu_client.h>
+#endif
+
 /** annotations for msgb ownership */
 #define __uses
 
@@ -311,12 +316,14 @@
 		struct mgcp_client *client;
 	} mgw;
 
+#if BUILD_IU
 	struct {
 		/* CS7 instance id number (set via VTY) */
 		uint32_t cs7_instance;
-		int rab_assign_addr_enc;
+		enum ranap_nsap_addr_enc rab_assign_addr_enc;
 		struct osmo_sccp_instance *sccp;
 	} iu;
+#endif
 
 	struct {
 		/* CS7 instance id number (set via VTY) */
diff --git a/src/libgsupclient/Makefile.am b/src/libgsupclient/Makefile.am
index a33fb38..6b4826d 100644
--- a/src/libgsupclient/Makefile.am
+++ b/src/libgsupclient/Makefile.am
@@ -10,6 +10,9 @@
 	$(LIBOSMOGSM_CFLAGS) \
 	$(LIBOSMOVTY_CFLAGS) \
 	$(LIBOSMOABIS_CFLAGS) \
+	$(LIBOSMOSCCP_CFLAGS) \
+	$(LIBOSMOMGCPCLIENT_CFLAGS) \
+	$(LIBOSMORANAP_CFLAGS) \
 	$(COVERAGE_CFLAGS) \
 	$(NULL)
 
diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c
index 84d4d14..4ca6d55 100644
--- a/src/libmsc/msc_vty.c
+++ b/src/libmsc/msc_vty.c
@@ -1422,7 +1422,7 @@
 
 	mgcp_client_vty_init(msc_network, MSC_NODE, &msc_network->mgw.conf);
 #ifdef BUILD_IU
-	ranap_iu_vty_init(MSC_NODE, (enum ranap_nsap_addr_enc*)&msc_network->iu.rab_assign_addr_enc);
+	ranap_iu_vty_init(MSC_NODE, &msc_network->iu.rab_assign_addr_enc);
 #endif
 	osmo_fsm_vty_add_cmds();
 

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

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: Ic9f8bf53f4b605c166e84cd7edd90c10fe7d7a1f
Gerrit-PatchSet: 3
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>