aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2019-08-30 19:50:48 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2019-09-02 14:03:04 +0200
commitea05d5c5f89f034a8d2c4151507f59a520535d9a (patch)
tree18f394d35c6c0db1f6921d90ec78a292bc4c641c
parent9d016fd499cb23ad6d9e4c2757dbc4e1c154107d (diff)
Move out gtphub to its own subdir
-rw-r--r--configure.ac1
-rw-r--r--debian/copyright10
-rw-r--r--doc/examples/osmo-gtphub/gtphub-example.txt2
-rw-r--r--osmoappdesc.py2
-rw-r--r--src/Makefile.am1
-rw-r--r--src/gprs/Makefile.am19
-rw-r--r--src/gtphub/Makefile.am45
-rw-r--r--src/gtphub/gtphub.c (renamed from src/gprs/gtphub.c)0
-rw-r--r--src/gtphub/gtphub_ares.c (renamed from src/gprs/gtphub_ares.c)0
-rw-r--r--src/gtphub/gtphub_main.c (renamed from src/gprs/gtphub_main.c)0
-rw-r--r--src/gtphub/gtphub_sock.c (renamed from src/gprs/gtphub_sock.c)0
-rw-r--r--src/gtphub/gtphub_vty.c (renamed from src/gprs/gtphub_vty.c)0
-rw-r--r--tests/gtphub/Makefile.am2
13 files changed, 55 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac
index 1c3f03b0..66722041 100644
--- a/configure.ac
+++ b/configure.ac
@@ -248,6 +248,7 @@ AC_OUTPUT(
src/Makefile
src/gprs/Makefile
src/gbproxy/Makefile
+ src/gtphub/Makefile
tests/Makefile
tests/atlocal
tests/gprs/Makefile
diff --git a/debian/copyright b/debian/copyright
index 695d768b..5d883b9d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -104,9 +104,9 @@ Files: include/osmocom/sgsn/a_reset.h
src/gprs/gprs_sndcp_vty.c
src/gprs/gprs_sndcp_xid.c
src/gprs/gprs_subscriber.c
- src/gprs/gtphub.c
- src/gprs/gtphub_main.c
- src/gprs/gtphub_vty.c
+ src/gtphub/gtphub.c
+ src/gtphub/gtphub_main.c
+ src/gtphub/gtphub_vty.c
src/gprs/sgsn_auth.c
src/gprs/sgsn_cdr.c
src/gprs/sgsn_ctrl.c
@@ -140,8 +140,8 @@ License: AGPL-3.0+
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-Files: src/gprs/gtphub_ares.c
- src/gprs/gtphub_sock.c
+Files: src/gtphub/gtphub_ares.c
+ src/gtphub/gtphub_sock.c
tests/gbproxy/gbproxy_test.c
Copyright: 2013 Jacob Erlbeck <jerlbeck@sysmocom.de>
2013 sysmocom s.f.m.c. GmbH
diff --git a/doc/examples/osmo-gtphub/gtphub-example.txt b/doc/examples/osmo-gtphub/gtphub-example.txt
index 9c65f925..17f6914d 100644
--- a/doc/examples/osmo-gtphub/gtphub-example.txt
+++ b/doc/examples/osmo-gtphub/gtphub-example.txt
@@ -59,7 +59,7 @@ The LD_LIBRARY_PATH below may be needed if OpenGGSN installed to /usr/local.
2. GTPHub:
cd <your-test-dir>
- path/to/openbsc/openbsc/src/gprs/osmo-gtphub -c gtphub.conf #-e 1 #for DEBUG level
+ path/to/openbsc/openbsc/src/gtphub/osmo-gtphub -c gtphub.conf #-e 1 #for DEBUG level
3. SGSN tests:
diff --git a/osmoappdesc.py b/osmoappdesc.py
index 1c47aee6..9c3fd5d9 100644
--- a/osmoappdesc.py
+++ b/osmoappdesc.py
@@ -25,7 +25,7 @@ app_configs = {
apps = [(4246, "src/gbproxy/osmo-gbproxy", "OsmoGbProxy", "gbproxy"),
(4245, "src/gprs/osmo-sgsn", "OsmoSGSN", "sgsn"),
- (4253, "src/gprs/osmo-gtphub", "OsmoGTPhub", "gtphub")
+ (4253, "src/gtphub/osmo-gtphub", "OsmoGTPhub", "gtphub")
]
vty_command = ["./src/gprs/osmo-sgsn", "-c",
diff --git a/src/Makefile.am b/src/Makefile.am
index 024938d8..2abd4375 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,5 @@
SUBDIRS = \
gprs \
gbproxy \
+ gtphub \
$(NULL)
diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am
index 8f7f054e..e5d50d37 100644
--- a/src/gprs/Makefile.am
+++ b/src/gprs/Makefile.am
@@ -56,7 +56,6 @@ libcommon_la_LIBADD = \
bin_PROGRAMS = \
osmo-sgsn \
- osmo-gtphub \
$(NULL)
osmo_sgsn_SOURCES = \
@@ -103,21 +102,3 @@ osmo_sgsn_LDADD += \
$(LIBASN1C_LIBS) \
$(NULL)
endif
-
-osmo_gtphub_SOURCES = \
- gtphub_main.c \
- gtphub.c \
- gtphub_sock.c \
- gtphub_ares.c \
- gtphub_vty.c \
- $(NULL)
-osmo_gtphub_LDADD = \
- libcommon.la \
- $(LIBOSMOCORE_LIBS) \
- $(LIBOSMOGSM_LIBS) \
- $(LIBOSMOVTY_LIBS) \
- $(LIBCARES_LIBS) \
- $(LIBGTP_LIBS) \
- $(LIBOSMOSIGTRAN_LIBS) \
- -lrt \
- $(NULL)
diff --git a/src/gtphub/Makefile.am b/src/gtphub/Makefile.am
new file mode 100644
index 00000000..a242a058
--- /dev/null
+++ b/src/gtphub/Makefile.am
@@ -0,0 +1,45 @@
+AM_CPPFLAGS = \
+ $(all_includes) \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir) \
+ $(NULL)
+
+AM_CFLAGS = \
+ -Wall \
+ -fno-strict-aliasing \
+ $(LIBOSMOCORE_CFLAGS) \
+ $(LIBOSMOGSM_CFLAGS) \
+ $(LIBOSMOVTY_CFLAGS) \
+ $(LIBOSMOGSUPCLIENT_CFLAGS) \
+ $(COVERAGE_CFLAGS) \
+ $(LIBGTP_CFLAGS) \
+ $(NULL)
+if BUILD_IU
+AM_CFLAGS += \
+ $(LIBASN1C_CFLAGS) \
+ $(LIBOSMOSIGTRAN_CFLAGS) \
+ $(LIBOSMORANAP_CFLAGS) \
+ $(NULL)
+endif
+
+bin_PROGRAMS = osmo-gtphub
+
+osmo_gtphub_SOURCES = \
+ gtphub_main.c \
+ gtphub.c \
+ gtphub_sock.c \
+ gtphub_ares.c \
+ gtphub_vty.c \
+ $(NULL)
+
+osmo_gtphub_LDADD = \
+ $(top_builddir)/src/gprs/sgsn_ares.o \
+ $(top_builddir)/src/gprs/gprs_utils.o \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBOSMOVTY_LIBS) \
+ $(LIBCARES_LIBS) \
+ $(LIBGTP_LIBS) \
+ $(LIBOSMOSIGTRAN_LIBS) \
+ -lrt \
+ $(NULL)
diff --git a/src/gprs/gtphub.c b/src/gtphub/gtphub.c
index ca5857b3..ca5857b3 100644
--- a/src/gprs/gtphub.c
+++ b/src/gtphub/gtphub.c
diff --git a/src/gprs/gtphub_ares.c b/src/gtphub/gtphub_ares.c
index 87dc860c..87dc860c 100644
--- a/src/gprs/gtphub_ares.c
+++ b/src/gtphub/gtphub_ares.c
diff --git a/src/gprs/gtphub_main.c b/src/gtphub/gtphub_main.c
index f693f099..f693f099 100644
--- a/src/gprs/gtphub_main.c
+++ b/src/gtphub/gtphub_main.c
diff --git a/src/gprs/gtphub_sock.c b/src/gtphub/gtphub_sock.c
index 1acd5a62..1acd5a62 100644
--- a/src/gprs/gtphub_sock.c
+++ b/src/gtphub/gtphub_sock.c
diff --git a/src/gprs/gtphub_vty.c b/src/gtphub/gtphub_vty.c
index abc08fd6..abc08fd6 100644
--- a/src/gprs/gtphub_vty.c
+++ b/src/gtphub/gtphub_vty.c
diff --git a/tests/gtphub/Makefile.am b/tests/gtphub/Makefile.am
index 523df61d..fea01e0d 100644
--- a/tests/gtphub/Makefile.am
+++ b/tests/gtphub/Makefile.am
@@ -31,7 +31,7 @@ gtphub_test_LDFLAGS = \
$(NULL)
gtphub_test_LDADD = \
- $(top_builddir)/src/gprs/gtphub.o \
+ $(top_builddir)/src/gtphub/gtphub.o \
$(top_builddir)/src/gprs/gprs_utils.o \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \