aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2019-08-30 20:47:02 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2019-09-02 14:03:04 +0200
commit762c39ccc65e0307a32b89e8bf7daaad2b6b66b4 (patch)
treec1d0de85859115be63d89d7802b278cfe013019d
parentea05d5c5f89f034a8d2c4151507f59a520535d9a (diff)
Move out sgsn to its own subdir
-rw-r--r--configure.ac1
-rw-r--r--debian/copyright36
-rw-r--r--osmoappdesc.py4
-rw-r--r--src/Makefile.am1
-rw-r--r--src/gprs/Makefile.am58
-rw-r--r--src/sgsn/Makefile.am88
-rw-r--r--src/sgsn/gprs_gb.c (renamed from src/gprs/gprs_gb.c)0
-rw-r--r--src/sgsn/gprs_gmm.c (renamed from src/gprs/gprs_gmm.c)0
-rw-r--r--src/sgsn/gprs_gmm_attach.c (renamed from src/gprs/gprs_gmm_attach.c)0
-rw-r--r--src/sgsn/gprs_llc.c (renamed from src/gprs/gprs_llc.c)0
-rw-r--r--src/sgsn/gprs_llc_vty.c (renamed from src/gprs/gprs_llc_vty.c)0
-rw-r--r--src/sgsn/gprs_llc_xid.c (renamed from src/gprs/gprs_llc_xid.c)0
-rw-r--r--src/sgsn/gprs_mm_state_gb_fsm.c (renamed from src/gprs/gprs_mm_state_gb_fsm.c)0
-rw-r--r--src/sgsn/gprs_mm_state_iu_fsm.c (renamed from src/gprs/gprs_mm_state_iu_fsm.c)0
-rw-r--r--src/sgsn/gprs_ranap.c (renamed from src/gprs/gprs_ranap.c)0
-rw-r--r--src/sgsn/gprs_sgsn.c (renamed from src/gprs/gprs_sgsn.c)0
-rw-r--r--src/sgsn/gprs_sndcp.c (renamed from src/gprs/gprs_sndcp.c)0
-rw-r--r--src/sgsn/gprs_sndcp_comp.c (renamed from src/gprs/gprs_sndcp_comp.c)0
-rw-r--r--src/sgsn/gprs_sndcp_dcomp.c (renamed from src/gprs/gprs_sndcp_dcomp.c)0
-rw-r--r--src/sgsn/gprs_sndcp_pcomp.c (renamed from src/gprs/gprs_sndcp_pcomp.c)0
-rw-r--r--src/sgsn/gprs_sndcp_vty.c (renamed from src/gprs/gprs_sndcp_vty.c)0
-rw-r--r--src/sgsn/gprs_sndcp_xid.c (renamed from src/gprs/gprs_sndcp_xid.c)0
-rw-r--r--src/sgsn/gprs_subscriber.c (renamed from src/gprs/gprs_subscriber.c)0
-rw-r--r--src/sgsn/sgsn_auth.c (renamed from src/gprs/sgsn_auth.c)0
-rw-r--r--src/sgsn/sgsn_cdr.c (renamed from src/gprs/sgsn_cdr.c)0
-rw-r--r--src/sgsn/sgsn_ctrl.c (renamed from src/gprs/sgsn_ctrl.c)0
-rw-r--r--src/sgsn/sgsn_libgtp.c (renamed from src/gprs/sgsn_libgtp.c)0
-rw-r--r--src/sgsn/sgsn_main.c (renamed from src/gprs/sgsn_main.c)0
-rw-r--r--src/sgsn/sgsn_vty.c (renamed from src/gprs/sgsn_vty.c)0
-rw-r--r--src/sgsn/slhc.c (renamed from src/gprs/slhc.c)0
-rw-r--r--src/sgsn/v42bis.c (renamed from src/gprs/v42bis.c)0
-rw-r--r--tests/Makefile.am2
-rwxr-xr-xtests/ctrl_test_runner.py6
-rw-r--r--tests/sgsn/Makefile.am44
-rw-r--r--tests/slhc/Makefile.am2
-rw-r--r--tests/sndcp_xid/Makefile.am2
-rw-r--r--tests/v42bis/Makefile.am2
-rwxr-xr-xtests/vty_test_runner.py6
-rw-r--r--tests/xid/Makefile.am2
39 files changed, 143 insertions, 111 deletions
diff --git a/configure.ac b/configure.ac
index 66722041..ec7af6ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -247,6 +247,7 @@ AC_OUTPUT(
include/osmocom/sgsn/Makefile
src/Makefile
src/gprs/Makefile
+ src/sgsn/Makefile
src/gbproxy/Makefile
src/gtphub/Makefile
tests/Makefile
diff --git a/debian/copyright b/debian/copyright
index 5d883b9d..fa7405fe 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -92,27 +92,27 @@ Files: include/osmocom/sgsn/a_reset.h
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
- src/gprs/gprs_llc_xid.c
- src/gprs/gprs_sgsn.c
- src/gprs/gprs_sndcp.c
- src/gprs/gprs_sndcp_comp.c
- src/gprs/gprs_sndcp_dcomp.c
- src/gprs/gprs_sndcp_pcomp.c
- src/gprs/gprs_sndcp_vty.c
- src/gprs/gprs_sndcp_xid.c
- src/gprs/gprs_subscriber.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
- src/gprs/sgsn_libgtp.c
- src/gprs/sgsn_main.c
- src/gprs/sgsn_vty.c
+ src/sgsn/gprs_gmm.c
+ src/sgsn/gprs_llc.c
+ src/sgsn/gprs_llc_vty.c
+ src/sgsn/gprs_llc_xid.c
+ src/sgsn/gprs_sgsn.c
+ src/sgsn/gprs_sndcp.c
+ src/sgsn/gprs_sndcp_comp.c
+ src/sgsn/gprs_sndcp_dcomp.c
+ src/sgsn/gprs_sndcp_pcomp.c
+ src/sgsn/gprs_sndcp_vty.c
+ src/sgsn/gprs_sndcp_xid.c
+ src/sgsn/gprs_subscriber.c
+ src/sgsn/sgsn_auth.c
+ src/sgsn/sgsn_cdr.c
+ src/sgsn/sgsn_ctrl.c
+ src/sgsn/sgsn_libgtp.c
+ src/sgsn/sgsn_main.c
+ src/sgsn/sgsn_vty.c
tests/gtphub/gtphub_test.c
tests/sgsn/sgsn_test.c
tests/slhc/slhc_test.c
diff --git a/osmoappdesc.py b/osmoappdesc.py
index 9c3fd5d9..08166a90 100644
--- a/osmoappdesc.py
+++ b/osmoappdesc.py
@@ -24,11 +24,11 @@ app_configs = {
apps = [(4246, "src/gbproxy/osmo-gbproxy", "OsmoGbProxy", "gbproxy"),
- (4245, "src/gprs/osmo-sgsn", "OsmoSGSN", "sgsn"),
+ (4245, "src/sgsn/osmo-sgsn", "OsmoSGSN", "sgsn"),
(4253, "src/gtphub/osmo-gtphub", "OsmoGTPhub", "gtphub")
]
-vty_command = ["./src/gprs/osmo-sgsn", "-c",
+vty_command = ["./src/sgsn/osmo-sgsn", "-c",
"doc/examples/osmo-sgsn/osmo-sgsn.cfg"]
vty_app = apps[1]
diff --git a/src/Makefile.am b/src/Makefile.am
index 2abd4375..c45d3ab4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,6 @@
SUBDIRS = \
gprs \
+ sgsn \
gbproxy \
gtphub \
$(NULL)
diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am
index e5d50d37..170ded8f 100644
--- a/src/gprs/Makefile.am
+++ b/src/gprs/Makefile.am
@@ -26,15 +26,6 @@ AM_CFLAGS += \
$(NULL)
endif
-OSMO_LIBS = \
- $(LIBOSMOCORE_LIBS) \
- $(LIBOSMOGSM_LIBS) \
- $(LIBOSMOVTY_LIBS) \
- $(LIBOSMOCTRL_LIBS) \
- $(LIBOSMOGB_LIBS) \
- $(LIBGTP_LIBS) \
- $(NULL)
-
noinst_LTLIBRARIES = libcommon.la
libcommon_la_SOURCES = \
@@ -53,52 +44,3 @@ libcommon_la_LIBADD = \
$(LIBOSMOSIGTRAN_LIBS) \
$(LIBCARES_LIBS) \
$(NULL)
-
-bin_PROGRAMS = \
- osmo-sgsn \
- $(NULL)
-
-osmo_sgsn_SOURCES = \
- gprs_gb.c \
- gprs_gmm_attach.c \
- gprs_gmm.c \
- gprs_mm_state_gb_fsm.c \
- gprs_mm_state_iu_fsm.c \
- gprs_ranap.c \
- gprs_sgsn.c \
- gprs_sndcp.c \
- gprs_sndcp_comp.c \
- gprs_sndcp_dcomp.c \
- gprs_sndcp_pcomp.c \
- gprs_sndcp_vty.c \
- gprs_sndcp_xid.c \
- sgsn_main.c \
- sgsn_vty.c \
- sgsn_libgtp.c \
- gprs_llc.c \
- gprs_llc_vty.c \
- sgsn_ctrl.c \
- sgsn_auth.c \
- gprs_subscriber.c \
- sgsn_cdr.c \
- slhc.c \
- gprs_llc_xid.c \
- v42bis.c \
- $(NULL)
-osmo_sgsn_LDADD = \
- libcommon.la \
- $(OSMO_LIBS) \
- $(LIBOSMOABIS_LIBS) \
- $(LIBOSMOGSUPCLIENT_LIBS) \
- $(LIBCARES_LIBS) \
- $(LIBGTP_LIBS) \
- -lrt \
- -lm \
- $(NULL)
-if BUILD_IU
-osmo_sgsn_LDADD += \
- $(LIBOSMOSIGTRAN_LIBS) \
- $(LIBOSMORANAP_LIBS) \
- $(LIBASN1C_LIBS) \
- $(NULL)
-endif
diff --git a/src/sgsn/Makefile.am b/src/sgsn/Makefile.am
new file mode 100644
index 00000000..a8da9430
--- /dev/null
+++ b/src/sgsn/Makefile.am
@@ -0,0 +1,88 @@
+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) \
+ $(LIBCARES_CFLAGS) \
+ $(LIBGTP_CFLAGS) \
+ $(NULL)
+if BUILD_IU
+AM_CFLAGS += \
+ $(LIBASN1C_CFLAGS) \
+ $(LIBOSMOSIGTRAN_CFLAGS) \
+ $(LIBOSMORANAP_CFLAGS) \
+ $(NULL)
+endif
+
+OSMO_LIBS = \
+ $(LIBOSMOCORE_LIBS) \
+ $(LIBOSMOGSM_LIBS) \
+ $(LIBOSMOVTY_LIBS) \
+ $(LIBOSMOCTRL_LIBS) \
+ $(LIBOSMOGB_LIBS) \
+ $(LIBGTP_LIBS) \
+ $(NULL)
+
+bin_PROGRAMS = \
+ osmo-sgsn \
+ $(NULL)
+
+osmo_sgsn_SOURCES = \
+ gprs_gb.c \
+ gprs_gmm_attach.c \
+ gprs_gmm.c \
+ gprs_mm_state_gb_fsm.c \
+ gprs_mm_state_iu_fsm.c \
+ gprs_ranap.c \
+ gprs_sgsn.c \
+ gprs_sndcp.c \
+ gprs_sndcp_comp.c \
+ gprs_sndcp_dcomp.c \
+ gprs_sndcp_pcomp.c \
+ gprs_sndcp_vty.c \
+ gprs_sndcp_xid.c \
+ sgsn_main.c \
+ sgsn_vty.c \
+ sgsn_libgtp.c \
+ gprs_llc.c \
+ gprs_llc_vty.c \
+ sgsn_ctrl.c \
+ sgsn_auth.c \
+ gprs_subscriber.c \
+ sgsn_cdr.c \
+ slhc.c \
+ gprs_llc_xid.c \
+ v42bis.c \
+ $(NULL)
+osmo_sgsn_LDADD = \
+ $(top_builddir)/src/gprs/gprs_llc_parse.o \
+ $(top_builddir)/src/gprs/crc24.o \
+ $(top_builddir)/src/gprs/gprs_utils.o \
+ $(top_builddir)/src/gprs/sgsn_ares.o \
+ $(OSMO_LIBS) \
+ $(LIBOSMOABIS_LIBS) \
+ $(LIBOSMOGSUPCLIENT_LIBS) \
+ $(LIBCARES_LIBS) \
+ $(LIBGTP_LIBS) \
+ -lrt \
+ -lm \
+ $(NULL)
+if BUILD_IU
+osmo_sgsn_LDADD += \
+ $(LIBOSMOSIGTRAN_LIBS) \
+ $(LIBOSMORANAP_LIBS) \
+ $(LIBASN1C_LIBS) \
+ $(NULL)
+endif
diff --git a/src/gprs/gprs_gb.c b/src/sgsn/gprs_gb.c
index 65342cf2..65342cf2 100644
--- a/src/gprs/gprs_gb.c
+++ b/src/sgsn/gprs_gb.c
diff --git a/src/gprs/gprs_gmm.c b/src/sgsn/gprs_gmm.c
index edb7eea1..edb7eea1 100644
--- a/src/gprs/gprs_gmm.c
+++ b/src/sgsn/gprs_gmm.c
diff --git a/src/gprs/gprs_gmm_attach.c b/src/sgsn/gprs_gmm_attach.c
index 130f8d1c..130f8d1c 100644
--- a/src/gprs/gprs_gmm_attach.c
+++ b/src/sgsn/gprs_gmm_attach.c
diff --git a/src/gprs/gprs_llc.c b/src/sgsn/gprs_llc.c
index 2a27da84..2a27da84 100644
--- a/src/gprs/gprs_llc.c
+++ b/src/sgsn/gprs_llc.c
diff --git a/src/gprs/gprs_llc_vty.c b/src/sgsn/gprs_llc_vty.c
index 418be834..418be834 100644
--- a/src/gprs/gprs_llc_vty.c
+++ b/src/sgsn/gprs_llc_vty.c
diff --git a/src/gprs/gprs_llc_xid.c b/src/sgsn/gprs_llc_xid.c
index b91fa6bf..b91fa6bf 100644
--- a/src/gprs/gprs_llc_xid.c
+++ b/src/sgsn/gprs_llc_xid.c
diff --git a/src/gprs/gprs_mm_state_gb_fsm.c b/src/sgsn/gprs_mm_state_gb_fsm.c
index 2056540d..2056540d 100644
--- a/src/gprs/gprs_mm_state_gb_fsm.c
+++ b/src/sgsn/gprs_mm_state_gb_fsm.c
diff --git a/src/gprs/gprs_mm_state_iu_fsm.c b/src/sgsn/gprs_mm_state_iu_fsm.c
index 1ed5f56f..1ed5f56f 100644
--- a/src/gprs/gprs_mm_state_iu_fsm.c
+++ b/src/sgsn/gprs_mm_state_iu_fsm.c
diff --git a/src/gprs/gprs_ranap.c b/src/sgsn/gprs_ranap.c
index 027b6665..027b6665 100644
--- a/src/gprs/gprs_ranap.c
+++ b/src/sgsn/gprs_ranap.c
diff --git a/src/gprs/gprs_sgsn.c b/src/sgsn/gprs_sgsn.c
index 387c0d5a..387c0d5a 100644
--- a/src/gprs/gprs_sgsn.c
+++ b/src/sgsn/gprs_sgsn.c
diff --git a/src/gprs/gprs_sndcp.c b/src/sgsn/gprs_sndcp.c
index d9aa1e57..d9aa1e57 100644
--- a/src/gprs/gprs_sndcp.c
+++ b/src/sgsn/gprs_sndcp.c
diff --git a/src/gprs/gprs_sndcp_comp.c b/src/sgsn/gprs_sndcp_comp.c
index c71cc898..c71cc898 100644
--- a/src/gprs/gprs_sndcp_comp.c
+++ b/src/sgsn/gprs_sndcp_comp.c
diff --git a/src/gprs/gprs_sndcp_dcomp.c b/src/sgsn/gprs_sndcp_dcomp.c
index c0da84d4..c0da84d4 100644
--- a/src/gprs/gprs_sndcp_dcomp.c
+++ b/src/sgsn/gprs_sndcp_dcomp.c
diff --git a/src/gprs/gprs_sndcp_pcomp.c b/src/sgsn/gprs_sndcp_pcomp.c
index 8c2fc974..8c2fc974 100644
--- a/src/gprs/gprs_sndcp_pcomp.c
+++ b/src/sgsn/gprs_sndcp_pcomp.c
diff --git a/src/gprs/gprs_sndcp_vty.c b/src/sgsn/gprs_sndcp_vty.c
index 0994a4cd..0994a4cd 100644
--- a/src/gprs/gprs_sndcp_vty.c
+++ b/src/sgsn/gprs_sndcp_vty.c
diff --git a/src/gprs/gprs_sndcp_xid.c b/src/sgsn/gprs_sndcp_xid.c
index a19f6451..a19f6451 100644
--- a/src/gprs/gprs_sndcp_xid.c
+++ b/src/sgsn/gprs_sndcp_xid.c
diff --git a/src/gprs/gprs_subscriber.c b/src/sgsn/gprs_subscriber.c
index 484c7ef4..484c7ef4 100644
--- a/src/gprs/gprs_subscriber.c
+++ b/src/sgsn/gprs_subscriber.c
diff --git a/src/gprs/sgsn_auth.c b/src/sgsn/sgsn_auth.c
index b8d80359..b8d80359 100644
--- a/src/gprs/sgsn_auth.c
+++ b/src/sgsn/sgsn_auth.c
diff --git a/src/gprs/sgsn_cdr.c b/src/sgsn/sgsn_cdr.c
index a50b4dfd..a50b4dfd 100644
--- a/src/gprs/sgsn_cdr.c
+++ b/src/sgsn/sgsn_cdr.c
diff --git a/src/gprs/sgsn_ctrl.c b/src/sgsn/sgsn_ctrl.c
index ad91d25a..ad91d25a 100644
--- a/src/gprs/sgsn_ctrl.c
+++ b/src/sgsn/sgsn_ctrl.c
diff --git a/src/gprs/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c
index 5e3f48f3..5e3f48f3 100644
--- a/src/gprs/sgsn_libgtp.c
+++ b/src/sgsn/sgsn_libgtp.c
diff --git a/src/gprs/sgsn_main.c b/src/sgsn/sgsn_main.c
index eef5f8f2..eef5f8f2 100644
--- a/src/gprs/sgsn_main.c
+++ b/src/sgsn/sgsn_main.c
diff --git a/src/gprs/sgsn_vty.c b/src/sgsn/sgsn_vty.c
index 184ece76..184ece76 100644
--- a/src/gprs/sgsn_vty.c
+++ b/src/sgsn/sgsn_vty.c
diff --git a/src/gprs/slhc.c b/src/sgsn/slhc.c
index 20e571d4..20e571d4 100644
--- a/src/gprs/slhc.c
+++ b/src/sgsn/slhc.c
diff --git a/src/gprs/v42bis.c b/src/sgsn/v42bis.c
index 0759cdf1..0759cdf1 100644
--- a/src/gprs/v42bis.c
+++ b/src/sgsn/v42bis.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6c392af9..a23d9317 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -63,7 +63,7 @@ vty-python-test: $(BUILT_SOURCES)
vty-transcript-test:
osmo_verify_transcript_vty.py -v \
-n OsmoSGSN -p 4245 \
- -r "$(top_builddir)/src/gprs/osmo-sgsn -c $(top_srcdir)/doc/examples/osmo-sgsn/osmo-sgsn.cfg" \
+ -r "$(top_builddir)/src/sgsn/osmo-sgsn -c $(top_srcdir)/doc/examples/osmo-sgsn/osmo-sgsn.cfg" \
$(U) $${T:-$(srcdir)/*.vty}
rm -f $(builddir)/sms.db $(builddir)/gsn_restart
diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py
index 57ef82ee..9c253fc6 100755
--- a/tests/ctrl_test_runner.py
+++ b/tests/ctrl_test_runner.py
@@ -145,11 +145,11 @@ class TestCtrlBase(unittest.TestCase):
class TestCtrlSGSN(TestCtrlBase):
def ctrl_command(self):
- return ["./src/gprs/osmo-sgsn", "-c",
+ return ["./src/sgsn/osmo-sgsn", "-c",
"doc/examples/osmo-sgsn/osmo-sgsn.cfg"]
def ctrl_app(self):
- return (4251, "./src/gprs/osmo-sgsn", "OsmoSGSN", "sgsn")
+ return (4251, "./src/sgsn/osmo-sgsn", "OsmoSGSN", "sgsn")
def testListSubscribers(self):
# TODO. Add command to mark a subscriber as active
@@ -159,7 +159,7 @@ class TestCtrlSGSN(TestCtrlBase):
self.assertEquals(r['value'], None)
def add_sgsn_test(suite, workdir):
- if not os.path.isfile(os.path.join(workdir, "src/gprs/osmo-sgsn")):
+ if not os.path.isfile(os.path.join(workdir, "src/sgsn/osmo-sgsn")):
print("Skipping the SGSN test")
return
test = unittest.TestLoader().loadTestsFromTestCase(TestCtrlSGSN)
diff --git a/tests/sgsn/Makefile.am b/tests/sgsn/Makefile.am
index 47189e55..7ba70eb6 100644
--- a/tests/sgsn/Makefile.am
+++ b/tests/sgsn/Makefile.am
@@ -42,31 +42,31 @@ sgsn_test_LDFLAGS = \
$(NULL)
sgsn_test_LDADD = \
+ $(top_builddir)/src/sgsn/gprs_llc.o \
+ $(top_builddir)/src/sgsn/gprs_gb.o \
+ $(top_builddir)/src/sgsn/gprs_ranap.o \
+ $(top_builddir)/src/sgsn/gprs_sndcp.o \
+ $(top_builddir)/src/sgsn/gprs_gmm_attach.o \
+ $(top_builddir)/src/sgsn/gprs_gmm.o \
+ $(top_builddir)/src/sgsn/gprs_mm_state_gb_fsm.o \
+ $(top_builddir)/src/sgsn/gprs_mm_state_iu_fsm.o \
+ $(top_builddir)/src/sgsn/gprs_sgsn.o \
+ $(top_builddir)/src/sgsn/sgsn_vty.o \
+ $(top_builddir)/src/sgsn/sgsn_libgtp.o \
+ $(top_builddir)/src/sgsn/sgsn_auth.o \
+ $(top_builddir)/src/sgsn/gprs_subscriber.o \
+ $(top_builddir)/src/sgsn/gprs_llc_xid.o \
+ $(top_builddir)/src/sgsn/gprs_sndcp_xid.o \
+ $(top_builddir)/src/sgsn/slhc.o \
+ $(top_builddir)/src/sgsn/gprs_sndcp_comp.o \
+ $(top_builddir)/src/sgsn/gprs_sndcp_pcomp.o \
+ $(top_builddir)/src/sgsn/v42bis.o \
+ $(top_builddir)/src/sgsn/gprs_sndcp_dcomp.o \
+ $(top_builddir)/src/gprs/gprs_utils.o \
$(top_builddir)/src/gprs/gprs_llc_parse.o \
- $(top_builddir)/src/gprs/gprs_llc.o \
+ $(top_builddir)/src/gprs/gprs_gb_parse.o \
$(top_builddir)/src/gprs/crc24.o \
- $(top_builddir)/src/gprs/gprs_gb.o \
- $(top_builddir)/src/gprs/gprs_ranap.o \
- $(top_builddir)/src/gprs/gprs_sndcp.o \
- $(top_builddir)/src/gprs/gprs_gmm_attach.o \
- $(top_builddir)/src/gprs/gprs_gmm.o \
- $(top_builddir)/src/gprs/gprs_mm_state_gb_fsm.o \
- $(top_builddir)/src/gprs/gprs_mm_state_iu_fsm.o \
- $(top_builddir)/src/gprs/gprs_sgsn.o \
- $(top_builddir)/src/gprs/sgsn_vty.o \
- $(top_builddir)/src/gprs/sgsn_libgtp.o \
- $(top_builddir)/src/gprs/sgsn_auth.o \
$(top_builddir)/src/gprs/sgsn_ares.o \
- $(top_builddir)/src/gprs/gprs_utils.o \
- $(top_builddir)/src/gprs/gprs_subscriber.o \
- $(top_builddir)/src/gprs/gprs_gb_parse.o \
- $(top_builddir)/src/gprs/gprs_llc_xid.o \
- $(top_builddir)/src/gprs/gprs_sndcp_xid.o \
- $(top_builddir)/src/gprs/slhc.o \
- $(top_builddir)/src/gprs/gprs_sndcp_comp.o \
- $(top_builddir)/src/gprs/gprs_sndcp_pcomp.o \
- $(top_builddir)/src/gprs/v42bis.o \
- $(top_builddir)/src/gprs/gprs_sndcp_dcomp.o \
$(LIBOSMOABIS_LIBS) \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
diff --git a/tests/slhc/Makefile.am b/tests/slhc/Makefile.am
index 818ae2ef..b6738c25 100644
--- a/tests/slhc/Makefile.am
+++ b/tests/slhc/Makefile.am
@@ -8,7 +8,7 @@ noinst_PROGRAMS = slhc_test
slhc_test_SOURCES = slhc_test.c
slhc_test_LDADD = \
- $(top_builddir)/src/gprs/slhc.o \
+ $(top_builddir)/src/sgsn/slhc.o \
$(LIBOSMOCORE_LIBS)
diff --git a/tests/sndcp_xid/Makefile.am b/tests/sndcp_xid/Makefile.am
index fbcb36c5..24626b32 100644
--- a/tests/sndcp_xid/Makefile.am
+++ b/tests/sndcp_xid/Makefile.am
@@ -8,7 +8,7 @@ noinst_PROGRAMS = sndcp_xid_test
sndcp_xid_test_SOURCES = sndcp_xid_test.c
sndcp_xid_test_LDADD = \
- $(top_builddir)/src/gprs/gprs_sndcp_xid.o \
+ $(top_builddir)/src/sgsn/gprs_sndcp_xid.o \
$(LIBOSMOABIS_LIBS) \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \
diff --git a/tests/v42bis/Makefile.am b/tests/v42bis/Makefile.am
index 8e17b4af..74423927 100644
--- a/tests/v42bis/Makefile.am
+++ b/tests/v42bis/Makefile.am
@@ -8,7 +8,7 @@ noinst_PROGRAMS = v42bis_test
v42bis_test_SOURCES = v42bis_test.c
v42bis_test_LDADD = \
- $(top_builddir)/src/gprs/v42bis.o \
+ $(top_builddir)/src/sgsn/v42bis.o \
$(LIBOSMOCORE_LIBS)
diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py
index a71865d4..a925b6b6 100755
--- a/tests/vty_test_runner.py
+++ b/tests/vty_test_runner.py
@@ -119,11 +119,11 @@ class TestVTYGbproxy(TestVTYBase):
class TestVTYSGSN(TestVTYBase):
def vty_command(self):
- return ["./src/gprs/osmo-sgsn", "-c",
+ return ["./src/sgsn/osmo-sgsn", "-c",
"doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg"]
def vty_app(self):
- return (4245, "./src/gprs/osmo-sgsn", "OsmoSGSN", "sgsn")
+ return (4245, "./src/sgsn/osmo-sgsn", "OsmoSGSN", "sgsn")
def testVtyTree(self):
self.vty.enable()
@@ -284,7 +284,7 @@ def add_gbproxy_test(suite, workdir):
suite.addTest(test)
def add_sgsn_test(suite, workdir):
- if not os.path.isfile(os.path.join(workdir, "src/gprs/osmo-sgsn")):
+ if not os.path.isfile(os.path.join(workdir, "src/sgsn/osmo-sgsn")):
print("Skipping the SGSN test")
return
test = unittest.TestLoader().loadTestsFromTestCase(TestVTYSGSN)
diff --git a/tests/xid/Makefile.am b/tests/xid/Makefile.am
index 92876ec3..6f058f5a 100644
--- a/tests/xid/Makefile.am
+++ b/tests/xid/Makefile.am
@@ -24,7 +24,7 @@ xid_test_SOURCES = \
$(NULL)
xid_test_LDADD = \
- $(top_builddir)/src/gprs/gprs_llc_xid.o \
+ $(top_builddir)/src/sgsn/gprs_llc_xid.o \
$(LIBOSMOABIS_LIBS) \
$(LIBOSMOCORE_LIBS) \
$(LIBOSMOGSM_LIBS) \