Change in osmo-sgsn[master]: Move gtphub header to include/osmocom/gtphub/

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30899 ) Change subject: Move gtphub header to include/osmocom/gtphub/ ...................................................................... Move gtphub header to include/osmocom/gtphub/ Change-Id: I82e1f2a3bc8e22b28747a540879bd661f1704cde --- M configure.ac M debian/copyright M include/osmocom/Makefile.am A include/osmocom/gtphub/Makefile.am R include/osmocom/gtphub/gtphub.h M include/osmocom/sgsn/Makefile.am M src/gtphub/gtphub.c M src/gtphub/gtphub_ares.c M src/gtphub/gtphub_main.c M src/gtphub/gtphub_sock.c M src/gtphub/gtphub_vty.c M tests/gtphub/gtphub_test.c 12 files changed, 12 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/99/30899/1 diff --git a/configure.ac b/configure.ac index 64b74e3..2c335d7 100644 --- a/configure.ac +++ b/configure.ac @@ -235,6 +235,7 @@ AC_OUTPUT( include/Makefile include/osmocom/Makefile + include/osmocom/gtphub/Makefile include/osmocom/sgsn/Makefile src/Makefile src/gprs/Makefile diff --git a/debian/copyright b/debian/copyright index d4e7451..cd8d7e8 100644 --- a/debian/copyright +++ b/debian/copyright @@ -74,7 +74,7 @@ include/osmocom/sgsn/gprs_sndcp_pcomp.h include/osmocom/sgsn/gprs_sndcp_xid.h include/osmocom/sgsn/gprs_utils.h - include/osmocom/sgsn/gtphub.h + include/osmocom/gtphub/gtphub.h include/osmocom/sgsn/signal.h src/gprs/gprs_llc_parse.c src/gprs/crc24.c diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am index 09db97a..f5bc76a 100644 --- a/include/osmocom/Makefile.am +++ b/include/osmocom/Makefile.am @@ -1,3 +1,4 @@ SUBDIRS = \ + gtphub \ sgsn \ $(NULL) diff --git a/include/osmocom/gtphub/Makefile.am b/include/osmocom/gtphub/Makefile.am new file mode 100644 index 0000000..c61dad9 --- /dev/null +++ b/include/osmocom/gtphub/Makefile.am @@ -0,0 +1,3 @@ +noinst_HEADERS = \ + gtphub.h \ + $(NULL) diff --git a/include/osmocom/sgsn/gtphub.h b/include/osmocom/gtphub/gtphub.h similarity index 100% rename from include/osmocom/sgsn/gtphub.h rename to include/osmocom/gtphub/gtphub.h diff --git a/include/osmocom/sgsn/Makefile.am b/include/osmocom/sgsn/Makefile.am index a3bc218..017954d 100644 --- a/include/osmocom/sgsn/Makefile.am +++ b/include/osmocom/sgsn/Makefile.am @@ -23,7 +23,6 @@ gprs_subscriber.h \ gprs_utils.h \ gtp.h \ - gtphub.h \ gtp_ggsn.h \ gtp_mme.h \ pdpctx.h \ diff --git a/src/gtphub/gtphub.c b/src/gtphub/gtphub.c index 89ca676..2b00f59 100644 --- a/src/gtphub/gtphub.c +++ b/src/gtphub/gtphub.c @@ -32,7 +32,7 @@ #include <gtp.h> #include <gtpie.h> -#include <osmocom/sgsn/gtphub.h> +#include <osmocom/gtphub/gtphub.h> #include <osmocom/sgsn/debug.h> #include <osmocom/sgsn/gprs_utils.h> diff --git a/src/gtphub/gtphub_ares.c b/src/gtphub/gtphub_ares.c index 87dc860..a2d8a4a 100644 --- a/src/gtphub/gtphub_ares.c +++ b/src/gtphub/gtphub_ares.c @@ -28,7 +28,7 @@ #include <string.h> #include <unistd.h> -#include <osmocom/sgsn/gtphub.h> +#include <osmocom/gtphub/gtphub.h> #include <osmocom/sgsn/debug.h> #include <osmocom/core/utils.h> diff --git a/src/gtphub/gtphub_main.c b/src/gtphub/gtphub_main.c index a9a7529..0f389ab 100644 --- a/src/gtphub/gtphub_main.c +++ b/src/gtphub/gtphub_main.c @@ -41,7 +41,7 @@ #include <osmocom/vty/misc.h> #include <osmocom/sgsn/debug.h> -#include <osmocom/sgsn/gtphub.h> +#include <osmocom/gtphub/gtphub.h> #include <osmocom/sgsn/vty.h> #include "../../bscconfig.h" diff --git a/src/gtphub/gtphub_sock.c b/src/gtphub/gtphub_sock.c index 1837533..59a0d42 100644 --- a/src/gtphub/gtphub_sock.c +++ b/src/gtphub/gtphub_sock.c @@ -25,7 +25,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <osmocom/sgsn/gtphub.h> +#include <osmocom/gtphub/gtphub.h> #include <osmocom/sgsn/debug.h> /* Convenience makro, note: only within this C file. */ diff --git a/src/gtphub/gtphub_vty.c b/src/gtphub/gtphub_vty.c index abc08fd..b5f102a 100644 --- a/src/gtphub/gtphub_vty.c +++ b/src/gtphub/gtphub_vty.c @@ -31,7 +31,7 @@ #include <osmocom/vty/misc.h> #include <osmocom/sgsn/vty.h> -#include <osmocom/sgsn/gtphub.h> +#include <osmocom/gtphub/gtphub.h> /* TODO split GRX ares from sgsn into a separate struct and allow use without * globals. */ diff --git a/tests/gtphub/gtphub_test.c b/tests/gtphub/gtphub_test.c index 13d2636..4f58315 100644 --- a/tests/gtphub/gtphub_test.c +++ b/tests/gtphub/gtphub_test.c @@ -30,7 +30,7 @@ #include <osmocom/sgsn/debug.h> -#include <osmocom/sgsn/gtphub.h> +#include <osmocom/gtphub/gtphub.h> #include <gtp.h> #include <gtpie.h> -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/30899 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I82e1f2a3bc8e22b28747a540879bd661f1704cde Gerrit-Change-Number: 30899 Gerrit-PatchSet: 1 Gerrit-Owner: pespin &lt;pespin(a)sysmocom.de&gt; Gerrit-MessageType: newchange