aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2017-09-04 15:13:25 +0200
committerNeels Hofmeyr <neels@hofmeyr.de>2017-09-06 16:47:47 +0200
commit396f2e69a047f461e2fcabae4c1f9990730289a3 (patch)
tree88a5843f3dcfb30a010e14289a829adf0e30af8f /src
parent2c17747c1b470118195518452860c3a3cae946dd (diff)
move include/openbsc to include/osmocom/sgsn
Diffstat (limited to 'src')
-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
47 files changed, 191 insertions, 191 deletions
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,