This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
pespin gerrit-no-reply at lists.osmocom.orgpespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15362 Change subject: Move out gtphub to its own subdir ...................................................................... Move out gtphub to its own subdir Change-Id: I707d5e9b775179e732d281ce3d245de83d648eea --- M configure.ac M debian/copyright M doc/examples/osmo-gtphub/gtphub-example.txt M osmoappdesc.py M src/Makefile.am M src/gprs/Makefile.am A src/gtphub/Makefile.am R src/gtphub/gtphub.c R src/gtphub/gtphub_ares.c R src/gtphub/gtphub_main.c R src/gtphub/gtphub_sock.c R src/gtphub/gtphub_vty.c M tests/gtphub/Makefile.am 13 files changed, 48 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/62/15362/1 diff --git a/configure.ac b/configure.ac index 1c3f03b..6672204 100644 --- a/configure.ac +++ b/configure.ac @@ -248,6 +248,7 @@ src/Makefile src/gprs/Makefile src/gbproxy/Makefile + src/gtphub/Makefile tests/Makefile tests/atlocal tests/gprs/Makefile diff --git a/debian/copyright b/debian/copyright index 695d768..5d883b9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -104,9 +104,9 @@ src/gprs/gprs_sndcp_vty.c src/gprs/gprs_sndcp_xid.c src/gprs/gprs_subscriber.c - src/gprs/gtphub.c - src/gprs/gtphub_main.c - src/gprs/gtphub_vty.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 @@ -140,8 +140,8 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. -Files: src/gprs/gtphub_ares.c - src/gprs/gtphub_sock.c +Files: src/gtphub/gtphub_ares.c + src/gtphub/gtphub_sock.c tests/gbproxy/gbproxy_test.c Copyright: 2013 Jacob Erlbeck <jerlbeck at sysmocom.de> 2013 sysmocom s.f.m.c. GmbH diff --git a/doc/examples/osmo-gtphub/gtphub-example.txt b/doc/examples/osmo-gtphub/gtphub-example.txt index 9c65f92..17f6914 100644 --- a/doc/examples/osmo-gtphub/gtphub-example.txt +++ b/doc/examples/osmo-gtphub/gtphub-example.txt @@ -59,7 +59,7 @@ 2. GTPHub: cd <your-test-dir> - path/to/openbsc/openbsc/src/gprs/osmo-gtphub -c gtphub.conf #-e 1 #for DEBUG level + path/to/openbsc/openbsc/src/gtphub/osmo-gtphub -c gtphub.conf #-e 1 #for DEBUG level 3. SGSN tests: diff --git a/osmoappdesc.py b/osmoappdesc.py index 1c47aee..9c3fd5d 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -25,7 +25,7 @@ apps = [(4246, "src/gbproxy/osmo-gbproxy", "OsmoGbProxy", "gbproxy"), (4245, "src/gprs/osmo-sgsn", "OsmoSGSN", "sgsn"), - (4253, "src/gprs/osmo-gtphub", "OsmoGTPhub", "gtphub") + (4253, "src/gtphub/osmo-gtphub", "OsmoGTPhub", "gtphub") ] vty_command = ["./src/gprs/osmo-sgsn", "-c", diff --git a/src/Makefile.am b/src/Makefile.am index 024938d..2abd437 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,5 @@ SUBDIRS = \ gprs \ gbproxy \ + gtphub \ $(NULL) diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am index e951004..4c0e40f 100644 --- a/src/gprs/Makefile.am +++ b/src/gprs/Makefile.am @@ -58,7 +58,6 @@ bin_PROGRAMS = \ osmo-sgsn \ - osmo-gtphub \ $(NULL) osmo_sgsn_SOURCES = \ @@ -105,21 +104,3 @@ $(LIBASN1C_LIBS) \ $(NULL) endif - -osmo_gtphub_SOURCES = \ - gtphub_main.c \ - gtphub.c \ - gtphub_sock.c \ - gtphub_ares.c \ - gtphub_vty.c \ - $(NULL) -osmo_gtphub_LDADD = \ - libcommon.la \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(LIBOSMOVTY_LIBS) \ - $(LIBCARES_LIBS) \ - $(LIBGTP_LIBS) \ - $(LIBOSMOSIGTRAN_LIBS) \ - -lrt \ - $(NULL) diff --git a/src/gtphub/Makefile.am b/src/gtphub/Makefile.am new file mode 100644 index 0000000..f3aac2c --- /dev/null +++ b/src/gtphub/Makefile.am @@ -0,0 +1,38 @@ +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir)/include \ + -I$(top_builddir) \ + $(NULL) + +AM_CFLAGS = \ + -Wall \ + -fno-strict-aliasing \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(LIBOSMOSIGTRAN_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(LIBGTP_CFLAGS) \ + $(NULL) + +bin_PROGRAMS = osmo-gtphub + +osmo_gtphub_SOURCES = \ + gtphub_main.c \ + gtphub.c \ + gtphub_sock.c \ + gtphub_ares.c \ + gtphub_vty.c \ + $(NULL) + +osmo_gtphub_LDADD = \ + $(top_builddir)/src/gprs/sgsn_ares.o \ + $(top_builddir)/src/gprs/gprs_utils.o \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBCARES_LIBS) \ + $(LIBGTP_LIBS) \ + $(LIBOSMOSIGTRAN_LIBS) \ + -lrt \ + $(NULL) diff --git a/src/gprs/gtphub.c b/src/gtphub/gtphub.c similarity index 100% rename from src/gprs/gtphub.c rename to src/gtphub/gtphub.c diff --git a/src/gprs/gtphub_ares.c b/src/gtphub/gtphub_ares.c similarity index 100% rename from src/gprs/gtphub_ares.c rename to src/gtphub/gtphub_ares.c diff --git a/src/gprs/gtphub_main.c b/src/gtphub/gtphub_main.c similarity index 100% rename from src/gprs/gtphub_main.c rename to src/gtphub/gtphub_main.c diff --git a/src/gprs/gtphub_sock.c b/src/gtphub/gtphub_sock.c similarity index 100% rename from src/gprs/gtphub_sock.c rename to src/gtphub/gtphub_sock.c diff --git a/src/gprs/gtphub_vty.c b/src/gtphub/gtphub_vty.c similarity index 100% rename from src/gprs/gtphub_vty.c rename to src/gtphub/gtphub_vty.c diff --git a/tests/gtphub/Makefile.am b/tests/gtphub/Makefile.am index 523df61..fea01e0 100644 --- a/tests/gtphub/Makefile.am +++ b/tests/gtphub/Makefile.am @@ -31,7 +31,7 @@ $(NULL) gtphub_test_LDADD = \ - $(top_builddir)/src/gprs/gtphub.o \ + $(top_builddir)/src/gtphub/gtphub.o \ $(top_builddir)/src/gprs/gprs_utils.o \ $(LIBOSMOCORE_LIBS) \ $(LIBOSMOGSM_LIBS) \ -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15362 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I707d5e9b775179e732d281ce3d245de83d648eea Gerrit-Change-Number: 15362 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin at sysmocom.de> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190830/7d29e92d/attachment.htm>