[MERGED] osmo-sgsn[master]: move include/openbsc to include/osmocom/sgsn

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Neels Hofmeyr gerrit-no-reply at lists.osmocom.org
Wed Sep 6 14:48:52 UTC 2017


Neels Hofmeyr has submitted this change and it was merged.

Change subject: move include/openbsc to include/osmocom/sgsn
......................................................................


move include/openbsc to include/osmocom/sgsn

Change-Id: I281ef585fffc2644682c8282224fb1c2da5ca795
---
M configure.ac
M debian/copyright
M include/Makefile.am
A include/osmocom/Makefile.am
R include/osmocom/sgsn/Makefile.am
R include/osmocom/sgsn/common.h
R include/osmocom/sgsn/crc24.h
R include/osmocom/sgsn/debug.h
R include/osmocom/sgsn/gb_proxy.h
R include/osmocom/sgsn/gprs_gb_parse.h
R include/osmocom/sgsn/gprs_gmm.h
R include/osmocom/sgsn/gprs_llc.h
R include/osmocom/sgsn/gprs_llc_xid.h
R include/osmocom/sgsn/gprs_sgsn.h
R include/osmocom/sgsn/gprs_sndcp.h
R include/osmocom/sgsn/gprs_sndcp_comp.h
R include/osmocom/sgsn/gprs_sndcp_dcomp.h
R include/osmocom/sgsn/gprs_sndcp_pcomp.h
R include/osmocom/sgsn/gprs_sndcp_xid.h
R include/osmocom/sgsn/gprs_subscriber.h
R include/osmocom/sgsn/gprs_utils.h
R include/osmocom/sgsn/gsup_client.h
R include/osmocom/sgsn/gtphub.h
R include/osmocom/sgsn/oap_client.h
R include/osmocom/sgsn/rest_octets.h
R include/osmocom/sgsn/sgsn.h
R include/osmocom/sgsn/signal.h
R include/osmocom/sgsn/slhc.h
R include/osmocom/sgsn/v42bis.h
R include/osmocom/sgsn/v42bis_private.h
R include/osmocom/sgsn/vty.h
M src/gprs/crc24.c
M src/gprs/gb_proxy.c
M src/gprs/gb_proxy_main.c
M src/gprs/gb_proxy_patch.c
M src/gprs/gb_proxy_peer.c
M src/gprs/gb_proxy_tlli.c
M src/gprs/gb_proxy_vty.c
M src/gprs/gprs_gb_parse.c
M src/gprs/gprs_gmm.c
M src/gprs/gprs_llc.c
M src/gprs/gprs_llc_parse.c
M src/gprs/gprs_llc_vty.c
M src/gprs/gprs_llc_xid.c
M src/gprs/gprs_sgsn.c
M src/gprs/gprs_sndcp.c
M src/gprs/gprs_sndcp_comp.c
M src/gprs/gprs_sndcp_dcomp.c
M src/gprs/gprs_sndcp_pcomp.c
M src/gprs/gprs_sndcp_vty.c
M src/gprs/gprs_sndcp_xid.c
M src/gprs/gprs_subscriber.c
M src/gprs/gprs_utils.c
M src/gprs/gsup_client.c
M src/gprs/gtphub.c
M src/gprs/gtphub_ares.c
M src/gprs/gtphub_main.c
M src/gprs/gtphub_sock.c
M src/gprs/gtphub_vty.c
M src/gprs/oap_client.c
M src/gprs/sgsn_ares.c
M src/gprs/sgsn_auth.c
M src/gprs/sgsn_cdr.c
M src/gprs/sgsn_ctrl.c
M src/gprs/sgsn_libgtp.c
M src/gprs/sgsn_main.c
M src/gprs/sgsn_vty.c
M src/gprs/slhc.c
M src/gprs/v42bis.c
M src/libcommon/common_vty.c
M src/libcommon/debug.c
M src/libcommon/gsm_data.c
M src/libcommon/gsm_data_shared.c
M src/libcommon/gsm_subscriber_base.c
M src/libcommon/gsup_client.c
M src/libcommon/gsup_test_client.c
M src/libcommon/oap_client.c
M src/libcommon/socket.c
M tests/gbproxy/gbproxy_test.c
M tests/gprs/gprs_test.c
M tests/gtphub/gtphub_test.c
M tests/oap/oap_client_test.c
M tests/sgsn/sgsn_test.c
M tests/slhc/slhc_test.c
M tests/sndcp_xid/sndcp_xid_test.c
M tests/v42bis/v42bis_test.c
M tests/xid/xid_test.c
87 files changed, 268 insertions(+), 264 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved



