diff options
author | Pau Espin Pedrol <pespin@sysmocom.de> | 2019-08-30 20:47:02 +0200 |
---|---|---|
committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2019-09-02 14:03:04 +0200 |
commit | 762c39ccc65e0307a32b89e8bf7daaad2b6b66b4 (patch) | |
tree | c1d0de85859115be63d89d7802b278cfe013019d /src | |
parent | ea05d5c5f89f034a8d2c4151507f59a520535d9a (diff) |
Move out sgsn to its own subdir
Change-Id: I16fccc0eadf588599b9e5578d0f4dbaf9df81737
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 1 | ||||
-rw-r--r-- | src/gprs/Makefile.am | 58 | ||||
-rw-r--r-- | src/sgsn/Makefile.am | 88 | ||||
-rw-r--r-- | src/sgsn/gprs_gb.c (renamed from src/gprs/gprs_gb.c) | 0 | ||||
-rw-r--r-- | src/sgsn/gprs_gmm.c (renamed from src/gprs/gprs_gmm.c) | 0 | ||||
-rw-r--r-- | src/sgsn/gprs_gmm_attach.c (renamed from src/gprs/gprs_gmm_attach.c) | 0 | ||||
-rw-r--r-- | src/sgsn/gprs_llc.c (renamed from src/gprs/gprs_llc.c) | 0 | ||||
-rw-r--r-- | src/sgsn/gprs_llc_vty.c (renamed from src/gprs/gprs_llc_vty.c) | 0 | ||||
-rw-r--r-- | src/sgsn/gprs_llc_xid.c (renamed from src/gprs/gprs_llc_xid.c) | 0 | ||||
-rw-r--r-- | src/sgsn/gprs_mm_state_gb_fsm.c (renamed from src/gprs/gprs_mm_state_gb_fsm.c) | 0 | ||||
-rw-r--r-- | src/sgsn/gprs_mm_state_iu_fsm.c (renamed from src/gprs/gprs_mm_state_iu_fsm.c) | 0 | ||||
-rw-r--r-- | src/sgsn/gprs_ranap.c (renamed from src/gprs/gprs_ranap.c) | 0 | ||||
-rw-r--r-- | src/sgsn/gprs_sgsn.c (renamed from src/gprs/gprs_sgsn.c) | 0 | ||||
-rw-r--r-- | src/sgsn/gprs_sndcp.c (renamed from src/gprs/gprs_sndcp.c) | 0 | ||||
-rw-r--r-- | src/sgsn/gprs_sndcp_comp.c (renamed from src/gprs/gprs_sndcp_comp.c) | 0 | ||||
-rw-r--r-- | src/sgsn/gprs_sndcp_dcomp.c (renamed from src/gprs/gprs_sndcp_dcomp.c) | 0 | ||||
-rw-r--r-- | src/sgsn/gprs_sndcp_pcomp.c (renamed from src/gprs/gprs_sndcp_pcomp.c) | 0 | ||||
-rw-r--r-- | src/sgsn/gprs_sndcp_vty.c (renamed from src/gprs/gprs_sndcp_vty.c) | 0 | ||||
-rw-r--r-- | src/sgsn/gprs_sndcp_xid.c (renamed from src/gprs/gprs_sndcp_xid.c) | 0 | ||||
-rw-r--r-- | src/sgsn/gprs_subscriber.c (renamed from src/gprs/gprs_subscriber.c) | 0 | ||||
-rw-r--r-- | src/sgsn/sgsn_auth.c (renamed from src/gprs/sgsn_auth.c) | 0 | ||||
-rw-r--r-- | src/sgsn/sgsn_cdr.c (renamed from src/gprs/sgsn_cdr.c) | 0 | ||||
-rw-r--r-- | src/sgsn/sgsn_ctrl.c (renamed from src/gprs/sgsn_ctrl.c) | 0 | ||||
-rw-r--r-- | src/sgsn/sgsn_libgtp.c (renamed from src/gprs/sgsn_libgtp.c) | 0 | ||||
-rw-r--r-- | src/sgsn/sgsn_main.c (renamed from src/gprs/sgsn_main.c) | 0 | ||||
-rw-r--r-- | src/sgsn/sgsn_vty.c (renamed from src/gprs/sgsn_vty.c) | 0 | ||||
-rw-r--r-- | src/sgsn/slhc.c (renamed from src/gprs/slhc.c) | 0 | ||||
-rw-r--r-- | src/sgsn/v42bis.c (renamed from src/gprs/v42bis.c) | 0 |
28 files changed, 89 insertions, 58 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 2abd4375e..c45d3ab46 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 e5d50d375..170ded8fc 100644 --- a/src/gprs/Makefile.am +++ b/src/gprs/Makefile.am @@ -26,15 +26,6 @@ AM_CFLAGS += \ $(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 @@ libcommon_la_LIBADD = \ $(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 \ - gprs_mm_state_iu_fsm.c \ - gprs_ranap.c \ - gprs_sgsn.c \ - gprs_sndcp.c \ - gprs_sndcp_comp.c \ - gprs_sndcp_dcomp.c \ - gprs_sndcp_pcomp.c \ - gprs_sndcp_vty.c \ - gprs_sndcp_xid.c \ - sgsn_main.c \ - sgsn_vty.c \ - sgsn_libgtp.c \ - gprs_llc.c \ - gprs_llc_vty.c \ - sgsn_ctrl.c \ - sgsn_auth.c \ - gprs_subscriber.c \ - sgsn_cdr.c \ - slhc.c \ - gprs_llc_xid.c \ - v42bis.c \ - $(NULL) -osmo_sgsn_LDADD = \ - libcommon.la \ - $(OSMO_LIBS) \ - $(LIBOSMOABIS_LIBS) \ - $(LIBOSMOGSUPCLIENT_LIBS) \ - $(LIBCARES_LIBS) \ - $(LIBGTP_LIBS) \ - -lrt \ - -lm \ - $(NULL) -if BUILD_IU -osmo_sgsn_LDADD += \ - $(LIBOSMOSIGTRAN_LIBS) \ - $(LIBOSMORANAP_LIBS) \ - $(LIBASN1C_LIBS) \ - $(NULL) -endif diff --git a/src/sgsn/Makefile.am b/src/sgsn/Makefile.am new file mode 100644 index 000000000..a8da94308 --- /dev/null +++ b/src/sgsn/Makefile.am @@ -0,0 +1,88 @@ +AM_CPPFLAGS = \ + $(all_includes) \ + -I$(top_srcdir)/include \ + -I$(top_builddir) \ + $(NULL) + +AM_CFLAGS = \ + -Wall \ + -fno-strict-aliasing \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOGSM_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(LIBOSMOCTRL_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOGB_CFLAGS) \ + $(LIBOSMOGSUPCLIENT_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(LIBCARES_CFLAGS) \ + $(LIBGTP_CFLAGS) \ + $(NULL) +if BUILD_IU +AM_CFLAGS += \ + $(LIBASN1C_CFLAGS) \ + $(LIBOSMOSIGTRAN_CFLAGS) \ + $(LIBOSMORANAP_CFLAGS) \ + $(NULL) +endif + +OSMO_LIBS = \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBOSMOCTRL_LIBS) \ + $(LIBOSMOGB_LIBS) \ + $(LIBGTP_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 \ + gprs_mm_state_iu_fsm.c \ + gprs_ranap.c \ + gprs_sgsn.c \ + gprs_sndcp.c \ + gprs_sndcp_comp.c \ + gprs_sndcp_dcomp.c \ + gprs_sndcp_pcomp.c \ + gprs_sndcp_vty.c \ + gprs_sndcp_xid.c \ + sgsn_main.c \ + sgsn_vty.c \ + sgsn_libgtp.c \ + gprs_llc.c \ + gprs_llc_vty.c \ + sgsn_ctrl.c \ + sgsn_auth.c \ + gprs_subscriber.c \ + sgsn_cdr.c \ + slhc.c \ + gprs_llc_xid.c \ + v42bis.c \ + $(NULL) +osmo_sgsn_LDADD = \ + $(top_builddir)/src/gprs/gprs_llc_parse.o \ + $(top_builddir)/src/gprs/crc24.o \ + $(top_builddir)/src/gprs/gprs_utils.o \ + $(top_builddir)/src/gprs/sgsn_ares.o \ + $(OSMO_LIBS) \ + $(LIBOSMOABIS_LIBS) \ + $(LIBOSMOGSUPCLIENT_LIBS) \ + $(LIBCARES_LIBS) \ + $(LIBGTP_LIBS) \ + -lrt \ + -lm \ + $(NULL) +if BUILD_IU +osmo_sgsn_LDADD += \ + $(LIBOSMOSIGTRAN_LIBS) \ + $(LIBOSMORANAP_LIBS) \ + $(LIBASN1C_LIBS) \ + $(NULL) +endif diff --git a/src/gprs/gprs_gb.c b/src/sgsn/gprs_gb.c index 65342cf22..65342cf22 100644 --- a/src/gprs/gprs_gb.c +++ b/src/sgsn/gprs_gb.c diff --git a/src/gprs/gprs_gmm.c b/src/sgsn/gprs_gmm.c index edb7eea1e..edb7eea1e 100644 --- a/src/gprs/gprs_gmm.c +++ b/src/sgsn/gprs_gmm.c diff --git a/src/gprs/gprs_gmm_attach.c b/src/sgsn/gprs_gmm_attach.c index 130f8d1c0..130f8d1c0 100644 --- a/src/gprs/gprs_gmm_attach.c +++ b/src/sgsn/gprs_gmm_attach.c diff --git a/src/gprs/gprs_llc.c b/src/sgsn/gprs_llc.c index 2a27da844..2a27da844 100644 --- a/src/gprs/gprs_llc.c +++ b/src/sgsn/gprs_llc.c diff --git a/src/gprs/gprs_llc_vty.c b/src/sgsn/gprs_llc_vty.c index 418be8348..418be8348 100644 --- a/src/gprs/gprs_llc_vty.c +++ b/src/sgsn/gprs_llc_vty.c diff --git a/src/gprs/gprs_llc_xid.c b/src/sgsn/gprs_llc_xid.c index b91fa6bfd..b91fa6bfd 100644 --- a/src/gprs/gprs_llc_xid.c +++ b/src/sgsn/gprs_llc_xid.c diff --git a/src/gprs/gprs_mm_state_gb_fsm.c b/src/sgsn/gprs_mm_state_gb_fsm.c index 2056540db..2056540db 100644 --- a/src/gprs/gprs_mm_state_gb_fsm.c +++ b/src/sgsn/gprs_mm_state_gb_fsm.c diff --git a/src/gprs/gprs_mm_state_iu_fsm.c b/src/sgsn/gprs_mm_state_iu_fsm.c index 1ed5f56f1..1ed5f56f1 100644 --- a/src/gprs/gprs_mm_state_iu_fsm.c +++ b/src/sgsn/gprs_mm_state_iu_fsm.c diff --git a/src/gprs/gprs_ranap.c b/src/sgsn/gprs_ranap.c index 027b6665a..027b6665a 100644 --- a/src/gprs/gprs_ranap.c +++ b/src/sgsn/gprs_ranap.c diff --git a/src/gprs/gprs_sgsn.c b/src/sgsn/gprs_sgsn.c index 387c0d5a1..387c0d5a1 100644 --- a/src/gprs/gprs_sgsn.c +++ b/src/sgsn/gprs_sgsn.c diff --git a/src/gprs/gprs_sndcp.c b/src/sgsn/gprs_sndcp.c index d9aa1e576..d9aa1e576 100644 --- a/src/gprs/gprs_sndcp.c +++ b/src/sgsn/gprs_sndcp.c diff --git a/src/gprs/gprs_sndcp_comp.c b/src/sgsn/gprs_sndcp_comp.c index c71cc8982..c71cc8982 100644 --- a/src/gprs/gprs_sndcp_comp.c +++ b/src/sgsn/gprs_sndcp_comp.c diff --git a/src/gprs/gprs_sndcp_dcomp.c b/src/sgsn/gprs_sndcp_dcomp.c index c0da84d47..c0da84d47 100644 --- a/src/gprs/gprs_sndcp_dcomp.c +++ b/src/sgsn/gprs_sndcp_dcomp.c diff --git a/src/gprs/gprs_sndcp_pcomp.c b/src/sgsn/gprs_sndcp_pcomp.c index 8c2fc974d..8c2fc974d 100644 --- a/src/gprs/gprs_sndcp_pcomp.c +++ b/src/sgsn/gprs_sndcp_pcomp.c diff --git a/src/gprs/gprs_sndcp_vty.c b/src/sgsn/gprs_sndcp_vty.c index 0994a4cd2..0994a4cd2 100644 --- a/src/gprs/gprs_sndcp_vty.c +++ b/src/sgsn/gprs_sndcp_vty.c diff --git a/src/gprs/gprs_sndcp_xid.c b/src/sgsn/gprs_sndcp_xid.c index a19f64514..a19f64514 100644 --- a/src/gprs/gprs_sndcp_xid.c +++ b/src/sgsn/gprs_sndcp_xid.c diff --git a/src/gprs/gprs_subscriber.c b/src/sgsn/gprs_subscriber.c index 484c7ef4e..484c7ef4e 100644 --- a/src/gprs/gprs_subscriber.c +++ b/src/sgsn/gprs_subscriber.c diff --git a/src/gprs/sgsn_auth.c b/src/sgsn/sgsn_auth.c index b8d803590..b8d803590 100644 --- a/src/gprs/sgsn_auth.c +++ b/src/sgsn/sgsn_auth.c diff --git a/src/gprs/sgsn_cdr.c b/src/sgsn/sgsn_cdr.c index a50b4dfdd..a50b4dfdd 100644 --- a/src/gprs/sgsn_cdr.c +++ b/src/sgsn/sgsn_cdr.c diff --git a/src/gprs/sgsn_ctrl.c b/src/sgsn/sgsn_ctrl.c index ad91d25a5..ad91d25a5 100644 --- a/src/gprs/sgsn_ctrl.c +++ b/src/sgsn/sgsn_ctrl.c diff --git a/src/gprs/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c index 5e3f48f3f..5e3f48f3f 100644 --- a/src/gprs/sgsn_libgtp.c +++ b/src/sgsn/sgsn_libgtp.c diff --git a/src/gprs/sgsn_main.c b/src/sgsn/sgsn_main.c index eef5f8f22..eef5f8f22 100644 --- a/src/gprs/sgsn_main.c +++ b/src/sgsn/sgsn_main.c diff --git a/src/gprs/sgsn_vty.c b/src/sgsn/sgsn_vty.c index 184ece761..184ece761 100644 --- a/src/gprs/sgsn_vty.c +++ b/src/sgsn/sgsn_vty.c diff --git a/src/gprs/slhc.c b/src/sgsn/slhc.c index 20e571d48..20e571d48 100644 --- a/src/gprs/slhc.c +++ b/src/sgsn/slhc.c diff --git a/src/gprs/v42bis.c b/src/sgsn/v42bis.c index 0759cdf1c..0759cdf1c 100644 --- a/src/gprs/v42bis.c +++ b/src/sgsn/v42bis.c |