diff options
author | Pau Espin Pedrol <pespin@sysmocom.de> | 2022-12-22 19:49:37 +0100 |
---|---|---|
committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2022-12-22 19:49:39 +0100 |
commit | 749ca7c850adcb4ae8cc2dfbac8d95e12773769d (patch) | |
tree | 18238c44384b9f21179902075d0e819555ae60d5 | |
parent | e7ccfdb4aaa44675ee00f6e82b34dabb22bf34b9 (diff) |
Move gprs_gb_parse.[c,h] to tests/sgsn/
That big file is really only used by tests/sgsn/sgsn_test nowadays, so
let's keep it out of osmo-sgsn app code base.
Change-Id: Ia5a639832f52b2f015a2800bd0d94a28d7bc689b
-rw-r--r-- | debian/copyright | 4 | ||||
-rw-r--r-- | include/osmocom/sgsn/Makefile.am | 1 | ||||
-rw-r--r-- | src/gprs/Makefile.am | 1 | ||||
-rw-r--r-- | tests/sgsn/Makefile.am | 6 | ||||
-rw-r--r-- | tests/sgsn/gprs_gb_parse.c (renamed from src/gprs/gprs_gb_parse.c) | 2 | ||||
-rw-r--r-- | tests/sgsn/gprs_gb_parse.h (renamed from include/osmocom/sgsn/gprs_gb_parse.h) | 0 | ||||
-rw-r--r-- | tests/sgsn/sgsn_test.c | 3 |
7 files changed, 10 insertions, 7 deletions
diff --git a/debian/copyright b/debian/copyright index 33d65851f..d4e745104 100644 --- a/debian/copyright +++ b/debian/copyright @@ -33,7 +33,6 @@ Files: .gitignore include/osmocom/sgsn/crc24.h include/osmocom/sgsn/debug.h include/osmocom/sgsn/gb_proxy.h - include/osmocom/sgsn/gprs_gb_parse.h include/osmocom/sgsn/gprs_gmm.h include/osmocom/sgsn/gprs_llc.h include/osmocom/sgsn/gprs_sgsn.h @@ -53,6 +52,7 @@ Files: .gitignore tests/gprs/gprs_test.ok tests/gtphub/Makefile.am tests/gtphub/gtphub_test.ok + tests/sgsn/gprs_gb_parse.h tests/sgsn/Makefile.am tests/sgsn/sgsn_test.ok tests/slhc/Makefile.am @@ -78,7 +78,6 @@ Files: include/osmocom/sgsn/a_reset.h include/osmocom/sgsn/signal.h src/gprs/gprs_llc_parse.c src/gprs/crc24.c - src/gprs/gprs_gb_parse.c src/gprs/gprs_utils.c src/gprs/sgsn_ares.c src/gtphub/gtphub.c @@ -103,6 +102,7 @@ Files: include/osmocom/sgsn/a_reset.h src/sgsn/sgsn_main.c src/sgsn/sgsn_vty.c tests/gtphub/gtphub_test.c + tests/sgsn/gprs_gb_parse.c tests/sgsn/sgsn_test.c tests/slhc/slhc_test.c tests/sndcp_xid/sndcp_xid_test.c diff --git a/include/osmocom/sgsn/Makefile.am b/include/osmocom/sgsn/Makefile.am index 289f502e8..515c79c47 100644 --- a/include/osmocom/sgsn/Makefile.am +++ b/include/osmocom/sgsn/Makefile.am @@ -3,7 +3,6 @@ noinst_HEADERS = \ crc24.h \ debug.h \ gprs_gb.h \ - gprs_gb_parse.h \ gprs_gmm.h \ gprs_gmm_fsm.h \ gprs_gmm_attach.h \ diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am index 170ded8fc..1533dc070 100644 --- a/src/gprs/Makefile.am +++ b/src/gprs/Makefile.am @@ -29,7 +29,6 @@ endif noinst_LTLIBRARIES = libcommon.la libcommon_la_SOURCES = \ - gprs_gb_parse.c \ gprs_llc_parse.c \ crc24.c \ gprs_utils.c \ diff --git a/tests/sgsn/Makefile.am b/tests/sgsn/Makefile.am index 72a771442..bd8e19c57 100644 --- a/tests/sgsn/Makefile.am +++ b/tests/sgsn/Makefile.am @@ -29,8 +29,13 @@ check_PROGRAMS = \ sgsn_test \ $(NULL) +noinst_HEADERS = \ + gprs_gb_parse.h \ + $(NULL) + sgsn_test_SOURCES = \ sgsn_test.c \ + gprs_gb_parse.c \ $(NULL) sgsn_test_LDFLAGS = \ @@ -66,7 +71,6 @@ sgsn_test_LDADD = \ $(top_builddir)/src/sgsn/sgsn_rim.o \ $(top_builddir)/src/gprs/gprs_utils.o \ $(top_builddir)/src/gprs/gprs_llc_parse.o \ - $(top_builddir)/src/gprs/gprs_gb_parse.o \ $(top_builddir)/src/gprs/crc24.o \ $(top_builddir)/src/gprs/sgsn_ares.o \ $(LIBOSMOABIS_LIBS) \ diff --git a/src/gprs/gprs_gb_parse.c b/tests/sgsn/gprs_gb_parse.c index e6a82acb2..3338911db 100644 --- a/src/gprs/gprs_gb_parse.c +++ b/tests/sgsn/gprs_gb_parse.c @@ -21,7 +21,7 @@ #include <osmocom/gsm/gsm48.h> #include <osmocom/gsm/protocol/gsm_04_08_gprs.h> -#include <osmocom/sgsn/gprs_gb_parse.h> +#include "gprs_gb_parse.h" #include <osmocom/sgsn/gprs_utils.h> diff --git a/include/osmocom/sgsn/gprs_gb_parse.h b/tests/sgsn/gprs_gb_parse.h index 58de17f81..58de17f81 100644 --- a/include/osmocom/sgsn/gprs_gb_parse.h +++ b/tests/sgsn/gprs_gb_parse.h diff --git a/tests/sgsn/sgsn_test.c b/tests/sgsn/sgsn_test.c index 2c41e8ea3..a09f1a5b6 100644 --- a/tests/sgsn/sgsn_test.c +++ b/tests/sgsn/sgsn_test.c @@ -27,7 +27,6 @@ #include <osmocom/gsm/gsup.h> #include <osmocom/gsupclient/gsup_client.h> #include <osmocom/sgsn/gprs_utils.h> -#include <osmocom/sgsn/gprs_gb_parse.h> #include <osmocom/sgsn/gprs_gmm_fsm.h> #include <osmocom/gprs/gprs_bssgp.h> @@ -42,6 +41,8 @@ #include <stdio.h> +#include "gprs_gb_parse.h" + void *tall_sgsn_ctx; static struct sgsn_instance sgsn_inst = { .config_file = "osmo_sgsn.cfg", |