diff options
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | include/Makefile.am | 2 | ||||
| -rw-r--r-- | include/osmocom/Makefile.am | 4 | ||||
| -rw-r--r-- | include/osmocom/core/Makefile.am | 12 | ||||
| -rw-r--r-- | include/osmocom/core/backtrace.h (renamed from include/osmocore/backtrace.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/core/bits.h (renamed from include/osmocore/bits.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/core/bitvec.h (renamed from include/osmocore/bitvec.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/core/crc16.h (renamed from include/osmocore/crc16.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/core/gsmtap.h (renamed from include/osmocore/gsmtap.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/core/gsmtap_util.h (renamed from include/osmocore/gsmtap_util.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/core/linuxlist.h (renamed from include/osmocore/linuxlist.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/core/logging.h (renamed from include/osmocore/logging.h) | 2 | ||||
| -rw-r--r-- | include/osmocom/core/msgb.h (renamed from include/osmocore/msgb.h) | 6 | ||||
| -rw-r--r-- | include/osmocom/core/msgfile.h (renamed from include/osmocore/msgfile.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/core/panic.h (renamed from include/osmocore/panic.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/core/plugin.h (renamed from include/osmocore/plugin.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/core/process.h (renamed from include/osmocore/process.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/core/rate_ctr.h (renamed from include/osmocore/rate_ctr.h) | 2 | ||||
| -rw-r--r-- | include/osmocom/core/select.h (renamed from include/osmocore/select.h) | 2 | ||||
| -rw-r--r-- | include/osmocom/core/signal.h (renamed from include/osmocore/signal.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/core/statistics.h (renamed from include/osmocore/statistics.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/core/talloc.h (renamed from include/osmocore/talloc.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/core/timer.h (renamed from include/osmocore/timer.h) | 2 | ||||
| -rw-r--r-- | include/osmocom/core/utils.h (renamed from include/osmocore/utils.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/core/write_queue.h (renamed from include/osmocore/write_queue.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/crypt/gprs_cipher.h | 2 | ||||
| -rw-r--r-- | include/osmocom/gsm/Makefile.am | 6 | ||||
| -rw-r--r-- | include/osmocom/gsm/comp128.h (renamed from include/osmocore/comp128.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/gsm/gsm0480.h (renamed from include/osmocore/gsm0480.h) | 6 | ||||
| -rw-r--r-- | include/osmocom/gsm/gsm0808.h (renamed from include/osmocore/gsm0808.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/gsm/gsm48.h (renamed from include/osmocore/gsm48.h) | 6 | ||||
| -rw-r--r-- | include/osmocom/gsm/gsm48_ie.h (renamed from include/osmocore/gsm48_ie.h) | 8 | ||||
| -rw-r--r-- | include/osmocom/gsm/gsm_utils.h (renamed from include/osmocore/gsm_utils.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/gsm/mncc.h (renamed from include/osmocore/mncc.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/gsm/protocol/Makefile.am | 6 | ||||
| -rw-r--r-- | include/osmocom/gsm/protocol/gsm_03_41.h (renamed from include/osmocore/protocol/gsm_03_41.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/gsm/protocol/gsm_04_08.h (renamed from include/osmocore/protocol/gsm_04_08.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/gsm/protocol/gsm_04_11.h (renamed from include/osmocore/protocol/gsm_04_11.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/gsm/protocol/gsm_04_12.h (renamed from include/osmocore/protocol/gsm_04_12.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/gsm/protocol/gsm_04_80.h (renamed from include/osmocore/protocol/gsm_04_80.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/gsm/protocol/gsm_08_08.h (renamed from include/osmocore/protocol/gsm_08_08.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/gsm/protocol/gsm_08_58.h (renamed from include/osmocore/protocol/gsm_08_58.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/gsm/protocol/gsm_12_21.h (renamed from include/osmocore/protocol/gsm_12_21.h) | 2 | ||||
| -rw-r--r-- | include/osmocom/gsm/rsl.h (renamed from include/osmocore/rsl.h) | 4 | ||||
| -rw-r--r-- | include/osmocom/gsm/rxlev_stat.h (renamed from include/osmocore/rxlev_stat.h) | 0 | ||||
| -rw-r--r-- | include/osmocom/gsm/tlv.h (renamed from include/osmocore/tlv.h) | 2 | ||||
| -rw-r--r-- | include/osmocom/vty/telnet_interface.h | 4 | ||||
| -rw-r--r-- | include/osmocore/Makefile.am | 14 | ||||
| -rw-r--r-- | include/osmocore/protocol/Makefile.am | 6 | ||||
| -rw-r--r-- | src/backtrace.c | 2 | ||||
| -rw-r--r-- | src/bits.c | 2 | ||||
| -rw-r--r-- | src/bitvec.c | 2 | ||||
| -rw-r--r-- | src/crc16.c | 2 | ||||
| -rw-r--r-- | src/gsm/gprs_cipher_core.c | 6 | ||||
| -rw-r--r-- | src/gsm/gsm0480.c | 10 | ||||
| -rw-r--r-- | src/gsm/gsm0808.c | 6 | ||||
| -rw-r--r-- | src/gsm/gsm48.c | 8 | ||||
| -rw-r--r-- | src/gsm/gsm48_ie.c | 12 | ||||
| -rw-r--r-- | src/gsm/gsm_utils.c | 6 | ||||
| -rw-r--r-- | src/gsm/rsl.c | 4 | ||||
| -rw-r--r-- | src/gsm/rxlev_stat.c | 4 | ||||
| -rw-r--r-- | src/gsm/tlv_parser.c | 4 | ||||
| -rw-r--r-- | src/gsmtap_util.c | 14 | ||||
| -rw-r--r-- | src/logging.c | 6 | ||||
| -rw-r--r-- | src/logging_syslog.c | 6 | ||||
| -rw-r--r-- | src/msgb.c | 4 | ||||
| -rw-r--r-- | src/msgfile.c | 4 | ||||
| -rw-r--r-- | src/panic.c | 6 | ||||
| -rw-r--r-- | src/plugin.c | 2 | ||||
| -rw-r--r-- | src/rate_ctr.c | 10 | ||||
| -rw-r--r-- | src/select.c | 6 | ||||
| -rw-r--r-- | src/signal.c | 6 | ||||
| -rw-r--r-- | src/statistics.c | 6 | ||||
| -rw-r--r-- | src/talloc.c | 2 | ||||
| -rw-r--r-- | src/timer.c | 2 | ||||
| -rw-r--r-- | src/utils.c | 2 | ||||
| -rw-r--r-- | src/vty/buffer.c | 2 | ||||
| -rw-r--r-- | src/vty/command.c | 2 | ||||
| -rw-r--r-- | src/vty/logging_vty.c | 6 | ||||
| -rw-r--r-- | src/vty/telnet_interface.c | 6 | ||||
| -rw-r--r-- | src/vty/utils.c | 8 | ||||
| -rw-r--r-- | src/vty/vector.c | 2 | ||||
| -rw-r--r-- | src/vty/vty.c | 2 | ||||
| -rw-r--r-- | src/write_queue.c | 2 | ||||
| -rw-r--r-- | tests/msgfile/msgfile_test.c | 2 | ||||
| -rw-r--r-- | tests/sms/sms_test.c | 6 | ||||
| -rw-r--r-- | tests/smscb/smscb_test.c | 2 | ||||
| -rw-r--r-- | tests/timer/timer_test.c | 4 | ||||
| -rw-r--r-- | tests/ussd/ussd_test.c | 2 |
89 files changed, 149 insertions, 144 deletions
diff --git a/configure.in b/configure.in index b572bf4c..ead18f07 100644 --- a/configure.in +++ b/configure.in @@ -106,8 +106,9 @@ AC_OUTPUT( include/osmocom/vty/Makefile include/osmocom/codec/Makefile include/osmocom/crypt/Makefile - include/osmocore/Makefile - include/osmocore/protocol/Makefile + include/osmocom/gsm/Makefile + include/osmocom/gsm/protocol/Makefile + include/osmocom/core/Makefile include/Makefile src/Makefile src/vty/Makefile diff --git a/include/Makefile.am b/include/Makefile.am index 185c6968..3578a80e 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1 +1 @@ -SUBDIRS = osmocom osmocore +SUBDIRS = osmocom diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am index ec548fbd..21f4f2d0 100644 --- a/include/osmocom/Makefile.am +++ b/include/osmocom/Makefile.am @@ -1,5 +1,5 @@ if ENABLE_VTY -SUBDIRS = vty codec crypt +SUBDIRS = vty codec crypt gsm core else -SUBDIRS = codec crypt +SUBDIRS = codec crypt gsm core endif diff --git a/include/osmocom/core/Makefile.am b/include/osmocom/core/Makefile.am new file mode 100644 index 00000000..6109f478 --- /dev/null +++ b/include/osmocom/core/Makefile.am @@ -0,0 +1,12 @@ +osmocore_HEADERS = signal.h linuxlist.h timer.h select.h msgb.h bits.h \ + bitvec.h statistics.h utils.h \ + gsmtap.h write_queue.h \ + logging.h rate_ctr.h gsmtap_util.h \ + plugin.h crc16.h panic.h process.h msgfile.h \ + backtrace.h + +if ENABLE_TALLOC +osmocore_HEADERS += talloc.h +endif + +osmocoredir = $(includedir)/osmocom/core diff --git a/include/osmocore/backtrace.h b/include/osmocom/core/backtrace.h index bbbb2c28..bbbb2c28 100644 --- a/include/osmocore/backtrace.h +++ b/include/osmocom/core/backtrace.h diff --git a/include/osmocore/bits.h b/include/osmocom/core/bits.h index 8d4a0789..8d4a0789 100644 --- a/include/osmocore/bits.h +++ b/include/osmocom/core/bits.h diff --git a/include/osmocore/bitvec.h b/include/osmocom/core/bitvec.h index 42977fb2..42977fb2 100644 --- a/include/osmocore/bitvec.h +++ b/include/osmocom/core/bitvec.h diff --git a/include/osmocore/crc16.h b/include/osmocom/core/crc16.h index 7a512490..7a512490 100644 --- a/include/osmocore/crc16.h +++ b/include/osmocom/core/crc16.h diff --git a/include/osmocore/gsmtap.h b/include/osmocom/core/gsmtap.h index 236b25ac..236b25ac 100644 --- a/include/osmocore/gsmtap.h +++ b/include/osmocom/core/gsmtap.h diff --git a/include/osmocore/gsmtap_util.h b/include/osmocom/core/gsmtap_util.h index 96449443..96449443 100644 --- a/include/osmocore/gsmtap_util.h +++ b/include/osmocom/core/gsmtap_util.h diff --git a/include/osmocore/linuxlist.h b/include/osmocom/core/linuxlist.h index fb99c5ec..fb99c5ec 100644 --- a/include/osmocore/linuxlist.h +++ b/include/osmocom/core/linuxlist.h diff --git a/include/osmocore/logging.h b/include/osmocom/core/logging.h index fd458440..db029402 100644 --- a/include/osmocore/logging.h +++ b/include/osmocom/core/logging.h @@ -3,7 +3,7 @@ #include <stdio.h> #include <stdint.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #define LOG_MAX_CATEGORY 32 #define LOG_MAX_CTX 8 diff --git a/include/osmocore/msgb.h b/include/osmocom/core/msgb.h index c4f44305..57b5d7f4 100644 --- a/include/osmocore/msgb.h +++ b/include/osmocom/core/msgb.h @@ -21,8 +21,8 @@ */ #include <stdint.h> -#include "linuxlist.h" -#include "utils.h" +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/utils.h> #define MSGB_DEBUG @@ -62,7 +62,7 @@ extern struct msgb *msgb_dequeue(struct llist_head *queue); extern void msgb_reset(struct msgb *m); #ifdef MSGB_DEBUG -#include <osmocore/panic.h> +#include <osmocom/core/panic.h> #define MSGB_ABORT(msg, fmt, args ...) do { \ osmo_panic("msgb(%p): " fmt, msg, ## args); \ } while(0) diff --git a/include/osmocore/msgfile.h b/include/osmocom/core/msgfile.h index 92caa9fc..92caa9fc 100644 --- a/include/osmocore/msgfile.h +++ b/include/osmocom/core/msgfile.h diff --git a/include/osmocore/panic.h b/include/osmocom/core/panic.h index c5a83778..c5a83778 100644 --- a/include/osmocore/panic.h +++ b/include/osmocom/core/panic.h diff --git a/include/osmocore/plugin.h b/include/osmocom/core/plugin.h index 98f9b56d..98f9b56d 100644 --- a/include/osmocore/plugin.h +++ b/include/osmocom/core/plugin.h diff --git a/include/osmocore/process.h b/include/osmocom/core/process.h index 2d663828..2d663828 100644 --- a/include/osmocore/process.h +++ b/include/osmocom/core/process.h diff --git a/include/osmocore/rate_ctr.h b/include/osmocom/core/rate_ctr.h index f887d9a7..dba573d9 100644 --- a/include/osmocore/rate_ctr.h +++ b/include/osmocom/core/rate_ctr.h @@ -3,7 +3,7 @@ #include <stdint.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #define RATE_CTR_INTV_NUM 4 diff --git a/include/osmocore/select.h b/include/osmocom/core/select.h index 2d8b3ec0..5ca21c3e 100644 --- a/include/osmocore/select.h +++ b/include/osmocom/core/select.h @@ -1,7 +1,7 @@ #ifndef _BSC_SELECT_H #define _BSC_SELECT_H -#include "linuxlist.h" +#include <osmocom/core/linuxlist.h> #define BSC_FD_READ 0x0001 #define BSC_FD_WRITE 0x0002 diff --git a/include/osmocore/signal.h b/include/osmocom/core/signal.h index 02d83d2e..02d83d2e 100644 --- a/include/osmocore/signal.h +++ b/include/osmocom/core/signal.h diff --git a/include/osmocore/statistics.h b/include/osmocom/core/statistics.h index 1d56054a..1d56054a 100644 --- a/include/osmocore/statistics.h +++ b/include/osmocom/core/statistics.h diff --git a/include/osmocore/talloc.h b/include/osmocom/core/talloc.h index f7f7643b..f7f7643b 100644 --- a/include/osmocore/talloc.h +++ b/include/osmocom/core/talloc.h diff --git a/include/osmocore/timer.h b/include/osmocom/core/timer.h index fee888bf..19664781 100644 --- a/include/osmocore/timer.h +++ b/include/osmocom/core/timer.h @@ -23,7 +23,7 @@ #include <sys/time.h> -#include "linuxlist.h" +#include <osmocom/core/linuxlist.h> /** * Timer management: diff --git a/include/osmocore/utils.h b/include/osmocom/core/utils.h index 0cdf03b8..0cdf03b8 100644 --- a/include/osmocore/utils.h +++ b/include/osmocom/core/utils.h diff --git a/include/osmocore/write_queue.h b/include/osmocom/core/write_queue.h index ef244c32..ef244c32 100644 --- a/include/osmocore/write_queue.h +++ b/include/osmocom/core/write_queue.h diff --git a/include/osmocom/crypt/gprs_cipher.h b/include/osmocom/crypt/gprs_cipher.h index 3e514ec7..30510711 100644 --- a/include/osmocom/crypt/gprs_cipher.h +++ b/include/osmocom/crypt/gprs_cipher.h @@ -1,7 +1,7 @@ #ifndef _GPRS_CIPHER_H #define _GPRS_CIPHER_H -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #define GSM0464_CIPH_MAX_BLOCK 1523 diff --git a/include/osmocom/gsm/Makefile.am b/include/osmocom/gsm/Makefile.am new file mode 100644 index 00000000..8685fc9a --- /dev/null +++ b/include/osmocom/gsm/Makefile.am @@ -0,0 +1,6 @@ +osmogsm_HEADERS = comp128.h gsm0808.h gsm48_ie.h mncc.h rxlev_stat.h \ + gsm0480.h gsm48.h gsm_utils.h rsl.h tlv.h + +SUBDIRS = protocol + +osmogsmdir = $(includedir)/osmocom/gsm diff --git a/include/osmocore/comp128.h b/include/osmocom/gsm/comp128.h index c37808f0..c37808f0 100644 --- a/include/osmocore/comp128.h +++ b/include/osmocom/gsm/comp128.h diff --git a/include/osmocore/gsm0480.h b/include/osmocom/gsm/gsm0480.h index b504332e..d6626d60 100644 --- a/include/osmocore/gsm0480.h +++ b/include/osmocom/gsm/gsm0480.h @@ -1,9 +1,9 @@ #ifndef gsm0480_h #define gsm0480_h -#include "msgb.h" -#include "protocol/gsm_04_08.h" -#include "protocol/gsm_04_80.h" +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> +#include <osmocom/gsm/protocol/gsm_04_80.h> #define MAX_LEN_USSD_STRING 31 diff --git a/include/osmocore/gsm0808.h b/include/osmocom/gsm/gsm0808.h index 1d853775..1d853775 100644 --- a/include/osmocore/gsm0808.h +++ b/include/osmocom/gsm/gsm0808.h diff --git a/include/osmocore/gsm48.h b/include/osmocom/gsm/gsm48.h index ffe0399b..1e9403bc 100644 --- a/include/osmocore/gsm48.h +++ b/include/osmocom/gsm/gsm48.h @@ -1,9 +1,9 @@ #ifndef _OSMOCORE_GSM48_H #define _OSMOCORE_GSM48_H -#include <osmocore/tlv.h> -#include <osmocore/protocol/gsm_04_08.h> -#include <osmocore/gsm48_ie.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> +#include <osmocom/gsm/gsm48_ie.h> /* A parsed GPRS routing area */ struct gprs_ra_id { diff --git a/include/osmocore/gsm48_ie.h b/include/osmocom/gsm/gsm48_ie.h index fa66159f..f4fce25c 100644 --- a/include/osmocore/gsm48_ie.h +++ b/include/osmocom/gsm/gsm48_ie.h @@ -5,10 +5,10 @@ #include <string.h> #include <errno.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> -#include <osmocore/mncc.h> -#include <osmocore/protocol/gsm_04_08.h> +#include <osmocom/core/msgb.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/gsm/mncc.h> +#include <osmocom/gsm/protocol/gsm_04_08.h> /* decode a 'called/calling/connect party BCD number' as in 10.5.4.7 */ int gsm48_decode_bcd_number(char *output, int output_len, diff --git a/include/osmocore/gsm_utils.h b/include/osmocom/gsm/gsm_utils.h index 19adb70a..19adb70a 100644 --- a/ |