summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/backtrace.c2
-rw-r--r--src/bits.c2
-rw-r--r--src/bitvec.c2
-rw-r--r--src/crc16.c2
-rw-r--r--src/gsm/gprs_cipher_core.c6
-rw-r--r--src/gsm/gsm0480.c10
-rw-r--r--src/gsm/gsm0808.c6
-rw-r--r--src/gsm/gsm48.c8
-rw-r--r--src/gsm/gsm48_ie.c12
-rw-r--r--src/gsm/gsm_utils.c6
-rw-r--r--src/gsm/rsl.c4
-rw-r--r--src/gsm/rxlev_stat.c4
-rw-r--r--src/gsm/tlv_parser.c4
-rw-r--r--src/gsmtap_util.c14
-rw-r--r--src/logging.c6
-rw-r--r--src/logging_syslog.c6
-rw-r--r--src/msgb.c4
-rw-r--r--src/msgfile.c4
-rw-r--r--src/panic.c6
-rw-r--r--src/plugin.c2
-rw-r--r--src/rate_ctr.c10
-rw-r--r--src/select.c6
-rw-r--r--src/signal.c6
-rw-r--r--src/statistics.c6
-rw-r--r--src/talloc.c2
-rw-r--r--src/timer.c2
-rw-r--r--src/utils.c2
-rw-r--r--src/vty/buffer.c2
-rw-r--r--src/vty/command.c2
-rw-r--r--src/vty/logging_vty.c6
-rw-r--r--src/vty/telnet_interface.c6
-rw-r--r--src/vty/utils.c8
-rw-r--r--src/vty/vector.c2
-rw-r--r--src/vty/vty.c2
-rw-r--r--src/write_queue.c2
35 files changed, 87 insertions, 87 deletions
diff --git a/src/backtrace.c b/src/backtrace.c
index 42394453..ecd6b9c5 100644
--- a/src/backtrace.c
+++ b/src/backtrace.c
@@ -24,7 +24,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <osmocore/utils.h>
+#include <osmocom/core/utils.h>
#include "config.h"
#ifdef HAVE_EXECINFO_H
diff --git a/src/bits.c b/src/bits.c
index fcdf5cc3..ff5d176c 100644
--- a/src/bits.c
+++ b/src/bits.c
@@ -1,7 +1,7 @@
#include <stdint.h>
-#include <osmocore/bits.h>
+#include <osmocom/core/bits.h>
/* convert unpacked bits to packed bits, return length in bytes */
int osmo_ubit2pbit(pbit_t *out, const ubit_t *in, unsigned int num_bits)
diff --git a/src/bitvec.c b/src/bitvec.c
index 95d78a5c..4984af22 100644
--- a/src/bitvec.c
+++ b/src/bitvec.c
@@ -24,7 +24,7 @@
#include <errno.h>
#include <stdint.h>
-#include <osmocore/bitvec.h>
+#include <osmocom/core/bitvec.h>
#define BITNUM_FROM_COMP(byte, bit) ((byte*8)+bit)
diff --git a/src/crc16.c b/src/crc16.c
index 8ac8031e..3a0d0ddb 100644
--- a/src/crc16.c
+++ b/src/crc16.c
@@ -8,7 +8,7 @@
* Version 2. See the file COPYING for more details.
*/
-#include <osmocore/crc16.h>
+#include <osmocom/core/crc16.h>
/** CRC table for the CRC-16. The poly is 0x8005 (x^16 + x^15 + x^2 + 1) */
uint16_t const crc16_table[256] = {
diff --git a/src/gsm/gprs_cipher_core.c b/src/gsm/gprs_cipher_core.c
index 6174bd72..0ff85e2d 100644
--- a/src/gsm/gprs_cipher_core.c
+++ b/src/gsm/gprs_cipher_core.c
@@ -23,9 +23,9 @@
#include <errno.h>
#include <stdint.h>
-#include <osmocore/utils.h>
-#include <osmocore/linuxlist.h>
-#include <osmocore/plugin.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/plugin.h>
#include <osmocom/crypt/gprs_cipher.h>
diff --git a/src/gsm/gsm0480.c b/src/gsm/gsm0480.c
index b6b345cb..b9b3ed97 100644
--- a/src/gsm/gsm0480.c
+++ b/src/gsm/gsm0480.c
@@ -22,13 +22,13 @@
*
*/
-#include <osmocore/gsm0480.h>
-#include <osmocore/gsm_utils.h>
+#include <osmocom/gsm/gsm0480.h>
+#include <osmocom/gsm/gsm_utils.h>
-#include <osmocore/logging.h>
+#include <osmocom/core/logging.h>
-#include <osmocore/protocol/gsm_04_08.h>
-#include <osmocore/protocol/gsm_04_80.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
+#include <osmocom/gsm/protocol/gsm_04_80.h>
#include <string.h>
diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c
index dc450cc4..1640adc8 100644
--- a/src/gsm/gsm0808.c
+++ b/src/gsm/gsm0808.c
@@ -18,9 +18,9 @@
*
*/
-#include <osmocore/gsm0808.h>
-#include <osmocore/protocol/gsm_08_08.h>
-#include <osmocore/gsm48.h>
+#include <osmocom/gsm/gsm0808.h>
+#include <osmocom/gsm/protocol/gsm_08_08.h>
+#include <osmocom/gsm/gsm48.h>
#include <arpa/inet.h>
diff --git a/src/gsm/gsm48.c b/src/gsm/gsm48.c
index daec4f39..436bf14b 100644
--- a/src/gsm/gsm48.c
+++ b/src/gsm/gsm48.c
@@ -28,11 +28,11 @@
#include <arpa/inet.h>
-#include <osmocore/utils.h>
-#include <osmocore/tlv.h>
-#include <osmocore/gsm48.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/gsm/tlv.h>
+#include <osmocom/gsm/gsm48.h>
-#include <osmocore/protocol/gsm_04_08.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
const struct tlv_definition gsm48_att_tlvdef = {
.def = {
diff --git a/src/gsm/gsm48_ie.c b/src/gsm/gsm48_ie.c
index 0e270881..efcf2816 100644
--- a/src/gsm/gsm48_ie.c
+++ b/src/gsm/gsm48_ie.c
@@ -27,12 +27,12 @@
#include <string.h>
#include <errno.h>
-#include <osmocore/utils.h>
-#include <osmocore/msgb.h>
-#include <osmocore/tlv.h>
-#include <osmocore/mncc.h>
-#include <osmocore/protocol/gsm_04_08.h>
-#include <osmocore/gsm48_ie.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/gsm/tlv.h>
+#include <osmocom/gsm/mncc.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
+#include <osmocom/gsm/gsm48_ie.h>
static const char bcd_num_digits[] = {
'0', '1', '2', '3', '4', '5', '6', '7',
diff --git a/src/gsm/gsm_utils.c b/src/gsm/gsm_utils.c
index 54a13ad8..377705d9 100644
--- a/src/gsm/gsm_utils.c
+++ b/src/gsm/gsm_utils.c
@@ -23,8 +23,8 @@
*/
//#include <openbsc/gsm_data.h>
-#include <osmocore/utils.h>
-#include <osmocore/gsm_utils.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/gsm/gsm_utils.h>
#include <stdlib.h>
#include <stdint.h>
@@ -33,7 +33,7 @@
#include <errno.h>
#include <ctype.h>
-#include "../config.h"
+#include "../../config.h"
/* ETSI GSM 03.38 6.2.1 and 6.2.1.1 default alphabet
* Greek symbols at hex positions 0x10 and 0x12-0x1a
diff --git a/src/gsm/rsl.c b/src/gsm/rsl.c
index 3bfeffb9..12ac0cfb 100644
--- a/src/gsm/rsl.c
+++ b/src/gsm/rsl.c
@@ -25,8 +25,8 @@
#include <stdio.h>
#include <errno.h>
-#include <osmocore/tlv.h>
-#include <osmocore/rsl.h>
+#include <osmocom/gsm/tlv.h>
+#include <osmocom/gsm/rsl.h>
#define RSL_ALLOC_SIZE 200
#define RSL_ALLOC_HEADROOM 56
diff --git a/src/gsm/rxlev_stat.c b/src/gsm/rxlev_stat.c
index b474aaa8..626aaffb 100644
--- a/src/gsm/rxlev_stat.c
+++ b/src/gsm/rxlev_stat.c
@@ -27,8 +27,8 @@
#include <errno.h>
#include <stdint.h>
-#include <osmocore/bitvec.h>
-#include <osmocore/rxlev_stat.h>
+#include <osmocom/core/bitvec.h>
+#include <osmocom/gsm/rxlev_stat.h>
int bitvec_find_bit_pos(const struct bitvec *bv, unsigned int n, enum bit_value val)
{
diff --git a/src/gsm/tlv_parser.c b/src/gsm/tlv_parser.c
index bbef7a9a..1e4c6b5f 100644
--- a/src/gsm/tlv_parser.c
+++ b/src/gsm/tlv_parser.c
@@ -1,7 +1,7 @@
#include <stdio.h>
#include <stdint.h>
-#include <osmocore/utils.h>
-#include <osmocore/tlv.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/gsm/tlv.h>
struct tlv_definition tvlv_att_def;
diff --git a/src/gsmtap_util.c b/src/gsmtap_util.c
index abee4dac..6d02d58f 100644
--- a/src/gsmtap_util.c
+++ b/src/gsmtap_util.c
@@ -24,13 +24,13 @@
#ifdef HAVE_SYS_SELECT_H
-#include <osmocore/gsmtap_util.h>
-#include <osmocore/logging.h>
-#include <osmocore/protocol/gsm_04_08.h>
-#include <osmocore/gsmtap.h>
-#include <osmocore/msgb.h>
-#include <osmocore/rsl.h>
-#include <osmocore/select.h>
+#include <osmocom/core/gsmtap_util.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/core/gsmtap.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/core/select.h>
+#include <osmocom/gsm/protocol/gsm_04_08.h>
+#include <osmocom/gsm/rsl.h>
#include <arpa/inet.h>
#include <sys/socket.h>
diff --git a/src/logging.c b/src/logging.c
index 89ca6ced..653c80db 100644
--- a/src/logging.c
+++ b/src/logging.c
@@ -34,9 +34,9 @@
#include <time.h>
#include <errno.h>
-#include <osmocore/talloc.h>
-#include <osmocore/utils.h>
-#include <osmocore/logging.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/core/logging.h>
#include <osmocom/vty/logging.h> /* for LOGGING_STR. */
diff --git a/src/logging_syslog.c b/src/logging_syslog.c
index b558fc0b..4f043b1d 100644
--- a/src/logging_syslog.c
+++ b/src/logging_syslog.c
@@ -33,9 +33,9 @@
#include <strings.h>
#endif
-#include <osmocore/talloc.h>
-#include <osmocore/utils.h>
-#include <osmocore/logging.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/core/logging.h>
static const int logp2syslog_level(unsigned int level)
{
diff --git a/src/msgb.c b/src/msgb.c
index 12a839a9..86720064 100644
--- a/src/msgb.c
+++ b/src/msgb.c
@@ -24,9 +24,9 @@
#include <stdlib.h>
#include <sys/types.h>
-#include <osmocore/msgb.h>
+#include <osmocom/core/msgb.h>
//#include <openbsc/gsm_data.h>
-#include <osmocore/talloc.h>
+#include <osmocom/core/talloc.h>
//#include <openbsc/debug.h>
void *tall_msgb_ctx;
diff --git a/src/msgfile.c b/src/msgfile.c
index 68f05813..ec4434a5 100644
--- a/src/msgfile.c
+++ b/src/msgfile.c
@@ -21,8 +21,8 @@
*
*/
-#include <osmocore/msgfile.h>
-#include <osmocore/talloc.h>
+#include <osmocom/core/msgfile.h>
+#include <osmocom/core/talloc.h>
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/src/panic.c b/src/panic.c
index 21e8fd56..588a5fe0 100644
--- a/src/panic.c
+++ b/src/panic.c
@@ -20,9 +20,9 @@
*
*/
-#include <osmocore/gsm_utils.h>
-#include <osmocore/panic.h>
-#include <osmocore/backtrace.h>
+#include <osmocom/gsm/gsm_utils.h>
+#include <osmocom/core/panic.h>
+#include <osmocom/core/backtrace.h>
#include "../config.h"
diff --git a/src/plugin.c b/src/plugin.c
index 3ba2d431..4924e950 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -31,7 +31,7 @@
#include <errno.h>
#include <limits.h>
-#include <osmocore/plugin.h>
+#include <osmocom/core/plugin.h>
int plugin_load_all(const char *directory)
{
diff --git a/src/rate_ctr.c b/src/rate_ctr.c
index 80ef55b2..dd56e806 100644
--- a/src/rate_ctr.c
+++ b/src/rate_ctr.c
@@ -23,11 +23,11 @@
#include <stdint.h>
#include <string.h>
-#include <osmocore/utils.h>
-#include <osmocore/linuxlist.h>
-#include <osmocore/talloc.h>
-#include <osmocore/timer.h>
-#include <osmocore/rate_ctr.h>
+#include <osmocom/core/utils.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/timer.h>
+#include <osmocom/core/rate_ctr.h>
static LLIST_HEAD(rate_ctr_groups);
diff --git a/src/select.c b/src/select.c
index 5aa2beb5..adf36194 100644
--- a/src/select.c
+++ b/src/select.c
@@ -22,9 +22,9 @@
#include <fcntl.h>
#include <stdio.h>
-#include <osmocore/select.h>
-#include <osmocore/linuxlist.h>
-#include <osmocore/timer.h>
+#include <osmocom/core/select.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/timer.h>
#include "../config.h"
diff --git a/src/signal.c b/src/signal.c
index c7ca86c4..bb5c38e1 100644
--- a/src/signal.c
+++ b/src/signal.c
@@ -18,9 +18,9 @@
*
*/
-#include <osmocore/signal.h>
-#include <osmocore/talloc.h>
-#include <osmocore/linuxlist.h>
+#include <osmocom/core/signal.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/linuxlist.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
diff --git a/src/statistics.c b/src/statistics.c
index 34e6a408..183005df 100644
--- a/src/statistics.c
+++ b/src/statistics.c
@@ -23,9 +23,9 @@
#include <sys/types.h>
-#include <osmocore/linuxlist.h>
-#include <osmocore/talloc.h>
-#include <osmocore/statistics.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/statistics.h>
static LLIST_HEAD(counters);
diff --git a/src/talloc.c b/src/talloc.c
index 98c2ee09..60d7927d 100644
--- a/src/talloc.c
+++ b/src/talloc.c
@@ -55,7 +55,7 @@
#define __USE_GNU
#include <string.h>
#undef __USE_GNU
-#include <osmocore/talloc.h>
+#include <osmocom/core/talloc.h>
#define MIN(x,y) ((x) < (y) ? (x) : (y))
#endif /* not _TALLOC_SAMBA3 */
diff --git a/src/timer.c b/src/timer.c
index 37d7d166..9b2dd9e9 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -20,7 +20,7 @@
#include <assert.h>
#include <string.h>
-#include <osmocore/timer.h>
+#include <osmocom/core/timer.h>
static LLIST_HEAD(timer_list);
static struct timeval s_nearest_time;
diff --git a/src/utils.c b/src/utils.c
index 354fce57..af1829c9 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -4,7 +4,7 @@
#include <errno.h>
#include <stdio.h>
-#include <osmocore/utils.h>
+#include <osmocom/core/utils.h>
static char namebuf[255];
const char *get_value_string(const struct value_string *vs, uint32_t val)
diff --git a/src/vty/buffer.c b/src/vty/buffer.c
index a5655b93..e385f9fd 100644
--- a/src/vty/buffer.c
+++ b/src/vty/buffer.c
@@ -28,7 +28,7 @@
#include <stddef.h>
#include <sys/uio.h>
-#include <osmocore/talloc.h>
+#include <osmocom/core/talloc.h>
#include <osmocom/vty/buffer.h>
#include <osmocom/vty/vty.h>
diff --git a/src/vty/command.c b/src/vty/command.c
index 0f65224f..5dc1dd45 100644
--- a/src/vty/command.c
+++ b/src/vty/command.c
@@ -38,7 +38,7 @@ Boston, MA 02111-1307, USA. */
#include <osmocom/vty/vty.h>
#include <osmocom/vty/command.h>
-#include <osmocore/talloc.h>
+#include <osmocom/core/talloc.h>
#define CONFIGFILE_MASK 022
diff --git a/src/vty/logging_vty.c b/src/vty/logging_vty.c
index 1b356c9f..4cab22a3 100644
--- a/src/vty/logging_vty.c
+++ b/src/vty/logging_vty.c
@@ -24,9 +24,9 @@
#include "../../config.h"
-#include <osmocore/talloc.h>
-#include <osmocore/logging.h>
-#include <osmocore/utils.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/logging.h>
+#include <osmocom/core/utils.h>
//#include <openbsc/vty.h>
diff --git a/src/vty/telnet_interface.c b/src/vty/telnet_interface.c
index 098fa2e6..0d45d614 100644
--- a/src/vty/telnet_interface.c
+++ b/src/vty/telnet_interface.c
@@ -25,9 +25,9 @@
#include <string.h>
#include <unistd.h>
-#include <osmocore/msgb.h>
-#include <osmocore/talloc.h>
-#include <osmocore/logging.h>
+#include <osmocom/core/msgb.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/logging.h>
#include <osmocom/vty/telnet_interface.h>
#include <osmocom/vty/buffer.h>
diff --git a/src/vty/utils.c b/src/vty/utils.c
index e163526e..7797e62d 100644
--- a/src/vty/utils.c
+++ b/src/vty/utils.c
@@ -23,10 +23,10 @@
#include <stdint.h>
#include <inttypes.h>
-#include <osmocore/linuxlist.h>
-#include <osmocore/talloc.h>
-#include <osmocore/timer.h>
-#include <osmocore/rate_ctr.h>
+#include <osmocom/core/linuxlist.h>
+#include <osmocom/core/talloc.h>
+#include <osmocom/core/timer.h>
+#include <osmocom/core/rate_ctr.h>
#include <osmocom/vty/vty.h>
diff --git a/src/vty/vector.c b/src/vty/vector.c
index 0343163f..4012f24b 100644
--- a/src/vty/vector.c
+++ b/src/vty/vector.c
@@ -24,7 +24,7 @@
#include <osmocom/vty/vector.h>
#include <osmocom/vty/vty.h>
-#include <osmocore/talloc.h>
+#include <osmocom/core/talloc.h>
#include <memory.h>
void *tall_vty_vec_ctx;
diff --git a/src/vty/vty.c b/src/vty/vty.c
index c1a9b3af..a1f0304b 100644
--- a/src/vty/vty.c
+++ b/src/vty/vty.c
@@ -16,7 +16,7 @@
#include <osmocom/vty/vty.h>
#include <osmocom/vty/command.h>
#include <osmocom/vty/buffer.h>
-#include <osmocore/talloc.h>
+#include <osmocom/core/talloc.h>
#define SYSCONFDIR "/usr/local/etc"
diff --git a/src/write_queue.c b/src/write_queue.c
index 7295569a..0642aad6 100644
--- a/src/write_queue.c
+++ b/src/write_queue.c
@@ -21,7 +21,7 @@
*
*/
-#include <osmocore/write_queue.h>
+#include <osmocom/core/write_queue.h>
int write_queue_bfd_cb(struct bsc_fd *fd, unsigned int what)
{