laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/39244?usp=email )
(
1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: Add include prefix for all libgtp related includes ......................................................................
Add include prefix for all libgtp related includes
The libgtp includes contain all the prefix osmocom/gtp. The old non-prefix was used in the old OpenGGSN code base.
Change-Id: I5ea50c9766f719e1eea89cbf6783fafc2093773d --- M src/gtphub/gtphub.c M src/sgsn/gprs_gmm.c M src/sgsn/gprs_ranap.c M src/sgsn/mmctx.c M src/sgsn/sgsn.c M src/sgsn/sgsn_cdr.c M src/sgsn/sgsn_ctrl.c M src/sgsn/sgsn_libgtp.c M src/sgsn/sgsn_main.c M src/sgsn/sgsn_vty.c M tests/gtphub/gtphub_test.c 11 files changed, 26 insertions(+), 22 deletions(-)
Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified
diff --git a/src/gtphub/gtphub.c b/src/gtphub/gtphub.c index 937e6a4..b09f9cb 100644 --- a/src/gtphub/gtphub.c +++ b/src/gtphub/gtphub.c @@ -29,8 +29,8 @@ #include <netinet/in.h> #include <arpa/inet.h>
-#include <gtp.h> -#include <gtpie.h> +#include <osmocom/gtp/gtp.h> +#include <osmocom/gtp/gtpie.h>
#include <osmocom/gtphub/gtphub.h> #include <osmocom/sgsn/debug.h> diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c index e49e611..b9b13fd 100644 --- a/src/sgsn/gprs_gmm.c +++ b/src/sgsn/gprs_gmm.c @@ -44,6 +44,8 @@ #include <osmocom/crypt/utran_cipher.h> #include <osmocom/gsm/protocol/gsm_04_08_gprs.h>
+#include <osmocom/gtp/pdp.h> + #include <osmocom/gprs/gprs_bssgp.h>
#include <osmocom/sgsn/debug.h> @@ -65,8 +67,6 @@ #include <osmocom/sgsn/pdpctx.h> #include <osmocom/sgsn/gprs_gmm_util.h>
-#include <pdp.h> - #define PTMSI_ALLOC
diff --git a/src/sgsn/gprs_ranap.c b/src/sgsn/gprs_ranap.c index b652cb5..af764de 100644 --- a/src/sgsn/gprs_ranap.c +++ b/src/sgsn/gprs_ranap.c @@ -22,7 +22,7 @@ */
#include "config.h" -#include <gtp.h> +#include <osmocom/gtp/gtp.h>
#include <osmocom/core/rate_ctr.h> #include <osmocom/core/tdef.h> diff --git a/src/sgsn/mmctx.c b/src/sgsn/mmctx.c index ae73320..40f902b 100644 --- a/src/sgsn/mmctx.c +++ b/src/sgsn/mmctx.c @@ -36,6 +36,8 @@ #include <osmocom/gsm/gsm_utils.h> #include <osmocom/gsm/gsup.h>
+#include <osmocom/gtp/pdp.h> + #include <osmocom/sgsn/gprs_subscriber.h> #include <osmocom/sgsn/debug.h> #include <osmocom/sgsn/mmctx.h> @@ -54,8 +56,6 @@ #include <osmocom/sgsn/gtp.h> #include <osmocom/sgsn/pdpctx.h>
-#include <pdp.h> - #include <time.h>
#include "../../config.h" diff --git a/src/sgsn/sgsn.c b/src/sgsn/sgsn.c index 1c637b3..4ebba26 100644 --- a/src/sgsn/sgsn.c +++ b/src/sgsn/sgsn.c @@ -39,6 +39,8 @@ #include <osmocom/crypt/gprs_cipher.h> #include <osmocom/crypt/utran_cipher.h>
+#include <osmocom/gtp/pdp.h> + #include <osmocom/sgsn/gprs_subscriber.h> #include <osmocom/sgsn/debug.h> #include <osmocom/sgsn/sgsn.h> @@ -57,8 +59,6 @@ #include <osmocom/sgsn/pdpctx.h> #include <osmocom/sgsn/gprs_routing_area.h>
-#include <pdp.h> - #include <time.h>
#define GPRS_LLME_CHECK_TICK 30 diff --git a/src/sgsn/sgsn_cdr.c b/src/sgsn/sgsn_cdr.c index 1979d92..b3656a8 100644 --- a/src/sgsn/sgsn_cdr.c +++ b/src/sgsn/sgsn_cdr.c @@ -20,6 +20,9 @@
#include <osmocom/ctrl/control_if.h>
+#include <osmocom/gtp/gtp.h> +#include <osmocom/gtp/pdp.h> + #include <osmocom/sgsn/sgsn.h> #include <osmocom/sgsn/signal.h> #include <osmocom/sgsn/gprs_utils.h> @@ -31,9 +34,6 @@ #include <osmocom/sgsn/pdpctx.h> #include <osmocom/sgsn/mmctx.h>
-#include <gtp.h> -#include <pdp.h> - #include <arpa/inet.h>
#include <time.h> diff --git a/src/sgsn/sgsn_ctrl.c b/src/sgsn/sgsn_ctrl.c index 069304a..245d6fd 100644 --- a/src/sgsn/sgsn_ctrl.c +++ b/src/sgsn/sgsn_ctrl.c @@ -21,12 +21,14 @@
#include <osmocom/ctrl/control_if.h> #include <osmocom/ctrl/control_cmd.h> + +#include <osmocom/gtp/pdp.h> + #include <osmocom/sgsn/mmctx.h> #include <osmocom/sgsn/pdpctx.h> #include <osmocom/sgsn/sgsn.h> #include <osmocom/sgsn/debug.h>
-#include <pdp.h>
static int get_subscriber_list(struct ctrl_cmd *cmd, void *d) { diff --git a/src/sgsn/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c index 3c35c78..af64738 100644 --- a/src/sgsn/sgsn_libgtp.c +++ b/src/sgsn/sgsn_libgtp.c @@ -42,6 +42,9 @@ #include <osmocom/gprs/gprs_bssgp.h> #include <osmocom/gsm/protocol/gsm_04_08_gprs.h>
+#include <osmocom/gtp/gtp.h> +#include <osmocom/gtp/pdp.h> + #include <osmocom/sgsn/signal.h> #include <osmocom/sgsn/debug.h> #include <osmocom/sgsn/sgsn.h> @@ -63,9 +66,6 @@ #include <osmocom/sgsn/gprs_bssgp.h> #include <osmocom/sgsn/pdpctx.h>
-#include <gtp.h> -#include <pdp.h> - /* TS 23.003: The MSISDN shall take the dummy MSISDN value composed of * 15 digits set to 0 (encoded as an E.164 international number) when * the MSISDN is not available in messages in which the presence of the diff --git a/src/sgsn/sgsn_main.c b/src/sgsn/sgsn_main.c index 86c3561..320842d 100644 --- a/src/sgsn/sgsn_main.c +++ b/src/sgsn/sgsn_main.c @@ -45,6 +45,8 @@ #include <osmocom/gprs/gprs_bssgp.h> #include <osmocom/gprs/gprs_bssgp_bss.h>
+#include <osmocom/gtp/gtp.h> + #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/logging.h> #include <osmocom/vty/stats.h> @@ -68,7 +70,6 @@ #include <osmocom/sgsn/gprs_subscriber.h> #include <osmocom/sgsn/gtp.h>
-#include <gtp.h> #include <osmocom/sgsn/sgsn_rim.h>
#include "../../config.h" diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c index 1a104b3..42e91e9 100644 --- a/src/sgsn/sgsn_vty.c +++ b/src/sgsn/sgsn_vty.c @@ -34,6 +34,9 @@ #include <osmocom/gsm/protocol/gsm_04_08_gprs.h> #include <osmocom/gsm/apn.h>
+#include <osmocom/gtp/gtp.h> +#include <osmocom/gtp/pdp.h> + #include <osmocom/sgsn/debug.h> #include <osmocom/sgsn/sgsn.h> #include <osmocom/gprs/gprs_ns2.h> @@ -57,9 +60,6 @@
#include <osmocom/gprs/gprs_bssgp.h>
-#include <pdp.h> -#include <gtp.h> - #include "../../config.h"
#ifdef BUILD_IU diff --git a/tests/gtphub/gtphub_test.c b/tests/gtphub/gtphub_test.c index 5fa730a..c5cd103 100644 --- a/tests/gtphub/gtphub_test.c +++ b/tests/gtphub/gtphub_test.c @@ -29,11 +29,12 @@ #include <osmocom/core/application.h> #include <osmocom/gsm/protocol/gsm_23_003.h>
+#include <osmocom/gtp/gtp.h> +#include <osmocom/gtp/gtpie.h> + #include <osmocom/sgsn/debug.h>
#include <osmocom/gtphub/gtphub.h> -#include <gtp.h> -#include <gtpie.h>
#define ZERO_STRUCT(struct_pointer) memset(struct_pointer, '\0', \ sizeof(*(struct_pointer)))
-
laforge