src: use new library libosmogsm and new path to headers in libosmocore
libosmogsm is a new library that is distributed in the libosmocore. Now, openbsc depends on it. This patch gets openbsc with this change. This patch also rewrites all include path to the new osmocom/[gsm|core] Signed-off-by: Pablo Neira Ayuso <pablo@gnumonks.org>
This commit is contained in:
parent
f304678c76
commit
dd5fff417b
|
@ -43,8 +43,9 @@ AC_ARG_ENABLE([osmo-bsc], [AS_HELP_STRING([--enable-osmo-bsc], [Build the Osmo B
|
||||||
])
|
])
|
||||||
AM_CONDITIONAL(BUILD_BSC, test "x$osmo_ac_build_bsc" = "xyes")
|
AM_CONDITIONAL(BUILD_BSC, test "x$osmo_ac_build_bsc" = "xyes")
|
||||||
|
|
||||||
PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.1.31)
|
PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 0.2.0)
|
||||||
PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.1.31)
|
PKG_CHECK_MODULES(LIBOSMOVTY, libosmovty >= 0.2.0)
|
||||||
|
PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.2.0)
|
||||||
|
|
||||||
dnl checks for header files
|
dnl checks for header files
|
||||||
AC_HEADER_STDC
|
AC_HEADER_STDC
|
||||||
|
|
|
@ -23,8 +23,8 @@
|
||||||
#define _NM_H
|
#define _NM_H
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <osmocore/tlv.h>
|
#include <osmocom/gsm/tlv.h>
|
||||||
#include <osmocore/protocol/gsm_12_21.h>
|
#include <osmocom/gsm/protocol/gsm_12_21.h>
|
||||||
|
|
||||||
struct cell_global_id {
|
struct cell_global_id {
|
||||||
u_int16_t mcc;
|
u_int16_t mcc;
|
||||||
|
|
|
@ -22,9 +22,9 @@
|
||||||
#ifndef _RSL_H
|
#ifndef _RSL_H
|
||||||
#define _RSL_H
|
#define _RSL_H
|
||||||
|
|
||||||
#include <osmocore/protocol/gsm_08_58.h>
|
#include <osmocom/gsm/protocol/gsm_08_58.h>
|
||||||
|
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
|
|
||||||
struct gsm_bts;
|
struct gsm_bts;
|
||||||
struct gsm_lchan;
|
struct gsm_lchan;
|
||||||
|
|
|
@ -22,8 +22,8 @@
|
||||||
#ifndef BSC_MSC_H
|
#ifndef BSC_MSC_H
|
||||||
#define BSC_MSC_H
|
#define BSC_MSC_H
|
||||||
|
|
||||||
#include <osmocore/write_queue.h>
|
#include <osmocom/core/write_queue.h>
|
||||||
#include <osmocore/timer.h>
|
#include <osmocom/core/timer.h>
|
||||||
|
|
||||||
struct bsc_msc_connection {
|
struct bsc_msc_connection {
|
||||||
struct write_queue write_queue;
|
struct write_queue write_queue;
|
||||||
|
|
|
@ -25,14 +25,14 @@
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
#include <osmocore/select.h>
|
#include <osmocom/core/select.h>
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
#include <osmocore/msgfile.h>
|
#include <osmocom/core/msgfile.h>
|
||||||
#include <osmocore/timer.h>
|
#include <osmocom/core/timer.h>
|
||||||
#include <osmocore/write_queue.h>
|
#include <osmocom/core/write_queue.h>
|
||||||
#include <osmocore/rate_ctr.h>
|
#include <osmocom/core/rate_ctr.h>
|
||||||
#include <osmocore/statistics.h>
|
#include <osmocom/core/statistics.h>
|
||||||
#include <osmocore/protocol/gsm_04_08.h>
|
#include <osmocom/gsm/protocol/gsm_04_08.h>
|
||||||
|
|
||||||
#include <regex.h>
|
#include <regex.h>
|
||||||
|
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
#define _DEBUG_H
|
#define _DEBUG_H
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <osmocore/linuxlist.h>
|
#include <osmocom/core/linuxlist.h>
|
||||||
|
|
||||||
#define DEBUG
|
#define DEBUG
|
||||||
#include <osmocore/logging.h>
|
#include <osmocom/core/logging.h>
|
||||||
|
|
||||||
/* Debug Areas of the code */
|
/* Debug Areas of the code */
|
||||||
enum {
|
enum {
|
||||||
|
|
|
@ -4,10 +4,10 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
|
|
||||||
#include <osmocore/linuxlist.h>
|
#include <osmocom/core/linuxlist.h>
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
#include <osmocore/select.h>
|
#include <osmocom/core/select.h>
|
||||||
#include <openbsc/subchan_demux.h>
|
#include <openbsc/subchan_demux.h>
|
||||||
|
|
||||||
#define NUM_E1_TS 32
|
#define NUM_E1_TS 32
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
|
|
||||||
#include <openbsc/gprs_ns.h>
|
#include <openbsc/gprs_ns.h>
|
||||||
#include <osmocom/vty/command.h>
|
#include <osmocom/vty/command.h>
|
||||||
|
|
|
@ -182,7 +182,7 @@ struct bssgp_bvc_ctx *btsctx_by_raid_cid(const struct gprs_ra_id *raid, uint16_t
|
||||||
/* Find a BTS context based on BVCI+NSEI tuple */
|
/* Find a BTS context based on BVCI+NSEI tuple */
|
||||||
struct bssgp_bvc_ctx *btsctx_by_bvci_nsei(uint16_t bvci, uint16_t nsei);
|
struct bssgp_bvc_ctx *btsctx_by_bvci_nsei(uint16_t bvci, uint16_t nsei);
|
||||||
|
|
||||||
#include <osmocore/tlv.h>
|
#include <osmocom/gsm/tlv.h>
|
||||||
|
|
||||||
/* BSSGP-UL-UNITDATA.ind */
|
/* BSSGP-UL-UNITDATA.ind */
|
||||||
int gprs_bssgp_rcvmsg(struct msgb *msg);
|
int gprs_bssgp_rcvmsg(struct msgb *msg);
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef _GPRS_GMM_H
|
#ifndef _GPRS_GMM_H
|
||||||
#define _GPRS_GMM_H
|
#define _GPRS_GMM_H
|
||||||
|
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
#include <openbsc/gprs_sgsn.h>
|
#include <openbsc/gprs_sgsn.h>
|
||||||
|
|
||||||
int gsm48_tx_gsm_deact_pdp_req(struct sgsn_pdp_ctx *pdp, uint8_t sm_cause);
|
int gsm48_tx_gsm_deact_pdp_req(struct sgsn_pdp_ctx *pdp, uint8_t sm_cause);
|
||||||
|
|
|
@ -77,10 +77,10 @@ enum ns_cause {
|
||||||
|
|
||||||
/* Our Implementation */
|
/* Our Implementation */
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include <osmocore/linuxlist.h>
|
#include <osmocom/core/linuxlist.h>
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
#include <osmocore/timer.h>
|
#include <osmocom/core/timer.h>
|
||||||
#include <osmocore/select.h>
|
#include <osmocom/core/select.h>
|
||||||
|
|
||||||
#define NS_TIMERS_COUNT 7
|
#define NS_TIMERS_COUNT 7
|
||||||
#define NS_TIMERS "(tns-block|tns-block-retries|tns-reset|tns-reset-retries|tns-test|tns-alive|tns-alive-retries)"
|
#define NS_TIMERS "(tns-block|tns-block-retries|tns-reset|tns-reset-retries|tns-test|tns-alive|tns-alive-retries)"
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
|
|
||||||
#include <osmocore/gsm48.h>
|
#include <osmocom/gsm/gsm48.h>
|
||||||
|
|
||||||
#include <osmocom/crypt/gprs_cipher.h>
|
#include <osmocom/crypt/gprs_cipher.h>
|
||||||
|
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
|
|
||||||
#include <openbsc/meas_rep.h>
|
#include <openbsc/meas_rep.h>
|
||||||
|
|
||||||
#include <osmocore/protocol/gsm_04_08.h>
|
#include <osmocom/gsm/protocol/gsm_04_08.h>
|
||||||
#include <osmocore/gsm48.h>
|
#include <osmocom/gsm/gsm48.h>
|
||||||
|
|
||||||
struct msgb;
|
struct msgb;
|
||||||
struct gsm_bts;
|
struct gsm_bts;
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#define _GSM48_GPRS_H
|
#define _GSM48_GPRS_H
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <osmocore/protocol/gsm_04_08.h>
|
#include <osmocom/gsm/protocol/gsm_04_08.h>
|
||||||
|
|
||||||
/* Table 10.4 / 10.4a, GPRS Mobility Management (GMM) */
|
/* Table 10.4 / 10.4a, GPRS Mobility Management (GMM) */
|
||||||
#define GSM48_MT_GMM_ATTACH_REQ 0x01
|
#define GSM48_MT_GMM_ATTACH_REQ 0x01
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef _GSM_04_11_H
|
#ifndef _GSM_04_11_H
|
||||||
#define _GSM_04_11_H
|
#define _GSM_04_11_H
|
||||||
|
|
||||||
#include <osmocore/protocol/gsm_04_11.h>
|
#include <osmocom/gsm/protocol/gsm_04_11.h>
|
||||||
|
|
||||||
#define UM_SAPI_SMS 3 /* See GSM 04.05/04.06 */
|
#define UM_SAPI_SMS 3 /* See GSM 04.05/04.06 */
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
#ifndef _GSM_04_80_H
|
#ifndef _GSM_04_80_H
|
||||||
#define _GSM_04_80_H
|
#define _GSM_04_80_H
|
||||||
|
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
#include <osmocore/protocol/gsm_04_80.h>
|
#include <osmocom/gsm/protocol/gsm_04_80.h>
|
||||||
#include <osmocore/gsm0480.h>
|
#include <osmocom/gsm/gsm0480.h>
|
||||||
|
|
||||||
struct gsm_subscriber_connection;
|
struct gsm_subscriber_connection;
|
||||||
|
|
||||||
|
|
|
@ -44,19 +44,19 @@ enum gsm_chreq_reason_t {
|
||||||
GSM_CHREQ_REASON_OTHER,
|
GSM_CHREQ_REASON_OTHER,
|
||||||
};
|
};
|
||||||
|
|
||||||
#include <osmocore/timer.h>
|
#include <osmocom/core/timer.h>
|
||||||
#include <openbsc/system_information.h>
|
#include <openbsc/system_information.h>
|
||||||
#include <openbsc/rest_octets.h>
|
#include <openbsc/rest_octets.h>
|
||||||
#include <openbsc/mncc.h>
|
#include <openbsc/mncc.h>
|
||||||
|
|
||||||
#include <osmocore/tlv.h>
|
#include <osmocom/gsm/tlv.h>
|
||||||
#include <osmocore/bitvec.h>
|
#include <osmocom/core/bitvec.h>
|
||||||
#include <osmocore/statistics.h>
|
#include <osmocom/core/statistics.h>
|
||||||
#include <osmocore/gsm_utils.h>
|
#include <osmocom/gsm/gsm_utils.h>
|
||||||
#include <osmocore/utils.h>
|
#include <osmocom/core/utils.h>
|
||||||
#include <osmocore/rxlev_stat.h>
|
#include <osmocom/gsm/rxlev_stat.h>
|
||||||
|
|
||||||
#include <osmocore/protocol/gsm_08_58.h>
|
#include <osmocom/gsm/protocol/gsm_08_58.h>
|
||||||
|
|
||||||
|
|
||||||
#define TRX_NR_TS 8
|
#define TRX_NR_TS 8
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include "gsm_data.h"
|
#include "gsm_data.h"
|
||||||
#include <osmocore/linuxlist.h>
|
#include <osmocom/core/linuxlist.h>
|
||||||
|
|
||||||
#define GSM_IMEI_LENGTH 17
|
#define GSM_IMEI_LENGTH 17
|
||||||
#define GSM_IMSI_LENGTH 17
|
#define GSM_IMSI_LENGTH 17
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
#include "e1_input.h"
|
#include "e1_input.h"
|
||||||
#include "gsm_subscriber.h"
|
#include "gsm_subscriber.h"
|
||||||
#include <osmocore/linuxlist.h>
|
#include <osmocom/core/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
|
||||||
|
|
|
@ -23,8 +23,8 @@
|
||||||
#ifndef OPENBSC_MGCP_H
|
#ifndef OPENBSC_MGCP_H
|
||||||
#define OPENBSC_MGCP_H
|
#define OPENBSC_MGCP_H
|
||||||
|
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
#include <osmocore/write_queue.h>
|
#include <osmocom/core/write_queue.h>
|
||||||
|
|
||||||
#include "debug.h"
|
#include "debug.h"
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
#ifndef OPENBSC_MGCP_DATA_H
|
#ifndef OPENBSC_MGCP_DATA_H
|
||||||
#define OPENBSC_MGCP_DATA_H
|
#define OPENBSC_MGCP_DATA_H
|
||||||
|
|
||||||
#include <osmocore/select.h>
|
#include <osmocom/core/select.h>
|
||||||
|
|
||||||
#define CI_UNUSED 0
|
#define CI_UNUSED 0
|
||||||
|
|
||||||
|
|
|
@ -24,8 +24,8 @@
|
||||||
#ifndef _MNCC_H
|
#ifndef _MNCC_H
|
||||||
#define _MNCC_H
|
#define _MNCC_H
|
||||||
|
|
||||||
#include <osmocore/linuxlist.h>
|
#include <osmocom/core/linuxlist.h>
|
||||||
#include <osmocore/mncc.h>
|
#include <osmocom/gsm/mncc.h>
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
#ifndef OSMO_BSC_RF
|
#ifndef OSMO_BSC_RF
|
||||||
#define OSMO_BSC_RF
|
#define OSMO_BSC_RF
|
||||||
|
|
||||||
#include <osmocore/write_queue.h>
|
#include <osmocom/core/write_queue.h>
|
||||||
#include <osmocore/timer.h>
|
#include <osmocom/core/timer.h>
|
||||||
|
|
||||||
struct gsm_network;
|
struct gsm_network;
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
#include "bsc_msc.h"
|
#include "bsc_msc.h"
|
||||||
|
|
||||||
#include <osmocore/timer.h>
|
#include <osmocom/core/timer.h>
|
||||||
|
|
||||||
struct osmo_bsc_rf;
|
struct osmo_bsc_rf;
|
||||||
struct gsm_network;
|
struct gsm_network;
|
||||||
|
|
|
@ -23,10 +23,10 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include <osmocore/linuxlist.h>
|
#include <osmocom/core/linuxlist.h>
|
||||||
#include "gsm_data.h"
|
#include "gsm_data.h"
|
||||||
#include "gsm_subscriber.h"
|
#include "gsm_subscriber.h"
|
||||||
#include <osmocore/timer.h>
|
#include <osmocom/core/timer.h>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A pending paging request
|
* A pending paging request
|
||||||
|
|
|
@ -24,8 +24,8 @@
|
||||||
|
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
|
|
||||||
#include <osmocore/linuxlist.h>
|
#include <osmocom/core/linuxlist.h>
|
||||||
#include <osmocore/select.h>
|
#include <osmocom/core/select.h>
|
||||||
|
|
||||||
#define RTP_PT_GSM_FULL 3
|
#define RTP_PT_GSM_FULL 3
|
||||||
#define RTP_PT_GSM_HALF 96
|
#define RTP_PT_GSM_HALF 96
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
|
|
||||||
#include <openbsc/gprs_ns.h>
|
#include <openbsc/gprs_ns.h>
|
||||||
#include <openbsc/gprs_sgsn.h>
|
#include <openbsc/gprs_sgsn.h>
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
|
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
|
|
||||||
#include <osmocore/signal.h>
|
#include <osmocom/core/signal.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Signalling subsystems
|
* Signalling subsystems
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#define _BSC_SOCKET_H
|
#define _BSC_SOCKET_H
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <osmocore/select.h>
|
#include <osmocom/core/select.h>
|
||||||
|
|
||||||
#ifndef IPPROTO_GRE
|
#ifndef IPPROTO_GRE
|
||||||
#define IPPROTO_GRE 47
|
#define IPPROTO_GRE 47
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <osmocore/linuxlist.h>
|
#include <osmocom/core/linuxlist.h>
|
||||||
|
|
||||||
#define NR_SUBCH 4
|
#define NR_SUBCH 4
|
||||||
#define TRAU_FRAME_SIZE 40
|
#define TRAU_FRAME_SIZE 40
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef _SYSTEM_INFO_H
|
#ifndef _SYSTEM_INFO_H
|
||||||
#define _SYSTEM_INFO_H
|
#define _SYSTEM_INFO_H
|
||||||
|
|
||||||
#include <osmocore/utils.h>
|
#include <osmocom/core/utils.h>
|
||||||
|
|
||||||
#define GSM_MACBLOCK_LEN 23
|
#define GSM_MACBLOCK_LEN 23
|
||||||
|
|
||||||
|
|
|
@ -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 <osmocore/linuxlist.h>
|
#include <osmocom/core/linuxlist.h>
|
||||||
#include <openbsc/gsm_04_11.h>
|
#include <openbsc/gsm_04_11.h>
|
||||||
|
|
||||||
/* One transaction */
|
/* One transaction */
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
/* Handler function for mobile-originated USSD messages */
|
/* Handler function for mobile-originated USSD messages */
|
||||||
|
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
|
|
||||||
int handle_rcv_ussd(struct gsm_subscriber_connection *conn, struct msgb *msg);
|
int handle_rcv_ussd(struct gsm_subscriber_connection *conn, struct msgb *msg);
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
|
INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
|
||||||
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
|
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
|
||||||
AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(COVERAGE_LDFLAGS)
|
AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(COVERAGE_LDFLAGS)
|
||||||
|
|
||||||
SUBDIRS = libcommon libabis libmgcp libbsc libmsc libtrau osmo-nitb osmo-bsc_mgcp utils ipaccess libgb gprs
|
SUBDIRS = libcommon libabis libmgcp libbsc libmsc libtrau osmo-nitb osmo-bsc_mgcp utils ipaccess libgb gprs
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
|
INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
|
||||||
AM_CFLAGS=-Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
|
AM_CFLAGS=-Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
|
||||||
AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS)
|
AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS)
|
||||||
|
|
||||||
noinst_HEADERS = gprs_sndcp.h
|
noinst_HEADERS = gprs_sndcp.h
|
||||||
|
|
||||||
|
|
|
@ -30,8 +30,8 @@
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <osmocore/select.h>
|
#include <osmocom/core/select.h>
|
||||||
|
|
||||||
#include <openbsc/signal.h>
|
#include <openbsc/signal.h>
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
|
|
|
@ -33,10 +33,10 @@
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <osmocore/select.h>
|
#include <osmocom/core/select.h>
|
||||||
#include <osmocore/rate_ctr.h>
|
#include <osmocom/core/rate_ctr.h>
|
||||||
#include <osmocore/process.h>
|
#include <osmocom/core/process.h>
|
||||||
|
|
||||||
#include <openbsc/signal.h>
|
#include <openbsc/signal.h>
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
|
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
#include <openbsc/gb_proxy.h>
|
#include <openbsc/gb_proxy.h>
|
||||||
|
|
|
@ -31,12 +31,12 @@
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include <openbsc/db.h>
|
#include <openbsc/db.h>
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
#include <osmocore/tlv.h>
|
#include <osmocom/core/tlv.h>
|
||||||
#include <osmocore/gsm_utils.h>
|
#include <osmocom/core/gsm_utils.h>
|
||||||
#include <osmocore/signal.h>
|
#include <osmocom/core/signal.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <osmocore/rate_ctr.h>
|
#include <osmocom/core/rate_ctr.h>
|
||||||
|
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
|
|
|
@ -22,10 +22,10 @@
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
#include <osmocore/linuxlist.h>
|
#include <osmocom/core/linuxlist.h>
|
||||||
#include <osmocore/timer.h>
|
#include <osmocom/core/timer.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
|
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
|
|
|
@ -27,11 +27,11 @@
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
#include <osmocore/tlv.h>
|
#include <osmocom/core/tlv.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <osmocore/select.h>
|
#include <osmocom/core/select.h>
|
||||||
#include <osmocore/rate_ctr.h>
|
#include <osmocom/core/rate_ctr.h>
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
#include <openbsc/signal.h>
|
#include <openbsc/signal.h>
|
||||||
#include <openbsc/gprs_llc.h>
|
#include <openbsc/gprs_llc.h>
|
||||||
|
|
|
@ -21,10 +21,10 @@
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
#include <osmocore/linuxlist.h>
|
#include <osmocom/core/linuxlist.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <osmocore/timer.h>
|
#include <osmocom/core/timer.h>
|
||||||
#include <osmocore/rate_ctr.h>
|
#include <osmocom/core/rate_ctr.h>
|
||||||
#include <openbsc/gsm_subscriber.h>
|
#include <openbsc/gsm_subscriber.h>
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
#include <openbsc/gprs_sgsn.h>
|
#include <openbsc/gprs_sgsn.h>
|
||||||
|
|
|
@ -23,10 +23,10 @@
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
#include <osmocore/linuxlist.h>
|
#include <osmocom/core/linuxlist.h>
|
||||||
#include <osmocore/timer.h>
|
#include <osmocom/core/timer.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
|
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
|
|
|
@ -27,11 +27,11 @@
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
#include <osmocore/tlv.h>
|
#include <osmocom/core/tlv.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <osmocore/select.h>
|
#include <osmocom/core/select.h>
|
||||||
#include <osmocore/rate_ctr.h>
|
#include <osmocom/core/rate_ctr.h>
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
#include <openbsc/signal.h>
|
#include <openbsc/signal.h>
|
||||||
#include <openbsc/gprs_llc.h>
|
#include <openbsc/gprs_llc.h>
|
||||||
|
|
|
@ -34,9 +34,9 @@
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <osmocore/select.h>
|
#include <osmocom/core/select.h>
|
||||||
#include <osmocore/rate_ctr.h>
|
#include <osmocom/core/rate_ctr.h>
|
||||||
#include <openbsc/gsm_04_08_gprs.h>
|
#include <openbsc/gsm_04_08_gprs.h>
|
||||||
|
|
||||||
#include <openbsc/signal.h>
|
#include <openbsc/signal.h>
|
||||||
|
|
|
@ -33,11 +33,11 @@
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <osmocore/select.h>
|
#include <osmocom/core/select.h>
|
||||||
#include <osmocore/rate_ctr.h>
|
#include <osmocom/core/rate_ctr.h>
|
||||||
#include <osmocore/logging.h>
|
#include <osmocom/core/logging.h>
|
||||||
#include <osmocore/process.h>
|
#include <osmocom/core/process.h>
|
||||||
|
|
||||||
#include <osmocom/vty/telnet_interface.h>
|
#include <osmocom/vty/telnet_interface.h>
|
||||||
#include <osmocom/vty/logging.h>
|
#include <osmocom/vty/logging.h>
|
||||||
|
|
|
@ -23,9 +23,9 @@
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <osmocore/utils.h>
|
#include <osmocom/core/utils.h>
|
||||||
#include <osmocore/rate_ctr.h>
|
#include <osmocom/core/rate_ctr.h>
|
||||||
|
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
#include <openbsc/sgsn.h>
|
#include <openbsc/sgsn.h>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
|
INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
|
||||||
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(COVERAGE_CFLAGS)
|
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(COVERAGE_CFLAGS)
|
||||||
AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(COVERAGE_LDFLAGS)
|
AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(COVERAGE_LDFLAGS)
|
||||||
|
|
||||||
bin_PROGRAMS = ipaccess-find ipaccess-config ipaccess-proxy
|
bin_PROGRAMS = ipaccess-find ipaccess-config ipaccess-proxy
|
||||||
|
|
||||||
|
|
|
@ -35,8 +35,8 @@
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
|
|
||||||
#include <osmocore/select.h>
|
#include <osmocom/core/select.h>
|
||||||
#include <osmocore/timer.h>
|
#include <osmocom/core/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>
|
||||||
|
@ -44,7 +44,7 @@
|
||||||
#include <openbsc/signal.h>
|
#include <openbsc/signal.h>
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
#include <openbsc/network_listen.h>
|
#include <openbsc/network_listen.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
|
|
||||||
static struct gsm_network *gsmnet;
|
static struct gsm_network *gsmnet;
|
||||||
|
|
||||||
|
|
|
@ -27,8 +27,8 @@
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
|
|
||||||
#include <osmocore/select.h>
|
#include <osmocom/core/select.h>
|
||||||
#include <osmocore/timer.h>
|
#include <osmocom/core/timer.h>
|
||||||
#include <openbsc/ipaccess.h>
|
#include <openbsc/ipaccess.h>
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
#include <openbsc/ipaccess.h>
|
#include <openbsc/ipaccess.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
|
@ -39,12 +39,12 @@
|
||||||
#include <getopt.h>
|
#include <getopt.h>
|
||||||
|
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
#include <osmocore/select.h>
|
#include <osmocom/core/select.h>
|
||||||
#include <osmocore/tlv.h>
|
#include <osmocom/gsm/tlv.h>
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
#include <openbsc/ipaccess.h>
|
#include <openbsc/ipaccess.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
|
|
||||||
static struct log_target *stderr_target;
|
static struct log_target *stderr_target;
|
||||||
|
|
||||||
|
|
|
@ -28,10 +28,10 @@
|
||||||
|
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <osmocore/timer.h>
|
#include <osmocom/core/timer.h>
|
||||||
#include <osmocore/rxlev_stat.h>
|
#include <osmocom/gsm/rxlev_stat.h>
|
||||||
#include <osmocore/gsm48_ie.h>
|
#include <osmocom/gsm/gsm48_ie.h>
|
||||||
|
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
#include <openbsc/abis_nm.h>
|
#include <openbsc/abis_nm.h>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
|
INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
|
||||||
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
|
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
|
||||||
AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(COVERAGE_LDFLAGS)
|
AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(COVERAGE_LDFLAGS)
|
||||||
|
|
||||||
noinst_LIBRARIES = libabis.a
|
noinst_LIBRARIES = libabis.a
|
||||||
|
|
||||||
|
|
|
@ -39,18 +39,18 @@
|
||||||
#define PF_ISDN AF_ISDN
|
#define PF_ISDN AF_ISDN
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <osmocore/select.h>
|
#include <osmocom/core/select.h>
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/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 <osmocore/linuxlist.h>
|
#include <osmocom/core/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 <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <openbsc/signal.h>
|
#include <openbsc/signal.h>
|
||||||
#include <openbsc/misdn.h>
|
#include <openbsc/misdn.h>
|
||||||
|
|
||||||
|
|
|
@ -27,12 +27,12 @@
|
||||||
#include <osmocom/vty/logging.h>
|
#include <osmocom/vty/logging.h>
|
||||||
#include <osmocom/vty/telnet_interface.h>
|
#include <osmocom/vty/telnet_interface.h>
|
||||||
|
|
||||||
#include <osmocore/linuxlist.h>
|
#include <osmocom/core/linuxlist.h>
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
#include <openbsc/e1_input.h>
|
#include <openbsc/e1_input.h>
|
||||||
#include <osmocore/utils.h>
|
#include <osmocom/core/utils.h>
|
||||||
#include <osmocore/gsm_utils.h>
|
#include <osmocom/gsm/gsm_utils.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <openbsc/vty.h>
|
#include <openbsc/vty.h>
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
|
|
||||||
|
|
|
@ -39,8 +39,8 @@
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#include <dahdi/user.h>
|
#include <dahdi/user.h>
|
||||||
|
|
||||||
#include <osmocore/select.h>
|
#include <osmocom/core/select.h>
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/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>
|
||||||
|
@ -48,7 +48,7 @@
|
||||||
#include <openbsc/subchan_demux.h>
|
#include <openbsc/subchan_demux.h>
|
||||||
#include <openbsc/e1_input.h>
|
#include <openbsc/e1_input.h>
|
||||||
#include <openbsc/signal.h>
|
#include <openbsc/signal.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
|
|
||||||
#include "lapd.h"
|
#include "lapd.h"
|
||||||
|
|
||||||
|
|
|
@ -43,9 +43,9 @@
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include <osmocore/select.h>
|
#include <osmocom/core/select.h>
|
||||||
#include <osmocore/tlv.h>
|
#include <osmocom/gsm/tlv.h>
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/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>
|
||||||
|
@ -55,7 +55,7 @@
|
||||||
#include <openbsc/ipaccess.h>
|
#include <openbsc/ipaccess.h>
|
||||||
#include <openbsc/socket.h>
|
#include <openbsc/socket.h>
|
||||||
#include <openbsc/signal.h>
|
#include <openbsc/signal.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
|
|
||||||
#define HSL_TCP_PORT 2500
|
#define HSL_TCP_PORT 2500
|
||||||
#define HSL_PROTO_DEBUG 0xdd
|
#define HSL_PROTO_DEBUG 0xdd
|
||||||
|
|
|
@ -33,10 +33,10 @@
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include <osmocore/select.h>
|
#include <osmocom/core/select.h>
|
||||||
#include <osmocore/tlv.h>
|
#include <osmocom/gsm/tlv.h>
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.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>
|
||||||
|
|
|
@ -36,10 +36,10 @@
|
||||||
|
|
||||||
#include "lapd.h"
|
#include "lapd.h"
|
||||||
|
|
||||||
#include <osmocore/linuxlist.h>
|
#include <osmocom/core/linuxlist.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
#include <osmocore/timer.h>
|
#include <osmocom/core/timer.h>
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
|
|
||||||
#define SABM_INTERVAL 0, 300000
|
#define SABM_INTERVAL 0, 300000
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
#include <osmocore/linuxlist.h>
|
#include <osmocom/core/linuxlist.h>
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
LAPD_MPH_NONE = 0,
|
LAPD_MPH_NONE = 0,
|
||||||
|
|
|
@ -40,9 +40,9 @@
|
||||||
#define PF_ISDN AF_ISDN
|
#define PF_ISDN AF_ISDN
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <osmocore/select.h>
|
#include <osmocom/core/select.h>
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.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>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
|
INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
|
||||||
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
|
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
|
||||||
AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(COVERAGE_LDFLAGS)
|
AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(COVERAGE_LDFLAGS)
|
||||||
|
|
||||||
noinst_LIBRARIES = libbsc.a
|
noinst_LIBRARIES = libbsc.a
|
||||||
|
|
||||||
|
|
|
@ -37,9 +37,9 @@
|
||||||
|
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
#include <osmocore/tlv.h>
|
#include <osmocom/gsm/tlv.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/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>
|
||||||
|
|
|
@ -27,9 +27,9 @@
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
#include <osmocore/tlv.h>
|
#include <osmocom/gsm/tlv.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
#include <openbsc/signal.h>
|
#include <openbsc/signal.h>
|
||||||
#include <openbsc/abis_nm.h>
|
#include <openbsc/abis_nm.h>
|
||||||
|
|
|
@ -30,10 +30,10 @@
|
||||||
|
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
#include <osmocore/tlv.h>
|
#include <osmocom/gsm/tlv.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <osmocore/utils.h>
|
#include <osmocom/core/utils.h>
|
||||||
|
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
|
|
|
@ -27,9 +27,9 @@
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
#include <osmocore/tlv.h>
|
#include <osmocom/gsm/tlv.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
#include <openbsc/signal.h>
|
#include <openbsc/signal.h>
|
||||||
#include <openbsc/abis_om2000.h>
|
#include <openbsc/abis_om2000.h>
|
||||||
|
|
|
@ -29,19 +29,19 @@
|
||||||
|
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
#include <openbsc/gsm_04_08.h>
|
#include <openbsc/gsm_04_08.h>
|
||||||
#include <osmocore/gsm_utils.h>
|
#include <osmocom/gsm/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 <osmocore/tlv.h>
|
#include <osmocom/gsm/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>
|
||||||
#include <openbsc/rtp_proxy.h>
|
#include <openbsc/rtp_proxy.h>
|
||||||
#include <osmocore/rsl.h>
|
#include <osmocom/gsm/rsl.h>
|
||||||
|
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
|
|
||||||
#define RSL_ALLOC_SIZE 1024
|
#define RSL_ALLOC_SIZE 1024
|
||||||
#define RSL_ALLOC_HEADROOM 128
|
#define RSL_ALLOC_HEADROOM 128
|
||||||
|
|
|
@ -32,9 +32,9 @@
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
#include <openbsc/gsm_04_08.h>
|
#include <openbsc/gsm_04_08.h>
|
||||||
|
|
||||||
#include <osmocore/protocol/gsm_08_08.h>
|
#include <osmocom/gsm/protocol/gsm_08_08.h>
|
||||||
|
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
|
|
||||||
#define GSM0808_T10_VALUE 6, 0
|
#define GSM0808_T10_VALUE 6, 0
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
#include <osmocore/gsm_utils.h>
|
#include <osmocom/gsm/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/paging.h>
|
#include <openbsc/paging.h>
|
||||||
#include <openbsc/signal.h>
|
#include <openbsc/signal.h>
|
||||||
#include <openbsc/chan_alloc.h>
|
#include <openbsc/chan_alloc.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <openbsc/ipaccess.h>
|
#include <openbsc/ipaccess.h>
|
||||||
|
|
||||||
/* global pointer to the gsm network data structure */
|
/* global pointer to the gsm network data structure */
|
||||||
|
|
|
@ -23,8 +23,8 @@
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
#include <openbsc/ipaccess.h>
|
#include <openbsc/ipaccess.h>
|
||||||
|
|
||||||
#include <osmocore/write_queue.h>
|
#include <osmocom/core/write_queue.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
|
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
|
|
|
@ -23,9 +23,9 @@
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <osmocore/timer.h>
|
#include <osmocom/core/timer.h>
|
||||||
#include <osmocore/linuxlist.h>
|
#include <osmocom/core/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>
|
||||||
|
|
|
@ -29,17 +29,17 @@
|
||||||
|
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include <osmocore/linuxlist.h>
|
#include <osmocom/core/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/abis_om2000.h>
|
#include <openbsc/abis_om2000.h>
|
||||||
#include <osmocore/utils.h>
|
#include <osmocom/core/utils.h>
|
||||||
#include <osmocore/gsm_utils.h>
|
#include <osmocom/gsm/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 <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <openbsc/vty.h>
|
#include <openbsc/vty.h>
|
||||||
#include <openbsc/gprs_ns.h>
|
#include <openbsc/gprs_ns.h>
|
||||||
#include <openbsc/system_information.h>
|
#include <openbsc/system_information.h>
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
#include <osmocore/tlv.h>
|
#include <osmocom/gsm/tlv.h>
|
||||||
|
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include <osmocore/tlv.h>
|
#include <osmocom/gsm/tlv.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>
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include <osmocore/tlv.h>
|
#include <osmocom/gsm/tlv.h>
|
||||||
|
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
#include <openbsc/signal.h>
|
#include <openbsc/signal.h>
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
#include <osmocore/tlv.h>
|
#include <osmocom/gsm/tlv.h>
|
||||||
|
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
#include <osmocore/tlv.h>
|
#include <osmocom/gsm/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 = {
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
#include <openbsc/signal.h>
|
#include <openbsc/signal.h>
|
||||||
|
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
|
|
||||||
static int ts_is_usable(struct gsm_bts_trx_ts *ts)
|
static int ts_is_usable(struct gsm_bts_trx_ts *ts)
|
||||||
{
|
{
|
||||||
|
|
|
@ -29,7 +29,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 <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
|
|
||||||
#define SAPI_L2ML 0
|
#define SAPI_L2ML 0
|
||||||
|
|
|
@ -27,8 +27,8 @@
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
|
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
#include <osmocore/gsm48.h>
|
#include <osmocom/gsm/gsm48.h>
|
||||||
|
|
||||||
#include <openbsc/abis_rsl.h>
|
#include <openbsc/abis_rsl.h>
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <openbsc/gsm_subscriber.h>
|
#include <openbsc/gsm_subscriber.h>
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
|
|
||||||
|
|
|
@ -24,14 +24,14 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/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 <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <openbsc/handover.h>
|
#include <openbsc/handover.h>
|
||||||
#include <osmocore/gsm_utils.h>
|
#include <osmocom/gsm/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,
|
||||||
|
|
|
@ -28,16 +28,16 @@
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
|
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
#include <osmocore/gsm_utils.h>
|
#include <osmocom/gsm/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 <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <openbsc/transaction.h>
|
#include <openbsc/transaction.h>
|
||||||
#include <openbsc/rtp_proxy.h>
|
#include <openbsc/rtp_proxy.h>
|
||||||
|
|
||||||
|
|
|
@ -22,8 +22,8 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/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>
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
#include <openbsc/paging.h>
|
#include <openbsc/paging.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/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>
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
#include <osmocore/bitvec.h>
|
#include <osmocom/core/bitvec.h>
|
||||||
#include <openbsc/rest_octets.h>
|
#include <openbsc/rest_octets.h>
|
||||||
|
|
||||||
/* generate SI1 rest octets */
|
/* generate SI1 rest octets */
|
||||||
|
|
|
@ -30,8 +30,8 @@
|
||||||
#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 <osmocore/bitvec.h>
|
#include <osmocom/core/bitvec.h>
|
||||||
#include <osmocore/utils.h>
|
#include <osmocom/core/utils.h>
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
|
|
||||||
#define GSM48_CELL_CHAN_DESC_SIZE 16
|
#define GSM48_CELL_CHAN_DESC_SIZE 16
|
||||||
|
|
|
@ -22,7 +22,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 <osmocore/talloc.h>
|
#include <osmocom/core/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>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
|
INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
|
||||||
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
|
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
|
||||||
AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(COVERAGE_LDFLAGS)
|
AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(COVERAGE_LDFLAGS)
|
||||||
|
|
||||||
noinst_LIBRARIES = libcommon.a
|
noinst_LIBRARIES = libcommon.a
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
|
|
||||||
#include <openbsc/vty.h>
|
#include <openbsc/vty.h>
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
|
|
|
@ -27,9 +27,9 @@
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <osmocore/utils.h>
|
#include <osmocom/core/utils.h>
|
||||||
#include <osmocore/logging.h>
|
#include <osmocom/core/logging.h>
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
#include <openbsc/gsm_subscriber.h>
|
#include <openbsc/gsm_subscriber.h>
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
|
|
|
@ -26,10 +26,10 @@
|
||||||
|
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
|
|
||||||
#include <osmocore/linuxlist.h>
|
#include <osmocom/core/linuxlist.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <osmocore/gsm_utils.h>
|
#include <osmocom/gsm/gsm_utils.h>
|
||||||
#include <osmocore/statistics.h>
|
#include <osmocom/core/statistics.h>
|
||||||
|
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
#include <openbsc/osmo_msc_data.h>
|
#include <openbsc/osmo_msc_data.h>
|
||||||
|
|
|
@ -33,12 +33,12 @@
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include <osmocore/select.h>
|
#include <osmocom/core/select.h>
|
||||||
#include <osmocore/tlv.h>
|
#include <osmocom/gsm/tlv.h>
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
|
|
||||||
int make_sock(struct bsc_fd *bfd, int proto, u_int32_t ip, u_int16_t port,
|
int make_sock(struct bsc_fd *bfd, int proto, u_int32_t ip, u_int16_t port,
|
||||||
int (*cb)(struct bsc_fd *fd, unsigned int what))
|
int (*cb)(struct bsc_fd *fd, unsigned int what))
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
|
|
||||||
extern void *tall_msgb_ctx;
|
extern void *tall_msgb_ctx;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
|
INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
|
||||||
AM_CFLAGS=-Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
|
AM_CFLAGS=-Wall -fno-strict-aliasing $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS)
|
||||||
AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS)
|
AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOCORE_GSM) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS)
|
||||||
|
|
||||||
noinst_LIBRARIES = libgb.a
|
noinst_LIBRARIES = libgb.a
|
||||||
|
|
||||||
|
|
|
@ -27,10 +27,10 @@
|
||||||
|
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
|
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
#include <osmocore/tlv.h>
|
#include <osmocom/gsm/tlv.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <osmocore/rate_ctr.h>
|
#include <osmocom/core/rate_ctr.h>
|
||||||
|
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
|
|
|
@ -24,9 +24,9 @@
|
||||||
|
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
|
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
#include <osmocore/tlv.h>
|
#include <osmocom/gsm/tlv.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
|
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
|
|
|
@ -27,11 +27,11 @@
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
#include <osmocore/tlv.h>
|
#include <osmocom/gsm/tlv.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <osmocore/select.h>
|
#include <osmocom/core/select.h>
|
||||||
#include <osmocore/rate_ctr.h>
|
#include <osmocom/core/rate_ctr.h>
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
#include <openbsc/signal.h>
|
#include <openbsc/signal.h>
|
||||||
#include <openbsc/gprs_ns.h>
|
#include <openbsc/gprs_ns.h>
|
||||||
|
|
|
@ -59,11 +59,11 @@
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include <openbsc/gsm_data.h>
|
#include <openbsc/gsm_data.h>
|
||||||
#include <osmocore/msgb.h>
|
#include <osmocom/core/msgb.h>
|
||||||
#include <osmocore/tlv.h>
|
#include <osmocom/gsm/tlv.h>
|
||||||
#include <osmocore/talloc.h>
|
#include <osmocom/core/talloc.h>
|
||||||
#include <osmocore/select.h>
|
#include <osmocom/core/select.h>
|
||||||
#include <osmocore/rate_ctr.h>
|
#include <osmocom/core/rate_ctr.h>
|
||||||
#include <openbsc/debug.h>
|
#include <openbsc/debug.h>
|
||||||
#include <openbsc/signal.h>
|
#include <openbsc/signal.h>
|
||||||
#include <openbsc/gprs_ns.h>
|
#include <openbsc/gprs_ns.h>
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue