<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15362">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move out gtphub to its own subdir<br><br>Change-Id: I707d5e9b775179e732d281ce3d245de83d648eea<br>---<br>M configure.ac<br>M debian/copyright<br>M doc/examples/osmo-gtphub/gtphub-example.txt<br>M osmoappdesc.py<br>M src/Makefile.am<br>M src/gprs/Makefile.am<br>A src/gtphub/Makefile.am<br>R src/gtphub/gtphub.c<br>R src/gtphub/gtphub_ares.c<br>R src/gtphub/gtphub_main.c<br>R src/gtphub/gtphub_sock.c<br>R src/gtphub/gtphub_vty.c<br>M tests/gtphub/Makefile.am<br>13 files changed, 48 insertions(+), 27 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/62/15362/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 1c3f03b..6672204 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -248,6 +248,7 @@</span><br><span>     src/Makefile</span><br><span>     src/gprs/Makefile</span><br><span>     src/gbproxy/Makefile</span><br><span style="color: hsl(120, 100%, 40%);">+    src/gtphub/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 695d768..5d883b9 100644</span><br><span>--- a/debian/copyright</span><br><span>+++ b/debian/copyright</span><br><span>@@ -104,9 +104,9 @@</span><br><span>            src/gprs/gprs_sndcp_vty.c</span><br><span>            src/gprs/gprs_sndcp_xid.c</span><br><span>            src/gprs/gprs_subscriber.c</span><br><span style="color: hsl(0, 100%, 40%);">-           src/gprs/gtphub.c</span><br><span style="color: hsl(0, 100%, 40%);">-           src/gprs/gtphub_main.c</span><br><span style="color: hsl(0, 100%, 40%);">-           src/gprs/gtphub_vty.c</span><br><span style="color: hsl(120, 100%, 40%);">+           src/gtphub/gtphub.c</span><br><span style="color: hsl(120, 100%, 40%);">+           src/gtphub/gtphub_main.c</span><br><span style="color: hsl(120, 100%, 40%);">+           src/gtphub/gtphub_vty.c</span><br><span>            src/gprs/sgsn_auth.c</span><br><span>            src/gprs/sgsn_cdr.c</span><br><span>            src/gprs/sgsn_ctrl.c</span><br><span>@@ -140,8 +140,8 @@</span><br><span>  You should have received a copy of the GNU Affero General Public License</span><br><span>  along with this program.  If not, see <http://www.gnu.org/licenses/>.</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-Files:     src/gprs/gtphub_ares.c</span><br><span style="color: hsl(0, 100%, 40%);">-           src/gprs/gtphub_sock.c</span><br><span style="color: hsl(120, 100%, 40%);">+Files:     src/gtphub/gtphub_ares.c</span><br><span style="color: hsl(120, 100%, 40%);">+           src/gtphub/gtphub_sock.c</span><br><span>            tests/gbproxy/gbproxy_test.c</span><br><span> Copyright: 2013 Jacob Erlbeck <jerlbeck@sysmocom.de></span><br><span>            2013 sysmocom s.f.m.c. GmbH</span><br><span>diff --git a/doc/examples/osmo-gtphub/gtphub-example.txt b/doc/examples/osmo-gtphub/gtphub-example.txt</span><br><span>index 9c65f92..17f6914 100644</span><br><span>--- a/doc/examples/osmo-gtphub/gtphub-example.txt</span><br><span>+++ b/doc/examples/osmo-gtphub/gtphub-example.txt</span><br><span>@@ -59,7 +59,7 @@</span><br><span> 2. GTPHub:</span><br><span> </span><br><span>     cd <your-test-dir></span><br><span style="color: hsl(0, 100%, 40%);">-    path/to/openbsc/openbsc/src/gprs/osmo-gtphub -c gtphub.conf #-e 1 #for DEBUG level</span><br><span style="color: hsl(120, 100%, 40%);">+    path/to/openbsc/openbsc/src/gtphub/osmo-gtphub -c gtphub.conf #-e 1 #for DEBUG level</span><br><span> </span><br><span> 3. SGSN tests:</span><br><span> </span><br><span>diff --git a/osmoappdesc.py b/osmoappdesc.py</span><br><span>index 1c47aee..9c3fd5d 100644</span><br><span>--- a/osmoappdesc.py</span><br><span>+++ b/osmoappdesc.py</span><br><span>@@ -25,7 +25,7 @@</span><br><span> </span><br><span> apps = [(4246, "src/gbproxy/osmo-gbproxy", "OsmoGbProxy", "gbproxy"),</span><br><span>         (4245, "src/gprs/osmo-sgsn", "OsmoSGSN", "sgsn"),</span><br><span style="color: hsl(0, 100%, 40%);">-        (4253, "src/gprs/osmo-gtphub", "OsmoGTPhub", "gtphub")</span><br><span style="color: hsl(120, 100%, 40%);">+        (4253, "src/gtphub/osmo-gtphub", "OsmoGTPhub", "gtphub")</span><br><span>         ]</span><br><span> </span><br><span> vty_command = ["./src/gprs/osmo-sgsn", "-c",</span><br><span>diff --git a/src/Makefile.am b/src/Makefile.am</span><br><span>index 024938d..2abd437 100644</span><br><span>--- a/src/Makefile.am</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -1,4 +1,5 @@</span><br><span> SUBDIRS = \</span><br><span>    gprs \</span><br><span>       gbproxy \</span><br><span style="color: hsl(120, 100%, 40%);">+     gtphub \</span><br><span>     $(NULL)</span><br><span>diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am</span><br><span>index e951004..4c0e40f 100644</span><br><span>--- a/src/gprs/Makefile.am</span><br><span>+++ b/src/gprs/Makefile.am</span><br><span>@@ -58,7 +58,6 @@</span><br><span> </span><br><span> bin_PROGRAMS = \</span><br><span>     osmo-sgsn \</span><br><span style="color: hsl(0, 100%, 40%);">-     osmo-gtphub \</span><br><span>        $(NULL)</span><br><span> </span><br><span> osmo_sgsn_SOURCES = \</span><br><span>@@ -105,21 +104,3 @@</span><br><span>  $(LIBASN1C_LIBS) \</span><br><span>   $(NULL)</span><br><span> endif</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_gtphub_SOURCES = \</span><br><span style="color: hsl(0, 100%, 40%);">- gtphub_main.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gtphub.c \</span><br><span style="color: hsl(0, 100%, 40%);">-      gtphub_sock.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gtphub_ares.c \</span><br><span style="color: hsl(0, 100%, 40%);">- gtphub_vty.c \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(NULL)</span><br><span style="color: hsl(0, 100%, 40%);">-osmo_gtphub_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">-    libcommon.la \</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%);">-    $(LIBCARES_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">-      $(LIBGTP_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">-        $(LIBOSMOSIGTRAN_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">-        -lrt \</span><br><span style="color: hsl(0, 100%, 40%);">-  $(NULL)</span><br><span>diff --git a/src/gtphub/Makefile.am b/src/gtphub/Makefile.am</span><br><span>new file mode 100644</span><br><span>index 0000000..f3aac2c</span><br><span>--- /dev/null</span><br><span>+++ b/src/gtphub/Makefile.am</span><br><span>@@ -0,0 +1,38 @@</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%);">+      $(LIBOSMOSIGTRAN_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 = osmo-gtphub</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_gtphub_SOURCES = \</span><br><span style="color: hsl(120, 100%, 40%);">+        gtphub_main.c \</span><br><span style="color: hsl(120, 100%, 40%);">+       gtphub.c \</span><br><span style="color: hsl(120, 100%, 40%);">+    gtphub_sock.c \</span><br><span style="color: hsl(120, 100%, 40%);">+       gtphub_ares.c \</span><br><span style="color: hsl(120, 100%, 40%);">+       gtphub_vty.c \</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_gtphub_LDADD = \</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%);">+        $(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%);">+  $(LIBCARES_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+    $(LIBGTP_LIBS) \</span><br><span style="color: hsl(120, 100%, 40%);">+      $(LIBOSMOSIGTRAN_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/gtphub.c b/src/gtphub/gtphub.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gtphub.c</span><br><span>rename to src/gtphub/gtphub.c</span><br><span>diff --git a/src/gprs/gtphub_ares.c b/src/gtphub/gtphub_ares.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gtphub_ares.c</span><br><span>rename to src/gtphub/gtphub_ares.c</span><br><span>diff --git a/src/gprs/gtphub_main.c b/src/gtphub/gtphub_main.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gtphub_main.c</span><br><span>rename to src/gtphub/gtphub_main.c</span><br><span>diff --git a/src/gprs/gtphub_sock.c b/src/gtphub/gtphub_sock.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gtphub_sock.c</span><br><span>rename to src/gtphub/gtphub_sock.c</span><br><span>diff --git a/src/gprs/gtphub_vty.c b/src/gtphub/gtphub_vty.c</span><br><span>similarity index 100%</span><br><span>rename from src/gprs/gtphub_vty.c</span><br><span>rename to src/gtphub/gtphub_vty.c</span><br><span>diff --git a/tests/gtphub/Makefile.am b/tests/gtphub/Makefile.am</span><br><span>index 523df61..fea01e0 100644</span><br><span>--- a/tests/gtphub/Makefile.am</span><br><span>+++ b/tests/gtphub/Makefile.am</span><br><span>@@ -31,7 +31,7 @@</span><br><span>      $(NULL)</span><br><span> </span><br><span> gtphub_test_LDADD = \</span><br><span style="color: hsl(0, 100%, 40%);">-    $(top_builddir)/src/gprs/gtphub.o \</span><br><span style="color: hsl(120, 100%, 40%);">+   $(top_builddir)/src/gtphub/gtphub.o \</span><br><span>        $(top_builddir)/src/gprs/gprs_utils.o \</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/+/15362">change 15362</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/+/15362"/><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: I707d5e9b775179e732d281ce3d245de83d648eea </div>
<div style="display:none"> Gerrit-Change-Number: 15362 </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>