diff options
author | Neels Hofmeyr <neels@hofmeyr.de> | 2018-03-15 13:00:35 +0100 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2018-03-16 09:16:19 +0000 |
commit | 69e356be93c420b5e2f8b96fbc89ef889cbcfe53 (patch) | |
tree | e48a5f369b1fd57871fbbea678010d767a1f445f /include/osmocom | |
parent | 5343a8c0d3384a56b82636aecdfcd42b6eda2c0a (diff) |
compiler warnings: use enum ranap_nsap_addr_enc, constify local var
Use the proper enum ranap_nsap_addr_enc instead of int, and properly exclude
that member when we're building without Iu support:
sgsn_vty.c:1323:31: error: passing argument 2 of ‘ranap_iu_vty_init’ from incompatible pointer type [-Werror=incompatible-pointer-types]
ranap_iu_vty_init(SGSN_NODE, &g_cfg->iu.rab_assign_addr_enc);
Add const to a local var to silence compiler warning retrieving TLVP_VAL:
gprs_gmm.c:1657:18: error: initialization discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers]
uint8_t *mi = TLVP_VAL(&tp, GSM48_IE_GMM_ALLOC_PTMSI);
^~~~~~~~
Change-Id: I1168ce6425c31db3f6c3bf1f3682ae96b028c59b
Diffstat (limited to 'include/osmocom')
-rw-r--r-- | include/osmocom/sgsn/sgsn.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/osmocom/sgsn/sgsn.h b/include/osmocom/sgsn/sgsn.h index 7e0b5d477..829a8fc6e 100644 --- a/include/osmocom/sgsn/sgsn.h +++ b/include/osmocom/sgsn/sgsn.h @@ -9,6 +9,12 @@ #include <osmocom/sgsn/oap_client.h> #include <osmocom/sgsn/common.h> +#include "../../bscconfig.h" + +#if BUILD_IU +#include <osmocom/ranap/iu_client.h> +#endif + #include <ares.h> #include <gtp.h> @@ -113,9 +119,11 @@ struct sgsn_config { int p2; } dcomp_v42bis; +#if BUILD_IU struct { - int rab_assign_addr_enc; + enum ranap_nsap_addr_enc rab_assign_addr_enc; } iu; +#endif }; struct sgsn_instance { |