cellular-infrastructure
/
osmo-bsc
mirror of https://gerrit.osmocom.org/osmo-bsc
9
0
Fork 0
Code Issues Releases Wiki Activity

split 'libosmocore' from openbsc codebase 

This library is intended to collect all generic/common funcitionality
of all Osmocom.org projects, including OpenBSC but also OsmocomBB

The library currently includes the following modules:

bitvec, comp128, gsm_utils, msgb, select, signal, statistics, talloc, timer,
tlv_parse, linuxlist

msgb allocation error debugging had to be temporarily disabled as it depends on
'debug.c' functionality which at the moment remains in OpenBSC
This commit is contained in:
Harald Welte 2010-02-20 16:24:02 +01:00
parent 9442c1b9ba
commit dfe6c7d910
96 changed files with 289 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libosmocore/Makefile.am Normal file
View File

@ -0,0 +1,7 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6
INCLUDES = $(all_includes) -I$(top_srcdir)/include
SUBDIRS = include src
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libosmocore.pc

37
libosmocore/configure.in Normal file
View File

@ -0,0 +1,37 @@
AC_INIT
AM_INIT_AUTOMAKE(libosmocore, 0.0alpha1)
dnl kernel style compile messages
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
dnl checks for programs
AC_PROG_MAKE_SET
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_RANLIB
AC_PROG_LIBTOOL
dnl checks for header files
AC_HEADER_STDC
# The following test is taken from WebKit's webkit.m4
saved_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -fvisibility=hidden "
AC_MSG_CHECKING([if ${CC} supports -fvisibility=hidden])
AC_COMPILE_IFELSE([char foo;],
[ AC_MSG_RESULT([yes])
SYMBOL_VISIBILITY="-fvisibility=hidden"],
AC_MSG_RESULT([no]))
CFLAGS="$saved_CFLAGS"
AC_SUBST(SYMBOL_VISIBILITY)
dnl Generate the output
AM_CONFIG_HEADER(config.h)
AC_OUTPUT(
libosmocore.pc
include/osmocore/Makefile
include/Makefile
src/Makefile
Makefile)

1
libosmocore/include/Makefile.am Normal file
View File

@ -0,0 +1 @@
SUBDIRS = osmocore

2
libosmocore/include/osmocore/Makefile.am Normal file
View File

@ -0,0 +1,2 @@
pkginclude_HEADERS = signal.h linuxlist.h timer.h talloc.h msgb.h select.h \
tlv.h bitvec.h comp128.h statistics.h gsm_utils.h

0
openbsc/include/openbsc/bitvec.h → libosmocore/include/osmocore/bitvec.h
View File

0
openbsc/include/openbsc/comp128.h → libosmocore/include/osmocore/comp128.h
View File

11
openbsc/include/openbsc/gsm_utils.h → libosmocore/include/osmocore/gsm_utils.h
View File

@ -27,6 +27,17 @@
#include <sys/types.h> #include <sys/types.h>
enum gsm_band {
GSM_BAND_850 = 1,
GSM_BAND_900 = 2,
GSM_BAND_1800 = 4,
GSM_BAND_1900 = 8,
GSM_BAND_450 = 0x10,
GSM_BAND_480 = 0x20,
GSM_BAND_750 = 0x40,
GSM_BAND_810 = 0x80,
};
int gsm_7bit_decode(char *decoded, const u_int8_t *user_data, u_int8_t length); int gsm_7bit_decode(char *decoded, const u_int8_t *user_data, u_int8_t length);
int gsm_7bit_encode(u_int8_t *result, const char *data); int gsm_7bit_encode(u_int8_t *result, const char *data);

0
openbsc/include/openbsc/linuxlist.h → libosmocore/include/osmocore/linuxlist.h
View File

0
openbsc/include/openbsc/msgb.h → libosmocore/include/osmocore/msgb.h
View File

0
openbsc/include/openbsc/select.h → libosmocore/include/osmocore/select.h
View File

15
libosmocore/include/osmocore/signal.h Normal file
View File

@ -0,0 +1,15 @@
#ifndef OSMOCORE_SIGNAL_H
#define OSMOCORE_SIGNAL_H
typedef int signal_cbfn(unsigned int subsys, unsigned int signal,
void *handler_data, void *signal_data);
/* Management */
int register_signal_handler(unsigned int subsys, signal_cbfn *cbfn, void *data);
void unregister_signal_handler(unsigned int subsys, signal_cbfn *cbfn, void *data);
/* Dispatch */
void dispatch_signal(unsigned int subsys, unsigned int signal, void *signal_data);
#endif /* OSMOCORE_SIGNAL_H */

0
openbsc/include/openbsc/statistics.h → libosmocore/include/osmocore/statistics.h
View File

0
openbsc/include/openbsc/talloc.h → libosmocore/include/osmocore/talloc.h
View File

0
openbsc/include/openbsc/timer.h → libosmocore/include/osmocore/timer.h
View File

2
openbsc/include/openbsc/tlv.h → libosmocore/include/osmocore/tlv.h
View File

