aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/Makefile.am2
-rw-r--r--include/osmocom/Makefile.am3
-rw-r--r--include/osmocom/sgsn/Makefile.am (renamed from include/openbsc/Makefile.am)0
-rw-r--r--include/osmocom/sgsn/common.h (renamed from include/openbsc/common.h)0
-rw-r--r--include/osmocom/sgsn/crc24.h (renamed from include/openbsc/crc24.h)0
-rw-r--r--include/osmocom/sgsn/debug.h (renamed from include/openbsc/debug.h)0
-rw-r--r--include/osmocom/sgsn/gb_proxy.h (renamed from include/openbsc/gb_proxy.h)0
-rw-r--r--include/osmocom/sgsn/gprs_gb_parse.h (renamed from include/openbsc/gprs_gb_parse.h)2
-rw-r--r--include/osmocom/sgsn/gprs_gmm.h (renamed from include/openbsc/gprs_gmm.h)2
-rw-r--r--include/osmocom/sgsn/gprs_llc.h (renamed from include/openbsc/gprs_llc.h)4
-rw-r--r--include/osmocom/sgsn/gprs_llc_xid.h (renamed from include/openbsc/gprs_llc_xid.h)0
-rw-r--r--include/osmocom/sgsn/gprs_sgsn.h (renamed from include/openbsc/gprs_sgsn.h)0
-rw-r--r--include/osmocom/sgsn/gprs_sndcp.h (renamed from include/openbsc/gprs_sndcp.h)0
-rw-r--r--include/osmocom/sgsn/gprs_sndcp_comp.h (renamed from include/openbsc/gprs_sndcp_comp.h)2
-rw-r--r--include/osmocom/sgsn/gprs_sndcp_dcomp.h (renamed from include/openbsc/gprs_sndcp_dcomp.h)2
-rw-r--r--include/osmocom/sgsn/gprs_sndcp_pcomp.h (renamed from include/openbsc/gprs_sndcp_pcomp.h)2
-rw-r--r--include/osmocom/sgsn/gprs_sndcp_xid.h (renamed from include/openbsc/gprs_sndcp_xid.h)0
-rw-r--r--include/osmocom/sgsn/gprs_subscriber.h (renamed from include/openbsc/gprs_subscriber.h)0
-rw-r--r--include/osmocom/sgsn/gprs_utils.h (renamed from include/openbsc/gprs_utils.h)0
-rw-r--r--include/osmocom/sgsn/gsup_client.h (renamed from include/openbsc/gsup_client.h)2
-rw-r--r--include/osmocom/sgsn/gtphub.h (renamed from include/openbsc/gtphub.h)2
-rw-r--r--include/osmocom/sgsn/oap_client.h (renamed from include/openbsc/oap_client.h)0
-rw-r--r--include/osmocom/sgsn/rest_octets.h (renamed from include/openbsc/rest_octets.h)2
-rw-r--r--include/osmocom/sgsn/sgsn.h (renamed from include/openbsc/sgsn.h)6
-rw-r--r--include/osmocom/sgsn/signal.h (renamed from include/openbsc/signal.h)0
-rw-r--r--include/osmocom/sgsn/slhc.h (renamed from include/openbsc/slhc.h)0
-rw-r--r--include/osmocom/sgsn/v42bis.h (renamed from include/openbsc/v42bis.h)0
-rw-r--r--include/osmocom/sgsn/v42bis_private.h (renamed from include/openbsc/v42bis_private.h)0
-rw-r--r--include/osmocom/sgsn/vty.h (renamed from include/openbsc/vty.h)0
29 files changed, 17 insertions, 14 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index 677eec3a..9d963a02 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 00000000..09db97a9
--- /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 15021297..15021297 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 d91b3d39..d91b3d39 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 756638c0..756638c0 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 65e197d5..65e197d5 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 e10894fc..e10894fc 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 24683928..9f43faed 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 c38e49f0..6324c5da 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 8bc22678..376ae9a1 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 d340d40b..d340d40b 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 c47fb090..c47fb090 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 d970240e..d970240e 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 87ab6382..c04f7d49 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 a76b4a4b..3e851421 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 4e15b9be..3e3131b5 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 e64bc523..e64bc523 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 be78febf..be78febf 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 e06364da..e06364da 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 4a25490f..29092ad5 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 9cb7605f..8fd9f38c 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 80c86d5d..80c86d5d 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 49a23129..0dbe7ae1 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 f371dc69..e4eda17d 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 4b6ba56f..4b6ba56f 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 cd5a47cf..cd5a47cf 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 607a58e5..607a58e5 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 daa5ea31..daa5ea31 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 d2e3d9a7..d2e3d9a7 100644
--- a/include/openbsc/vty.h
+++ b/include/osmocom/sgsn/vty.h