move include/openbsc to include/osmocom/sgsn
Change-Id: I281ef585fffc2644682c8282224fb1c2da5ca795
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