aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2017-09-04 15:13:25 +0200
committerNeels Hofmeyr <neels@hofmeyr.de>2017-09-04 15:32:08 +0200
commitf62d3da86bf1b89c20755c1e82a3674bc6387d63 (patch)
treefb5ce2e8b411ac003bc9b3b4f9eecf396480351d
parent1d55ce7abc3045bf84520ca942b0199bc2094eaf (diff)
move include/openbsc to include/osmocom/sgsnneels/pending
-rw-r--r--configure.ac3
-rw-r--r--debian/copyright58
-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
-rw-r--r--src/gprs/crc24.c2
-rw-r--r--src/gprs/gb_proxy.c12
-rw-r--r--src/gprs/gb_proxy_main.c8
-rw-r--r--src/gprs/gb_proxy_patch.c8
-rw-r--r--src/gprs/gb_proxy_peer.c4
-rw-r--r--src/gprs/gb_proxy_tlli.c8
-rw-r--r--src/gprs/gb_proxy_vty.c8
-rw-r--r--src/gprs/gprs_gb_parse.c6
-rw-r--r--src/gprs/gprs_gmm.c18
-rw-r--r--src/gprs/gprs_llc.c18
-rw-r--r--src/gprs/gprs_llc_parse.c10
-rw-r--r--src/gprs/gprs_llc_vty.c6
-rw-r--r--src/gprs/gprs_llc_xid.c8
-rw-r--r--src/gprs/gprs_sgsn.c16
-rw-r--r--src/gprs/gprs_sndcp.c18
-rw-r--r--src/gprs/gprs_sndcp_comp.c10
-rw-r--r--src/gprs/gprs_sndcp_dcomp.c16
-rw-r--r--src/gprs/gprs_sndcp_pcomp.c14
-rw-r--r--src/gprs/gprs_sndcp_vty.c8
-rw-r--r--src/gprs/gprs_sndcp_xid.c8
-rw-r--r--src/gprs/gprs_subscriber.c14
-rw-r--r--src/gprs/gprs_utils.c2
-rw-r--r--src/gprs/gsup_client.c4
-rw-r--r--src/gprs/gtphub.c6
-rw-r--r--src/gprs/gtphub_ares.c6
-rw-r--r--src/gprs/gtphub_main.c6
-rw-r--r--src/gprs/gtphub_sock.c4
-rw-r--r--src/gprs/gtphub_vty.c6
-rw-r--r--src/gprs/oap_client.c4
-rw-r--r--src/gprs/sgsn_ares.c4
-rw-r--r--src/gprs/sgsn_auth.c10
-rw-r--r--src/gprs/sgsn_cdr.c10
-rw-r--r--src/gprs/sgsn_ctrl.c6
-rw-r--r--src/gprs/sgsn_libgtp.c16
-rw-r--r--src/gprs/sgsn_main.c12
-rw-r--r--src/gprs/sgsn_vty.c12
-rw-r--r--src/gprs/slhc.c4
-rw-r--r--src/gprs/v42bis.c6
-rw-r--r--src/libcommon/common_vty.c10
-rw-r--r--src/libcommon/debug.c4
-rw-r--r--src/libcommon/gsm_data.c6
-rw-r--r--src/libcommon/gsm_data_shared.c2
-rw-r--r--src/libcommon/gsm_subscriber_base.c6
-rw-r--r--src/libcommon/gsup_client.c4
-rw-r--r--src/libcommon/gsup_test_client.c4
-rw-r--r--src/libcommon/oap_client.c4
-rw-r--r--src/libcommon/socket.c4
-rw-r--r--tests/gbproxy/gbproxy_test.c10
-rw-r--r--tests/gprs/gprs_test.c6
-rw-r--r--tests/gtphub/gtphub_test.c4
-rw-r--r--tests/oap/oap_client_test.c4
-rw-r--r--tests/sgsn/sgsn_test.c16
-rw-r--r--tests/slhc/slhc_test.c4
-rw-r--r--tests/sndcp_xid/sndcp_xid_test.c4
-rw-r--r--tests/v42bis/v42bis_test.c6
-rw-r--r--tests/xid/xid_test.c4
87 files changed, 268 insertions, 264 deletions
diff --git a/configure.ac b/configure.ac
index f1167d6d..5ded61fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -179,8 +179,9 @@ AM_CONFIG_HEADER(bscconfig.h)
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 b58117ed..1f7f6fde 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -78,22 +78,22 @@ Files: .gitignore
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 @@ Files: .gitignore
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 @@ Copyright: 2013 Jacob Erlbeck <jerlbeck@sysmocom.de>
2015 sysmocom s.f.m.c. GmbH <info@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 @@ License: LGPL-2.1
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 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
diff --git a/src/gprs/crc24.c b/src/gprs/crc24.c
index 1a420ed6..da269b37 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 d288cb31..eb2bbccd 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 853a763a..9f9c6051 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 bee31503..48627550 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 a83630bc..69cce3ac 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 3b3b976a..18321228 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 bd5bb1b5..156f3378 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 d5a122bd..ba78e897 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 7301bf1c..7e109b4f 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 904ec7e0..22743fe9 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 be634974..1d97004e 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 626d6ef1..1433efef 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 fe631715..de60e49e 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 560485de..4cd3df16 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 05dad660..77f8ca66 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 a12c39aa..60b15b92 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 b0f95b48..04ff491f 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 a2236c3b..2911b5eb 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 4bad8b04..0994a4cd 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 dfea5feb..8f844b57 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 94297d0d..bebdb1e4 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 91a09d2d..307699be 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 258f230c..48357b47 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 0a8e375a..7e3e6631 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 afeeda65..87dc860c 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 d7b3ba74..782afb32 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 60bebaae..1acd5a62 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 d611b1f9..3a46e817 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 5128ac11..9ff84a6e 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 62380991..17567c48 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 a64339c3..92712ef9 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 16ea9d47..474d41a9 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 f7b1180b..dc5ae79a 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 90b4d163..9a002664 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 8ffc6c83..d79beb33 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 fce25188..18828525 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 @@ DEFUN(cfg_auth_policy, cfg_auth_policy_cmd,
}
/* 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 cbdf8dbd..20e571d4 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 a04b0af5..3bb9afcd 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 856583e0..ac3c7fc9 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 72364133..60764099 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 7be22408..a2837f38 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 26962730..8d5f990e 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 018ed210..2a8a59fe 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 fd65e7b0..89a9f706 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 b6a8d6b7..cc0f58b0 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 5128ac11..9ff84a6e 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 2a64767f..dfcb3934 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 9672dcba..e8a4ef98 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 aac9bb89..2dcbafaf 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 e7c27d2c..ac0223b8 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 e6501cb6..7adae83c 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 d66c5dd8..a4867946 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 d2e1cd9d..bb0e26cb 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 151dd2bb..dc6da823 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 7e907858..41d23b02 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 b77a4ae8..e30a14f9 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>