move include/openbsc to include/osmocom/sgsn

Change-Id: I281ef585fffc2644682c8282224fb1c2da5ca795

29 files changed, 17 insertions, 14 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 677eec3aa..9d963a024 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 000000000..09db97a95
--- /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
index 150212971..150212971 100644
--- a/include/openbsc/Makefile.am
+++ b/include/osmocom/sgsn/Makefile.am
diff --git a/include/openbsc/common.h b/include/osmocom/sgsn/common.h
index d91b3d39e..d91b3d39e 100644
--- a/include/openbsc/common.h
+++ b/include/osmocom/sgsn/common.h
diff --git a/include/openbsc/crc24.h b/include/osmocom/sgsn/crc24.h
index 756638c03..756638c03 100644
--- a/include/openbsc/crc24.h
+++ b/include/osmocom/sgsn/crc24.h
diff --git a/include/openbsc/debug.h b/include/osmocom/sgsn/debug.h
index 65e197d52..65e197d52 100644
--- a/include/openbsc/debug.h
+++ b/include/osmocom/sgsn/debug.h
diff --git a/include/openbsc/gb_proxy.h b/include/osmocom/sgsn/gb_proxy.h
index e10894fc3..e10894fc3 100644
--- a/include/openbsc/gb_proxy.h
+++ b/include/osmocom/sgsn/gb_proxy.h
diff --git a/include/openbsc/gprs_gb_parse.h b/include/osmocom/sgsn/gprs_gb_parse.h
index 246839286..9f43faed6 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
index c38e49f0d..6324c5da7 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
index 8bc226781..376ae9a1a 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
index d340d40b7..d340d40b7 100644
--- a/include/openbsc/gprs_llc_xid.h
+++ b/include/osmocom/sgsn/gprs_llc_xid.h
diff --git a/include/openbsc/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h
index c47fb0905..c47fb0905 100644
--- a/include/openbsc/gprs_sgsn.h
+++ b/include/osmocom/sgsn/gprs_sgsn.h
diff --git a/include/openbsc/gprs_sndcp.h b/include/osmocom/sgsn/gprs_sndcp.h
index d970240e4..d970240e4 100644
--- a/include/openbsc/gprs_sndcp.h
+++ b/include/osmocom/sgsn/gprs_sndcp.h
diff --git a/include/openbsc/gprs_sndcp_comp.h b/include/osmocom/sgsn/gprs_sndcp_comp.h
index 87ab6382a..c04f7d49a 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
index a76b4a4b3..3e851421c 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
index 4e15b9be2..3e3131b52 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
index e64bc5237..e64bc5237 100644
--- a/include/openbsc/gprs_sndcp_xid.h
+++ b/include/osmocom/sgsn/gprs_sndcp_xid.h
diff --git a/include/openbsc/gprs_subscriber.h b/include/osmocom/sgsn/gprs_subscriber.h
index be78febff..be78febff 100644
--- a/include/openbsc/gprs_subscriber.h
+++ b/include/osmocom/sgsn/gprs_subscriber.h
diff --git a/include/openbsc/gprs_utils.h b/include/osmocom/sgsn/gprs_utils.h
index e06364dad..e06364dad 100644
--- a/include/openbsc/gprs_utils.h
+++ b/include/osmocom/sgsn/gprs_utils.h
diff --git a/include/openbsc/gsup_client.h b/include/osmocom/sgsn/gsup_client.h
index 4a25490f6..29092ad5b 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
index 9cb7605f8..8fd9f38cf 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
index 80c86d5d6..80c86d5d6 100644
--- a/include/openbsc/oap_client.h
+++ b/include/osmocom/sgsn/oap_client.h
diff --git a/include/openbsc/rest_octets.h b/include/osmocom/sgsn/rest_octets.h
index 49a231296..0dbe7ae13 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
index f371dc695..e4eda17d2 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
index 4b6ba56f6..4b6ba56f6 100644
--- a/include/openbsc/signal.h
+++ b/include/osmocom/sgsn/signal.h
diff --git a/include/openbsc/slhc.h b/include/osmocom/sgsn/slhc.h
index cd5a47cf4..cd5a47cf4 100644
--- a/include/openbsc/slhc.h
+++ b/include/osmocom/sgsn/slhc.h
diff --git a/include/openbsc/v42bis.h b/include/osmocom/sgsn/v42bis.h
index 607a58e51..607a58e51 100644
--- a/include/openbsc/v42bis.h
+++ b/include/osmocom/sgsn/v42bis.h
diff --git a/include/openbsc/v42bis_private.h b/include/osmocom/sgsn/v42bis_private.h
index daa5ea315..daa5ea315 100644
--- a/include/openbsc/v42bis_private.h
+++ b/include/osmocom/sgsn/v42bis_private.h
diff --git a/include/openbsc/vty.h b/include/osmocom/sgsn/vty.h
index d2e3d9a73..d2e3d9a73 100644
--- a/include/openbsc/vty.h
+++ b/include/osmocom/sgsn/vty.h