Change in ...osmo-sgsn[master]: Move out sgsn to its own subdir
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15363 ) Change subject: Move out sgsn to its own subdir .. Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I16fccc0eadf588599b9e5578d0f4dbaf9df81737 Gerrit-Change-Number: 15363 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Fri, 06 Sep 2019 19:06:45 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: Move out sgsn to its own subdir
laforge has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15363 ) Change subject: Move out sgsn to its own subdir .. Move out sgsn to its own subdir Change-Id: I16fccc0eadf588599b9e5578d0f4dbaf9df81737 --- M configure.ac M debian/copyright M osmoappdesc.py M src/Makefile.am M src/gprs/Makefile.am A src/sgsn/Makefile.am R src/sgsn/gprs_gb.c R src/sgsn/gprs_gmm.c R src/sgsn/gprs_gmm_attach.c R src/sgsn/gprs_llc.c R src/sgsn/gprs_llc_vty.c R src/sgsn/gprs_llc_xid.c R src/sgsn/gprs_mm_state_gb_fsm.c R src/sgsn/gprs_mm_state_iu_fsm.c R src/sgsn/gprs_ranap.c R src/sgsn/gprs_sgsn.c R src/sgsn/gprs_sndcp.c R src/sgsn/gprs_sndcp_comp.c R src/sgsn/gprs_sndcp_dcomp.c R src/sgsn/gprs_sndcp_pcomp.c R src/sgsn/gprs_sndcp_vty.c R src/sgsn/gprs_sndcp_xid.c R src/sgsn/gprs_subscriber.c R src/sgsn/sgsn_auth.c R src/sgsn/sgsn_cdr.c R src/sgsn/sgsn_ctrl.c R src/sgsn/sgsn_libgtp.c R src/sgsn/sgsn_main.c R src/sgsn/sgsn_vty.c R src/sgsn/slhc.c R src/sgsn/v42bis.c M tests/Makefile.am M tests/ctrl_test_runner.py M tests/sgsn/Makefile.am M tests/slhc/Makefile.am M tests/sndcp_xid/Makefile.am M tests/v42bis/Makefile.am M tests/vty_test_runner.py M tests/xid/Makefile.am 39 files changed, 144 insertions(+), 112 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 6672204..ec7af6e 100644 --- a/configure.ac +++ b/configure.ac @@ -247,6 +247,7 @@ 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 5d883b9..fa7405f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -92,27 +92,27 @@ 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 9c3fd5d..08166a9 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -24,11 +24,11 @@ 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 2abd437..c45d3ab 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 e5d50d3..170ded8 100644 --- a/src/gprs/Makefile.am +++ b/src/gprs/Makefile.am @@ -26,15 +26,6 @@ $(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 @@ $(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 \ -
Change in ...osmo-sgsn[master]: Move out sgsn to its own subdir
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15363 ) Change subject: Move out sgsn to its own subdir .. Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I16fccc0eadf588599b9e5578d0f4dbaf9df81737 Gerrit-Change-Number: 15363 Gerrit-PatchSet: 5 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 03 Sep 2019 16:07:51 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: Move out sgsn to its own subdir
Hello laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15363 to look at the new patch set (#4). Change subject: Move out sgsn to its own subdir .. Move out sgsn to its own subdir Change-Id: I16fccc0eadf588599b9e5578d0f4dbaf9df81737 --- M configure.ac M debian/copyright M osmoappdesc.py M src/Makefile.am M src/gprs/Makefile.am A src/sgsn/Makefile.am R src/sgsn/gprs_gb.c R src/sgsn/gprs_gmm.c R src/sgsn/gprs_gmm_attach.c R src/sgsn/gprs_llc.c R src/sgsn/gprs_llc_vty.c R src/sgsn/gprs_llc_xid.c R src/sgsn/gprs_mm_state_gb_fsm.c R src/sgsn/gprs_mm_state_iu_fsm.c R src/sgsn/gprs_ranap.c R src/sgsn/gprs_sgsn.c R src/sgsn/gprs_sndcp.c R src/sgsn/gprs_sndcp_comp.c R src/sgsn/gprs_sndcp_dcomp.c R src/sgsn/gprs_sndcp_pcomp.c R src/sgsn/gprs_sndcp_vty.c R src/sgsn/gprs_sndcp_xid.c R src/sgsn/gprs_subscriber.c R src/sgsn/sgsn_auth.c R src/sgsn/sgsn_cdr.c R src/sgsn/sgsn_ctrl.c R src/sgsn/sgsn_libgtp.c R src/sgsn/sgsn_main.c R src/sgsn/sgsn_vty.c R src/sgsn/slhc.c R src/sgsn/v42bis.c M tests/Makefile.am M tests/ctrl_test_runner.py M tests/sgsn/Makefile.am M tests/slhc/Makefile.am M tests/sndcp_xid/Makefile.am M tests/v42bis/Makefile.am M tests/vty_test_runner.py M tests/xid/Makefile.am 39 files changed, 144 insertions(+), 112 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/63/15363/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I16fccc0eadf588599b9e5578d0f4dbaf9df81737 Gerrit-Change-Number: 15363 Gerrit-PatchSet: 4 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-MessageType: newpatchset
Change in ...osmo-sgsn[master]: Move out sgsn to its own subdir
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15363 ) Change subject: Move out sgsn to its own subdir .. Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/15363 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I16fccc0eadf588599b9e5578d0f4dbaf9df81737 Gerrit-Change-Number: 15363 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Sat, 31 Aug 2019 10:44:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: Move out sgsn to its own subdir
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/15363 Change subject: Move out sgsn to its own subdir .. Move out sgsn to its own subdir Change-Id: I16fccc0eadf588599b9e5578d0f4dbaf9df81737 --- M configure.ac M debian/copyright M osmoappdesc.py M src/Makefile.am M src/gprs/Makefile.am A src/sgsn/Makefile.am R src/sgsn/gprs_gb.c R src/sgsn/gprs_gmm.c R src/sgsn/gprs_gmm_attach.c R src/sgsn/gprs_llc.c R src/sgsn/gprs_llc_vty.c R src/sgsn/gprs_llc_xid.c R src/sgsn/gprs_mm_state_gb_fsm.c R src/sgsn/gprs_mm_state_iu_fsm.c R src/sgsn/gprs_ranap.c R src/sgsn/gprs_sgsn.c R src/sgsn/gprs_sndcp.c R src/sgsn/gprs_sndcp_comp.c R src/sgsn/gprs_sndcp_dcomp.c R src/sgsn/gprs_sndcp_pcomp.c R src/sgsn/gprs_sndcp_vty.c R src/sgsn/gprs_sndcp_xid.c R src/sgsn/gprs_subscriber.c R src/sgsn/sgsn_auth.c R src/sgsn/sgsn_cdr.c R src/sgsn/sgsn_ctrl.c R src/sgsn/sgsn_libgtp.c R src/sgsn/sgsn_main.c R src/sgsn/sgsn_vty.c R src/sgsn/slhc.c R src/sgsn/v42bis.c M tests/Makefile.am M tests/ctrl_test_runner.py M tests/sgsn/Makefile.am M tests/slhc/Makefile.am M tests/sndcp_xid/Makefile.am M tests/v42bis/Makefile.am M tests/vty_test_runner.py M tests/xid/Makefile.am 39 files changed, 144 insertions(+), 112 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/63/15363/1 diff --git a/configure.ac b/configure.ac index 6672204..ec7af6e 100644 --- a/configure.ac +++ b/configure.ac @@ -247,6 +247,7 @@ 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 5d883b9..fa7405f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -92,27 +92,27 @@ 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 9c3fd5d..08166a9 100644 --- a/osmoappdesc.py +++ b/osmoappdesc.py @@ -24,11 +24,11 @@ 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 2abd437..c45d3ab 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 4c0e40f..64648e2 100644 --- a/src/gprs/Makefile.am +++ b/src/gprs/Makefile.am @@ -26,15 +26,6 @@ $(NULL) endif -OSMO_LIBS = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(LIBOSMOVTY_LIBS) \ - $(LIBOSMOCTRL_LIBS) \ - $(LIBOSMOGB_LIBS) \ - $(LIBGTP_LIBS) \ - $(NULL) - noinst_LTLIBRARIES = libcommon.la libcommon_la_SOURCES = \ @@ -55,52 +46,3 @@ $(LIBCARES_LIBS) \ -lrt \ $(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 \ -