@ -4,7 +4,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <string.h> #include <string.h>
#include <openbsc/msgb.h> #include <osmocore/msgb.h>
/* Terminology / wording /* Terminology / wording
tag length value (in bits) tag length value (in bits)

6
libosmocore/include/osmocore/utils.h Normal file
View File

@ -0,0 +1,6 @@
#ifndef OSMOCORE_UTIL_H
#define OSMOCORE_UTIL_H
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
#endif

7
openbsc/liblaf0rge1.pc.in → libosmocore/libosmocore.pc.in
View File

@ -1,11 +1,10 @@
prefix=@prefix@ prefix=@exec_prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
Name: LaF0rge Lib Name: Osmocom Core Library
Description: C Utility Library Description: C Utility Library
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -llaf0rge1 Libs: -L${libdir} -losmocore
Cflags: -I${includedir}/ Cflags: -I${includedir}/

11
libosmocore/src/Makefile.am Normal file
View File

@ -0,0 +1,11 @@
# This is _NOT_ the library release version, it's an API version.
# Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification
LIBVERSION=0:0:0
INCLUDES = $(all_includes) -I$(top_srcdir)/include
AM_CFLAGS = -fPIC -Wall
lib_LTLIBRARIES = libosmocore.la
libosmocore_la_SOURCES = msgb.c timer.c talloc.c select.c signal.c \
tlv_parser.c bitvec.c comp128.c gsm_utils.c statistics.c

2
openbsc/src/bitvec.c → libosmocore/src/bitvec.c
View File

@ -24,7 +24,7 @@
#include <errno.h> #include <errno.h>
#include <sys/types.h> #include <sys/types.h>
#include <openbsc/bitvec.h> #include <osmocore/bitvec.h>
#define BITNUM_FROM_COMP(byte, bit) ((byte*8)+bit) #define BITNUM_FROM_COMP(byte, bit) ((byte*8)+bit)

0
openbsc/src/comp128.c → libosmocore/src/comp128.c
View File

18
openbsc/src/gsm_utils.c → libosmocore/src/gsm_utils.c
View File

@ -21,9 +21,10 @@
* *
*/ */
#include <openbsc/gsm_data.h> //#include <openbsc/gsm_data.h>
#include <openbsc/gsm_utils.h> #include <osmocore/utils.h>
#include <execinfo.h> #include <osmocore/gsm_utils.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
@ -83,8 +84,11 @@ int gsm_7bit_encode(u_int8_t *result, const char *data)
int ms_pwr_ctl_lvl(enum gsm_band band, unsigned int dbm) int ms_pwr_ctl_lvl(enum gsm_band band, unsigned int dbm)
{ {
switch (band) { switch (band) {
case GSM_BAND_400: case GSM_BAND_450:
case GSM_BAND_480:
case GSM_BAND_750:
case GSM_BAND_900: case GSM_BAND_900:
case GSM_BAND_810:
case GSM_BAND_850: case GSM_BAND_850:
if (dbm >= 39) if (dbm >= 39)
return 0; return 0;
@ -130,8 +134,11 @@ int ms_pwr_dbm(enum gsm_band band, u_int8_t lvl)
lvl &= 0x1f; lvl &= 0x1f;
switch (band) { switch (band) {
case GSM_BAND_400: case GSM_BAND_450:
case GSM_BAND_480:
case GSM_BAND_750:
case GSM_BAND_900: case GSM_BAND_900:
case GSM_BAND_810:
case GSM_BAND_850: case GSM_BAND_850:
if (lvl < 2) if (lvl < 2)
return 39; return 39;
@ -182,6 +189,7 @@ u_int8_t dbm2rxlev(int dbm)
return rxlev; return rxlev;
} }
#include <execinfo.h>
void generate_backtrace() void generate_backtrace()
{ {
int i, nptrs; int i, nptrs;

10
openbsc/src/msgb.c → libosmocore/src/msgb.c
View File

@ -23,10 +23,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
#include <openbsc/msgb.h> #include <osmocore/msgb.h>
#include <openbsc/gsm_data.h> //#include <openbsc/gsm_data.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <openbsc/debug.h> //#include <openbsc/debug.h>
void *tall_msgb_ctx; void *tall_msgb_ctx;
@ -37,7 +37,7 @@ struct msgb *msgb_alloc(u_int16_t size, const char *name)
msg = _talloc_zero(tall_msgb_ctx, sizeof(*msg) + size, name); msg = _talloc_zero(tall_msgb_ctx, sizeof(*msg) + size, name);
if (!msg) { if (!msg) {
LOGP(DRSL, LOGL_FATAL, "unable to allocate msgb\n"); //LOGP(DRSL, LOGL_FATAL, "unable to allocate msgb\n");
return NULL; return NULL;
} }

6
openbsc/src/select.c → libosmocore/src/select.c
View File

@ -19,9 +19,9 @@
*/ */
#include <fcntl.h> #include <fcntl.h>
#include <openbsc/select.h> #include <osmocore/select.h>
#include <openbsc/linuxlist.h> #include <osmocore/linuxlist.h>
#include <openbsc/timer.h> #include <osmocore/timer.h>
static int maxfd = 0; static int maxfd = 0;
static LLIST_HEAD(bsc_fds); static LLIST_HEAD(bsc_fds);

7
openbsc/src/signal.c → libosmocore/src/signal.c
View File

@ -18,11 +18,12 @@
* *
*/ */
#include <openbsc/signal.h> #include <osmocore/signal.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <osmocore/linuxlist.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <errno.h>
void *tall_sigh_ctx; void *tall_sigh_ctx;
static LLIST_HEAD(signal_handler_list); static LLIST_HEAD(signal_handler_list);

10
openbsc/src/statistics.c → libosmocore/src/statistics.c
View File

@ -23,13 +23,9 @@
#include <sys/types.h> #include <sys/types.h>
#include <openbsc/gsm_data.h> #include <osmocore/linuxlist.h>
#include <openbsc/signal.h> #include <osmocore/talloc.h>
#include <openbsc/linuxlist.h> #include <osmocore/statistics.h>
#include <openbsc/talloc.h>
#include <openbsc/statistics.h>
#include <openbsc/db.h>
#include <openbsc/timer.h>
static LLIST_HEAD(counters); static LLIST_HEAD(counters);

2
openbsc/src/talloc.c → libosmocore/src/talloc.c
View File

@ -55,7 +55,7 @@
#define __USE_GNU #define __USE_GNU
#include <string.h> #include <string.h>
#undef __USE_GNU #undef __USE_GNU
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#define MIN(x,y) ((x) < (y) ? (x) : (y)) #define MIN(x,y) ((x) < (y) ? (x) : (y))
#endif /* not _TALLOC_SAMBA3 */ #endif /* not _TALLOC_SAMBA3 */

2
openbsc/src/timer.c → libosmocore/src/timer.c
View File

@ -20,7 +20,7 @@
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include <openbsc/timer.h> #include <osmocore/timer.h>
static LLIST_HEAD(timer_list); static LLIST_HEAD(timer_list);
static struct timeval s_nearest_time; static struct timeval s_nearest_time;

4
openbsc/src/tlv_parser.c → libosmocore/src/tlv_parser.c
View File

@ -1,6 +1,6 @@
#include <stdio.h> #include <stdio.h>
#include <openbsc/tlv.h> #include <osmocore/utils.h>
#include <openbsc/gsm_data.h> #include <osmocore/tlv.h>
struct tlv_definition tvlv_att_def; struct tlv_definition tvlv_att_def;

2
openbsc/Makefile.am
View File

@ -4,7 +4,7 @@ INCLUDES = $(all_includes) -I$(top_srcdir)/include
SUBDIRS = include src tests SUBDIRS = include src tests
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = openbsc.pc liblaf0rge1.pc libsccp.pc pkgconfig_DATA = openbsc.pc libsccp.pc
#dist-hook: #dist-hook:
# rm -rf `find $(distdir) -name .svn` # rm -rf `find $(distdir) -name .svn`

2
openbsc/include/openbsc/abis_nm.h
View File

@ -25,7 +25,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <openbsc/tlv.h> #include <osmocore/tlv.h>
/* PRIVATE */ /* PRIVATE */

2
openbsc/include/openbsc/abis_rsl.h
View File

@ -484,7 +484,7 @@ enum rsl_ipac_rtp_csd_format_ir {
RSL_IPAC_RTP_CSD_IR_64k = 3, RSL_IPAC_RTP_CSD_IR_64k = 3,
}; };
#include "msgb.h" #include <osmocore/msgb.h>
int rsl_bcch_info(struct gsm_bts_trx *trx, u_int8_t type, int rsl_bcch_info(struct gsm_bts_trx *trx, u_int8_t type,
const u_int8_t *data, int len); const u_int8_t *data, int len);

2
openbsc/include/openbsc/debug.h
View File

@ -2,7 +2,7 @@
#define _DEBUG_H #define _DEBUG_H
#include <stdio.h> #include <stdio.h>
#include "linuxlist.h" #include <osmocore/linuxlist.h>
#define DEBUG #define DEBUG

6
openbsc/include/openbsc/e1_input.h
View File

@ -4,10 +4,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <openbsc/linuxlist.h> #include <osmocore/linuxlist.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/msgb.h> #include <osmocore/msgb.h>
#include <openbsc/select.h> #include <osmocore/select.h>
#include <openbsc/subchan_demux.h> #include <openbsc/subchan_demux.h>
#define NUM_E1_TS 32 #define NUM_E1_TS 32

2
openbsc/include/openbsc/gsm_04_80.h
View File

@ -123,7 +123,7 @@
#define ASN1_IA5_STRING_TAG 0x16 #define ASN1_IA5_STRING_TAG 0x16
#define ASN1_UNICODE_STRING_TAG 0x1E #define ASN1_UNICODE_STRING_TAG 0x1E
#include <openbsc/msgb.h> #include <osmocore/msgb.h>
#define MAX_LEN_USSD_STRING 31 #define MAX_LEN_USSD_STRING 31

20
openbsc/include/openbsc/gsm_data.h
View File

@ -11,14 +11,6 @@ struct value_string {
const char *get_value_string(const struct value_string *vs, u_int32_t val); const char *get_value_string(const struct value_string *vs, u_int32_t val);
int get_string_value(const struct value_string *vs, const char *str); int get_string_value(const struct value_string *vs, const char *str);
enum gsm_band {
GSM_BAND_400,
GSM_BAND_850,
GSM_BAND_900,
GSM_BAND_1800,
GSM_BAND_1900,
};
enum gsm_phys_chan_config { enum gsm_phys_chan_config {
GSM_PCHAN_NONE, GSM_PCHAN_NONE,
GSM_PCHAN_CCCH, GSM_PCHAN_CCCH,
@ -56,15 +48,15 @@ enum gsm_chreq_reason_t {
GSM_CHREQ_REASON_OTHER, GSM_CHREQ_REASON_OTHER,
}; };
#include <openbsc/timer.h> #include <osmocore/timer.h>
#include <openbsc/gsm_04_08.h> #include <openbsc/gsm_04_08.h>
#include <openbsc/abis_rsl.h> #include <openbsc/abis_rsl.h>
#include <openbsc/mncc.h> #include <openbsc/mncc.h>
#include <openbsc/tlv.h> #include <osmocore/tlv.h>
#include <openbsc/bitvec.h> #include <osmocore/bitvec.h>
#include <openbsc/statistics.h> #include <osmocore/statistics.h>
#include <osmocore/gsm_utils.h>
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #include <osmocore/utils.h>
#define TRX_NR_TS 8 #define TRX_NR_TS 8
#define TS_MAX_LCHAN 8 #define TS_MAX_LCHAN 8

2
openbsc/include/openbsc/gsm_subscriber.h
View File

@ -3,7 +3,7 @@
#include <sys/types.h> #include <sys/types.h>
#include "gsm_data.h" #include "gsm_data.h"
#include "linuxlist.h" #include <osmocore/linuxlist.h>
#define GSM_IMEI_LENGTH 17 #define GSM_IMEI_LENGTH 17
#define GSM_IMSI_LENGTH 17 #define GSM_IMSI_LENGTH 17

2
openbsc/include/openbsc/ipaccess.h
View File

@ -2,7 +2,7 @@
#define _IPACCESS_H #define _IPACCESS_H
#include "e1_input.h" #include "e1_input.h"
#include "linuxlist.h" #include <osmocore/linuxlist.h>
#define IPA_TCP_PORT_OML 3002 #define IPA_TCP_PORT_OML 3002
#define IPA_TCP_PORT_RSL 3003 #define IPA_TCP_PORT_RSL 3003

2
openbsc/include/openbsc/mgcp.h
View File

@ -24,7 +24,7 @@
#ifndef OPENBSC_MGCP_H #ifndef OPENBSC_MGCP_H
#define OPENBSC_MGCP_H #define OPENBSC_MGCP_H
#include "msgb.h" #include <osmocore/msgb.h>
#define RTP_PORT_DEFAULT 4000 #define RTP_PORT_DEFAULT 4000
extern unsigned int rtp_base_port; extern unsigned int rtp_base_port;

2
openbsc/include/openbsc/mncc.h
View File

@ -25,7 +25,7 @@
#ifndef _MNCC_H #ifndef _MNCC_H
#define _MNCC_H #define _MNCC_H
#include <openbsc/linuxlist.h> #include <osmocore/linuxlist.h>
/* One end of a call */ /* One end of a call */
struct gsm_call { struct gsm_call {

4
openbsc/include/openbsc/paging.h
View File

@ -24,10 +24,10 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "linuxlist.h" #include <osmocore/linuxlist.h>
#include "gsm_data.h" #include "gsm_data.h"
#include "gsm_subscriber.h" #include "gsm_subscriber.h"
#include "timer.h" #include <osmocore/timer.h>
/* call once for every gsm_bts... */ /* call once for every gsm_bts... */
void paging_init(struct gsm_bts *bts); void paging_init(struct gsm_bts *bts);

4
openbsc/include/openbsc/rtp_proxy.h
View File

@ -25,8 +25,8 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <openbsc/linuxlist.h> #include <osmocore/linuxlist.h>
#include <openbsc/select.h> #include <osmocore/select.h>
enum rtp_rx_action { enum rtp_rx_action {
RTP_NONE, RTP_NONE,

12
openbsc/include/openbsc/signal.h
View File

@ -28,6 +28,7 @@
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/gsm_subscriber.h> #include <openbsc/gsm_subscriber.h>
#include <osmocore/signal.h>
/* /*
* Signalling subsystems * Signalling subsystems
@ -110,9 +111,6 @@ enum signal_global {
S_GLOBAL_SHUTDOWN, S_GLOBAL_SHUTDOWN,
}; };
typedef int signal_cbfn(unsigned int subsys, unsigned int signal,
void *handler_data, void *signal_data);
struct paging_signal_data { struct paging_signal_data {
struct gsm_subscriber *subscr; struct gsm_subscriber *subscr;
struct gsm_bts *bts; struct gsm_bts *bts;
@ -132,12 +130,4 @@ struct ipacc_ack_signal_data {
u_int8_t msg_type; u_int8_t msg_type;
}; };
/* Management */
int register_signal_handler(unsigned int subsys, signal_cbfn *cbfn, void *data);
void unregister_signal_handler(unsigned int subsys, signal_cbfn *cbfn, void *data);
/* Dispatch */
void dispatch_signal(unsigned int subsys, unsigned int signal, void *signal_data);
#endif #endif

2
openbsc/include/openbsc/subchan_demux.h
View File

@ -22,7 +22,7 @@
*/ */
#include <sys/types.h> #include <sys/types.h>
#include <openbsc/linuxlist.h> #include <osmocore/linuxlist.h>
#define NR_SUBCH 4 #define NR_SUBCH 4
#define TRAU_FRAME_SIZE 40 #define TRAU_FRAME_SIZE 40

2
openbsc/include/openbsc/telnet_interface.h
View File

@ -23,7 +23,7 @@
#include "gsm_data.h" #include "gsm_data.h"
#include "debug.h" #include "debug.h"
#include "select.h" #include <osmocore/select.h>
#include <vty/vty.h> #include <vty/vty.h>

2
openbsc/include/openbsc/transaction.h
View File

@ -3,7 +3,7 @@
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/gsm_subscriber.h> #include <openbsc/gsm_subscriber.h>
#include <openbsc/linuxlist.h> #include <osmocore/linuxlist.h>
#include <openbsc/gsm_04_11.h> #include <openbsc/gsm_04_11.h>
/* One transaction */ /* One transaction */

2
openbsc/include/openbsc/ussd.h
View File

@ -3,7 +3,7 @@
/* Handler function for mobile-originated USSD messages */ /* Handler function for mobile-originated USSD messages */
#include <openbsc/msgb.h> #include <osmocore/msgb.h>
int handle_rcv_ussd(struct msgb *msg); int handle_rcv_ussd(struct msgb *msg);

36
openbsc/src/Makefile.am
View File

@ -7,43 +7,43 @@ noinst_LIBRARIES = libbsc.a libmsc.a libvty.a
noinst_HEADERS = vty/cardshell.h noinst_HEADERS = vty/cardshell.h
bscdir = $(libdir) bscdir = $(libdir)
bsc_LIBRARIES = liblaf0rge1.a libsccp.a bsc_LIBRARIES = libsccp.a
liblaf0rge1_a_SOURCES = msgb.c timer.c talloc.c select.c signal.c debug.c
libbsc_a_SOURCES = abis_rsl.c abis_nm.c gsm_data.c gsm_04_08_utils.c \ libbsc_a_SOURCES = abis_rsl.c abis_nm.c gsm_data.c gsm_04_08_utils.c \
chan_alloc.c \ chan_alloc.c debug.c \
gsm_subscriber_base.c subchan_demux.c bsc_rll.c transaction.c \ gsm_subscriber_base.c subchan_demux.c bsc_rll.c transaction.c \
trau_frame.c trau_mux.c paging.c e1_config.c e1_input.c tlv_parser.c \ trau_frame.c trau_mux.c paging.c e1_config.c e1_input.c \
input/misdn.c input/ipaccess.c signal.c gsm_utils.c \ input/misdn.c input/ipaccess.c \
talloc_ctx.c system_information.c bitvec.c rest_octets.c \ talloc_ctx.c system_information.c rest_octets.c \
rtp_proxy.c statistics.c bts_siemens_bs11.c bts_ipaccess_nanobts.c \ rtp_proxy.c bts_siemens_bs11.c bts_ipaccess_nanobts.c \
bts_unknown.c bts_unknown.c
libmsc_a_SOURCES = gsm_subscriber.c db.c telnet_interface.c \ libmsc_a_SOURCES = gsm_subscriber.c db.c telnet_interface.c \
mncc.c gsm_04_08.c gsm_04_11.c transaction.c \ mncc.c gsm_04_08.c gsm_04_11.c transaction.c \
token_auth.c rrlp.c gsm_04_80.c ussd.c silent_call.c \ token_auth.c rrlp.c gsm_04_80.c ussd.c silent_call.c \
handover_logic.c handover_decision.c meas_rep.c comp128.c handover_logic.c handover_decision.c meas_rep.c
libvty_a_SOURCES = vty/buffer.c vty/command.c vty/vector.c vty/vty.c libvty_a_SOURCES = vty/buffer.c vty/command.c vty/vector.c vty/vty.c
libsccp_a_SOURCES = sccp/sccp.c libsccp_a_SOURCES = sccp/sccp.c
bsc_hack_SOURCES = bsc_hack.c bsc_init.c vty_interface.c vty_interface_layer3.c bsc_hack_SOURCES = bsc_hack.c bsc_init.c vty_interface.c vty_interface_layer3.c
bsc_hack_LDADD = libmsc.a libbsc.a libmsc.a libvty.a liblaf0rge1.a -ldl -ldbi $(LIBCRYPT) bsc_hack_LDADD = libmsc.a libbsc.a libmsc.a libvty.a -losmocore -ldl -ldbi $(LIBCRYPT)
bs11_config_SOURCES = bs11_config.c abis_nm.c gsm_data.c msgb.c debug.c \ bs11_config_SOURCES = bs11_config.c abis_nm.c gsm_data.c debug.c \
select.c timer.c rs232.c tlv_parser.c signal.c talloc.c \ rs232.c bts_siemens_bs11.c
bts_siemens_bs11.c bs11_config_LDADD = -losmocore
ipaccess_find_SOURCES = ipaccess/ipaccess-find.c select.c timer.c ipaccess_find_SOURCES = ipaccess/ipaccess-find.c
ipaccess_find_LDADD = -losmocore
ipaccess_config_SOURCES = ipaccess/ipaccess-config.c ipaccess/ipaccess-firmware.c ipaccess_config_SOURCES = ipaccess/ipaccess-config.c ipaccess/ipaccess-firmware.c
ipaccess_config_LDADD = libbsc.a libmsc.a libbsc.a libvty.a liblaf0rge1.a -ldl -ldbi $(LIBCRYPT) ipaccess_config_LDADD = libbsc.a libmsc.a libbsc.a libvty.a -losmocore -ldl -ldbi $(LIBCRYPT)
isdnsync_SOURCES = isdnsync.c isdnsync_SOURCES = isdnsync.c
bsc_mgcp_SOURCES = mgcp/mgcp_main.c mgcp/mgcp_protocol.c msgb.c talloc.c debug.c select.c timer.c telnet_interface.c bsc_mgcp_SOURCES = mgcp/mgcp_main.c mgcp/mgcp_protocol.c debug.c telnet_interface.c
bsc_mgcp_LDADD = libvty.a liblaf0rge1.a bsc_mgcp_LDADD = libvty.a -losmocore
ipaccess_proxy_SOURCES = ipaccess/ipaccess-proxy.c msgb.c select.c talloc.c debug.c timer.c ipaccess_proxy_SOURCES = ipaccess/ipaccess-proxy.c debug.c
ipaccess_proxy_LDADD = -losmocore

6
openbsc/src/abis_nm.c
View File

@ -38,12 +38,12 @@
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/msgb.h> #include <osmocore/msgb.h>
#include <openbsc/tlv.h> #include <osmocore/tlv.h>
#include <osmocore/talloc.h>
#include <openbsc/abis_nm.h> #include <openbsc/abis_nm.h>
#include <openbsc/misdn.h> #include <openbsc/misdn.h>
#include <openbsc/signal.h> #include <openbsc/signal.h>
#include <openbsc/talloc.h>
#define OM_ALLOC_SIZE 1024 #define OM_ALLOC_SIZE 1024
#define OM_HEADROOM_SIZE 128 #define OM_HEADROOM_SIZE 128

4
openbsc/src/abis_rsl.c
View File

@ -30,12 +30,12 @@
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/gsm_04_08.h> #include <openbsc/gsm_04_08.h>
#include <openbsc/gsm_utils.h> #include <osmocore/gsm_utils.h>
#include <openbsc/abis_rsl.h> #include <openbsc/abis_rsl.h>
#include <openbsc/chan_alloc.h> #include <openbsc/chan_alloc.h>
#include <openbsc/bsc_rll.h> #include <openbsc/bsc_rll.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/tlv.h> #include <osmocore/tlv.h>
#include <openbsc/paging.h> #include <openbsc/paging.h>
#include <openbsc/signal.h> #include <openbsc/signal.h>
#include <openbsc/meas_rep.h> #include <openbsc/meas_rep.h>

6
openbsc/src/bs11_config.c
View File

@ -36,10 +36,10 @@
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/abis_nm.h> #include <openbsc/abis_nm.h>
#include <openbsc/msgb.h> #include <osmocore/msgb.h>
#include <openbsc/tlv.h> #include <osmocore/tlv.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/select.h> #include <osmocore/select.h>
#include <openbsc/rs232.h> #include <openbsc/rs232.h>
/* state of our bs11_config application */ /* state of our bs11_config application */

4
openbsc/src/bsc_hack.c
View File

@ -31,10 +31,10 @@
#include <getopt.h> #include <getopt.h>
#include <openbsc/db.h> #include <openbsc/db.h>
#include <openbsc/select.h> #include <osmocore/select.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/e1_input.h> #include <openbsc/e1_input.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <openbsc/signal.h> #include <openbsc/signal.h>
/* MCC and MNC for the Location Area Identifier */ /* MCC and MNC for the Location Area Identifier */

4
openbsc/src/bsc_init.c
View File

@ -21,7 +21,7 @@
*/ */
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/gsm_utils.h> #include <osmocore/gsm_utils.h>
#include <openbsc/gsm_04_08.h> #include <openbsc/gsm_04_08.h>
#include <openbsc/abis_rsl.h> #include <openbsc/abis_rsl.h>
#include <openbsc/abis_nm.h> #include <openbsc/abis_nm.h>
@ -31,7 +31,7 @@
#include <openbsc/system_information.h> #include <openbsc/system_information.h>
#include <openbsc/paging.h> #include <openbsc/paging.h>
#include <openbsc/signal.h> #include <openbsc/signal.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
/* global pointer to the gsm network data structure */ /* global pointer to the gsm network data structure */
extern struct gsm_network *bsc_gsmnet; extern struct gsm_network *bsc_gsmnet;

6
openbsc/src/bsc_rll.c
View File

@ -24,9 +24,9 @@
#include <errno.h> #include <errno.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <openbsc/timer.h> #include <osmocore/timer.h>
#include <openbsc/linuxlist.h> #include <osmocore/linuxlist.h>
#include <openbsc/bsc_rll.h> #include <openbsc/bsc_rll.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/chan_alloc.h> #include <openbsc/chan_alloc.h>

2
openbsc/src/bts_ipaccess_nanobts.c
View File

@ -23,7 +23,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/tlv.h> #include <osmocore/tlv.h>
#include <openbsc/abis_nm.h> #include <openbsc/abis_nm.h>
static struct gsm_bts_model model_nanobts = { static struct gsm_bts_model model_nanobts = {

2
openbsc/src/bts_siemens_bs11.c
View File

@ -23,7 +23,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/tlv.h> #include <osmocore/tlv.h>
#include <openbsc/abis_nm.h> #include <openbsc/abis_nm.h>
static struct gsm_bts_model model_bs11 = { static struct gsm_bts_model model_bs11 = {

2
openbsc/src/bts_unknown.c
View File

@ -23,7 +23,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/tlv.h> #include <osmocore/tlv.h>
#include <openbsc/abis_nm.h> #include <openbsc/abis_nm.h>
static struct gsm_bts_model model_unknown = { static struct gsm_bts_model model_unknown = {

4
openbsc/src/db.c
View File

@ -23,9 +23,9 @@
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/gsm_04_11.h> #include <openbsc/gsm_04_11.h>
#include <openbsc/db.h> #include <openbsc/db.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/statistics.h> #include <osmocore/statistics.h>
#include <libgen.h> #include <libgen.h>
#include <stdio.h> #include <stdio.h>

2
openbsc/src/debug.c
View File

@ -28,7 +28,7 @@
#include <errno.h> #include <errno.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/gsm_subscriber.h> #include <openbsc/gsm_subscriber.h>

2
openbsc/src/e1_config.c
View File

@ -9,7 +9,7 @@
#include <openbsc/trau_mux.h> #include <openbsc/trau_mux.h>
#include <openbsc/misdn.h> #include <openbsc/misdn.h>
#include <openbsc/ipaccess.h> #include <openbsc/ipaccess.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#define SAPI_L2ML 0 #define SAPI_L2ML 0

8
openbsc/src/e1_input.c
View File

@ -40,18 +40,18 @@
#define PF_ISDN AF_ISDN #define PF_ISDN AF_ISDN
#endif #endif
#include <openbsc/select.h> #include <osmocore/select.h>
#include <openbsc/msgb.h> #include <osmocore/msgb.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/e1_input.h> #include <openbsc/e1_input.h>
#include <openbsc/abis_nm.h> #include <openbsc/abis_nm.h>
#include <openbsc/abis_rsl.h> #include <openbsc/abis_rsl.h>
#include <openbsc/linuxlist.h> #include <osmocore/linuxlist.h>
#include <openbsc/subchan_demux.h> #include <openbsc/subchan_demux.h>
#include <openbsc/trau_frame.h> #include <openbsc/trau_frame.h>
#include <openbsc/trau_mux.h> #include <openbsc/trau_mux.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <openbsc/signal.h> #include <openbsc/signal.h>
#include <openbsc/misdn.h> #include <openbsc/misdn.h>

10
openbsc/src/gsm_04_08.c
View File

@ -31,12 +31,12 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <openbsc/db.h> #include <openbsc/db.h>
#include <openbsc/msgb.h> #include <osmocore/msgb.h>
#include <openbsc/bitvec.h> #include <osmocore/bitvec.h>
#include <openbsc/tlv.h> #include <osmocore/tlv.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/gsm_utils.h> #include <osmocore/gsm_utils.h>
#include <openbsc/gsm_subscriber.h> #include <openbsc/gsm_subscriber.h>
#include <openbsc/gsm_04_11.h> #include <openbsc/gsm_04_11.h>
#include <openbsc/gsm_04_08.h> #include <openbsc/gsm_04_08.h>
@ -47,7 +47,7 @@
#include <openbsc/trau_frame.h> #include <openbsc/trau_frame.h>
#include <openbsc/trau_mux.h> #include <openbsc/trau_mux.h>
#include <openbsc/rtp_proxy.h> #include <openbsc/rtp_proxy.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <openbsc/transaction.h> #include <openbsc/transaction.h>
#include <openbsc/ussd.h> #include <openbsc/ussd.h>
#include <openbsc/silent_call.h> #include <openbsc/silent_call.h>

2
openbsc/src/gsm_04_08_utils.c
View File

@ -28,7 +28,7 @@
#include <errno.h> #include <errno.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <openbsc/msgb.h> #include <osmocore/msgb.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/gsm_04_08.h> #include <openbsc/gsm_04_08.h>
#include <openbsc/transaction.h> #include <openbsc/transaction.h>

8
openbsc/src/gsm_04_11.c
View File

@ -31,18 +31,18 @@
#include <time.h> #include <time.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <openbsc/msgb.h> #include <osmocore/msgb.h>
#include <openbsc/tlv.h> #include <osmocore/tlv.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/gsm_subscriber.h> #include <openbsc/gsm_subscriber.h>
#include <openbsc/gsm_04_11.h> #include <openbsc/gsm_04_11.h>
#include <openbsc/gsm_04_08.h> #include <openbsc/gsm_04_08.h>
#include <openbsc/gsm_utils.h> #include <osmocore/gsm_utils.h>
#include <openbsc/abis_rsl.h> #include <openbsc/abis_rsl.h>
#include <openbsc/signal.h> #include <openbsc/signal.h>
#include <openbsc/db.h> #include <openbsc/db.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <openbsc/transaction.h> #include <openbsc/transaction.h>
#include <openbsc/paging.h> #include <openbsc/paging.h>
#include <openbsc/bsc_rll.h> #include <openbsc/bsc_rll.h>

6
openbsc/src/gsm_04_80.c
View File

@ -29,11 +29,11 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <openbsc/msgb.h> #include <osmocore/msgb.h>
#include <openbsc/tlv.h> #include <osmocore/tlv.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/gsm_utils.h> #include <osmocore/gsm_utils.h>
#include <openbsc/gsm_04_08.h> #include <openbsc/gsm_04_08.h>
#include <openbsc/gsm_04_80.h> #include <openbsc/gsm_04_80.h>

24
openbsc/src/gsm_data.c
View File

@ -26,9 +26,9 @@
#include <ctype.h> #include <ctype.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <openbsc/abis_nm.h> #include <openbsc/abis_nm.h>
#include <openbsc/statistics.h> #include <osmocore/statistics.h>
void *tall_bsc_ctx; void *tall_bsc_ctx;
@ -438,8 +438,14 @@ struct gsm_bts *gsm_bts_by_lac(struct gsm_network *net, unsigned int lac,
char *gsm_band_name(enum gsm_band band) char *gsm_band_name(enum gsm_band band)
{ {
switch (band) { switch (band) {
case GSM_BAND_400: case GSM_BAND_450:
return "GSM400"; return "GSM450";
case GSM_BAND_480:
return "GSM450";
case GSM_BAND_750:
return "GSM750";
case GSM_BAND_810:
return "GSM810";
case GSM_BAND_850: case GSM_BAND_850:
return "GSM850"; return "GSM850";
case GSM_BAND_900: case GSM_BAND_900:
@ -461,8 +467,14 @@ enum gsm_band gsm_band_parse(const char* mhz)
return -EINVAL; return -EINVAL;
switch (atoi(mhz)) { switch (atoi(mhz)) {
case 400: case 450:
return GSM_BAND_400; return GSM_BAND_450;
case 480:
return GSM_BAND_480;
case 750:
return GSM_BAND_750;
case 810:
return GSM_BAND_810;
case 850: case 850:
return GSM_BAND_850; return GSM_BAND_850;
case 900: case 900:

3
openbsc/src/gsm_subscriber_base.c
View File

@ -27,11 +27,10 @@
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <openbsc/gsm_subscriber.h> #include <openbsc/gsm_subscriber.h>
#include <openbsc/paging.h> #include <openbsc/paging.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/paging.h>
LLIST_HEAD(active_subscribers); LLIST_HEAD(active_subscribers);
void *tall_subscr_ctx; void *tall_subscr_ctx;

6
openbsc/src/handover_decision.c
View File

@ -25,14 +25,14 @@
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <openbsc/msgb.h> #include <osmocore/msgb.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/meas_rep.h> #include <openbsc/meas_rep.h>
#include <openbsc/signal.h> #include <openbsc/signal.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <openbsc/handover.h> #include <openbsc/handover.h>
#include <openbsc/gsm_utils.h> #include <osmocore/gsm_utils.h>
/* issue handover to a cell identified by ARFCN and BSIC */ /* issue handover to a cell identified by ARFCN and BSIC */
static int handover_to_arfcn_bsic(struct gsm_lchan *lchan, static int handover_to_arfcn_bsic(struct gsm_lchan *lchan,

6
openbsc/src/handover_logic.c
View File

@ -29,16 +29,16 @@
#include <time.h> #include <time.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <openbsc/msgb.h> #include <osmocore/msgb.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/gsm_utils.h> #include <osmocore/gsm_utils.h>
#include <openbsc/gsm_subscriber.h> #include <openbsc/gsm_subscriber.h>
#include <openbsc/gsm_04_08.h> #include <openbsc/gsm_04_08.h>
#include <openbsc/abis_rsl.h> #include <openbsc/abis_rsl.h>
#include <openbsc/chan_alloc.h> #include <openbsc/chan_alloc.h>
#include <openbsc/signal.h> #include <openbsc/signal.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <openbsc/transaction.h> #include <openbsc/transaction.h>
#include <openbsc/rtp_proxy.h> #include <openbsc/rtp_proxy.h>

8
openbsc/src/input/ipaccess.c
View File

@ -32,9 +32,9 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <openbsc/select.h> #include <osmocore/select.h>
#include <openbsc/tlv.h> #include <osmocore/tlv.h>
#include <openbsc/msgb.h> #include <osmocore/msgb.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/abis_nm.h> #include <openbsc/abis_nm.h>
@ -42,7 +42,7 @@
#include <openbsc/subchan_demux.h> #include <openbsc/subchan_demux.h>
#include <openbsc/e1_input.h> #include <openbsc/e1_input.h>
#include <openbsc/ipaccess.h> #include <openbsc/ipaccess.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
/* data structure for one E1 interface with A-bis */ /* data structure for one E1 interface with A-bis */
struct ia_e1_handle { struct ia_e1_handle {

6
openbsc/src/input/misdn.c
View File

@ -41,15 +41,15 @@
#define PF_ISDN AF_ISDN #define PF_ISDN AF_ISDN
#endif #endif
#include <openbsc/select.h> #include <osmocore/select.h>
#include <openbsc/msgb.h> #include <osmocore/msgb.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/abis_nm.h> #include <openbsc/abis_nm.h>
#include <openbsc/abis_rsl.h> #include <openbsc/abis_rsl.h>
#include <openbsc/subchan_demux.h> #include <openbsc/subchan_demux.h>
#include <openbsc/e1_input.h> #include <openbsc/e1_input.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#define TS1_ALLOC_SIZE 300 #define TS1_ALLOC_SIZE 300

7
openbsc/src/ipaccess/ipaccess-config.c
View File

@ -26,6 +26,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <getopt.h> #include <getopt.h>
#include <errno.h>
#include <sys/fcntl.h> #include <sys/fcntl.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
@ -35,15 +36,15 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <openbsc/select.h> #include <osmocore/select.h>
#include <openbsc/timer.h> #include <osmocore/timer.h>
#include <openbsc/ipaccess.h> #include <openbsc/ipaccess.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/e1_input.h> #include <openbsc/e1_input.h>
#include <openbsc/abis_nm.h> #include <openbsc/abis_nm.h>
#include <openbsc/signal.h> #include <openbsc/signal.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
static struct gsm_network *gsmnet; static struct gsm_network *gsmnet;

4
openbsc/src/ipaccess/ipaccess-find.c
View File

@ -8,8 +8,8 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <openbsc/select.h> #include <osmocore/select.h>
#include <openbsc/timer.h> #include <osmocore/timer.h>
#include <openbsc/ipaccess.h> #include <openbsc/ipaccess.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>

2
openbsc/src/ipaccess/ipaccess-firmware.c
View File

@ -21,7 +21,7 @@
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/ipaccess.h> #include <openbsc/ipaccess.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

8
openbsc/src/ipaccess/ipaccess-proxy.c
View File

@ -35,12 +35,12 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/select.h> #include <osmocore/select.h>
#include <openbsc/tlv.h> #include <osmocore/tlv.h>
#include <openbsc/msgb.h> #include <osmocore/msgb.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/ipaccess.h> #include <openbsc/ipaccess.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
static struct debug_target *stderr_target; static struct debug_target *stderr_target;

6
openbsc/src/mgcp/mgcp_main.c
View File

@ -34,10 +34,10 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/msgb.h> #include <osmocore/msgb.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/select.h> #include <osmocore/select.h>
#include <openbsc/mgcp.h> #include <openbsc/mgcp.h>
#include <openbsc/telnet_interface.h> #include <openbsc/telnet_interface.h>

6
openbsc/src/mgcp/mgcp_protocol.c
View File

@ -34,10 +34,10 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/msgb.h> #include <osmocore/msgb.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/select.h> #include <osmocore/select.h>
#include <openbsc/mgcp.h> #include <openbsc/mgcp.h>
#include <openbsc/telnet_interface.h> #include <openbsc/telnet_interface.h>

2
openbsc/src/mncc.c
View File

@ -28,7 +28,7 @@
#include <openbsc/gsm_04_08.h> #include <openbsc/gsm_04_08.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/mncc.h> #include <openbsc/mncc.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/transaction.h> #include <openbsc/transaction.h>
#include <openbsc/rtp_proxy.h> #include <openbsc/rtp_proxy.h>

2
openbsc/src/paging.c
View File

@ -40,7 +40,7 @@
#include <assert.h> #include <assert.h>
#include <openbsc/paging.h> #include <openbsc/paging.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/signal.h> #include <openbsc/signal.h>
#include <openbsc/abis_rsl.h> #include <openbsc/abis_rsl.h>

2
openbsc/src/rest_octets.c
View File

@ -27,7 +27,7 @@
#include <errno.h> #include <errno.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/bitvec.h> #include <osmocore/bitvec.h>
#include <openbsc/rest_octets.h> #include <openbsc/rest_octets.h>
/* generate SI1 rest octets */ /* generate SI1 rest octets */

4
openbsc/src/rs232.c
View File

@ -28,8 +28,8 @@
#include <termios.h> #include <termios.h>
#include <fcntl.h> #include <fcntl.h>
#include <openbsc/select.h> #include <osmocore/select.h>
#include <openbsc/msgb.h> #include <osmocore/msgb.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/rs232.h> #include <openbsc/rs232.h>

6
openbsc/src/rtp_proxy.c
View File

@ -29,10 +29,10 @@
#include <time.h> /* clock() */ #include <time.h> /* clock() */
#include <sys/utsname.h> /* uname() */ #include <sys/utsname.h> /* uname() */
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/msgb.h> #include <osmocore/msgb.h>
#include <openbsc/select.h> #include <osmocore/select.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/rtp_proxy.h> #include <openbsc/rtp_proxy.h>

4
openbsc/src/sccp/sccp.c
View File

@ -24,9 +24,9 @@
#include <string.h> #include <string.h>
#include <openbsc/msgb.h> #include <osmocore/msgb.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <sccp/sccp.h> #include <sccp/sccp.h>

2
openbsc/src/silent_call.c
View File

@ -25,7 +25,7 @@
#include <unistd.h> #include <unistd.h>
#include <errno.h> #include <errno.h>
#include <openbsc/msgb.h> #include <osmocore/msgb.h>
#include <openbsc/signal.h> #include <openbsc/signal.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/paging.h> #include <openbsc/paging.h>

2
openbsc/src/subchan_demux.c
View File

@ -28,7 +28,7 @@
#include <openbsc/subchan_demux.h> #include <openbsc/subchan_demux.h>
#include <openbsc/trau_frame.h> #include <openbsc/trau_frame.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
void *tall_tqe_ctx; void *tall_tqe_ctx;

2
openbsc/src/system_information.c
View File

@ -31,7 +31,7 @@
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/abis_rsl.h> #include <openbsc/abis_rsl.h>
#include <openbsc/rest_octets.h> #include <openbsc/rest_octets.h>
#include <openbsc/bitvec.h> #include <osmocore/bitvec.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#define GSM48_CELL_CHAN_DESC_SIZE 16 #define GSM48_CELL_CHAN_DESC_SIZE 16

2
openbsc/src/talloc_ctx.c
View File

@ -1,4 +1,4 @@
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
extern void *tall_msgb_ctx; extern void *tall_msgb_ctx;

4
openbsc/src/telnet_interface.c
View File

@ -30,11 +30,11 @@
#include <openbsc/chan_alloc.h> #include <openbsc/chan_alloc.h>
#include <openbsc/gsm_04_08.h> #include <openbsc/gsm_04_08.h>
#include <openbsc/gsm_04_11.h> #include <openbsc/gsm_04_11.h>
#include <openbsc/msgb.h> #include <osmocore/msgb.h>
#include <openbsc/abis_rsl.h> #include <openbsc/abis_rsl.h>
#include <openbsc/paging.h> #include <openbsc/paging.h>
#include <openbsc/signal.h> #include <openbsc/signal.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <vty/buffer.h> #include <vty/buffer.h>

2
openbsc/src/token_auth.c
View File

@ -21,7 +21,7 @@
*/ */
#include <stdio.h> #include <stdio.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <openbsc/signal.h> #include <openbsc/signal.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/gsm_04_11.h> #include <openbsc/gsm_04_11.h>

2
openbsc/src/transaction.c
View File

@ -23,7 +23,7 @@
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/mncc.h> #include <openbsc/mncc.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <openbsc/gsm_subscriber.h> #include <openbsc/gsm_subscriber.h>
#include <openbsc/gsm_04_08.h> #include <openbsc/gsm_04_08.h>
#include <openbsc/mncc.h> #include <openbsc/mncc.h>

2
openbsc/src/trau_mux.c
View File

@ -30,7 +30,7 @@
#include <openbsc/subchan_demux.h> #include <openbsc/subchan_demux.h>
#include <openbsc/e1_input.h> #include <openbsc/e1_input.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
u_int8_t gsm_fr_map[] = { u_int8_t gsm_fr_map[] = {
6, 6, 5, 5, 4, 4, 3, 3, 6, 6, 5, 5, 4, 4, 3, 3,

2
openbsc/src/vty/buffer.c
View File

@ -28,7 +28,7 @@
#include <stddef.h> #include <stddef.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <vty/buffer.h> #include <vty/buffer.h>
#include <vty/vty.h> #include <vty/vty.h>

2
openbsc/src/vty/command.c
View File

@ -47,7 +47,7 @@ Boston, MA 02111-1307, USA. */
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/gsm_subscriber.h> #include <openbsc/gsm_subscriber.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
void *tall_vty_cmd_ctx; void *tall_vty_cmd_ctx;

2
openbsc/src/vty/vector.c
View File

@ -24,7 +24,7 @@
#include <vty/vector.h> #include <vty/vector.h>
#include <vty/vty.h> #include <vty/vty.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <memory.h> #include <memory.h>
void *tall_vty_vec_ctx; void *tall_vty_vec_ctx;

2
openbsc/src/vty/vty.c
View File

@ -17,7 +17,7 @@
#include <vty/vty.h> #include <vty/vty.h>
#include <vty/command.h> #include <vty/command.h>
#include <vty/buffer.h> #include <vty/buffer.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
/* our callback, located in telnet_interface.c */ /* our callback, located in telnet_interface.c */
void vty_event(enum event event, int sock, struct vty *vty); void vty_event(enum event event, int sock, struct vty *vty);

6
openbsc/src/vty_interface.c
View File

@ -28,15 +28,15 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <openbsc/linuxlist.h> #include <osmocore/linuxlist.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/e1_input.h> #include <openbsc/e1_input.h>
#include <openbsc/abis_nm.h> #include <openbsc/abis_nm.h>
#include <openbsc/gsm_utils.h> #include <osmocore/gsm_utils.h>
#include <openbsc/chan_alloc.h> #include <openbsc/chan_alloc.h>
#include <openbsc/meas_rep.h> #include <openbsc/meas_rep.h>
#include <openbsc/db.h> #include <openbsc/db.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <openbsc/telnet_interface.h> #include <openbsc/telnet_interface.h>
static struct gsm_network *gsmnet; static struct gsm_network *gsmnet;

6
openbsc/src/vty_interface_layer3.c
View File

@ -29,16 +29,16 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <openbsc/linuxlist.h> #include <osmocore/linuxlist.h>
#include <openbsc/gsm_data.h> #include <openbsc/gsm_data.h>
#include <openbsc/gsm_subscriber.h> #include <openbsc/gsm_subscriber.h>
#include <openbsc/silent_call.h> #include <openbsc/silent_call.h>
#include <openbsc/gsm_04_11.h> #include <openbsc/gsm_04_11.h>
#include <openbsc/e1_input.h> #include <openbsc/e1_input.h>
#include <openbsc/abis_nm.h> #include <openbsc/abis_nm.h>
#include <openbsc/gsm_utils.h> #include <osmocore/gsm_utils.h>
#include <openbsc/db.h> #include <openbsc/db.h>
#include <openbsc/talloc.h> #include <osmocore/talloc.h>
#include <openbsc/signal.h> #include <openbsc/signal.h>
#include <openbsc/debug.h> #include <openbsc/debug.h>