diff --git a/configure.ac b/configure.ac
index 55aa7d5..d5d80cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -179,8 +179,9 @@
 
 AC_OUTPUT(
     osmo-sgsn.pc
-    include/openbsc/Makefile
     include/Makefile
+    include/osmocom/Makefile
+    include/osmocom/sgsn/Makefile
     src/Makefile
     src/gprs/Makefile
     tests/Makefile
diff --git a/debian/copyright b/debian/copyright
index b58117e..1f7f6fd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -78,22 +78,22 @@
            doc/osmo-nitb-data_structures.dot
            doc/paging.txt
            include/Makefile.am
-           include/openbsc/Makefile.am
-           include/openbsc/common.h
-           include/openbsc/crc24.h
-           include/openbsc/debug.h
-           include/openbsc/gb_proxy.h
-           include/openbsc/gprs_gb_parse.h
-           include/openbsc/gprs_gmm.h
-           include/openbsc/gprs_llc.h
-           include/openbsc/gprs_sgsn.h
-           include/openbsc/gprs_sndcp.h
-           include/openbsc/gprs_subscriber.h
-           include/openbsc/rest_octets.h
-           include/openbsc/sgsn.h
-           include/openbsc/vty.h
+           include/osmocom/sgsn/Makefile.am
+           include/osmocom/sgsn/common.h
+           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
+           include/osmocom/sgsn/gprs_sndcp.h
+           include/osmocom/sgsn/gprs_subscriber.h
+           include/osmocom/sgsn/rest_octets.h
+           include/osmocom/sgsn/sgsn.h
+           include/osmocom/sgsn/vty.h
            m4/README
-           openbsc.pc.in
+           osmo-sgsn.pc.in
            src/Makefile.am
            src/gprs/.gitignore
            src/gprs/Makefile.am
@@ -130,17 +130,17 @@
 Copyright: __NO_COPYRIGHT_NOR_LICENSE__
 License:   __NO_COPYRIGHT_NOR_LICENSE__
 
-Files:     include/openbsc/a_reset.h
-           include/openbsc/gprs_llc_xid.h
-           include/openbsc/gprs_sndcp_comp.h
-           include/openbsc/gprs_sndcp_dcomp.h
-           include/openbsc/gprs_sndcp_pcomp.h
-           include/openbsc/gprs_sndcp_xid.h
-           include/openbsc/gprs_utils.h
-           include/openbsc/gsup_client.h
-           include/openbsc/gtphub.h
-           include/openbsc/oap_client.h
-           include/openbsc/signal.h
+Files:     include/osmocom/sgsn/a_reset.h
+           include/osmocom/sgsn/gprs_llc_xid.h
+           include/osmocom/sgsn/gprs_sndcp_comp.h
+           include/osmocom/sgsn/gprs_sndcp_dcomp.h
+           include/osmocom/sgsn/gprs_sndcp_pcomp.h
+           include/osmocom/sgsn/gprs_sndcp_xid.h
+           include/osmocom/sgsn/gprs_utils.h
+           include/osmocom/sgsn/gsup_client.h
+           include/osmocom/sgsn/gtphub.h
+           include/osmocom/sgsn/oap_client.h
+           include/osmocom/sgsn/signal.h
            src/gprs/crc24.c
            src/gprs/gb_proxy.c
            src/gprs/gb_proxy_main.c
@@ -223,8 +223,8 @@
            2015 sysmocom s.f.m.c. GmbH <info at sysmocom.de>
 License:   __NO_LICENSE__
 
-Files:     include/openbsc/v42bis.h
-           include/openbsc/v42bis_private.h
+Files:     include/osmocom/sgsn/v42bis.h
+           include/osmocom/sgsn/v42bis_private.h
 Copyright: 2005-2011 Steve Underwood
 License:   LGPL-2.1
  This program is free software; you can redistribute it and/or modify
@@ -367,7 +367,7 @@
  On Debian systems, the complete text of the GNU Lesser General Public License
  Version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
-Files:     include/openbsc/slhc.h
+Files:     include/osmocom/sgsn/slhc.h
 Copyright: 1989 Regents of the University of California.
 License:   __UNKNOWN__
  Redistribution and use in source and binary forms are permitted
diff --git a/include/Makefile.am b/include/Makefile.am
index 677eec3..9d963a0 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,3 +1,3 @@
 SUBDIRS = \
-	openbsc \
+	osmocom \
 	$(NULL)
diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am
new file mode 100644
index 0000000..09db97a
--- /dev/null
+++ b/include/osmocom/Makefile.am
@@ -0,0 +1,3 @@
+SUBDIRS = \
+	sgsn \
+	$(NULL)
diff --git a/include/openbsc/Makefile.am b/include/osmocom/sgsn/Makefile.am
similarity index 100%
rename from include/openbsc/Makefile.am
rename to include/osmocom/sgsn/Makefile.am
diff --git a/include/openbsc/common.h b/include/osmocom/sgsn/common.h
similarity index 100%
rename from include/openbsc/common.h
rename to include/osmocom/sgsn/common.h
diff --git a/include/openbsc/crc24.h b/include/osmocom/sgsn/crc24.h
similarity index 100%
rename from include/openbsc/crc24.h
rename to include/osmocom/sgsn/crc24.h
diff --git a/include/openbsc/debug.h b/include/osmocom/sgsn/debug.h
similarity index 100%
rename from include/openbsc/debug.h
rename to include/osmocom/sgsn/debug.h
diff --git a/include/openbsc/gb_proxy.h b/include/osmocom/sgsn/gb_proxy.h
similarity index 100%
rename from include/openbsc/gb_proxy.h
rename to include/osmocom/sgsn/gb_proxy.h
diff --git a/include/openbsc/gprs_gb_parse.h b/include/osmocom/sgsn/gprs_gb_parse.h
similarity index 97%
rename from include/openbsc/gprs_gb_parse.h
rename to include/osmocom/sgsn/gprs_gb_parse.h
index 2468392..9f43fae 100644
--- a/include/openbsc/gprs_gb_parse.h
+++ b/include/osmocom/sgsn/gprs_gb_parse.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <openbsc/gprs_llc.h>
+#include <osmocom/sgsn/gprs_llc.h>
 
 #include <sys/types.h>
 
diff --git a/include/openbsc/gprs_gmm.h b/include/osmocom/sgsn/gprs_gmm.h
similarity index 96%
rename from include/openbsc/gprs_gmm.h
rename to include/osmocom/sgsn/gprs_gmm.h
index c38e49f..6324c5d 100644
--- a/include/openbsc/gprs_gmm.h
+++ b/include/osmocom/sgsn/gprs_gmm.h
@@ -2,7 +2,7 @@
 #define _GPRS_GMM_H
 
 #include <osmocom/core/msgb.h>
-#include <openbsc/gprs_sgsn.h>
+#include <osmocom/sgsn/gprs_sgsn.h>
 
 #include <stdbool.h>
 
diff --git a/include/openbsc/gprs_llc.h b/include/osmocom/sgsn/gprs_llc.h
similarity index 98%
rename from include/openbsc/gprs_llc.h
rename to include/osmocom/sgsn/gprs_llc.h
index 8bc2267..376ae9a 100644
--- a/include/openbsc/gprs_llc.h
+++ b/include/osmocom/sgsn/gprs_llc.h
@@ -3,8 +3,8 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-#include <openbsc/gprs_sgsn.h>
-#include <openbsc/gprs_llc_xid.h>
+#include <osmocom/sgsn/gprs_sgsn.h>
+#include <osmocom/sgsn/gprs_llc_xid.h>
 
 /* Section 4.7 LLC Layer Structure */
 enum gprs_llc_sapi {
diff --git a/include/openbsc/gprs_llc_xid.h b/include/osmocom/sgsn/gprs_llc_xid.h
similarity index 100%
rename from include/openbsc/gprs_llc_xid.h
rename to include/osmocom/sgsn/gprs_llc_xid.h
diff --git a/include/openbsc/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h
similarity index 100%
rename from include/openbsc/gprs_sgsn.h
rename to include/osmocom/sgsn/gprs_sgsn.h
diff --git a/include/openbsc/gprs_sndcp.h b/include/osmocom/sgsn/gprs_sndcp.h
similarity index 100%
rename from include/openbsc/gprs_sndcp.h
rename to include/osmocom/sgsn/gprs_sndcp.h
diff --git a/include/openbsc/gprs_sndcp_comp.h b/include/osmocom/sgsn/gprs_sndcp_comp.h
similarity index 98%
rename from include/openbsc/gprs_sndcp_comp.h
rename to include/osmocom/sgsn/gprs_sndcp_comp.h
index 87ab638..c04f7d4 100644
--- a/include/openbsc/gprs_sndcp_comp.h
+++ b/include/osmocom/sgsn/gprs_sndcp_comp.h
@@ -23,7 +23,7 @@
 
 #include <stdint.h>
 #include <osmocom/core/linuxlist.h>
-#include <openbsc/gprs_sndcp_xid.h>
+#include <osmocom/sgsn/gprs_sndcp_xid.h>
 
 /* Header / Data compression entity */
 struct gprs_sndcp_comp {
diff --git a/include/openbsc/gprs_sndcp_dcomp.h b/include/osmocom/sgsn/gprs_sndcp_dcomp.h
similarity index 97%
rename from include/openbsc/gprs_sndcp_dcomp.h
rename to include/osmocom/sgsn/gprs_sndcp_dcomp.h
index a76b4a4..3e85142 100644
--- a/include/openbsc/gprs_sndcp_dcomp.h
+++ b/include/osmocom/sgsn/gprs_sndcp_dcomp.h
@@ -23,7 +23,7 @@
 
 #include <stdint.h>
 #include <osmocom/core/linuxlist.h>
-#include <openbsc/gprs_sndcp_comp.h>
+#include <osmocom/sgsn/gprs_sndcp_comp.h>
 
 /* Note: The decompressed packet may have a maximum size of:
  * Return value * MAX_DATADECOMPR_FAC */
diff --git a/include/openbsc/gprs_sndcp_pcomp.h b/include/osmocom/sgsn/gprs_sndcp_pcomp.h
similarity index 97%
rename from include/openbsc/gprs_sndcp_pcomp.h
rename to include/osmocom/sgsn/gprs_sndcp_pcomp.h
index 4e15b9b..3e3131b 100644
--- a/include/openbsc/gprs_sndcp_pcomp.h
+++ b/include/osmocom/sgsn/gprs_sndcp_pcomp.h
@@ -23,7 +23,7 @@
 
 #include <stdint.h>
 #include <osmocom/core/linuxlist.h>
-#include <openbsc/gprs_sndcp_comp.h>
+#include <osmocom/sgsn/gprs_sndcp_comp.h>
 
 /* Note: The decompressed packet may have a maximum size of:
  * Return value + MAX_DECOMPR_INCR */
diff --git a/include/openbsc/gprs_sndcp_xid.h b/include/osmocom/sgsn/gprs_sndcp_xid.h
similarity index 100%
rename from include/openbsc/gprs_sndcp_xid.h
rename to include/osmocom/sgsn/gprs_sndcp_xid.h
diff --git a/include/openbsc/gprs_subscriber.h b/include/osmocom/sgsn/gprs_subscriber.h
similarity index 100%
rename from include/openbsc/gprs_subscriber.h
rename to include/osmocom/sgsn/gprs_subscriber.h
diff --git a/include/openbsc/gprs_utils.h b/include/osmocom/sgsn/gprs_utils.h
similarity index 100%
rename from include/openbsc/gprs_utils.h
rename to include/osmocom/sgsn/gprs_utils.h
diff --git a/include/openbsc/gsup_client.h b/include/osmocom/sgsn/gsup_client.h
similarity index 97%
rename from include/openbsc/gsup_client.h
rename to include/osmocom/sgsn/gsup_client.h
index 4a25490..29092ad 100644
--- a/include/openbsc/gsup_client.h
+++ b/include/osmocom/sgsn/gsup_client.h
@@ -23,7 +23,7 @@
 
 #include <osmocom/core/timer.h>
 
-#include <openbsc/oap_client.h>
+#include <osmocom/sgsn/oap_client.h>
 
 #define GSUP_CLIENT_RECONNECT_INTERVAL 10
 #define GSUP_CLIENT_PING_INTERVAL 20
diff --git a/include/openbsc/gtphub.h b/include/osmocom/sgsn/gtphub.h
similarity index 99%
rename from include/openbsc/gtphub.h
rename to include/osmocom/sgsn/gtphub.h
index 9cb7605..8fd9f38 100644
--- a/include/openbsc/gtphub.h
+++ b/include/osmocom/sgsn/gtphub.h
@@ -28,7 +28,7 @@
 #include <osmocom/core/timer.h>
 #include <osmocom/core/rate_ctr.h>
 
-#include <openbsc/gprs_sgsn.h>
+#include <osmocom/sgsn/gprs_sgsn.h>
 
 
 /* support */
diff --git a/include/openbsc/oap_client.h b/include/osmocom/sgsn/oap_client.h
similarity index 100%
rename from include/openbsc/oap_client.h
rename to include/osmocom/sgsn/oap_client.h
diff --git a/include/openbsc/rest_octets.h b/include/osmocom/sgsn/rest_octets.h
similarity index 98%
rename from include/openbsc/rest_octets.h
rename to include/osmocom/sgsn/rest_octets.h
index 49a2312..0dbe7ae 100644
--- a/include/openbsc/rest_octets.h
+++ b/include/osmocom/sgsn/rest_octets.h
@@ -2,7 +2,7 @@
 #define _REST_OCTETS_H
 
 #include <stdbool.h>
-#include <openbsc/gsm_04_08.h>
+#include <osmocom/sgsn/gsm_04_08.h>
 #include <osmocom/gsm/sysinfo.h>
 
 /* generate SI1 rest octets */
diff --git a/include/openbsc/sgsn.h b/include/osmocom/sgsn/sgsn.h
similarity index 97%
rename from include/openbsc/sgsn.h
rename to include/osmocom/sgsn/sgsn.h
index f371dc6..e4eda17 100644
--- a/include/openbsc/sgsn.h
+++ b/include/osmocom/sgsn/sgsn.h
@@ -5,9 +5,9 @@
 #include <osmocom/core/msgb.h>
 #include <osmocom/crypt/gprs_cipher.h>
 #include <osmocom/gprs/gprs_ns.h>
-#include <openbsc/gprs_sgsn.h>
-#include <openbsc/oap_client.h>
-#include <openbsc/common.h>
+#include <osmocom/sgsn/gprs_sgsn.h>
+#include <osmocom/sgsn/oap_client.h>
+#include <osmocom/sgsn/common.h>
 
 #include <ares.h>
 
diff --git a/include/openbsc/signal.h b/include/osmocom/sgsn/signal.h
similarity index 100%
rename from include/openbsc/signal.h
rename to include/osmocom/sgsn/signal.h
diff --git a/include/openbsc/slhc.h b/include/osmocom/sgsn/slhc.h
similarity index 100%
rename from include/openbsc/slhc.h
rename to include/osmocom/sgsn/slhc.h
diff --git a/include/openbsc/v42bis.h b/include/osmocom/sgsn/v42bis.h
similarity index 100%
rename from include/openbsc/v42bis.h
rename to include/osmocom/sgsn/v42bis.h
diff --git a/include/openbsc/v42bis_private.h b/include/osmocom/sgsn/v42bis_private.h
similarity index 100%
rename from include/openbsc/v42bis_private.h
rename to include/osmocom/sgsn/v42bis_private.h
diff --git a/include/openbsc/vty.h b/include/osmocom/sgsn/vty.h
similarity index 100%
rename from include/openbsc/vty.h
rename to include/osmocom/sgsn/vty.h
diff --git a/src/gprs/crc24.c b/src/gprs/crc24.c
index 1a420ed..da269b3 100644
--- a/src/gprs/crc24.c
+++ b/src/gprs/crc24.c
@@ -19,7 +19,7 @@
  *
  */
 
-#include <openbsc/crc24.h>
+#include <osmocom/sgsn/crc24.h>
 
 /* CRC24 table - FCS */
 static const uint32_t tbl_crc24[256] = {
diff --git a/src/gprs/gb_proxy.c b/src/gprs/gb_proxy.c
index d288cb3..eb2bbcc 100644
--- a/src/gprs/gb_proxy.c
+++ b/src/gprs/gb_proxy.c
@@ -41,14 +41,14 @@
 
 #include <osmocom/gsm/gsm_utils.h>
 
-#include <openbsc/signal.h>
-#include <openbsc/debug.h>
-#include <openbsc/gprs_gb_parse.h>
-#include <openbsc/gb_proxy.h>
+#include <osmocom/sgsn/signal.h>
+#include <osmocom/sgsn/debug.h>
+#include <osmocom/sgsn/gprs_gb_parse.h>
+#include <osmocom/sgsn/gb_proxy.h>
 
-#include <openbsc/gprs_llc.h>
+#include <osmocom/sgsn/gprs_llc.h>
 #include <osmocom/gsm/protocol/gsm_04_08_gprs.h>
-#include <openbsc/gprs_utils.h>
+#include <osmocom/sgsn/gprs_utils.h>
 
 #include <openssl/rand.h>
 
diff --git a/src/gprs/gb_proxy_main.c b/src/gprs/gb_proxy_main.c
index 853a763..9f9c605 100644
--- a/src/gprs/gb_proxy_main.c
+++ b/src/gprs/gb_proxy_main.c
@@ -41,10 +41,10 @@
 #include <osmocom/gprs/gprs_ns.h>
 #include <osmocom/gprs/gprs_bssgp.h>
 
-#include <openbsc/signal.h>
-#include <openbsc/debug.h>
-#include <openbsc/vty.h>
-#include <openbsc/gb_proxy.h>
+#include <osmocom/sgsn/signal.h>
+#include <osmocom/sgsn/debug.h>
+#include <osmocom/sgsn/vty.h>
+#include <osmocom/sgsn/gb_proxy.h>
 
 #include <osmocom/vty/command.h>
 #include <osmocom/vty/telnet_interface.h>
diff --git a/src/gprs/gb_proxy_patch.c b/src/gprs/gb_proxy_patch.c
index bee3150..4862755 100644
--- a/src/gprs/gb_proxy_patch.c
+++ b/src/gprs/gb_proxy_patch.c
@@ -18,12 +18,12 @@
  *
  */
 
-#include <openbsc/gb_proxy.h>
+#include <osmocom/sgsn/gb_proxy.h>
 
-#include <openbsc/gprs_utils.h>
-#include <openbsc/gprs_gb_parse.h>
+#include <osmocom/sgsn/gprs_utils.h>
+#include <osmocom/sgsn/gprs_gb_parse.h>
 
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/debug.h>
 
 #include <osmocom/gprs/protocol/gsm_08_18.h>
 #include <osmocom/core/rate_ctr.h>
diff --git a/src/gprs/gb_proxy_peer.c b/src/gprs/gb_proxy_peer.c
index a83630b..69cce3a 100644
--- a/src/gprs/gb_proxy_peer.c
+++ b/src/gprs/gb_proxy_peer.c
@@ -20,9 +20,9 @@
  *
  */
 
-#include <openbsc/gb_proxy.h>
+#include <osmocom/sgsn/gb_proxy.h>
 
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/debug.h>
 
 #include <osmocom/gprs/protocol/gsm_08_18.h>
 #include <osmocom/core/rate_ctr.h>
diff --git a/src/gprs/gb_proxy_tlli.c b/src/gprs/gb_proxy_tlli.c
index 3b3b976..1832122 100644
--- a/src/gprs/gb_proxy_tlli.c
+++ b/src/gprs/gb_proxy_tlli.c
@@ -20,12 +20,12 @@
 
 #include <osmocom/gsm/gsm48.h>
 
-#include <openbsc/gb_proxy.h>
+#include <osmocom/sgsn/gb_proxy.h>
 
-#include <openbsc/gprs_utils.h>
-#include <openbsc/gprs_gb_parse.h>
+#include <osmocom/sgsn/gprs_utils.h>
+#include <osmocom/sgsn/gprs_gb_parse.h>
 
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/debug.h>
 
 #include <osmocom/gsm/gsm_utils.h>
 
diff --git a/src/gprs/gb_proxy_vty.c b/src/gprs/gb_proxy_vty.c
index bd5bb1b..156f337 100644
--- a/src/gprs/gb_proxy_vty.c
+++ b/src/gprs/gb_proxy_vty.c
@@ -31,10 +31,10 @@
 #include <osmocom/gprs/gprs_ns.h>
 #include <osmocom/gsm/apn.h>
 
-#include <openbsc/debug.h>
-#include <openbsc/gb_proxy.h>
-#include <openbsc/gprs_utils.h>
-#include <openbsc/vty.h>
+#include <osmocom/sgsn/debug.h>
+#include <osmocom/sgsn/gb_proxy.h>
+#include <osmocom/sgsn/gprs_utils.h>
+#include <osmocom/sgsn/vty.h>
 
 #include <osmocom/vty/command.h>
 #include <osmocom/vty/vty.h>
diff --git a/src/gprs/gprs_gb_parse.c b/src/gprs/gprs_gb_parse.c
index d5a122b..ba78e89 100644
--- a/src/gprs/gprs_gb_parse.c
+++ b/src/gprs/gprs_gb_parse.c
@@ -21,11 +21,11 @@
 #include <osmocom/gsm/gsm48.h>
 #include <osmocom/gsm/protocol/gsm_04_08_gprs.h>
 
-#include <openbsc/gprs_gb_parse.h>
+#include <osmocom/sgsn/gprs_gb_parse.h>
 
-#include <openbsc/gprs_utils.h>
+#include <osmocom/sgsn/gprs_utils.h>
 
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/debug.h>
 
 #include <osmocom/gprs/gprs_bssgp.h>
 
diff --git a/src/gprs/gprs_gmm.c b/src/gprs/gprs_gmm.c
index 7301bf1..7e109b4 100644
--- a/src/gprs/gprs_gmm.c
+++ b/src/gprs/gprs_gmm.c
@@ -54,15 +54,15 @@
 #include <osmocom/ranap/iu_client.h>
 #endif
 
-#include <openbsc/debug.h>
-#include <openbsc/gprs_llc.h>
-#include <openbsc/gprs_sgsn.h>
-#include <openbsc/gprs_gmm.h>
-#include <openbsc/gprs_utils.h>
-#include <openbsc/gprs_subscriber.h>
-#include <openbsc/sgsn.h>
-#include <openbsc/signal.h>
-#include <openbsc/gprs_sndcp.h>
+#include <osmocom/sgsn/debug.h>
+#include <osmocom/sgsn/gprs_llc.h>
+#include <osmocom/sgsn/gprs_sgsn.h>
+#include <osmocom/sgsn/gprs_gmm.h>
+#include <osmocom/sgsn/gprs_utils.h>
+#include <osmocom/sgsn/gprs_subscriber.h>
+#include <osmocom/sgsn/sgsn.h>
+#include <osmocom/sgsn/signal.h>
+#include <osmocom/sgsn/gprs_sndcp.h>
 
 #include <pdp.h>
 
diff --git a/src/gprs/gprs_llc.c b/src/gprs/gprs_llc.c
index 904ec7e..22743fe 100644
--- a/src/gprs/gprs_llc.c
+++ b/src/gprs/gprs_llc.c
@@ -33,15 +33,15 @@
 #include <osmocom/gprs/gprs_bssgp.h>
 #include <osmocom/gsm/gsm_utils.h>
 
-#include <openbsc/debug.h>
-#include <openbsc/gprs_sgsn.h>
-#include <openbsc/gprs_gmm.h>
-#include <openbsc/gprs_llc.h>
-#include <openbsc/crc24.h>
-#include <openbsc/sgsn.h>
-#include <openbsc/gprs_llc_xid.h>
-#include <openbsc/gprs_sndcp_comp.h>
-#include <openbsc/gprs_sndcp.h>
+#include <osmocom/sgsn/debug.h>
+#include <osmocom/sgsn/gprs_sgsn.h>
+#include <osmocom/sgsn/gprs_gmm.h>
+#include <osmocom/sgsn/gprs_llc.h>
+#include <osmocom/sgsn/crc24.h>
+#include <osmocom/sgsn/sgsn.h>
+#include <osmocom/sgsn/gprs_llc_xid.h>
+#include <osmocom/sgsn/gprs_sndcp_comp.h>
+#include <osmocom/sgsn/gprs_sndcp.h>
 
 static struct gprs_llc_llme *llme_alloc(uint32_t tlli);
 static int gprs_llc_tx_xid(struct gprs_llc_lle *lle, struct msgb *msg,
diff --git a/src/gprs/gprs_llc_parse.c b/src/gprs/gprs_llc_parse.c
index be63497..1d97004 100644
--- a/src/gprs/gprs_llc_parse.c
+++ b/src/gprs/gprs_llc_parse.c
@@ -28,11 +28,11 @@
 #include <osmocom/core/talloc.h>
 #include <osmocom/gprs/gprs_bssgp.h>
 
-#include <openbsc/debug.h>
-#include <openbsc/gprs_sgsn.h>
-#include <openbsc/gprs_gmm.h>
-#include <openbsc/gprs_llc.h>
-#include <openbsc/crc24.h>
+#include <osmocom/sgsn/debug.h>
+#include <osmocom/sgsn/gprs_sgsn.h>
+#include <osmocom/sgsn/gprs_gmm.h>
+#include <osmocom/sgsn/gprs_llc.h>
+#include <osmocom/sgsn/crc24.h>
 
 static const struct value_string llc_cmd_strs[] = {
 	{ GPRS_LLC_NULL,	"NULL" },
diff --git a/src/gprs/gprs_llc_vty.c b/src/gprs/gprs_llc_vty.c
index 626d6ef..1433efe 100644
--- a/src/gprs/gprs_llc_vty.c
+++ b/src/gprs/gprs_llc_vty.c
@@ -32,9 +32,9 @@
 #include <osmocom/core/talloc.h>
 #include <osmocom/core/select.h>
 #include <osmocom/core/rate_ctr.h>
-#include <openbsc/debug.h>
-#include <openbsc/signal.h>
-#include <openbsc/gprs_llc.h>
+#include <osmocom/sgsn/debug.h>
+#include <osmocom/sgsn/signal.h>
+#include <osmocom/sgsn/gprs_llc.h>
 
 #include <osmocom/vty/vty.h>
 #include <osmocom/vty/command.h>
diff --git a/src/gprs/gprs_llc_xid.c b/src/gprs/gprs_llc_xid.c
index fe63171..de60e49 100644
--- a/src/gprs/gprs_llc_xid.c
+++ b/src/gprs/gprs_llc_xid.c
@@ -30,10 +30,10 @@
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/talloc.h>
 
-#include <openbsc/debug.h>
-#include <openbsc/gprs_llc.h>
-#include <openbsc/sgsn.h>
-#include <openbsc/gprs_llc_xid.h>
+#include <osmocom/sgsn/debug.h>
+#include <osmocom/sgsn/gprs_llc.h>
+#include <osmocom/sgsn/sgsn.h>
+#include <osmocom/sgsn/gprs_llc_xid.h>
 
 const struct value_string gprs_llc_xid_type_names[] = {
 	{ GPRS_LLC_XID_T_VERSION,	"VERSION"},
diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c
index 560485d..4cd3df1 100644
--- a/src/gprs/gprs_sgsn.c
+++ b/src/gprs/gprs_sgsn.c
@@ -33,14 +33,14 @@
 #include <osmocom/gsm/apn.h>
 #include <osmocom/gsm/gsm_utils.h>
 
-#include <openbsc/gprs_subscriber.h>
-#include <openbsc/debug.h>
-#include <openbsc/gprs_sgsn.h>
-#include <openbsc/sgsn.h>
-#include <openbsc/gprs_gmm.h>
-#include <openbsc/gprs_utils.h>
-#include <openbsc/signal.h>
-#include "openbsc/gprs_llc.h"
+#include <osmocom/sgsn/gprs_subscriber.h>
+#include <osmocom/sgsn/debug.h>
+#include <osmocom/sgsn/gprs_sgsn.h>
+#include <osmocom/sgsn/sgsn.h>
+#include <osmocom/sgsn/gprs_gmm.h>
+#include <osmocom/sgsn/gprs_utils.h>
+#include <osmocom/sgsn/signal.h>
+#include <osmocom/sgsn/gprs_llc.h>
 
 #include <pdp.h>
 
diff --git a/src/gprs/gprs_sndcp.c b/src/gprs/gprs_sndcp.c
index 05dad66..77f8ca6 100644
--- a/src/gprs/gprs_sndcp.c
+++ b/src/gprs/gprs_sndcp.c
@@ -30,15 +30,15 @@
 #include <osmocom/core/talloc.h>
 #include <osmocom/gprs/gprs_bssgp.h>
 
-#include <openbsc/debug.h>
-#include <openbsc/gprs_llc.h>
-#include <openbsc/sgsn.h>
-#include <openbsc/gprs_sndcp.h>
-#include <openbsc/gprs_llc_xid.h>
-#include <openbsc/gprs_sndcp_xid.h>
-#include <openbsc/gprs_sndcp_pcomp.h>
-#include <openbsc/gprs_sndcp_dcomp.h>
-#include <openbsc/gprs_sndcp_comp.h>
+#include <osmocom/sgsn/debug.h>
+#include <osmocom/sgsn/gprs_llc.h>
+#include <osmocom/sgsn/sgsn.h>
+#include <osmocom/sgsn/gprs_sndcp.h>
+#include <osmocom/sgsn/gprs_llc_xid.h>
+#include <osmocom/sgsn/gprs_sndcp_xid.h>
+#include <osmocom/sgsn/gprs_sndcp_pcomp.h>
+#include <osmocom/sgsn/gprs_sndcp_dcomp.h>
+#include <osmocom/sgsn/gprs_sndcp_comp.h>
 
 #define DEBUG_IP_PACKETS 0	/* 0=Disabled, 1=Enabled */
 
diff --git a/src/gprs/gprs_sndcp_comp.c b/src/gprs/gprs_sndcp_comp.c
index a12c39a..60b15b9 100644
--- a/src/gprs/gprs_sndcp_comp.c
+++ b/src/gprs/gprs_sndcp_comp.c
@@ -30,11 +30,11 @@
 #include <osmocom/core/talloc.h>
 #include <osmocom/core/utils.h>
 
-#include <openbsc/debug.h>
-#include <openbsc/gprs_sndcp_xid.h>
-#include <openbsc/gprs_sndcp_comp.h>
-#include <openbsc/gprs_sndcp_pcomp.h>
-#include <openbsc/gprs_sndcp_dcomp.h>
+#include <osmocom/sgsn/debug.h>
+#include <osmocom/sgsn/gprs_sndcp_xid.h>
+#include <osmocom/sgsn/gprs_sndcp_comp.h>
+#include <osmocom/sgsn/gprs_sndcp_pcomp.h>
+#include <osmocom/sgsn/gprs_sndcp_dcomp.h>
 
 /* Create a new compression entity from a XID-Field */
 static struct gprs_sndcp_comp *gprs_sndcp_comp_create(const void *ctx,
diff --git a/src/gprs/gprs_sndcp_dcomp.c b/src/gprs/gprs_sndcp_dcomp.c
index b0f95b4..04ff491 100644
--- a/src/gprs/gprs_sndcp_dcomp.c
+++ b/src/gprs/gprs_sndcp_dcomp.c
@@ -33,14 +33,14 @@
 #include <osmocom/core/talloc.h>
 #include <osmocom/gsm/tlv.h>
 
-#include <openbsc/gprs_llc.h>
-#include <openbsc/sgsn.h>
-#include <openbsc/gprs_sndcp_xid.h>
-#include <openbsc/v42bis.h>
-#include <openbsc/v42bis_private.h>
-#include <openbsc/debug.h>
-#include <openbsc/gprs_sndcp_comp.h>
-#include <openbsc/gprs_sndcp_dcomp.h>
+#include <osmocom/sgsn/gprs_llc.h>
+#include <osmocom/sgsn/sgsn.h>
+#include <osmocom/sgsn/gprs_sndcp_xid.h>
+#include <osmocom/sgsn/v42bis.h>
+#include <osmocom/sgsn/v42bis_private.h>
+#include <osmocom/sgsn/debug.h>
+#include <osmocom/sgsn/gprs_sndcp_comp.h>
+#include <osmocom/sgsn/gprs_sndcp_dcomp.h>
 
 /* A struct to capture the output data of compressor and decompressor */
 struct v42bis_output_buffer {
diff --git a/src/gprs/gprs_sndcp_pcomp.c b/src/gprs/gprs_sndcp_pcomp.c
index a2236c3..2911b5e 100644
--- a/src/gprs/gprs_sndcp_pcomp.c
+++ b/src/gprs/gprs_sndcp_pcomp.c
@@ -33,13 +33,13 @@
 #include <osmocom/core/talloc.h>
 #include <osmocom/gsm/tlv.h>
 
-#include <openbsc/gprs_llc.h>
-#include <openbsc/sgsn.h>
-#include <openbsc/gprs_sndcp_xid.h>
-#include <openbsc/slhc.h>
-#include <openbsc/debug.h>
-#include <openbsc/gprs_sndcp_comp.h>
-#include <openbsc/gprs_sndcp_pcomp.h>
+#include <osmocom/sgsn/gprs_llc.h>
+#include <osmocom/sgsn/sgsn.h>
+#include <osmocom/sgsn/gprs_sndcp_xid.h>
+#include <osmocom/sgsn/slhc.h>
+#include <osmocom/sgsn/debug.h>
+#include <osmocom/sgsn/gprs_sndcp_comp.h>
+#include <osmocom/sgsn/gprs_sndcp_pcomp.h>
 
 /* Initalize header compression */
 int gprs_sndcp_pcomp_init(const void *ctx, struct gprs_sndcp_comp *comp_entity,
diff --git a/src/gprs/gprs_sndcp_vty.c b/src/gprs/gprs_sndcp_vty.c
index 4bad8b0..0994a4c 100644
--- a/src/gprs/gprs_sndcp_vty.c
+++ b/src/gprs/gprs_sndcp_vty.c
@@ -31,10 +31,10 @@
 #include <osmocom/core/talloc.h>
 #include <osmocom/core/select.h>
 #include <osmocom/core/rate_ctr.h>
-#include <openbsc/debug.h>
-#include <openbsc/signal.h>
-#include <openbsc/gprs_llc.h>
-#include <openbsc/gprs_sndcp.h>
+#include <osmocom/sgsn/debug.h>
+#include <osmocom/sgsn/signal.h>
+#include <osmocom/sgsn/gprs_llc.h>
+#include <osmocom/sgsn/gprs_sndcp.h>
 
 #include <osmocom/vty/vty.h>
 #include <osmocom/vty/command.h>
diff --git a/src/gprs/gprs_sndcp_xid.c b/src/gprs/gprs_sndcp_xid.c
index dfea5fe..8f844b5 100644
--- a/src/gprs/gprs_sndcp_xid.c
+++ b/src/gprs/gprs_sndcp_xid.c
@@ -31,10 +31,10 @@
 #include <osmocom/core/talloc.h>
 #include <osmocom/gsm/tlv.h>
 
-#include <openbsc/debug.h>
-#include <openbsc/gprs_llc.h>
-#include <openbsc/sgsn.h>
-#include <openbsc/gprs_sndcp_xid.h>
+#include <osmocom/sgsn/debug.h>
+#include <osmocom/sgsn/gprs_llc.h>
+#include <osmocom/sgsn/sgsn.h>
+#include <osmocom/sgsn/gprs_sndcp_xid.h>
 
 /* When the propose bit in an SNDCP-XID compression field is set to zero,
  * the algorithm identifier is stripped. The algoritm parameters are specific
diff --git a/src/gprs/gprs_subscriber.c b/src/gprs/gprs_subscriber.c
index 94297d0..bebdb1e 100644
--- a/src/gprs/gprs_subscriber.c
+++ b/src/gprs/gprs_subscriber.c
@@ -25,15 +25,15 @@
 #include <osmocom/gsm/apn.h>
 #include <osmocom/core/utils.h>
 #include <osmocom/core/logging.h>
-#include <openbsc/gprs_subscriber.h>
-#include <openbsc/gsup_client.h>
+#include <osmocom/sgsn/gprs_subscriber.h>
+#include <osmocom/sgsn/gsup_client.h>
 
-#include <openbsc/sgsn.h>
-#include <openbsc/gprs_sgsn.h>
-#include <openbsc/gprs_gmm.h>
-#include <openbsc/gprs_utils.h>
+#include <osmocom/sgsn/sgsn.h>
+#include <osmocom/sgsn/gprs_sgsn.h>
+#include <osmocom/sgsn/gprs_gmm.h>
+#include <osmocom/sgsn/gprs_utils.h>
 
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/debug.h>
 
 #include <netinet/in.h>
 #include <arpa/inet.h>
diff --git a/src/gprs/gprs_utils.c b/src/gprs/gprs_utils.c
index 91a09d2..307699b 100644
--- a/src/gprs/gprs_utils.c
+++ b/src/gprs/gprs_utils.c
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include <openbsc/gprs_utils.h>
+#include <osmocom/sgsn/gprs_utils.h>
 
 #include <osmocom/core/msgb.h>
 #include <osmocom/gprs/gprs_ns.h>
diff --git a/src/gprs/gsup_client.c b/src/gprs/gsup_client.c
index 258f230..48357b4 100644
--- a/src/gprs/gsup_client.c
+++ b/src/gprs/gsup_client.c
@@ -21,14 +21,14 @@
  *
  */
 
-#include <openbsc/gsup_client.h>
+#include <osmocom/sgsn/gsup_client.h>
 
 #include <osmocom/abis/ipa.h>
 #include <osmocom/gsm/protocol/ipaccess.h>
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/logging.h>
 
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/debug.h>
 
 #include <errno.h>
 #include <string.h>
diff --git a/src/gprs/gtphub.c b/src/gprs/gtphub.c
index 0a8e375..7e3e663 100644
--- a/src/gprs/gtphub.c
+++ b/src/gprs/gtphub.c
@@ -32,9 +32,9 @@
 #include <gtp.h>
 #include <gtpie.h>
 
-#include <openbsc/gtphub.h>
-#include <openbsc/debug.h>
-#include <openbsc/gprs_utils.h>
+#include <osmocom/sgsn/gtphub.h>
+#include <osmocom/sgsn/debug.h>
+#include <osmocom/sgsn/gprs_utils.h>
 
 #include <osmocom/core/utils.h>
 #include <osmocom/core/logging.h>
diff --git a/src/gprs/gtphub_ares.c b/src/gprs/gtphub_ares.c
index afeeda6..87dc860 100644
--- a/src/gprs/gtphub_ares.c
+++ b/src/gprs/gtphub_ares.c
@@ -28,15 +28,15 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <openbsc/gtphub.h>
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/gtphub.h>
+#include <osmocom/sgsn/debug.h>
 
 #include <osmocom/core/utils.h>
 #include <osmocom/gsm/apn.h>
 
 /* TODO split GRX ares from sgsn into a separate struct and allow use without
  * globals. */
-#include <openbsc/sgsn.h>
+#include <osmocom/sgsn/sgsn.h>
 extern struct sgsn_instance *sgsn;
 
 struct sgsn_instance sgsn_inst = { 0 };
diff --git a/src/gprs/gtphub_main.c b/src/gprs/gtphub_main.c
index d7b3ba7..782afb3 100644
--- a/src/gprs/gtphub_main.c
+++ b/src/gprs/gtphub_main.c
@@ -41,9 +41,9 @@
 
 #include <osmocom/sigtran/osmo_ss7.h>
 
-#include <openbsc/debug.h>
-#include <openbsc/gtphub.h>
-#include <openbsc/vty.h>
+#include <osmocom/sgsn/debug.h>
+#include <osmocom/sgsn/gtphub.h>
+#include <osmocom/sgsn/vty.h>
 
 #include "../../bscconfig.h"
 
diff --git a/src/gprs/gtphub_sock.c b/src/gprs/gtphub_sock.c
index 60bebaa..1acd5a6 100644
--- a/src/gprs/gtphub_sock.c
+++ b/src/gprs/gtphub_sock.c
@@ -25,8 +25,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <openbsc/gtphub.h>
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/gtphub.h>
+#include <osmocom/sgsn/debug.h>
 
 /* Convenience makro, note: only within this C file. */
 #define LOG(level, fmt, args...) \
diff --git a/src/gprs/gtphub_vty.c b/src/gprs/gtphub_vty.c
index d611b1f..3a46e81 100644
--- a/src/gprs/gtphub_vty.c
+++ b/src/gprs/gtphub_vty.c
@@ -30,12 +30,12 @@
 #include <osmocom/vty/command.h>
 #include <osmocom/vty/misc.h>
 
-#include <openbsc/vty.h>
-#include <openbsc/gtphub.h>
+#include <osmocom/sgsn/vty.h>
+#include <osmocom/sgsn/gtphub.h>
 
 /* TODO split GRX ares from sgsn into a separate struct and allow use without
  * globals. */
-#include <openbsc/sgsn.h>
+#include <osmocom/sgsn/sgsn.h>
 extern struct sgsn_instance *sgsn;
 extern void *tall_bsc_ctx;
 
diff --git a/src/gprs/oap_client.c b/src/gprs/oap_client.c
index 5128ac1..9ff84a6 100644
--- a/src/gprs/oap_client.c
+++ b/src/gprs/oap_client.c
@@ -27,8 +27,8 @@
 #include <osmocom/crypt/auth.h>
 #include <osmocom/gsm/oap.h>
 
-#include <openbsc/oap_client.h>
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/oap_client.h>
+#include <osmocom/sgsn/debug.h>
 
 int oap_client_init(struct oap_client_config *config,
 		    struct oap_client_state *state)
diff --git a/src/gprs/sgsn_ares.c b/src/gprs/sgsn_ares.c
index 6238099..17567c4 100644
--- a/src/gprs/sgsn_ares.c
+++ b/src/gprs/sgsn_ares.c
@@ -19,8 +19,8 @@
  *
  */
 
-#include <openbsc/sgsn.h>
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/sgsn.h>
+#include <osmocom/sgsn/debug.h>
 
 #include <netdb.h>
 
diff --git a/src/gprs/sgsn_auth.c b/src/gprs/sgsn_auth.c
index a64339c..92712ef 100644
--- a/src/gprs/sgsn_auth.c
+++ b/src/gprs/sgsn_auth.c
@@ -21,11 +21,11 @@
 
 #include <osmocom/gsm/protocol/gsm_04_08_gprs.h>
 #include <osmocom/core/utils.h>
-#include <openbsc/sgsn.h>
-#include <openbsc/gprs_sgsn.h>
-#include <openbsc/gprs_gmm.h>
-#include <openbsc/gprs_subscriber.h>
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/sgsn.h>
+#include <osmocom/sgsn/gprs_sgsn.h>
+#include <osmocom/sgsn/gprs_gmm.h>
+#include <osmocom/sgsn/gprs_subscriber.h>
+#include <osmocom/sgsn/debug.h>
 
 const struct value_string auth_state_names[] = {
 	{ SGSN_AUTH_ACCEPTED,	"accepted"},
diff --git a/src/gprs/sgsn_cdr.c b/src/gprs/sgsn_cdr.c
index 16ea9d4..474d41a 100644
--- a/src/gprs/sgsn_cdr.c
+++ b/src/gprs/sgsn_cdr.c
@@ -18,13 +18,13 @@
  *
  */
 
-#include <openbsc/sgsn.h>
-#include <openbsc/signal.h>
-#include <openbsc/gprs_utils.h>
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/sgsn.h>
+#include <osmocom/sgsn/signal.h>
+#include <osmocom/sgsn/gprs_utils.h>
+#include <osmocom/sgsn/debug.h>
 #include <osmocom/gsm/apn.h>
 
-#include <openbsc/vty.h>
+#include <osmocom/sgsn/vty.h>
 
 #include <gtp.h>
 #include <pdp.h>
diff --git a/src/gprs/sgsn_ctrl.c b/src/gprs/sgsn_ctrl.c
index f7b1180..dc5ae79 100644
--- a/src/gprs/sgsn_ctrl.c
+++ b/src/gprs/sgsn_ctrl.c
@@ -21,9 +21,9 @@
 
 #include <osmocom/ctrl/control_if.h>
 #include <osmocom/ctrl/control_cmd.h>
-#include <openbsc/gprs_sgsn.h>
-#include <openbsc/sgsn.h>
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/gprs_sgsn.h>
+#include <osmocom/sgsn/sgsn.h>
+#include <osmocom/sgsn/debug.h>
 
 #include <pdp.h>
 
diff --git a/src/gprs/sgsn_libgtp.c b/src/gprs/sgsn_libgtp.c
index 90b4d16..9a00266 100644
--- a/src/gprs/sgsn_libgtp.c
+++ b/src/gprs/sgsn_libgtp.c
@@ -42,14 +42,14 @@
 #include <osmocom/gprs/gprs_bssgp.h>
 #include <osmocom/gsm/protocol/gsm_04_08_gprs.h>
 
-#include <openbsc/signal.h>
-#include <openbsc/debug.h>
-#include <openbsc/sgsn.h>
-#include <openbsc/gprs_llc.h>
-#include <openbsc/gprs_sgsn.h>
-#include <openbsc/gprs_gmm.h>
-#include <openbsc/gprs_subscriber.h>
-#include <openbsc/gprs_sndcp.h>
+#include <osmocom/sgsn/signal.h>
+#include <osmocom/sgsn/debug.h>
+#include <osmocom/sgsn/sgsn.h>
+#include <osmocom/sgsn/gprs_llc.h>
+#include <osmocom/sgsn/gprs_sgsn.h>
+#include <osmocom/sgsn/gprs_gmm.h>
+#include <osmocom/sgsn/gprs_subscriber.h>
+#include <osmocom/sgsn/gprs_sndcp.h>
 
 #ifdef BUILD_IU
 #include <osmocom/ranap/iu_client.h>
diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c
index 8ffc6c8..d79beb3 100644
--- a/src/gprs/sgsn_main.c
+++ b/src/gprs/sgsn_main.c
@@ -52,12 +52,12 @@
 
 #include <osmocom/ctrl/control_vty.h>
 
-#include <openbsc/signal.h>
-#include <openbsc/debug.h>
-#include <openbsc/vty.h>
-#include <openbsc/sgsn.h>
-#include <openbsc/gprs_llc.h>
-#include <openbsc/gprs_gmm.h>
+#include <osmocom/sgsn/signal.h>
+#include <osmocom/sgsn/debug.h>
+#include <osmocom/sgsn/vty.h>
+#include <osmocom/sgsn/sgsn.h>
+#include <osmocom/sgsn/gprs_llc.h>
+#include <osmocom/sgsn/gprs_gmm.h>
 
 #include <osmocom/ctrl/control_if.h>
 #include <osmocom/ctrl/ports.h>
diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c
index fce2518..1882852 100644
--- a/src/gprs/sgsn_vty.c
+++ b/src/gprs/sgsn_vty.c
@@ -30,12 +30,12 @@
 #include <osmocom/gsm/protocol/gsm_04_08_gprs.h>
 #include <osmocom/gsm/apn.h>
 
-#include <openbsc/debug.h>
-#include <openbsc/sgsn.h>
+#include <osmocom/sgsn/debug.h>
+#include <osmocom/sgsn/sgsn.h>
 #include <osmocom/gprs/gprs_ns.h>
-#include <openbsc/gprs_sgsn.h>
-#include <openbsc/vty.h>
-#include <openbsc/gsup_client.h>
+#include <osmocom/sgsn/gprs_sgsn.h>
+#include <osmocom/sgsn/vty.h>
+#include <osmocom/sgsn/gsup_client.h>
 
 #include <osmocom/vty/command.h>
 #include <osmocom/vty/vty.h>
@@ -657,7 +657,7 @@
 }
 
 /* Subscriber */
-#include <openbsc/gprs_subscriber.h>
+#include <osmocom/sgsn/gprs_subscriber.h>
 
 static void subscr_dump_full_vty(struct vty *vty, struct gprs_subscr *gsub, int pending)
 {
diff --git a/src/gprs/slhc.c b/src/gprs/slhc.c
index cbdf8db..20e571d 100644
--- a/src/gprs/slhc.c
+++ b/src/gprs/slhc.c
@@ -57,8 +57,8 @@
 #include <arpa/inet.h>
 #include <osmocom/core/utils.h>
 #include <osmocom/core/talloc.h>
-#include <openbsc/slhc.h>
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/slhc.h>
+#include <osmocom/sgsn/debug.h>
 
 #define ERR_PTR(x) x
 
diff --git a/src/gprs/v42bis.c b/src/gprs/v42bis.c
index a04b0af..3bb9afc 100644
--- a/src/gprs/v42bis.c
+++ b/src/gprs/v42bis.c
@@ -38,9 +38,9 @@
 #include <ctype.h>
 #include <assert.h>
 
-#include <openbsc/v42bis.h>
-#include <openbsc/v42bis_private.h>
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/v42bis.h>
+#include <osmocom/sgsn/v42bis_private.h>
+#include <osmocom/sgsn/debug.h>
 #include <osmocom/core/talloc.h>
 
 
diff --git a/src/libcommon/common_vty.c b/src/libcommon/common_vty.c
index 856583e..ac3c7fc 100644
--- a/src/libcommon/common_vty.c
+++ b/src/libcommon/common_vty.c
@@ -23,11 +23,11 @@
 
 #include <osmocom/core/talloc.h>
 
-#include <openbsc/vty.h>
-#include <openbsc/debug.h>
-#include <openbsc/gsm_subscriber.h>
-#include <openbsc/bsc_nat.h>
-#include <openbsc/abis_om2000.h>
+#include <osmocom/sgsn/vty.h>
+#include <osmocom/sgsn/debug.h>
+#include <osmocom/sgsn/gsm_subscriber.h>
+#include <osmocom/sgsn/bsc_nat.h>
+#include <osmocom/sgsn/abis_om2000.h>
 
 #include <osmocom/vty/telnet_interface.h>
 #include <osmocom/vty/command.h>
diff --git a/src/libcommon/debug.c b/src/libcommon/debug.c
index 7236413..6076409 100644
--- a/src/libcommon/debug.c
+++ b/src/libcommon/debug.c
@@ -31,8 +31,8 @@
 #include <osmocom/core/utils.h>
 #include <osmocom/core/logging.h>
 #include <osmocom/gprs/gprs_msgb.h>
-#include <openbsc/gsm_data.h>
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/gsm_data.h>
+#include <osmocom/sgsn/debug.h>
 
 /* default categories */
 static const struct log_info_cat default_categories[] = {
diff --git a/src/libcommon/gsm_data.c b/src/libcommon/gsm_data.c
index 7be2240..a2837f3 100644
--- a/src/libcommon/gsm_data.c
+++ b/src/libcommon/gsm_data.c
@@ -33,9 +33,9 @@
 #include <osmocom/core/statistics.h>
 #include <osmocom/gsm/protocol/gsm_04_08.h>
 
-#include <openbsc/gsm_data.h>
-#include <openbsc/bsc_msc_data.h>
-#include <openbsc/abis_nm.h>
+#include <osmocom/sgsn/gsm_data.h>
+#include <osmocom/sgsn/bsc_msc_data.h>
+#include <osmocom/sgsn/abis_nm.h>
 
 void *tall_bsc_ctx;
 
diff --git a/src/libcommon/gsm_data_shared.c b/src/libcommon/gsm_data_shared.c
index 2696273..8d5f990 100644
--- a/src/libcommon/gsm_data_shared.c
+++ b/src/libcommon/gsm_data_shared.c
@@ -32,7 +32,7 @@
 #include <osmocom/gsm/abis_nm.h>
 #include <osmocom/core/statistics.h>
 
-#include <openbsc/gsm_data.h>
+#include <osmocom/sgsn/gsm_data.h>
 
 void gsm_abis_mo_reset(struct gsm_abis_mo *mo)
 {
diff --git a/src/libcommon/gsm_subscriber_base.c b/src/libcommon/gsm_subscriber_base.c
index 018ed21..2a8a59f 100644
--- a/src/libcommon/gsm_subscriber_base.c
+++ b/src/libcommon/gsm_subscriber_base.c
@@ -29,9 +29,9 @@
 
 #include <osmocom/core/talloc.h>
 #include <osmocom/core/utils.h>
-#include <openbsc/gsm_subscriber.h>
-#include <openbsc/debug.h>
-#include <openbsc/vlr.h>
+#include <osmocom/sgsn/gsm_subscriber.h>
+#include <osmocom/sgsn/debug.h>
+#include <osmocom/sgsn/vlr.h>
 
 LLIST_HEAD(active_subscribers);
 void *tall_subscr_ctx;
diff --git a/src/libcommon/gsup_client.c b/src/libcommon/gsup_client.c
index fd65e7b..89a9f70 100644
--- a/src/libcommon/gsup_client.c
+++ b/src/libcommon/gsup_client.c
@@ -21,14 +21,14 @@
  *
  */
 
-#include <openbsc/gsup_client.h>
+#include <osmocom/sgsn/gsup_client.h>
 
 #include <osmocom/abis/ipa.h>
 #include <osmocom/gsm/protocol/ipaccess.h>
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/logging.h>
 
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/debug.h>
 
 #include <errno.h>
 #include <string.h>
diff --git a/src/libcommon/gsup_test_client.c b/src/libcommon/gsup_test_client.c
index b6a8d6b..cc0f58b 100644
--- a/src/libcommon/gsup_test_client.c
+++ b/src/libcommon/gsup_test_client.c
@@ -10,8 +10,8 @@
 #include <osmocom/core/utils.h>
 #include <osmocom/gsm/gsup.h>
 
-#include <openbsc/gsup_client.h>
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/gsup_client.h>
+#include <osmocom/sgsn/debug.h>
 
 static struct gsup_client *g_gc;
 
diff --git a/src/libcommon/oap_client.c b/src/libcommon/oap_client.c
index 5128ac1..9ff84a6 100644
--- a/src/libcommon/oap_client.c
+++ b/src/libcommon/oap_client.c
@@ -27,8 +27,8 @@
 #include <osmocom/crypt/auth.h>
 #include <osmocom/gsm/oap.h>
 
-#include <openbsc/oap_client.h>
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/oap_client.h>
+#include <osmocom/sgsn/debug.h>
 
 int oap_client_init(struct oap_client_config *config,
 		    struct oap_client_state *state)
diff --git a/src/libcommon/socket.c b/src/libcommon/socket.c
index 2a64767..dfcb393 100644
--- a/src/libcommon/socket.c
+++ b/src/libcommon/socket.c
@@ -35,8 +35,8 @@
 #include <osmocom/core/select.h>
 #include <osmocom/gsm/tlv.h>
 #include <osmocom/core/msgb.h>
-#include <openbsc/debug.h>
-#include <openbsc/gsm_data.h>
+#include <osmocom/sgsn/debug.h>
+#include <osmocom/sgsn/gsm_data.h>
 #include <osmocom/core/talloc.h>
 
 int make_sock(struct osmo_fd *bfd, int proto,
diff --git a/tests/gbproxy/gbproxy_test.c b/tests/gbproxy/gbproxy_test.c
index 9672dcb..e8a4ef9 100644
--- a/tests/gbproxy/gbproxy_test.c
+++ b/tests/gbproxy/gbproxy_test.c
@@ -31,11 +31,11 @@
 #include <osmocom/gprs/gprs_ns.h>
 #include <osmocom/gprs/gprs_bssgp.h>
 
-#include <openbsc/gb_proxy.h>
-#include <openbsc/gprs_utils.h>
-#include <openbsc/gprs_llc.h>
-#include <openbsc/gprs_gb_parse.h>
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/gb_proxy.h>
+#include <osmocom/sgsn/gprs_utils.h>
+#include <osmocom/sgsn/gprs_llc.h>
+#include <osmocom/sgsn/gprs_gb_parse.h>
+#include <osmocom/sgsn/debug.h>
 
 #include <openssl/rand.h>
 
diff --git a/tests/gprs/gprs_test.c b/tests/gprs/gprs_test.c
index aac9bb8..2dcbafa 100644
--- a/tests/gprs/gprs_test.c
+++ b/tests/gprs/gprs_test.c
@@ -2,10 +2,10 @@
 #include <stdlib.h>
 #include <inttypes.h>
 
-#include <openbsc/gprs_llc.h>
-#include <openbsc/gprs_utils.h>
+#include <osmocom/sgsn/gprs_llc.h>
+#include <osmocom/sgsn/gprs_utils.h>
 
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/debug.h>
 
 #include <osmocom/core/application.h>
 #include <osmocom/gsm/gsup.h>
diff --git a/tests/gtphub/gtphub_test.c b/tests/gtphub/gtphub_test.c
index e7c27d2..ac0223b 100644
--- a/tests/gtphub/gtphub_test.c
+++ b/tests/gtphub/gtphub_test.c
@@ -28,9 +28,9 @@
 #include <osmocom/core/utils.h>
 #include <osmocom/core/application.h>
 
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/debug.h>
 
-#include <openbsc/gtphub.h>
+#include <osmocom/sgsn/gtphub.h>
 #include <gtp.h>
 #include <gtpie.h>
 
diff --git a/tests/oap/oap_client_test.c b/tests/oap/oap_client_test.c
index e6501cb..7adae83 100644
--- a/tests/oap/oap_client_test.c
+++ b/tests/oap/oap_client_test.c
@@ -21,8 +21,8 @@
 #include <osmocom/core/application.h>
 #include <osmocom/gsm/oap.h>
 
-#include <openbsc/debug.h>
-#include <openbsc/oap_client.h>
+#include <osmocom/sgsn/debug.h>
+#include <osmocom/sgsn/oap_client.h>
 
 #include <stdio.h>
 #include <string.h>
diff --git a/tests/sgsn/sgsn_test.c b/tests/sgsn/sgsn_test.c
index d66c5dd..a486794 100644
--- a/tests/sgsn/sgsn_test.c
+++ b/tests/sgsn/sgsn_test.c
@@ -19,15 +19,15 @@
  *
  */
 
-#include <openbsc/gprs_llc.h>
-#include <openbsc/sgsn.h>
-#include <openbsc/gprs_gmm.h>
-#include <openbsc/debug.h>
-#include <openbsc/gprs_subscriber.h>
+#include <osmocom/sgsn/gprs_llc.h>
+#include <osmocom/sgsn/sgsn.h>
+#include <osmocom/sgsn/gprs_gmm.h>
+#include <osmocom/sgsn/debug.h>
+#include <osmocom/sgsn/gprs_subscriber.h>
 #include <osmocom/gsm/gsup.h>
-#include <openbsc/gsup_client.h>
-#include <openbsc/gprs_utils.h>
-#include <openbsc/gprs_gb_parse.h>
+#include <osmocom/sgsn/gsup_client.h>
+#include <osmocom/sgsn/gprs_utils.h>
+#include <osmocom/sgsn/gprs_gb_parse.h>
 
 #include <osmocom/gprs/gprs_bssgp.h>
 
diff --git a/tests/slhc/slhc_test.c b/tests/slhc/slhc_test.c
index d2e1cd9..bb0e26c 100644
--- a/tests/slhc/slhc_test.c
+++ b/tests/slhc/slhc_test.c
@@ -19,8 +19,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <openbsc/slhc.h>
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/slhc.h>
+#include <osmocom/sgsn/debug.h>
 
 #include <osmocom/core/talloc.h>
 #include <osmocom/core/utils.h>
diff --git a/tests/sndcp_xid/sndcp_xid_test.c b/tests/sndcp_xid/sndcp_xid_test.c
index 151dd2b..dc6da82 100644
--- a/tests/sndcp_xid/sndcp_xid_test.c
+++ b/tests/sndcp_xid/sndcp_xid_test.c
@@ -19,8 +19,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <openbsc/gprs_sndcp_xid.h>
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/gprs_sndcp_xid.h>
+#include <osmocom/sgsn/debug.h>
 
 #include <osmocom/core/talloc.h>
 #include <osmocom/core/utils.h>
diff --git a/tests/v42bis/v42bis_test.c b/tests/v42bis/v42bis_test.c
index 7e90785..41d23b0 100644
--- a/tests/v42bis/v42bis_test.c
+++ b/tests/v42bis/v42bis_test.c
@@ -19,9 +19,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <openbsc/v42bis.h>
-#include <openbsc/v42bis_private.h>
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/v42bis.h>
+#include <osmocom/sgsn/v42bis_private.h>
+#include <osmocom/sgsn/debug.h>
 
 #include <osmocom/core/talloc.h>
 #include <osmocom/core/utils.h>
diff --git a/tests/xid/xid_test.c b/tests/xid/xid_test.c
index b77a4ae..e30a14f 100644
--- a/tests/xid/xid_test.c
+++ b/tests/xid/xid_test.c
@@ -19,8 +19,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <openbsc/gprs_llc_xid.h>
-#include <openbsc/debug.h>
+#include <osmocom/sgsn/gprs_llc_xid.h>
+#include <osmocom/sgsn/debug.h>
 
 #include <osmocom/core/talloc.h>
 #include <osmocom/core/utils.h>

-- 
To view, visit https://gerrit.osmocom.org/3810
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I281ef585fffc2644682c8282224fb1c2da5ca795
Gerrit-PatchSet: 2
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder



More information about the gerrit-log mailing list