pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/30786 )
Change subject: Rename gprs_gb.[c,h] -> gprs_ns.[c,h] ......................................................................
Rename gprs_gb.[c,h] -> gprs_ns.[c,h]
All remaining code in that file is NS protocol related, hence let's rename it so that we end up with one file per protocol in the Gb stack.
Change-Id: I8312c8a70d60cab48764950c5b57ca02964e9db2 --- M include/osmocom/sgsn/Makefile.am R include/osmocom/sgsn/gprs_ns.h M src/sgsn/Makefile.am R src/sgsn/gprs_ns.c M src/sgsn/gprs_sndcp.c M src/sgsn/sgsn_libgtp.c M src/sgsn/sgsn_main.c M src/sgsn/sgsn_vty.c M tests/sgsn/Makefile.am 9 files changed, 7 insertions(+), 7 deletions(-)
Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved
diff --git a/include/osmocom/sgsn/Makefile.am b/include/osmocom/sgsn/Makefile.am index 3b1f840..64ba16f 100644 --- a/include/osmocom/sgsn/Makefile.am +++ b/include/osmocom/sgsn/Makefile.am @@ -3,12 +3,12 @@ crc24.h \ debug.h \ gprs_bssgp.h \ - gprs_gb.h \ gprs_gmm.h \ gprs_gmm_fsm.h \ gprs_gmm_attach.h \ gprs_mm_state_gb_fsm.h \ gprs_mm_state_iu_fsm.h \ + gprs_ns.h \ gprs_llc.h \ gprs_llc_xid.h \ gprs_ranap.h \ diff --git a/include/osmocom/sgsn/gprs_gb.h b/include/osmocom/sgsn/gprs_ns.h similarity index 100% rename from include/osmocom/sgsn/gprs_gb.h rename to include/osmocom/sgsn/gprs_ns.h diff --git a/src/sgsn/Makefile.am b/src/sgsn/Makefile.am index 8bc5ccb..f97d2ba 100644 --- a/src/sgsn/Makefile.am +++ b/src/sgsn/Makefile.am @@ -41,11 +41,11 @@
osmo_sgsn_SOURCES = \ gprs_bssgp.c \ - gprs_gb.c \ gprs_gmm_attach.c \ gprs_gmm.c \ gprs_gmm_fsm.c \ gprs_mm_state_gb_fsm.c \ + gprs_ns.c \ gprs_sgsn.c \ gprs_sm.c \ gprs_sndcp.c \ diff --git a/src/sgsn/gprs_gb.c b/src/sgsn/gprs_ns.c similarity index 100% rename from src/sgsn/gprs_gb.c rename to src/sgsn/gprs_ns.c diff --git a/src/sgsn/gprs_sndcp.c b/src/sgsn/gprs_sndcp.c index 3b9d28a..a0c35bf 100644 --- a/src/sgsn/gprs_sndcp.c +++ b/src/sgsn/gprs_sndcp.c @@ -32,7 +32,7 @@ #include <osmocom/gprs/gprs_bssgp.h>
#include <osmocom/sgsn/debug.h> -#include <osmocom/sgsn/gprs_gb.h> +#include <osmocom/sgsn/gprs_ns.h> #include <osmocom/sgsn/gprs_llc.h> #include <osmocom/sgsn/sgsn.h> #include <osmocom/sgsn/gprs_sndcp.h> diff --git a/src/sgsn/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c index caab953..a2d0c7a 100644 --- a/src/sgsn/sgsn_libgtp.c +++ b/src/sgsn/sgsn_libgtp.c @@ -45,7 +45,7 @@ #include <osmocom/sgsn/signal.h> #include <osmocom/sgsn/debug.h> #include <osmocom/sgsn/sgsn.h> -#include <osmocom/sgsn/gprs_gb.h> +#include <osmocom/sgsn/gprs_ns.h> #include <osmocom/sgsn/gprs_llc.h> #include <osmocom/sgsn/gprs_sgsn.h> #include <osmocom/sgsn/gprs_gmm.h> diff --git a/src/sgsn/sgsn_main.c b/src/sgsn/sgsn_main.c index 77797b9..b744310 100644 --- a/src/sgsn/sgsn_main.c +++ b/src/sgsn/sgsn_main.c @@ -61,7 +61,7 @@ #include <osmocom/sgsn/gprs_llc.h> #include <osmocom/sgsn/gprs_gmm.h> #include <osmocom/sgsn/gprs_ranap.h> -#include <osmocom/sgsn/gprs_gb.h> +#include <osmocom/sgsn/gprs_ns.h> #include <osmocom/sgsn/gprs_bssgp.h>
#include <osmocom/ctrl/control_if.h> diff --git a/src/sgsn/sgsn_vty.c b/src/sgsn/sgsn_vty.c index db76c35..7a94f79 100644 --- a/src/sgsn/sgsn_vty.c +++ b/src/sgsn/sgsn_vty.c @@ -35,7 +35,7 @@ #include <osmocom/sgsn/debug.h> #include <osmocom/sgsn/sgsn.h> #include <osmocom/gprs/gprs_ns2.h> -#include <osmocom/sgsn/gprs_gb.h> +#include <osmocom/sgsn/gprs_ns.h> #include <osmocom/sgsn/gprs_gmm.h> #include <osmocom/sgsn/gprs_bssgp.h> #include <osmocom/sgsn/gprs_sgsn.h> diff --git a/tests/sgsn/Makefile.am b/tests/sgsn/Makefile.am index 5a01903..6d8fb76 100644 --- a/tests/sgsn/Makefile.am +++ b/tests/sgsn/Makefile.am @@ -49,7 +49,7 @@ sgsn_test_LDADD = \ $(top_builddir)/src/sgsn/gprs_bssgp.o \ $(top_builddir)/src/sgsn/gprs_llc.o \ - $(top_builddir)/src/sgsn/gprs_gb.o \ + $(top_builddir)/src/sgsn/gprs_ns.o \ $(top_builddir)/src/sgsn/gprs_sndcp.o \ $(top_builddir)/src/sgsn/gprs_gmm_attach.o \ $(top_builddir)/src/sgsn/gprs_gmm.o \
-
pespin