move include/openbsc to include/osmocom/sgsn

Change-Id: I281ef585fffc2644682c8282224fb1c2da5ca795

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

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

include/Makefile.am

@@ -1,3 +1,3 @@
 SUBDIRS = \
-	openbsc \
+	osmocom \
 	$(NULL)

include/osmocom/Makefile.am

@@ -0,0 +1,3 @@
+SUBDIRS = \
+	sgsn \
+	$(NULL)

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>
 

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>
 

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 {

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 {

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 */

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 */

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

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 */

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 */

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>
 

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] = {

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>
 

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>

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>

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>

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>
 

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>

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>
 

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>
 

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,

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" },

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>

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"},

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>
 

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 */
 

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,

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 {

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,

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>

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

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>

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>

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>

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>

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 };

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"
 

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...) \

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;
 

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)

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>
 

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"},

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>

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>
 

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>

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>

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)
 {

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
 

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>
 
 

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>

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[] = {

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;
 

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)
 {

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;

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>

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;
 

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)

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,

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>
 

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>

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>