<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15363">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move out sgsn to its own subdir<br><br>Change-Id: I16fccc0eadf588599b9e5578d0f4dbaf9df81737<br>---<br>M configure.ac<br>M debian/copyright<br>M osmoappdesc.py<br>M src/Makefile.am<br>M src/gprs/Makefile.am<br>A src/sgsn/Makefile.am<br>R src/sgsn/gprs_gb.c<br>R src/sgsn/gprs_gmm.c<br>R src/sgsn/gprs_gmm_attach.c<br>R src/sgsn/gprs_llc.c<br>R src/sgsn/gprs_llc_vty.c<br>R src/sgsn/gprs_llc_xid.c<br>R src/sgsn/gprs_mm_state_gb_fsm.c<br>R src/sgsn/gprs_mm_state_iu_fsm.c<br>R src/sgsn/gprs_ranap.c<br>R src/sgsn/gprs_sgsn.c<br>R src/sgsn/gprs_sndcp.c<br>R src/sgsn/gprs_sndcp_comp.c<br>R src/sgsn/gprs_sndcp_dcomp.c<br>R src/sgsn/gprs_sndcp_pcomp.c<br>R src/sgsn/gprs_sndcp_vty.c<br>R src/sgsn/gprs_sndcp_xid.c<br>R src/sgsn/gprs_subscriber.c<br>R src/sgsn/sgsn_auth.c<br>R src/sgsn/sgsn_cdr.c<br>R src/sgsn/sgsn_ctrl.c<br>R src/sgsn/sgsn_libgtp.c<br>R src/sgsn/sgsn_main.c<br>R src/sgsn/sgsn_vty.c<br>R src/sgsn/slhc.c<br>R src/sgsn/v42bis.c<br>M tests/Makefile.am<br>M tests/ctrl_test_runner.py<br>M tests/sgsn/Makefile.am<br>M tests/slhc/Makefile.am<br>M tests/sndcp_xid/Makefile.am<br>M tests/v42bis/Makefile.am<br>M tests/vty_test_runner.py<br>M tests/xid/Makefile.am<br>39 files changed, 144 insertions(+), 112 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 6672204..ec7af6e 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -247,6 +247,7 @@</span><br><span> include/osmocom/sgsn/Makefile</span><br><span> src/Makefile</span><br><span> src/gprs/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+ src/sgsn/Makefile</span><br><span> src/gbproxy/Makefile</span><br><span> src/gtphub/Makefile</span><br><span> tests/Makefile</span><br><span>diff --git a/debian/copyright b/debian/copyright</span><br><span>index 5d883b9..fa7405f 100644</span><br><span>--- a/debian/copyright</span><br><span>+++ b/debian/copyright</span><br><span>@@ -92,27 +92,27 @@</span><br><span> src/gbproxy/gb_proxy_peer.c</span><br><span> src/gbproxy/gb_proxy_tlli.c</span><br><span> src/gbproxy/gb_proxy_vty.c</span><br><span style="color: hsl(0, 100%, 40%);">- src/gprs/gprs_gmm.c</span><br><span style="color: hsl(0, 100%, 40%);">- src/gprs/gprs_llc.c</span><br><span style="color: hsl(0, 100%, 40%);">- src/gprs/gprs_llc_vty.c</span><br><span style="color: hsl(0, 100%, 40%);">- src/gprs/gprs_llc_xid.c</span><br><span style="color: hsl(0, 100%, 40%);">- src/gprs/gprs_sgsn.c</span><br><span style="color: hsl(0, 100%, 40%);">- src/gprs/gprs_sndcp.c</span><br><span style="color: hsl(0, 100%, 40%);">- src/gprs/gprs_sndcp_comp.c</span><br><span style="color: hsl(0, 100%, 40%);">- src/gprs/gprs_sndcp_dcomp.c</span><br><span style="color: hsl(0, 100%, 40%);">- src/gprs/gprs_sndcp_pcomp.c</span><br><span style="color: hsl(0, 100%, 40%);">- src/gprs/gprs_sndcp_vty.c</span><br><span style="color: hsl(0, 100%, 40%);">- src/gprs/gprs_sndcp_xid.c</span><br><span style="color: hsl(0, 100%, 40%);">- src/gprs/gprs_subscriber.c</span><br><span> src/gtphub/gtphub.c</span><br><span> src/gtphub/gtphub_main.c</span><br><span> src/gtphub/gtphub_vty.c</span><br><span style="color: hsl(0, 100%, 40%);">- src/gprs/sgsn_auth.c</span><br><span style="color: hsl(0, 100%, 40%);">- src/gprs/sgsn_cdr.c</span><br><span style="color: hsl(0, 100%, 40%);">- src/gprs/sgsn_ctrl.c</span><br><span style="color: hsl(0, 100%, 40%);">- src/gprs/sgsn_libgtp.c</span><br><span style="color: hsl(0, 100%, 40%);">- src/gprs/sgsn_main.c</span><br><span style="color: hsl(0, 100%, 40%);">- src/gprs/sgsn_vty.c</span><br><span style="color: hsl(120, 100%, 40%);">+ src/sgsn/gprs_gmm.c</span><br><span style="color: hsl(120, 100%, 40%);">+ src/sgsn/gprs_llc.c</span><br><span style="color: hsl(120, 100%, 40%);">+ src/sgsn/gprs_llc_vty.c</span><br><span style="color: hsl(120, 100%, 40%);">+ src/sgsn/gprs_llc_xid.c</span><br><span style="color: hsl(120, 100%, 40%);">+ src/sgsn/gprs_sgsn.c</span><br><span style="color: hsl(120, 100%, 40%);">+ src/sgsn/gprs_sndcp.c</span><br><span style="color: hsl(120, 100%, 40%);">+ src/sgsn/gprs_sndcp_comp.c</span><br><span style="color: hsl(120, 100%, 40%);">+ src/sgsn/gprs_sndcp_dcomp.c</span><br><span style="color: hsl(120, 100%, 40%);">+ src/sgsn/gprs_sndcp_pcomp.c</span><br><span style="color: hsl(120, 100%, 40%);">+ src/sgsn/gprs_sndcp_vty.c</span><br><span style="color: hsl(120, 100%, 40%);">+ src/sgsn/gprs_sndcp_xid.c</span><br><span style="color: hsl(120, 100%, 40%);">+ src/sgsn/gprs_subscriber.c</span><br><span style="color: hsl(120, 100%, 40%);">+ src/sgsn/sgsn_auth.c</span><br><span style="color: hsl(120, 100%, 40%);">+ src/sgsn/sgsn_cdr.c</span><br><span style="color: hsl(120, 100%, 40%);">+ src/sgsn/sgsn_ctrl.c</span><br><span style="color: hsl(120, 100%, 40%);">+ src/sgsn/sgsn_libgtp.c</span><br><span style="color: hsl(120, 100%, 40%);">+ src/sgsn/sgsn_main.c</span><br><span style="color: hsl(120, 100%, 40%);">+ src/sgsn/sgsn_vty.c</span><br><span> tests/gtphub/gtphub_test.c</span><br><span> tests/sgsn/sgsn_test.c</span><br><span> tests/slhc/slhc_test.c</span><br><span>diff --git a/osmoappdesc.py b/osmoappdesc.py</span><br><span>index 9c3fd5d..08166a9 100644</span><br><span>--- a/osmoappdesc.py</span><br><span>+++ b/osmoappdesc.py</span><br><span>@@ -24,11 +24,11 @@</span><br><span> </span><br><span> </span><br><span> apps = [(4246, "src/gbproxy/osmo-gbproxy", "OsmoGbProxy", "gbproxy"),</span><br><span style="color: hsl(0, 100%, 40%);">- (4245, "src/gprs/osmo-sgsn", "OsmoSGSN", "sgsn"),</span><br><span style="color: hsl(120, 100%, 40%);">+ (4245, "src/sgsn/osmo-sgsn", "OsmoSGSN", "sgsn"),</span><br><span> (4253, "src/gtphub/osmo-gtphub", "OsmoGTPhub", "gtphub")</span><br><span> ]</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-vty_command = ["./src/gprs/osmo-sgsn", "-c",</span><br><span style="color: hsl(120, 100%, 40%);">+vty_command = ["./src/sgsn/osmo-sgsn", "-c",</span><br><span> "doc/examples/osmo-sgsn/osmo-sgsn.cfg"]</span><br><span> </span><br><span> vty_app = apps[1]</span><br><span>diff --git a/src/Makefile.am b/src/Makefile.am</span><br><span>index 2abd437..c45d3ab 100644</span><br><span>--- a/src/Makefile.am</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -1,5 +1,6 @@</span><br><span> SUBDIRS = \</span><br><span> gprs \</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn \</span><br><span> gbproxy \</span><br><span> gtphub \</span><br><span> $(NULL)</span><br><span>diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am</span><br><span>index e5d50d3..170ded8 100644</span><br><span>--- a/src/gprs/Makefile.am</span><br><span>+++ b/src/gprs/Makefile.am</span><br><span>@@ -26,15 +26,6 @@</span><br><span> $(NULL)</span><br><span> endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-OSMO_LIBS = \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMOCORE_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMOGSM_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMOVTY_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMOCTRL_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMOGB_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBGTP_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> noinst_LTLIBRARIES = libcommon.la</span><br><span> </span><br><span> libcommon_la_SOURCES = \</span><br><span>@@ -53,52 +44,3 @@</span><br><span> $(LIBOSMOSIGTRAN_LIBS) \</span><br><span> $(LIBCARES_LIBS) \</span><br><span> $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-bin_PROGRAMS = \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo-sgsn \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_sgsn_SOURCES = \</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_gb.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_gmm_attach.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_gmm.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_mm_state_gb_fsm.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_mm_state_iu_fsm.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_ranap.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_sgsn.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_sndcp.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_sndcp_comp.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_sndcp_dcomp.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_sndcp_pcomp.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_sndcp_vty.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_sndcp_xid.c \</span><br><span style="color: hsl(0, 100%, 40%);">- sgsn_main.c \</span><br><span style="color: hsl(0, 100%, 40%);">- sgsn_vty.c \</span><br><span style="color: hsl(0, 100%, 40%);">- sgsn_libgtp.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_llc.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_llc_vty.c \</span><br><span style="color: hsl(0, 100%, 40%);">- sgsn_ctrl.c \</span><br><span style="color: hsl(0, 100%, 40%);">- sgsn_auth.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_subscriber.c \</span><br><span style="color: hsl(0, 100%, 40%);">- sgsn_cdr.c \</span><br><span style="color: hsl(0, 100%, 40%);">- slhc.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gprs_llc_xid.c \</span><br><span style="color: hsl(0, 100%, 40%);">- v42bis.c \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_sgsn_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">- libcommon.la \</span><br><span style="color: hsl(0, 100%, 40%);">- $(OSMO_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMOABIS_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMOGSUPCLIENT_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBCARES_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBGTP_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- -lrt \</span><br><span style="color: hsl(0, 100%, 40%);">- -lm \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-if BUILD_IU</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_sgsn_LDADD += \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMOSIGTRAN_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBOSMORANAP_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(LIBASN1C_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-endif</span><br><span>diff --git a/src/sgsn/Makefile.am b/src/sgsn/Makefile.am</span><br><span>new file mode 100644</span><br><span>index 0000000..a8da943</span><br><span>--- /dev/null</span><br><span>+++ b/src/sgsn/Makefile.am</span><br><span>@@ -0,0 +1,88 @@</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CPPFLAGS = \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(all_includes) \</span><br><span style="color: hsl(120, 100%, 40%);">+ -I$(top_srcdir)/include \</span><br><span style="color: hsl(120, 100%, 40%);">+ -I$(top_builddir) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CFLAGS = \</span><br><span style="color: hsl(120, 100%, 40%);">+ -Wall \</span><br><span style="color: hsl(120, 100%, 40%);">+ -fno-strict-aliasing \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOCORE_CFLAGS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOGSM_CFLAGS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOVTY_CFLAGS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOCTRL_CFLAGS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOABIS_CFLAGS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOGB_CFLAGS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOGSUPCLIENT_CFLAGS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(COVERAGE_CFLAGS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBCARES_CFLAGS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBGTP_CFLAGS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+if BUILD_IU</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CFLAGS += \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBASN1C_CFLAGS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOSIGTRAN_CFLAGS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMORANAP_CFLAGS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OSMO_LIBS = \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOCORE_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOGSM_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOVTY_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOCTRL_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOGB_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBGTP_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+bin_PROGRAMS = \</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo-sgsn \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_sgsn_SOURCES = \</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_gb.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_gmm_attach.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_gmm.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_mm_state_gb_fsm.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_mm_state_iu_fsm.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_ranap.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_sgsn.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_sndcp.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_sndcp_comp.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_sndcp_dcomp.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_sndcp_pcomp.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_sndcp_vty.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_sndcp_xid.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_main.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_vty.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_libgtp.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_llc.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_llc_vty.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_ctrl.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_auth.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_subscriber.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn_cdr.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ slhc.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ gprs_llc_xid.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ v42bis.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_sgsn_LDADD = \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/gprs/gprs_llc_parse.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/gprs/crc24.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/gprs/gprs_utils.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/gprs/sgsn_ares.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(OSMO_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOABIS_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOGSUPCLIENT_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBCARES_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBGTP_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ -lrt \</span><br><span style="color: hsl(120, 100%, 40%);">+ -lm \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+if BUILD_IU</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_sgsn_LDADD += \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMOSIGTRAN_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMORANAP_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBASN1C_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span>diff --git a/src/gprs/gprs_gb.c b/src/sgsn/gprs_gb.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gprs_gb.c</span><br><span>rename to src/sgsn/gprs_gb.c</span><br><span>diff --git a/src/gprs/gprs_gmm.c b/src/sgsn/gprs_gmm.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gprs_gmm.c</span><br><span>rename to src/sgsn/gprs_gmm.c</span><br><span>diff --git a/src/gprs/gprs_gmm_attach.c b/src/sgsn/gprs_gmm_attach.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gprs_gmm_attach.c</span><br><span>rename to src/sgsn/gprs_gmm_attach.c</span><br><span>diff --git a/src/gprs/gprs_llc.c b/src/sgsn/gprs_llc.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gprs_llc.c</span><br><span>rename to src/sgsn/gprs_llc.c</span><br><span>diff --git a/src/gprs/gprs_llc_vty.c b/src/sgsn/gprs_llc_vty.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gprs_llc_vty.c</span><br><span>rename to src/sgsn/gprs_llc_vty.c</span><br><span>diff --git a/src/gprs/gprs_llc_xid.c b/src/sgsn/gprs_llc_xid.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gprs_llc_xid.c</span><br><span>rename to src/sgsn/gprs_llc_xid.c</span><br><span>diff --git a/src/gprs/gprs_mm_state_gb_fsm.c b/src/sgsn/gprs_mm_state_gb_fsm.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gprs_mm_state_gb_fsm.c</span><br><span>rename to src/sgsn/gprs_mm_state_gb_fsm.c</span><br><span>diff --git a/src/gprs/gprs_mm_state_iu_fsm.c b/src/sgsn/gprs_mm_state_iu_fsm.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gprs_mm_state_iu_fsm.c</span><br><span>rename to src/sgsn/gprs_mm_state_iu_fsm.c</span><br><span>diff --git a/src/gprs/gprs_ranap.c b/src/sgsn/gprs_ranap.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gprs_ranap.c</span><br><span>rename to src/sgsn/gprs_ranap.c</span><br><span>diff --git a/src/gprs/gprs_sgsn.c b/src/sgsn/gprs_sgsn.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gprs_sgsn.c</span><br><span>rename to src/sgsn/gprs_sgsn.c</span><br><span>diff --git a/src/gprs/gprs_sndcp.c b/src/sgsn/gprs_sndcp.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gprs_sndcp.c</span><br><span>rename to src/sgsn/gprs_sndcp.c</span><br><span>diff --git a/src/gprs/gprs_sndcp_comp.c b/src/sgsn/gprs_sndcp_comp.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gprs_sndcp_comp.c</span><br><span>rename to src/sgsn/gprs_sndcp_comp.c</span><br><span>diff --git a/src/gprs/gprs_sndcp_dcomp.c b/src/sgsn/gprs_sndcp_dcomp.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gprs_sndcp_dcomp.c</span><br><span>rename to src/sgsn/gprs_sndcp_dcomp.c</span><br><span>diff --git a/src/gprs/gprs_sndcp_pcomp.c b/src/sgsn/gprs_sndcp_pcomp.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gprs_sndcp_pcomp.c</span><br><span>rename to src/sgsn/gprs_sndcp_pcomp.c</span><br><span>diff --git a/src/gprs/gprs_sndcp_vty.c b/src/sgsn/gprs_sndcp_vty.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gprs_sndcp_vty.c</span><br><span>rename to src/sgsn/gprs_sndcp_vty.c</span><br><span>diff --git a/src/gprs/gprs_sndcp_xid.c b/src/sgsn/gprs_sndcp_xid.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gprs_sndcp_xid.c</span><br><span>rename to src/sgsn/gprs_sndcp_xid.c</span><br><span>diff --git a/src/gprs/gprs_subscriber.c b/src/sgsn/gprs_subscriber.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gprs_subscriber.c</span><br><span>rename to src/sgsn/gprs_subscriber.c</span><br><span>diff --git a/src/gprs/sgsn_auth.c b/src/sgsn/sgsn_auth.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/sgsn_auth.c</span><br><span>rename to src/sgsn/sgsn_auth.c</span><br><span>diff --git a/src/gprs/sgsn_cdr.c b/src/sgsn/sgsn_cdr.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/sgsn_cdr.c</span><br><span>rename to src/sgsn/sgsn_cdr.c</span><br><span>diff --git a/src/gprs/sgsn_ctrl.c b/src/sgsn/sgsn_ctrl.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/sgsn_ctrl.c</span><br><span>rename to src/sgsn/sgsn_ctrl.c</span><br><span>diff --git a/src/gprs/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/sgsn_libgtp.c</span><br><span>rename to src/sgsn/sgsn_libgtp.c</span><br><span>diff --git a/src/gprs/sgsn_main.c b/src/sgsn/sgsn_main.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/sgsn_main.c</span><br><span>rename to src/sgsn/sgsn_main.c</span><br><span>diff --git a/src/gprs/sgsn_vty.c b/src/sgsn/sgsn_vty.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/sgsn_vty.c</span><br><span>rename to src/sgsn/sgsn_vty.c</span><br><span>diff --git a/src/gprs/slhc.c b/src/sgsn/slhc.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/slhc.c</span><br><span>rename to src/sgsn/slhc.c</span><br><span>diff --git a/src/gprs/v42bis.c b/src/sgsn/v42bis.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/v42bis.c</span><br><span>rename to src/sgsn/v42bis.c</span><br><span>diff --git a/tests/Makefile.am b/tests/Makefile.am</span><br><span>index 6c392af..a23d931 100644</span><br><span>--- a/tests/Makefile.am</span><br><span>+++ b/tests/Makefile.am</span><br><span>@@ -63,7 +63,7 @@</span><br><span> vty-transcript-test:</span><br><span> osmo_verify_transcript_vty.py -v \</span><br><span> -n OsmoSGSN -p 4245 \</span><br><span style="color: hsl(0, 100%, 40%);">- -r "$(top_builddir)/src/gprs/osmo-sgsn -c $(top_srcdir)/doc/examples/osmo-sgsn/osmo-sgsn.cfg" \</span><br><span style="color: hsl(120, 100%, 40%);">+ -r "$(top_builddir)/src/sgsn/osmo-sgsn -c $(top_srcdir)/doc/examples/osmo-sgsn/osmo-sgsn.cfg" \</span><br><span> $(U) $${T:-$(srcdir)/*.vty}</span><br><span> rm -f $(builddir)/sms.db $(builddir)/gsn_restart</span><br><span> </span><br><span>diff --git a/tests/ctrl_test_runner.py b/tests/ctrl_test_runner.py</span><br><span>index 57ef82e..9c253fc 100755</span><br><span>--- a/tests/ctrl_test_runner.py</span><br><span>+++ b/tests/ctrl_test_runner.py</span><br><span>@@ -145,11 +145,11 @@</span><br><span> </span><br><span> class TestCtrlSGSN(TestCtrlBase):</span><br><span> def ctrl_command(self):</span><br><span style="color: hsl(0, 100%, 40%);">- return ["./src/gprs/osmo-sgsn", "-c",</span><br><span style="color: hsl(120, 100%, 40%);">+ return ["./src/sgsn/osmo-sgsn", "-c",</span><br><span> "doc/examples/osmo-sgsn/osmo-sgsn.cfg"]</span><br><span> </span><br><span> def ctrl_app(self):</span><br><span style="color: hsl(0, 100%, 40%);">- return (4251, "./src/gprs/osmo-sgsn", "OsmoSGSN", "sgsn")</span><br><span style="color: hsl(120, 100%, 40%);">+ return (4251, "./src/sgsn/osmo-sgsn", "OsmoSGSN", "sgsn")</span><br><span> </span><br><span> def testListSubscribers(self):</span><br><span> # TODO. Add command to mark a subscriber as active</span><br><span>@@ -159,7 +159,7 @@</span><br><span> self.assertEquals(r['value'], None)</span><br><span> </span><br><span> def add_sgsn_test(suite, workdir):</span><br><span style="color: hsl(0, 100%, 40%);">- if not os.path.isfile(os.path.join(workdir, "src/gprs/osmo-sgsn")):</span><br><span style="color: hsl(120, 100%, 40%);">+ if not os.path.isfile(os.path.join(workdir, "src/sgsn/osmo-sgsn")):</span><br><span> print("Skipping the SGSN test")</span><br><span> return</span><br><span> test = unittest.TestLoader().loadTestsFromTestCase(TestCtrlSGSN)</span><br><span>diff --git a/tests/sgsn/Makefile.am b/tests/sgsn/Makefile.am</span><br><span>index 47189e5..7ba70eb 100644</span><br><span>--- a/tests/sgsn/Makefile.am</span><br><span>+++ b/tests/sgsn/Makefile.am</span><br><span>@@ -42,31 +42,31 @@</span><br><span> $(NULL)</span><br><span> </span><br><span> sgsn_test_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/gprs/gprs_llc_parse.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/gprs/gprs_llc.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/gprs/crc24.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/gprs/gprs_gb.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/gprs/gprs_ranap.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/gprs/gprs_sndcp.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/gprs/gprs_gmm_attach.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/gprs/gprs_gmm.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/gprs/gprs_mm_state_gb_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/gprs/gprs_mm_state_iu_fsm.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/gprs/gprs_sgsn.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/gprs/sgsn_vty.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/gprs/sgsn_libgtp.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/gprs/sgsn_auth.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/gprs/sgsn_ares.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/sgsn/gprs_llc.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/sgsn/gprs_gb.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/sgsn/gprs_ranap.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/sgsn/gprs_sndcp.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/sgsn/gprs_gmm_attach.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/sgsn/gprs_gmm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/sgsn/gprs_mm_state_gb_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/sgsn/gprs_mm_state_iu_fsm.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/sgsn/gprs_sgsn.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/sgsn/sgsn_vty.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/sgsn/sgsn_libgtp.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/sgsn/sgsn_auth.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/sgsn/gprs_subscriber.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/sgsn/gprs_llc_xid.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/sgsn/gprs_sndcp_xid.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/sgsn/slhc.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/sgsn/gprs_sndcp_comp.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/sgsn/gprs_sndcp_pcomp.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/sgsn/v42bis.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/sgsn/gprs_sndcp_dcomp.o \</span><br><span> $(top_builddir)/src/gprs/gprs_utils.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/gprs/gprs_subscriber.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/gprs/gprs_llc_parse.o \</span><br><span> $(top_builddir)/src/gprs/gprs_gb_parse.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/gprs/gprs_llc_xid.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/gprs/gprs_sndcp_xid.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/gprs/slhc.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/gprs/gprs_sndcp_comp.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/gprs/gprs_sndcp_pcomp.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/gprs/v42bis.o \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/gprs/gprs_sndcp_dcomp.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/gprs/crc24.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/gprs/sgsn_ares.o \</span><br><span> $(LIBOSMOABIS_LIBS) \</span><br><span> $(LIBOSMOCORE_LIBS) \</span><br><span> $(LIBOSMOGSM_LIBS) \</span><br><span>diff --git a/tests/slhc/Makefile.am b/tests/slhc/Makefile.am</span><br><span>index 818ae2e..b6738c2 100644</span><br><span>--- a/tests/slhc/Makefile.am</span><br><span>+++ b/tests/slhc/Makefile.am</span><br><span>@@ -8,7 +8,7 @@</span><br><span> slhc_test_SOURCES = slhc_test.c</span><br><span> </span><br><span> slhc_test_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/gprs/slhc.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/sgsn/slhc.o \</span><br><span> $(LIBOSMOCORE_LIBS)</span><br><span> </span><br><span> </span><br><span>diff --git a/tests/sndcp_xid/Makefile.am b/tests/sndcp_xid/Makefile.am</span><br><span>index fbcb36c..24626b3 100644</span><br><span>--- a/tests/sndcp_xid/Makefile.am</span><br><span>+++ b/tests/sndcp_xid/Makefile.am</span><br><span>@@ -8,7 +8,7 @@</span><br><span> sndcp_xid_test_SOURCES = sndcp_xid_test.c</span><br><span> </span><br><span> sndcp_xid_test_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/gprs/gprs_sndcp_xid.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/sgsn/gprs_sndcp_xid.o \</span><br><span> $(LIBOSMOABIS_LIBS) \</span><br><span> $(LIBOSMOCORE_LIBS) \</span><br><span> $(LIBOSMOGSM_LIBS) \</span><br><span>diff --git a/tests/v42bis/Makefile.am b/tests/v42bis/Makefile.am</span><br><span>index 8e17b4a..7442392 100644</span><br><span>--- a/tests/v42bis/Makefile.am</span><br><span>+++ b/tests/v42bis/Makefile.am</span><br><span>@@ -8,7 +8,7 @@</span><br><span> v42bis_test_SOURCES = v42bis_test.c</span><br><span> </span><br><span> v42bis_test_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/gprs/v42bis.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/sgsn/v42bis.o \</span><br><span> $(LIBOSMOCORE_LIBS)</span><br><span> </span><br><span> </span><br><span>diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py</span><br><span>index a71865d..a925b6b 100755</span><br><span>--- a/tests/vty_test_runner.py</span><br><span>+++ b/tests/vty_test_runner.py</span><br><span>@@ -119,11 +119,11 @@</span><br><span> class TestVTYSGSN(TestVTYBase):</span><br><span> </span><br><span> def vty_command(self):</span><br><span style="color: hsl(0, 100%, 40%);">- return ["./src/gprs/osmo-sgsn", "-c",</span><br><span style="color: hsl(120, 100%, 40%);">+ return ["./src/sgsn/osmo-sgsn", "-c",</span><br><span> "doc/examples/osmo-sgsn/osmo-sgsn-accept-all.cfg"]</span><br><span> </span><br><span> def vty_app(self):</span><br><span style="color: hsl(0, 100%, 40%);">- return (4245, "./src/gprs/osmo-sgsn", "OsmoSGSN", "sgsn")</span><br><span style="color: hsl(120, 100%, 40%);">+ return (4245, "./src/sgsn/osmo-sgsn", "OsmoSGSN", "sgsn")</span><br><span> </span><br><span> def testVtyTree(self):</span><br><span> self.vty.enable()</span><br><span>@@ -284,7 +284,7 @@</span><br><span> suite.addTest(test)</span><br><span> </span><br><span> def add_sgsn_test(suite, workdir):</span><br><span style="color: hsl(0, 100%, 40%);">- if not os.path.isfile(os.path.join(workdir, "src/gprs/osmo-sgsn")):</span><br><span style="color: hsl(120, 100%, 40%);">+ if not os.path.isfile(os.path.join(workdir, "src/sgsn/osmo-sgsn")):</span><br><span> print("Skipping the SGSN test")</span><br><span> return</span><br><span> test = unittest.TestLoader().loadTestsFromTestCase(TestVTYSGSN)</span><br><span>diff --git a/tests/xid/Makefile.am b/tests/xid/Makefile.am</span><br><span>index 92876ec..6f058f5 100644</span><br><span>--- a/tests/xid/Makefile.am</span><br><span>+++ b/tests/xid/Makefile.am</span><br><span>@@ -24,7 +24,7 @@</span><br><span> $(NULL)</span><br><span> </span><br><span> xid_test_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">- $(top_builddir)/src/gprs/gprs_llc_xid.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/sgsn/gprs_llc_xid.o \</span><br><span> $(LIBOSMOABIS_LIBS) \</span><br><span> $(LIBOSMOCORE_LIBS) \</span><br><span> $(LIBOSMOGSM_LIBS) \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15363">change 15363</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15363"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I16fccc0eadf588599b9e5578d0f4dbaf9df81737 </div>
<div style="display:none"> Gerrit-Change-Number: 15363 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>