Move out gbproxy to its own subdir
Change-Id: I2cc98d3a276d953609bbbbaa9782a0112687791e
This commit is contained in:
parent
b8f22bd6c7
commit
9d016fd499
|
@ -247,6 +247,7 @@ AC_OUTPUT(
|
|||
include/osmocom/sgsn/Makefile
|
||||
src/Makefile
|
||||
src/gprs/Makefile
|
||||
src/gbproxy/Makefile
|
||||
tests/Makefile
|
||||
tests/atlocal
|
||||
tests/gprs/Makefile
|
||||
|
|
|
@ -86,12 +86,12 @@ Files: include/osmocom/sgsn/a_reset.h
|
|||
src/gprs/gprs_gb_parse.c
|
||||
src/gprs/gprs_utils.c
|
||||
src/gprs/sgsn_ares.c
|
||||
src/gprs/gb_proxy.c
|
||||
src/gprs/gb_proxy_main.c
|
||||
src/gprs/gb_proxy_patch.c
|
||||
src/gprs/gb_proxy_peer.c
|
||||
src/gprs/gb_proxy_tlli.c
|
||||
src/gprs/gb_proxy_vty.c
|
||||
src/gbproxy/gb_proxy.c
|
||||
src/gbproxy/gb_proxy_main.c
|
||||
src/gbproxy/gb_proxy_patch.c
|
||||
src/gbproxy/gb_proxy_peer.c
|
||||
src/gbproxy/gb_proxy_tlli.c
|
||||
src/gbproxy/gb_proxy_vty.c
|
||||
src/gprs/gprs_gmm.c
|
||||
src/gprs/gprs_llc.c
|
||||
src/gprs/gprs_llc_vty.c
|
||||
|
|
|
@ -23,7 +23,7 @@ app_configs = {
|
|||
}
|
||||
|
||||
|
||||
apps = [(4246, "src/gprs/osmo-gbproxy", "OsmoGbProxy", "gbproxy"),
|
||||
apps = [(4246, "src/gbproxy/osmo-gbproxy", "OsmoGbProxy", "gbproxy"),
|
||||
(4245, "src/gprs/osmo-sgsn", "OsmoSGSN", "sgsn"),
|
||||
(4253, "src/gprs/osmo-gtphub", "OsmoGTPhub", "gtphub")
|
||||
]
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
SUBDIRS = \
|
||||
gprs \
|
||||
gbproxy \
|
||||
$(NULL)
|
||||
|
|
|
@ -0,0 +1,46 @@
|
|||
AM_CPPFLAGS = \
|
||||
$(all_includes) \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_builddir) \
|
||||
$(NULL)
|
||||
|
||||
AM_CFLAGS = \
|
||||
-Wall \
|
||||
-fno-strict-aliasing \
|
||||
$(LIBOSMOCORE_CFLAGS) \
|
||||
$(LIBOSMOGSM_CFLAGS) \
|
||||
$(LIBOSMOVTY_CFLAGS) \
|
||||
$(LIBOSMOCTRL_CFLAGS) \
|
||||
$(LIBOSMOABIS_CFLAGS) \
|
||||
$(LIBOSMOGB_CFLAGS) \
|
||||
$(LIBOSMOGSUPCLIENT_CFLAGS) \
|
||||
$(COVERAGE_CFLAGS) \
|
||||
$(LIBGTP_CFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
bin_PROGRAMS = \
|
||||
osmo-gbproxy \
|
||||
$(NULL)
|
||||
|
||||
osmo_gbproxy_SOURCES = \
|
||||
gb_proxy.c \
|
||||
gb_proxy_main.c \
|
||||
gb_proxy_vty.c \
|
||||
gb_proxy_ctrl.c \
|
||||
gb_proxy_patch.c \
|
||||
gb_proxy_tlli.c \
|
||||
gb_proxy_peer.c \
|
||||
$(NULL)
|
||||
osmo_gbproxy_LDADD = \
|
||||
$(top_builddir)/src/gprs/gprs_gb_parse.o \
|
||||
$(top_builddir)/src/gprs/gprs_llc_parse.o \
|
||||
$(top_builddir)/src/gprs/crc24.o \
|
||||
$(top_builddir)/src/gprs/gprs_utils.o \
|
||||
$(LIBOSMOCORE_LIBS) \
|
||||
$(LIBOSMOGSM_LIBS) \
|
||||
$(LIBOSMOVTY_LIBS) \
|
||||
$(LIBOSMOCTRL_LIBS) \
|
||||
$(LIBOSMOGB_LIBS) \
|
||||
$(LIBGTP_LIBS) \
|
||||
-lrt \
|
||||
$(NULL)
|
|
@ -55,26 +55,10 @@ libcommon_la_LIBADD = \
|
|||
$(NULL)
|
||||
|
||||
bin_PROGRAMS = \
|
||||
osmo-gbproxy \
|
||||
osmo-sgsn \
|
||||
osmo-gtphub \
|
||||
$(NULL)
|
||||
|
||||
osmo_gbproxy_SOURCES = \
|
||||
gb_proxy.c \
|
||||
gb_proxy_main.c \
|
||||
gb_proxy_vty.c \
|
||||
gb_proxy_ctrl.c \
|
||||
gb_proxy_patch.c \
|
||||
gb_proxy_tlli.c \
|
||||
gb_proxy_peer.c \
|
||||
$(NULL)
|
||||
osmo_gbproxy_LDADD = \
|
||||
libcommon.la \
|
||||
$(OSMO_LIBS) \
|
||||
-lrt \
|
||||
$(NULL)
|
||||
|
||||
osmo_sgsn_SOURCES = \
|
||||
gprs_gb.c \
|
||||
gprs_gmm_attach.c \
|
||||
|
|
|
@ -32,10 +32,10 @@ gbproxy_test_LDFLAGS = \
|
|||
$(NULL)
|
||||
|
||||
gbproxy_test_LDADD = \
|
||||
$(top_builddir)/src/gprs/gb_proxy.o \
|
||||
$(top_builddir)/src/gprs/gb_proxy_patch.o \
|
||||
$(top_builddir)/src/gprs/gb_proxy_peer.o \
|
||||
$(top_builddir)/src/gprs/gb_proxy_tlli.o \
|
||||
$(top_builddir)/src/gbproxy/gb_proxy.o \
|
||||
$(top_builddir)/src/gbproxy/gb_proxy_patch.o \
|
||||
$(top_builddir)/src/gbproxy/gb_proxy_peer.o \
|
||||
$(top_builddir)/src/gbproxy/gb_proxy_tlli.o \
|
||||
$(top_builddir)/src/gprs/gprs_gb_parse.o \
|
||||
$(top_builddir)/src/gprs/gprs_llc_parse.o \
|
||||
$(top_builddir)/src/gprs/crc24.o \
|
||||
|
|
|
@ -71,11 +71,11 @@ class TestVTYBase(unittest.TestCase):
|
|||
class TestVTYGbproxy(TestVTYBase):
|
||||
|
||||
def vty_command(self):
|
||||
return ["./src/gprs/osmo-gbproxy", "-c",
|
||||
return ["./src/gbproxy/osmo-gbproxy", "-c",
|
||||
"doc/examples/osmo-gbproxy/osmo-gbproxy.cfg"]
|
||||
|
||||
def vty_app(self):
|
||||
return (4246, "./src/gprs/osmo-gbproxy", "OsmoGbProxy", "gbproxy")
|
||||
return (4246, "./src/gbproxy/osmo-gbproxy", "OsmoGbProxy", "gbproxy")
|
||||
|
||||
def testVtyTree(self):
|
||||
self.vty.enable()
|
||||
|
@ -277,7 +277,7 @@ class TestVTYSGSN(TestVTYBase):
|
|||
self.assertTrue(self.vty.verify('timer t%d 10' % t, ['']))
|
||||
|
||||
def add_gbproxy_test(suite, workdir):
|
||||
if not os.path.isfile(os.path.join(workdir, "src/gprs/osmo-gbproxy")):
|
||||
if not os.path.isfile(os.path.join(workdir, "src/gbproxy/osmo-gbproxy")):
|
||||
print("Skipping the Gb-Proxy test")
|
||||
return
|
||||
test = unittest.TestLoader().loadTestsFromTestCase(TestVTYGbproxy)
|
||||
|
|
Loading…
Reference in New Issue