pespin submitted this change.

View Change

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
---
M debian/copyright
M include/osmocom/sgsn/Makefile.am
M src/gprs/Makefile.am
M tests/sgsn/Makefile.am
R tests/sgsn/gprs_gb_parse.c
R tests/sgsn/gprs_gb_parse.h
M tests/sgsn/sgsn_test.c
7 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 33d6585..d4e7451 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -33,7 +33,6 @@
            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 @@
            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 @@
            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 @@
            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 289f502..515c79c 100644
--- a/include/osmocom/sgsn/Makefile.am
+++ b/include/osmocom/sgsn/Makefile.am
@@ -3,7 +3,6 @@
 	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 170ded8..1533dc0 100644
--- a/src/gprs/Makefile.am
+++ b/src/gprs/Makefile.am
@@ -29,7 +29,6 @@
 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 72a7714..bd8e19c 100644
--- a/tests/sgsn/Makefile.am
+++ b/tests/sgsn/Makefile.am
@@ -29,8 +29,13 @@
 	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 @@
 	$(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
similarity index 99%
rename from src/gprs/gprs_gb_parse.c
rename to tests/sgsn/gprs_gb_parse.c
index e6a82ac..3338911 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
similarity index 100%
rename from include/osmocom/sgsn/gprs_gb_parse.h
rename to tests/sgsn/gprs_gb_parse.h
diff --git a/tests/sgsn/sgsn_test.c b/tests/sgsn/sgsn_test.c
index 2c41e8e..a09f1a5 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",

To view, visit change 30774. To unsubscribe, or for help writing mail filters, visit settings.