<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15361">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move out gbproxy to its own subdir<br><br>Change-Id: I2cc98d3a276d953609bbbbaa9782a0112687791e<br>---<br>M configure.ac<br>M debian/copyright<br>M osmoappdesc.py<br>M src/Makefile.am<br>A src/gbproxy/Makefile.am<br>R src/gbproxy/gb_proxy.c<br>R src/gbproxy/gb_proxy_ctrl.c<br>R src/gbproxy/gb_proxy_main.c<br>R src/gbproxy/gb_proxy_patch.c<br>R src/gbproxy/gb_proxy_peer.c<br>R src/gbproxy/gb_proxy_tlli.c<br>R src/gbproxy/gb_proxy_vty.c<br>M src/gprs/Makefile.am<br>M tests/gbproxy/Makefile.am<br>M tests/vty_test_runner.py<br>15 files changed, 62 insertions(+), 30 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/61/15361/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 02dcf05..1c3f03b 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/gbproxy/Makefile</span><br><span>     tests/Makefile</span><br><span>     tests/atlocal</span><br><span>     tests/gprs/Makefile</span><br><span>diff --git a/debian/copyright b/debian/copyright</span><br><span>index b9bc8e0..695d768 100644</span><br><span>--- a/debian/copyright</span><br><span>+++ b/debian/copyright</span><br><span>@@ -86,12 +86,12 @@</span><br><span>            src/gprs/gprs_gb_parse.c</span><br><span>            src/gprs/gprs_utils.c</span><br><span>            src/gprs/sgsn_ares.c</span><br><span style="color: hsl(0, 100%, 40%);">-           src/gprs/gb_proxy.c</span><br><span style="color: hsl(0, 100%, 40%);">-           src/gprs/gb_proxy_main.c</span><br><span style="color: hsl(0, 100%, 40%);">-           src/gprs/gb_proxy_patch.c</span><br><span style="color: hsl(0, 100%, 40%);">-           src/gprs/gb_proxy_peer.c</span><br><span style="color: hsl(0, 100%, 40%);">-           src/gprs/gb_proxy_tlli.c</span><br><span style="color: hsl(0, 100%, 40%);">-           src/gprs/gb_proxy_vty.c</span><br><span style="color: hsl(120, 100%, 40%);">+           src/gbproxy/gb_proxy.c</span><br><span style="color: hsl(120, 100%, 40%);">+           src/gbproxy/gb_proxy_main.c</span><br><span style="color: hsl(120, 100%, 40%);">+           src/gbproxy/gb_proxy_patch.c</span><br><span style="color: hsl(120, 100%, 40%);">+           src/gbproxy/gb_proxy_peer.c</span><br><span style="color: hsl(120, 100%, 40%);">+           src/gbproxy/gb_proxy_tlli.c</span><br><span style="color: hsl(120, 100%, 40%);">+           src/gbproxy/gb_proxy_vty.c</span><br><span>            src/gprs/gprs_gmm.c</span><br><span>            src/gprs/gprs_llc.c</span><br><span>            src/gprs/gprs_llc_vty.c</span><br><span>diff --git a/osmoappdesc.py b/osmoappdesc.py</span><br><span>index f610e77..1c47aee 100644</span><br><span>--- a/osmoappdesc.py</span><br><span>+++ b/osmoappdesc.py</span><br><span>@@ -23,7 +23,7 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-apps = [(4246, "src/gprs/osmo-gbproxy", "OsmoGbProxy", "gbproxy"),</span><br><span style="color: hsl(120, 100%, 40%);">+apps = [(4246, "src/gbproxy/osmo-gbproxy", "OsmoGbProxy", "gbproxy"),</span><br><span>         (4245, "src/gprs/osmo-sgsn", "OsmoSGSN", "sgsn"),</span><br><span>         (4253, "src/gprs/osmo-gtphub", "OsmoGTPhub", "gtphub")</span><br><span>         ]</span><br><span>diff --git a/src/Makefile.am b/src/Makefile.am</span><br><span>index d2dcb9f..024938d 100644</span><br><span>--- a/src/Makefile.am</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -1,3 +1,4 @@</span><br><span> SUBDIRS = \</span><br><span>       gprs \</span><br><span style="color: hsl(120, 100%, 40%);">+        gbproxy \</span><br><span>    $(NULL)</span><br><span>diff --git a/src/gbproxy/Makefile.am b/src/gbproxy/Makefile.am</span><br><span>new file mode 100644</span><br><span>index 0000000..6876f68</span><br><span>--- /dev/null</span><br><span>+++ b/src/gbproxy/Makefile.am</span><br><span>@@ -0,0 +1,46 @@</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%);">+  $(LIBGTP_CFLAGS) \</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-gbproxy \</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_gbproxy_SOURCES = \</span><br><span style="color: hsl(120, 100%, 40%);">+   gb_proxy.c \</span><br><span style="color: hsl(120, 100%, 40%);">+  gb_proxy_main.c \</span><br><span style="color: hsl(120, 100%, 40%);">+     gb_proxy_vty.c \</span><br><span style="color: hsl(120, 100%, 40%);">+      gb_proxy_ctrl.c \</span><br><span style="color: hsl(120, 100%, 40%);">+     gb_proxy_patch.c \</span><br><span style="color: hsl(120, 100%, 40%);">+    gb_proxy_tlli.c \</span><br><span style="color: hsl(120, 100%, 40%);">+     gb_proxy_peer.c \</span><br><span style="color: hsl(120, 100%, 40%);">+     $(NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_gbproxy_LDADD = \</span><br><span style="color: hsl(120, 100%, 40%);">+       $(top_builddir)/src/gprs/gprs_gb_parse.o \</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%);">+       $(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%);">+      -lrt \</span><br><span style="color: hsl(120, 100%, 40%);">+        $(NULL)</span><br><span>diff --git a/src/gprs/gb_proxy.c b/src/gbproxy/gb_proxy.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gb_proxy.c</span><br><span>rename to src/gbproxy/gb_proxy.c</span><br><span>diff --git a/src/gprs/gb_proxy_ctrl.c b/src/gbproxy/gb_proxy_ctrl.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gb_proxy_ctrl.c</span><br><span>rename to src/gbproxy/gb_proxy_ctrl.c</span><br><span>diff --git a/src/gprs/gb_proxy_main.c b/src/gbproxy/gb_proxy_main.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gb_proxy_main.c</span><br><span>rename to src/gbproxy/gb_proxy_main.c</span><br><span>diff --git a/src/gprs/gb_proxy_patch.c b/src/gbproxy/gb_proxy_patch.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gb_proxy_patch.c</span><br><span>rename to src/gbproxy/gb_proxy_patch.c</span><br><span>diff --git a/src/gprs/gb_proxy_peer.c b/src/gbproxy/gb_proxy_peer.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gb_proxy_peer.c</span><br><span>rename to src/gbproxy/gb_proxy_peer.c</span><br><span>diff --git a/src/gprs/gb_proxy_tlli.c b/src/gbproxy/gb_proxy_tlli.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gb_proxy_tlli.c</span><br><span>rename to src/gbproxy/gb_proxy_tlli.c</span><br><span>diff --git a/src/gprs/gb_proxy_vty.c b/src/gbproxy/gb_proxy_vty.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gb_proxy_vty.c</span><br><span>rename to src/gbproxy/gb_proxy_vty.c</span><br><span>diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am</span><br><span>index e6144f4..e951004 100644</span><br><span>--- a/src/gprs/Makefile.am</span><br><span>+++ b/src/gprs/Makefile.am</span><br><span>@@ -57,26 +57,10 @@</span><br><span>    $(NULL)</span><br><span> </span><br><span> bin_PROGRAMS = \</span><br><span style="color: hsl(0, 100%, 40%);">- osmo-gbproxy \</span><br><span>       osmo-sgsn \</span><br><span>  osmo-gtphub \</span><br><span>        $(NULL)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-osmo_gbproxy_SOURCES = \</span><br><span style="color: hsl(0, 100%, 40%);">-     gb_proxy.c \</span><br><span style="color: hsl(0, 100%, 40%);">-    gb_proxy_main.c \</span><br><span style="color: hsl(0, 100%, 40%);">-       gb_proxy_vty.c \</span><br><span style="color: hsl(0, 100%, 40%);">-        gb_proxy_ctrl.c \</span><br><span style="color: hsl(0, 100%, 40%);">-       gb_proxy_patch.c \</span><br><span style="color: hsl(0, 100%, 40%);">-      gb_proxy_tlli.c \</span><br><span style="color: hsl(0, 100%, 40%);">-       gb_proxy_peer.c \</span><br><span style="color: hsl(0, 100%, 40%);">-       $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_gbproxy_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%);">-  -lrt \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> osmo_sgsn_SOURCES = \</span><br><span>     gprs_gb.c \</span><br><span>  gprs_gmm_attach.c \</span><br><span>diff --git a/tests/gbproxy/Makefile.am b/tests/gbproxy/Makefile.am</span><br><span>index ef38fb6..cb245b4 100644</span><br><span>--- a/tests/gbproxy/Makefile.am</span><br><span>+++ b/tests/gbproxy/Makefile.am</span><br><span>@@ -32,10 +32,10 @@</span><br><span>   $(NULL)</span><br><span> </span><br><span> gbproxy_test_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(top_builddir)/src/gprs/gb_proxy.o \</span><br><span style="color: hsl(0, 100%, 40%);">-   $(top_builddir)/src/gprs/gb_proxy_patch.o \</span><br><span style="color: hsl(0, 100%, 40%);">-     $(top_builddir)/src/gprs/gb_proxy_peer.o \</span><br><span style="color: hsl(0, 100%, 40%);">-      $(top_builddir)/src/gprs/gb_proxy_tlli.o \</span><br><span style="color: hsl(120, 100%, 40%);">+    $(top_builddir)/src/gbproxy/gb_proxy.o \</span><br><span style="color: hsl(120, 100%, 40%);">+      $(top_builddir)/src/gbproxy/gb_proxy_patch.o \</span><br><span style="color: hsl(120, 100%, 40%);">+        $(top_builddir)/src/gbproxy/gb_proxy_peer.o \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(top_builddir)/src/gbproxy/gb_proxy_tlli.o \</span><br><span>        $(top_builddir)/src/gprs/gprs_gb_parse.o \</span><br><span>   $(top_builddir)/src/gprs/gprs_llc_parse.o \</span><br><span>  $(top_builddir)/src/gprs/crc24.o \</span><br><span>diff --git a/tests/vty_test_runner.py b/tests/vty_test_runner.py</span><br><span>index 19eaf28..a71865d 100755</span><br><span>--- a/tests/vty_test_runner.py</span><br><span>+++ b/tests/vty_test_runner.py</span><br><span>@@ -71,11 +71,11 @@</span><br><span> class TestVTYGbproxy(TestVTYBase):</span><br><span> </span><br><span>     def vty_command(self):</span><br><span style="color: hsl(0, 100%, 40%);">-        return ["./src/gprs/osmo-gbproxy", "-c",</span><br><span style="color: hsl(120, 100%, 40%);">+        return ["./src/gbproxy/osmo-gbproxy", "-c",</span><br><span>                 "doc/examples/osmo-gbproxy/osmo-gbproxy.cfg"]</span><br><span> </span><br><span>     def vty_app(self):</span><br><span style="color: hsl(0, 100%, 40%);">-        return (4246, "./src/gprs/osmo-gbproxy", "OsmoGbProxy", "gbproxy")</span><br><span style="color: hsl(120, 100%, 40%);">+        return (4246, "./src/gbproxy/osmo-gbproxy", "OsmoGbProxy", "gbproxy")</span><br><span> </span><br><span>     def testVtyTree(self):</span><br><span>         self.vty.enable()</span><br><span>@@ -277,7 +277,7 @@</span><br><span>             self.assertTrue(self.vty.verify('timer t%d 10' % t, ['']))</span><br><span> </span><br><span> def add_gbproxy_test(suite, workdir):</span><br><span style="color: hsl(0, 100%, 40%);">-    if not os.path.isfile(os.path.join(workdir, "src/gprs/osmo-gbproxy")):</span><br><span style="color: hsl(120, 100%, 40%);">+    if not os.path.isfile(os.path.join(workdir, "src/gbproxy/osmo-gbproxy")):</span><br><span>         print("Skipping the Gb-Proxy test")</span><br><span>         return</span><br><span>     test = unittest.TestLoader().loadTestsFromTestCase(TestVTYGbproxy)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15361">change 15361</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/+/15361"/><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: I2cc98d3a276d953609bbbbaa9782a0112687791e </div>
<div style="display:none"> Gerrit-Change-Number: 15361 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>