diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-03-15 12:55:46 +0100 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2018-04-16 01:50:46 +0200 |
| commit | 21adb2bcd1801c6103fde7f598d8309fcbbbd6c8 (patch) | |
| tree | 5fd41036c435ce81a8a550115f0a81dc7bd0f06f /include | |
| parent | 37a3ae8585df2d7b8d849b194705e3ef0d2e0f6e (diff) | |
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 libvlr, in order to find the iu_client.h header (now
also included from gsm_data.h).
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/osmocom/msc/gsm_data.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index c5e7aaf12..73047eeb9 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 gsm_network { 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) */ |