[PATCH 2/2] src: include osmocom/core/* instead of osmocore/*

This patch uses the new include path for core features in libosmocore. Signed-off-by: Pablo Neira Ayuso &lt;pablo(a)gnumonks.org&gt; --- openbsc/include/openbsc/abis_rsl.h | 2 +- openbsc/include/openbsc/bsc_msc.h | 4 ++-- openbsc/include/openbsc/bsc_nat.h | 14 +++++++------- openbsc/include/openbsc/debug.h | 4 ++-- openbsc/include/openbsc/e1_input.h | 6 +++--- openbsc/include/openbsc/gb_proxy.h | 2 +- openbsc/include/openbsc/gprs_gmm.h | 2 +- openbsc/include/openbsc/gprs_ns.h | 8 ++++---- openbsc/include/openbsc/gsm_04_80.h | 2 +- openbsc/include/openbsc/gsm_data.h | 8 ++++---- openbsc/include/openbsc/gsm_subscriber.h | 2 +- openbsc/include/openbsc/ipaccess.h | 2 +- openbsc/include/openbsc/mgcp.h | 4 ++-- openbsc/include/openbsc/mgcp_internal.h | 2 +- openbsc/include/openbsc/mncc.h | 2 +- openbsc/include/openbsc/osmo_bsc_rf.h | 4 ++-- openbsc/include/openbsc/osmo_msc_data.h | 2 +- openbsc/include/openbsc/paging.h | 4 ++-- openbsc/include/openbsc/rtp_proxy.h | 4 ++-- openbsc/include/openbsc/sgsn.h | 2 +- openbsc/include/openbsc/signal.h | 2 +- openbsc/include/openbsc/socket.h | 2 +- openbsc/include/openbsc/subchan_demux.h | 2 +- openbsc/include/openbsc/system_information.h | 2 +- openbsc/include/openbsc/transaction.h | 2 +- openbsc/include/openbsc/ussd.h | 2 +- openbsc/src/gprs/gb_proxy.c | 4 ++-- openbsc/src/gprs/gb_proxy_main.c | 8 ++++---- openbsc/src/gprs/gb_proxy_vty.c | 2 +- openbsc/src/gprs/gprs_gmm.c | 12 ++++++------ openbsc/src/gprs/gprs_llc.c | 8 ++++---- openbsc/src/gprs/gprs_llc_vty.c | 10 +++++----- openbsc/src/gprs/gprs_sgsn.c | 8 ++++---- openbsc/src/gprs/gprs_sndcp.c | 8 ++++---- openbsc/src/gprs/gprs_sndcp_vty.c | 10 +++++----- openbsc/src/gprs/sgsn_libgtp.c | 6 +++--- openbsc/src/gprs/sgsn_main.c | 10 +++++----- openbsc/src/gprs/sgsn_vty.c | 6 +++--- openbsc/src/ipaccess/ipaccess-config.c | 6 +++--- openbsc/src/ipaccess/ipaccess-find.c | 4 ++-- openbsc/src/ipaccess/ipaccess-firmware.c | 2 +- openbsc/src/ipaccess/ipaccess-proxy.c | 6 +++--- openbsc/src/ipaccess/network_listen.c | 4 ++-- openbsc/src/libabis/e1_input.c | 8 ++++---- openbsc/src/libabis/e1_input_vty.c | 6 +++--- openbsc/src/libabis/input/dahdi.c | 6 +++--- openbsc/src/libabis/input/hsl.c | 6 +++--- openbsc/src/libabis/input/ipaccess.c | 6 +++--- openbsc/src/libabis/input/lapd.c | 8 ++++---- openbsc/src/libabis/input/lapd.h | 2 +- openbsc/src/libabis/input/misdn.c | 6 +++--- openbsc/src/libbsc/abis_nm.c | 4 ++-- openbsc/src/libbsc/abis_nm_vty.c | 4 ++-- openbsc/src/libbsc/abis_om2000.c | 6 +++--- openbsc/src/libbsc/abis_om2000_vty.c | 4 ++-- openbsc/src/libbsc/abis_rsl.c | 2 +- openbsc/src/libbsc/bsc_api.c | 2 +- openbsc/src/libbsc/bsc_init.c | 2 +- openbsc/src/libbsc/bsc_msc.c | 4 ++-- openbsc/src/libbsc/bsc_rll.c | 6 +++--- openbsc/src/libbsc/bsc_vty.c | 6 +++--- openbsc/src/libbsc/chan_alloc.c | 2 +- openbsc/src/libbsc/e1_config.c | 2 +- openbsc/src/libbsc/gsm_04_08_utils.c | 2 +- openbsc/src/libbsc/gsm_subscriber_base.c | 2 +- openbsc/src/libbsc/handover_decision.c | 4 ++-- openbsc/src/libbsc/handover_logic.c | 4 ++-- openbsc/src/libbsc/meas_proc.c | 4 ++-- openbsc/src/libbsc/paging.c | 2 +- openbsc/src/libbsc/rest_octets.c | 2 +- openbsc/src/libbsc/system_information.c | 4 ++-- openbsc/src/libbsc/transaction.c | 2 +- openbsc/src/libcommon/common_vty.c | 2 +- openbsc/src/libcommon/debug.c | 6 +++--- openbsc/src/libcommon/gsm_data.c | 6 +++--- openbsc/src/libcommon/socket.c | 6 +++--- openbsc/src/libcommon/talloc_ctx.c | 2 +- openbsc/src/libgb/gprs_bssgp.c | 6 +++--- openbsc/src/libgb/gprs_bssgp_util.c | 4 ++-- openbsc/src/libgb/gprs_bssgp_vty.c | 8 ++++---- openbsc/src/libgb/gprs_ns.c | 8 ++++---- openbsc/src/libgb/gprs_ns_frgre.c | 6 +++--- openbsc/src/libgb/gprs_ns_vty.c | 8 ++++---- openbsc/src/libmgcp/mgcp_network.c | 4 ++-- openbsc/src/libmgcp/mgcp_protocol.c | 6 +++--- openbsc/src/libmgcp/mgcp_vty.c | 2 +- openbsc/src/libmsc/db.c | 6 +++--- openbsc/src/libmsc/gsm_04_08.c | 6 +++--- openbsc/src/libmsc/gsm_04_11.c | 4 ++-- openbsc/src/libmsc/gsm_04_80.c | 2 +- openbsc/src/libmsc/gsm_subscriber.c | 2 +- openbsc/src/libmsc/mncc.c | 2 +- openbsc/src/libmsc/mncc_builtin.c | 2 +- openbsc/src/libmsc/mncc_sock.c | 4 ++-- openbsc/src/libmsc/silent_call.c | 2 +- openbsc/src/libmsc/sms_queue.c | 2 +- openbsc/src/libmsc/token_auth.c | 2 +- openbsc/src/libmsc/vty_interface_layer3.c | 6 +++--- openbsc/src/libtrau/rtp_proxy.c | 6 +++--- openbsc/src/libtrau/subchan_demux.c | 2 +- openbsc/src/libtrau/trau_mux.c | 2 +- openbsc/src/osmo-bsc/osmo_bsc_api.c | 4 ++-- openbsc/src/osmo-bsc/osmo_bsc_bssap.c | 4 ++-- openbsc/src/osmo-bsc/osmo_bsc_main.c | 4 ++-- openbsc/src/osmo-bsc/osmo_bsc_msc.c | 2 +- openbsc/src/osmo-bsc/osmo_bsc_rf.c | 4 ++-- openbsc/src/osmo-bsc/osmo_bsc_sccp.c | 6 +++--- openbsc/src/osmo-bsc/osmo_bsc_vty.c | 2 +- openbsc/src/osmo-bsc_mgcp/mgcp_main.c | 8 ++++---- openbsc/src/osmo-bsc_nat/bsc_filter.c | 4 ++-- openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c | 6 +++--- openbsc/src/osmo-bsc_nat/bsc_nat.c | 8 ++++---- openbsc/src/osmo-bsc_nat/bsc_nat_utils.c | 8 ++++---- openbsc/src/osmo-bsc_nat/bsc_nat_vty.c | 6 +++--- openbsc/src/osmo-bsc_nat/bsc_sccp.c | 2 +- openbsc/src/osmo-bsc_nat/bsc_ussd.c | 8 ++++---- openbsc/src/osmo-nitb/bsc_hack.c | 6 +++--- openbsc/src/utils/bs11_config.c | 4 ++-- openbsc/src/utils/rs232.c | 4 ++-- openbsc/tests/channel/channel_test.c | 2 +- openbsc/tests/mgcp/mgcp_test.c | 2 +- 121 files changed, 271 insertions(+), 271 deletions(-) diff --git a/openbsc/include/openbsc/abis_rsl.h b/openbsc/include/openbsc/abis_rsl.h index 01a6f59..e5f38c9 100644 --- a/openbsc/include/openbsc/abis_rsl.h +++ b/openbsc/include/openbsc/abis_rsl.h @@ -24,7 +24,7 @@ #include <osmocom/gsm/protocol/gsm_08_58.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> struct gsm_bts; struct gsm_lchan; diff --git a/openbsc/include/openbsc/bsc_msc.h b/openbsc/include/openbsc/bsc_msc.h index d06ae05..ddaad3b 100644 --- a/openbsc/include/openbsc/bsc_msc.h +++ b/openbsc/include/openbsc/bsc_msc.h @@ -22,8 +22,8 @@ #ifndef BSC_MSC_H #define BSC_MSC_H -#include <osmocore/write_queue.h> -#include <osmocore/timer.h> +#include <osmocom/core/write_queue.h> +#include <osmocom/core/timer.h> struct bsc_msc_connection { struct write_queue write_queue; diff --git a/openbsc/include/openbsc/bsc_nat.h b/openbsc/include/openbsc/bsc_nat.h index cf57143..e628925 100644 --- a/openbsc/include/openbsc/bsc_nat.h +++ b/openbsc/include/openbsc/bsc_nat.h @@ -25,13 +25,13 @@ #include <sys/types.h> -#include <osmocore/select.h> -#include <osmocore/msgb.h> -#include <osmocore/msgfile.h> -#include <osmocore/timer.h> -#include <osmocore/write_queue.h> -#include <osmocore/rate_ctr.h> -#include <osmocore/statistics.h> +#include <osmocom/core/select.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/msgfile.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/write_queue.h> +#include <osmocom/core/rate_ctr.h> +#include <osmocom/core/statistics.h> #include <osmocom/gsm/protocol/gsm_04_08.h> #include <regex.h> diff --git a/openbsc/include/openbsc/debug.h b/openbsc/include/openbsc/debug.h index eb290e4..ff4aec1 100644 --- a/openbsc/include/openbsc/debug.h +++ b/openbsc/include/openbsc/debug.h @@ -2,10 +2,10 @@ #define _DEBUG_H #include <stdio.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #define DEBUG -#include <osmocore/logging.h> +#include <osmocom/core/logging.h> /* Debug Areas of the code */ enum { diff --git a/openbsc/include/openbsc/e1_input.h b/openbsc/include/openbsc/e1_input.h index 3c8af38..40ceedf 100644 --- a/openbsc/include/openbsc/e1_input.h +++ b/openbsc/include/openbsc/e1_input.h @@ -4,10 +4,10 @@ #include <stdlib.h> #include <netinet/in.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #include <openbsc/gsm_data.h> -#include <osmocore/msgb.h> -#include <osmocore/select.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/select.h> #include <openbsc/subchan_demux.h> #define NUM_E1_TS 32 diff --git a/openbsc/include/openbsc/gb_proxy.h b/openbsc/include/openbsc/gb_proxy.h index 18ded22..8a7911c 100644 --- a/openbsc/include/openbsc/gb_proxy.h +++ b/openbsc/include/openbsc/gb_proxy.h @@ -3,7 +3,7 @@ #include <sys/types.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <openbsc/gprs_ns.h> #include <osmocom/vty/command.h> diff --git a/openbsc/include/openbsc/gprs_gmm.h b/openbsc/include/openbsc/gprs_gmm.h index bd129ae..f6b3e5e 100644 --- a/openbsc/include/openbsc/gprs_gmm.h +++ b/openbsc/include/openbsc/gprs_gmm.h @@ -1,7 +1,7 @@ #ifndef _GPRS_GMM_H #define _GPRS_GMM_H -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <openbsc/gprs_sgsn.h> int gsm48_tx_gsm_deact_pdp_req(struct sgsn_pdp_ctx *pdp, uint8_t sm_cause); diff --git a/openbsc/include/openbsc/gprs_ns.h b/openbsc/include/openbsc/gprs_ns.h index 953c364..0b50149 100644 --- a/openbsc/include/openbsc/gprs_ns.h +++ b/openbsc/include/openbsc/gprs_ns.h @@ -77,10 +77,10 @@ enum ns_cause { /* Our Implementation */ #include <netinet/in.h> -#include <osmocore/linuxlist.h> -#include <osmocore/msgb.h> -#include <osmocore/timer.h> -#include <osmocore/select.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/select.h> #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)" diff --git a/openbsc/include/openbsc/gsm_04_80.h b/openbsc/include/openbsc/gsm_04_80.h index fadee2f..0a60652 100644 --- a/openbsc/include/openbsc/gsm_04_80.h +++ b/openbsc/include/openbsc/gsm_04_80.h @@ -1,7 +1,7 @@ #ifndef _GSM_04_80_H #define _GSM_04_80_H -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <osmocom/gsm/protocol/gsm_04_80.h> #include <osmocom/gsm/gsm0480.h> diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h index a25a97f..4b3ec93 100644 --- a/openbsc/include/openbsc/gsm_data.h +++ b/openbsc/include/openbsc/gsm_data.h @@ -44,16 +44,16 @@ enum gsm_chreq_reason_t { GSM_CHREQ_REASON_OTHER, }; -#include <osmocore/timer.h> +#include <osmocom/core/timer.h> #include <openbsc/system_information.h> #include <openbsc/rest_octets.h> #include <openbsc/mncc.h> #include <osmocom/gsm/tlv.h> -#include <osmocore/bitvec.h> -#include <osmocore/statistics.h> +#include <osmocom/core/bitvec.h> +#include <osmocom/core/statistics.h> #include <osmocom/gsm/gsm_utils.h> -#include <osmocore/utils.h> +#include <osmocom/core/utils.h> #include <osmocom/gsm/rxlev_stat.h> #include <osmocom/gsm/protocol/gsm_08_58.h> diff --git a/openbsc/include/openbsc/gsm_subscriber.h b/openbsc/include/openbsc/gsm_subscriber.h index c365bc7..79476d3 100644 --- a/openbsc/include/openbsc/gsm_subscriber.h +++ b/openbsc/include/openbsc/gsm_subscriber.h @@ -3,7 +3,7 @@ #include <sys/types.h> #include "gsm_data.h" -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #define GSM_IMEI_LENGTH 17 #define GSM_IMSI_LENGTH 17 diff --git a/openbsc/include/openbsc/ipaccess.h b/openbsc/include/openbsc/ipaccess.h index 1d00d97..314ca90 100644 --- a/openbsc/include/openbsc/ipaccess.h +++ b/openbsc/include/openbsc/ipaccess.h @@ -3,7 +3,7 @@ #include "e1_input.h" #include "gsm_subscriber.h" -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #define IPA_TCP_PORT_OML 3002 #define IPA_TCP_PORT_RSL 3003 diff --git a/openbsc/include/openbsc/mgcp.h b/openbsc/include/openbsc/mgcp.h index 516b76e..3d8e711 100644 --- a/openbsc/include/openbsc/mgcp.h +++ b/openbsc/include/openbsc/mgcp.h @@ -23,8 +23,8 @@ #ifndef OPENBSC_MGCP_H #define OPENBSC_MGCP_H -#include <osmocore/msgb.h> -#include <osmocore/write_queue.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/write_queue.h> #include "debug.h" diff --git a/openbsc/include/openbsc/mgcp_internal.h b/openbsc/include/openbsc/mgcp_internal.h index 7c6bb54..0214318 100644 --- a/openbsc/include/openbsc/mgcp_internal.h +++ b/openbsc/include/openbsc/mgcp_internal.h @@ -23,7 +23,7 @@ #ifndef OPENBSC_MGCP_DATA_H #define OPENBSC_MGCP_DATA_H -#include <osmocore/select.h> +#include <osmocom/core/select.h> #define CI_UNUSED 0 diff --git a/openbsc/include/openbsc/mncc.h b/openbsc/include/openbsc/mncc.h index d40385d..ed1bfd6 100644 --- a/openbsc/include/openbsc/mncc.h +++ b/openbsc/include/openbsc/mncc.h @@ -24,7 +24,7 @@ #ifndef _MNCC_H #define _MNCC_H -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #include <osmocom/gsm/mncc.h> #include <stdint.h> diff --git a/openbsc/include/openbsc/osmo_bsc_rf.h b/openbsc/include/openbsc/osmo_bsc_rf.h index e43ae2e..7de9866 100644 --- a/openbsc/include/openbsc/osmo_bsc_rf.h +++ b/openbsc/include/openbsc/osmo_bsc_rf.h @@ -1,8 +1,8 @@ #ifndef OSMO_BSC_RF #define OSMO_BSC_RF -#include <osmocore/write_queue.h> -#include <osmocore/timer.h> +#include <osmocom/core/write_queue.h> +#include <osmocom/core/timer.h> struct gsm_network; diff --git a/openbsc/include/openbsc/osmo_msc_data.h b/openbsc/include/openbsc/osmo_msc_data.h index 8f9ca68..55b0a0f 100644 --- a/openbsc/include/openbsc/osmo_msc_data.h +++ b/openbsc/include/openbsc/osmo_msc_data.h @@ -25,7 +25,7 @@ #include "bsc_msc.h" -#include <osmocore/timer.h> +#include <osmocom/core/timer.h> struct osmo_bsc_rf; struct gsm_network; diff --git a/openbsc/include/openbsc/paging.h b/openbsc/include/openbsc/paging.h index f719199..13d611a 100644 --- a/openbsc/include/openbsc/paging.h +++ b/openbsc/include/openbsc/paging.h @@ -23,10 +23,10 @@ #include <stdlib.h> #include <string.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #include "gsm_data.h" #include "gsm_subscriber.h" -#include <osmocore/timer.h> +#include <osmocom/core/timer.h> /** * A pending paging request diff --git a/openbsc/include/openbsc/rtp_proxy.h b/openbsc/include/openbsc/rtp_proxy.h index 53b58b4..2e4f278 100644 --- a/openbsc/include/openbsc/rtp_proxy.h +++ b/openbsc/include/openbsc/rtp_proxy.h @@ -24,8 +24,8 @@ #include <netinet/in.h> -#include <osmocore/linuxlist.h> -#include <osmocore/select.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/select.h> #define RTP_PT_GSM_FULL 3 #define RTP_PT_GSM_HALF 96 diff --git a/openbsc/include/openbsc/sgsn.h b/openbsc/include/openbsc/sgsn.h index 84db87e..e3b2467 100644 --- a/openbsc/include/openbsc/sgsn.h +++ b/openbsc/include/openbsc/sgsn.h @@ -3,7 +3,7 @@ #include <sys/types.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <openbsc/gprs_ns.h> #include <openbsc/gprs_sgsn.h> diff --git a/openbsc/include/openbsc/signal.h b/openbsc/include/openbsc/signal.h index 5e2b7ae..ea76a40 100644 --- a/openbsc/include/openbsc/signal.h +++ b/openbsc/include/openbsc/signal.h @@ -27,7 +27,7 @@ #include <openbsc/gsm_data.h> -#include <osmocore/signal.h> +#include <osmocom/core/signal.h> /* * Signalling subsystems diff --git a/openbsc/include/openbsc/socket.h b/openbsc/include/openbsc/socket.h index 4d31611..faca764 100644 --- a/openbsc/include/openbsc/socket.h +++ b/openbsc/include/openbsc/socket.h @@ -2,7 +2,7 @@ #define _BSC_SOCKET_H #include <sys/types.h> -#include <osmocore/select.h> +#include <osmocom/core/select.h> #ifndef IPPROTO_GRE #define IPPROTO_GRE 47 diff --git a/openbsc/include/openbsc/subchan_demux.h b/openbsc/include/openbsc/subchan_demux.h index da2a7f3..f7f0fba 100644 --- a/openbsc/include/openbsc/subchan_demux.h +++ b/openbsc/include/openbsc/subchan_demux.h @@ -21,7 +21,7 @@ */ #include <sys/types.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #define NR_SUBCH 4 #define TRAU_FRAME_SIZE 40 diff --git a/openbsc/include/openbsc/system_information.h b/openbsc/include/openbsc/system_information.h index da662e9..5f183e0 100644 --- a/openbsc/include/openbsc/system_information.h +++ b/openbsc/include/openbsc/system_information.h @@ -1,7 +1,7 @@ #ifndef _SYSTEM_INFO_H #define _SYSTEM_INFO_H -#include <osmocore/utils.h> +#include <osmocom/core/utils.h> #define GSM_MACBLOCK_LEN 23 diff --git a/openbsc/include/openbsc/transaction.h b/openbsc/include/openbsc/transaction.h index e41d8ef..721630b 100644 --- a/openbsc/include/openbsc/transaction.h +++ b/openbsc/include/openbsc/transaction.h @@ -3,7 +3,7 @@ #include <openbsc/gsm_data.h> #include <openbsc/gsm_subscriber.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #include <openbsc/gsm_04_11.h> /* One transaction */ diff --git a/openbsc/include/openbsc/ussd.h b/openbsc/include/openbsc/ussd.h index 6f80d23..2665468 100644 --- a/openbsc/include/openbsc/ussd.h +++ b/openbsc/include/openbsc/ussd.h @@ -3,7 +3,7 @@ /* 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); diff --git a/openbsc/src/gprs/gb_proxy.c b/openbsc/src/gprs/gb_proxy.c index 8df93a9..53282e2 100644 --- a/openbsc/src/gprs/gb_proxy.c +++ b/openbsc/src/gprs/gb_proxy.c @@ -30,8 +30,8 @@ #include <sys/types.h> #include <arpa/inet.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> #include <openbsc/signal.h> #include <openbsc/debug.h> diff --git a/openbsc/src/gprs/gb_proxy_main.c b/openbsc/src/gprs/gb_proxy_main.c index b53e985..12ff8e0 100644 --- a/openbsc/src/gprs/gb_proxy_main.c +++ b/openbsc/src/gprs/gb_proxy_main.c @@ -33,10 +33,10 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> -#include <osmocore/rate_ctr.h> -#include <osmocore/process.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/rate_ctr.h> +#include <osmocom/core/process.h> #include <openbsc/signal.h> #include <openbsc/debug.h> diff --git a/openbsc/src/gprs/gb_proxy_vty.c b/openbsc/src/gprs/gb_proxy_vty.c index 05f5b1e..67ed093 100644 --- a/openbsc/src/gprs/gb_proxy_vty.c +++ b/openbsc/src/gprs/gb_proxy_vty.c @@ -23,7 +23,7 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/debug.h> #include <openbsc/gb_proxy.h> diff --git a/openbsc/src/gprs/gprs_gmm.c b/openbsc/src/gprs/gprs_gmm.c index 949cd96..43aa212 100644 --- a/openbsc/src/gprs/gprs_gmm.c +++ b/openbsc/src/gprs/gprs_gmm.c @@ -31,12 +31,12 @@ #include <arpa/inet.h> #include <openbsc/db.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> -#include <osmocore/gsm_utils.h> -#include <osmocore/signal.h> -#include <osmocore/talloc.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/tlv.h> +#include <osmocom/core/gsm_utils.h> +#include <osmocom/core/signal.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> diff --git a/openbsc/src/gprs/gprs_llc.c b/openbsc/src/gprs/gprs_llc.c index 7991f4c..f7408ef 100644 --- a/openbsc/src/gprs/gprs_llc.c +++ b/openbsc/src/gprs/gprs_llc.c @@ -22,10 +22,10 @@ #include <errno.h> #include <stdint.h> -#include <osmocore/msgb.h> -#include <osmocore/linuxlist.h> -#include <osmocore/timer.h> -#include <osmocore/talloc.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/talloc.h> #include <openbsc/gsm_data.h> #include <openbsc/debug.h> diff --git a/openbsc/src/gprs/gprs_llc_vty.c b/openbsc/src/gprs/gprs_llc_vty.c index d4f743b..050d024 100644 --- a/openbsc/src/gprs/gprs_llc_vty.c +++ b/openbsc/src/gprs/gprs_llc_vty.c @@ -27,11 +27,11 @@ #include <arpa/inet.h> #include <openbsc/gsm_data.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/tlv.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/debug.h> #include <openbsc/signal.h> #include <openbsc/gprs_llc.h> diff --git a/openbsc/src/gprs/gprs_sgsn.c b/openbsc/src/gprs/gprs_sgsn.c index 4436554..85f7105 100644 --- a/openbsc/src/gprs/gprs_sgsn.c +++ b/openbsc/src/gprs/gprs_sgsn.c @@ -21,10 +21,10 @@ #include <stdint.h> -#include <osmocore/linuxlist.h> -#include <osmocore/talloc.h> -#include <osmocore/timer.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/gsm_subscriber.h> #include <openbsc/debug.h> #include <openbsc/gprs_sgsn.h> diff --git a/openbsc/src/gprs/gprs_sndcp.c b/openbsc/src/gprs/gprs_sndcp.c index 4f421e4..1307fe5 100644 --- a/openbsc/src/gprs/gprs_sndcp.c +++ b/openbsc/src/gprs/gprs_sndcp.c @@ -23,10 +23,10 @@ #include <errno.h> #include <stdint.h> -#include <osmocore/msgb.h> -#include <osmocore/linuxlist.h> -#include <osmocore/timer.h> -#include <osmocore/talloc.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/talloc.h> #include <openbsc/gsm_data.h> #include <openbsc/debug.h> diff --git a/openbsc/src/gprs/gprs_sndcp_vty.c b/openbsc/src/gprs/gprs_sndcp_vty.c index 5a755d5..a6c0bd3 100644 --- a/openbsc/src/gprs/gprs_sndcp_vty.c +++ b/openbsc/src/gprs/gprs_sndcp_vty.c @@ -27,11 +27,11 @@ #include <arpa/inet.h> #include <openbsc/gsm_data.h> -#include <osmocore/msgb.h> -#include <osmocore/tlv.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/tlv.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/debug.h> #include <openbsc/signal.h> #include <openbsc/gprs_llc.h> diff --git a/openbsc/src/gprs/sgsn_libgtp.c b/openbsc/src/gprs/sgsn_libgtp.c index 7b10a45..c2afc79 100644 --- a/openbsc/src/gprs/sgsn_libgtp.c +++ b/openbsc/src/gprs/sgsn_libgtp.c @@ -34,9 +34,9 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/gsm_04_08_gprs.h> #include <openbsc/signal.h> diff --git a/openbsc/src/gprs/sgsn_main.c b/openbsc/src/gprs/sgsn_main.c index c59265f..dd8cef1 100644 --- a/openbsc/src/gprs/sgsn_main.c +++ b/openbsc/src/gprs/sgsn_main.c @@ -33,11 +33,11 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> -#include <osmocore/rate_ctr.h> -#include <osmocore/logging.h> -#include <osmocore/process.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/rate_ctr.h> +#include <osmocom/core/logging.h> +#include <osmocom/core/process.h> #include <osmocom/vty/telnet_interface.h> diff --git a/openbsc/src/gprs/sgsn_vty.c b/openbsc/src/gprs/sgsn_vty.c index 74669ff..7100b1f 100644 --- a/openbsc/src/gprs/sgsn_vty.c +++ b/openbsc/src/gprs/sgsn_vty.c @@ -23,9 +23,9 @@ #include <netinet/in.h> #include <arpa/inet.h> -#include <osmocore/talloc.h> -#include <osmocore/utils.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/debug.h> #include <openbsc/sgsn.h> diff --git a/openbsc/src/ipaccess/ipaccess-config.c b/openbsc/src/ipaccess/ipaccess-config.c index d02faea..5215538 100644 --- a/openbsc/src/ipaccess/ipaccess-config.c +++ b/openbsc/src/ipaccess/ipaccess-config.c @@ -35,8 +35,8 @@ #include <arpa/inet.h> -#include <osmocore/select.h> -#include <osmocore/timer.h> +#include <osmocom/core/select.h> +#include <osmocom/core/timer.h> #include <openbsc/ipaccess.h> #include <openbsc/gsm_data.h> #include <openbsc/e1_input.h> @@ -44,7 +44,7 @@ #include <openbsc/signal.h> #include <openbsc/debug.h> #include <openbsc/network_listen.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> static struct gsm_network *gsmnet; diff --git a/openbsc/src/ipaccess/ipaccess-find.c b/openbsc/src/ipaccess/ipaccess-find.c index bea4b77..6dc2f06 100644 --- a/openbsc/src/ipaccess/ipaccess-find.c +++ b/openbsc/src/ipaccess/ipaccess-find.c @@ -27,8 +27,8 @@ #include <arpa/inet.h> -#include <osmocore/select.h> -#include <osmocore/timer.h> +#include <osmocom/core/select.h> +#include <osmocom/core/timer.h> #include <openbsc/ipaccess.h> #include <openbsc/gsm_data.h> diff --git a/openbsc/src/ipaccess/ipaccess-firmware.c b/openbsc/src/ipaccess/ipaccess-firmware.c index 7fdd0f8..971db9d 100644 --- a/openbsc/src/ipaccess/ipaccess-firmware.c +++ b/openbsc/src/ipaccess/ipaccess-firmware.c @@ -20,7 +20,7 @@ #include <openbsc/debug.h> #include <openbsc/ipaccess.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <stdio.h> #include <stdlib.h> diff --git a/openbsc/src/ipaccess/ipaccess-proxy.c b/openbsc/src/ipaccess/ipaccess-proxy.c index 1dc6834..56fe160 100644 --- a/openbsc/src/ipaccess/ipaccess-proxy.c +++ b/openbsc/src/ipaccess/ipaccess-proxy.c @@ -39,12 +39,12 @@ #include <getopt.h> #include <openbsc/gsm_data.h> -#include <osmocore/select.h> +#include <osmocom/core/select.h> #include <osmocom/gsm/tlv.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <openbsc/debug.h> #include <openbsc/ipaccess.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> static struct log_target *stderr_target; diff --git a/openbsc/src/ipaccess/network_listen.c b/openbsc/src/ipaccess/network_listen.c index 1253e2a..cf0a6dc 100644 --- a/openbsc/src/ipaccess/network_listen.c +++ b/openbsc/src/ipaccess/network_listen.c @@ -28,8 +28,8 @@ #include <arpa/inet.h> -#include <osmocore/talloc.h> -#include <osmocore/timer.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/timer.h> #include <osmocom/gsm/rxlev_stat.h> #include <osmocom/gsm/gsm48_ie.h> diff --git a/openbsc/src/libabis/e1_input.c b/openbsc/src/libabis/e1_input.c index 3b6644e..eea1abe 100644 --- a/openbsc/src/libabis/e1_input.c +++ b/openbsc/src/libabis/e1_input.c @@ -39,18 +39,18 @@ #define PF_ISDN AF_ISDN #endif -#include <osmocore/select.h> -#include <osmocore/msgb.h> +#include <osmocom/core/select.h> +#include <osmocom/core/msgb.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/e1_input.h> #include <openbsc/abis_nm.h> #include <openbsc/abis_rsl.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #include <openbsc/subchan_demux.h> #include <openbsc/trau_frame.h> #include <openbsc/trau_mux.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/signal.h> #include <openbsc/misdn.h> diff --git a/openbsc/src/libabis/e1_input_vty.c b/openbsc/src/libabis/e1_input_vty.c index b051a88..8905501 100644 --- a/openbsc/src/libabis/e1_input_vty.c +++ b/openbsc/src/libabis/e1_input_vty.c @@ -27,12 +27,12 @@ #include <osmocom/vty/logging.h> #include <osmocom/vty/telnet_interface.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #include <openbsc/gsm_data.h> #include <openbsc/e1_input.h> -#include <osmocore/utils.h> +#include <osmocom/core/utils.h> #include <osmocom/gsm/gsm_utils.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/vty.h> #include <openbsc/debug.h> diff --git a/openbsc/src/libabis/input/dahdi.c b/openbsc/src/libabis/input/dahdi.c index 572bb5a..2754944 100644 --- a/openbsc/src/libabis/input/dahdi.c +++ b/openbsc/src/libabis/input/dahdi.c @@ -39,8 +39,8 @@ #include <arpa/inet.h> #include <dahdi/user.h> -#include <osmocore/select.h> -#include <osmocore/msgb.h> +#include <osmocom/core/select.h> +#include <osmocom/core/msgb.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/abis_nm.h> @@ -48,7 +48,7 @@ #include <openbsc/subchan_demux.h> #include <openbsc/e1_input.h> #include <openbsc/signal.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include "lapd.h" diff --git a/openbsc/src/libabis/input/hsl.c b/openbsc/src/libabis/input/hsl.c index 2fb97b5..d8f284e 100644 --- a/openbsc/src/libabis/input/hsl.c +++ b/openbsc/src/libabis/input/hsl.c @@ -43,9 +43,9 @@ #include <sys/ioctl.h> #include <arpa/inet.h> -#include <osmocore/select.h> +#include <osmocom/core/select.h> #include <osmocom/gsm/tlv.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/abis_nm.h> @@ -55,7 +55,7 @@ #include <openbsc/ipaccess.h> #include <openbsc/socket.h> #include <openbsc/signal.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #define HSL_TCP_PORT 2500 #define HSL_PROTO_DEBUG 0xdd diff --git a/openbsc/src/libabis/input/ipaccess.c b/openbsc/src/libabis/input/ipaccess.c index 166d42b..f074616 100644 --- a/openbsc/src/libabis/input/ipaccess.c +++ b/openbsc/src/libabis/input/ipaccess.c @@ -33,10 +33,10 @@ #include <sys/ioctl.h> #include <arpa/inet.h> -#include <osmocore/select.h> +#include <osmocom/core/select.h> #include <osmocom/gsm/tlv.h> -#include <osmocore/msgb.h> -#include <osmocore/talloc.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/abis_nm.h> diff --git a/openbsc/src/libabis/input/lapd.c b/openbsc/src/libabis/input/lapd.c index 7bce6cc..2a4f60e 100644 --- a/openbsc/src/libabis/input/lapd.c +++ b/openbsc/src/libabis/input/lapd.c @@ -36,10 +36,10 @@ #include "lapd.h" -#include <osmocore/linuxlist.h> -#include <osmocore/talloc.h> -#include <osmocore/msgb.h> -#include <osmocore/timer.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/timer.h> #include <openbsc/debug.h> #define SABM_INTERVAL 0, 300000 diff --git a/openbsc/src/libabis/input/lapd.h b/openbsc/src/libabis/input/lapd.h index fd11eda..fb980d1 100644 --- a/openbsc/src/libabis/input/lapd.h +++ b/openbsc/src/libabis/input/lapd.h @@ -3,7 +3,7 @@ #include <stdint.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> typedef enum { LAPD_MPH_NONE = 0, diff --git a/openbsc/src/libabis/input/misdn.c b/openbsc/src/libabis/input/misdn.c index 4598879..e111c13 100644 --- a/openbsc/src/libabis/input/misdn.c +++ b/openbsc/src/libabis/input/misdn.c @@ -40,9 +40,9 @@ #define PF_ISDN AF_ISDN #endif -#include <osmocore/select.h> -#include <osmocore/msgb.h> -#include <osmocore/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/abis_nm.h> diff --git a/openbsc/src/libbsc/abis_nm.c b/openbsc/src/libbsc/abis_nm.c index cdb7409..1d86ffa 100644 --- a/openbsc/src/libbsc/abis_nm.c +++ b/openbsc/src/libbsc/abis_nm.c @@ -37,9 +37,9 @@ #include <openbsc/gsm_data.h> #include <openbsc/debug.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <osmocom/gsm/tlv.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/abis_nm.h> #include <openbsc/misdn.h> #include <openbsc/signal.h> diff --git a/openbsc/src/libbsc/abis_nm_vty.c b/openbsc/src/libbsc/abis_nm_vty.c index 867897b..3a16b2b 100644 --- a/openbsc/src/libbsc/abis_nm_vty.c +++ b/openbsc/src/libbsc/abis_nm_vty.c @@ -27,9 +27,9 @@ #include <arpa/inet.h> #include <openbsc/gsm_data.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <osmocom/gsm/tlv.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/debug.h> #include <openbsc/signal.h> #include <openbsc/abis_nm.h> diff --git a/openbsc/src/libbsc/abis_om2000.c b/openbsc/src/libbsc/abis_om2000.c index 786871f..c1aef9f 100644 --- a/openbsc/src/libbsc/abis_om2000.c +++ b/openbsc/src/libbsc/abis_om2000.c @@ -30,10 +30,10 @@ #include <arpa/inet.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <osmocom/gsm/tlv.h> -#include <osmocore/talloc.h> -#include <osmocore/utils.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/utils.h> #include <openbsc/gsm_data.h> #include <openbsc/debug.h> diff --git a/openbsc/src/libbsc/abis_om2000_vty.c b/openbsc/src/libbsc/abis_om2000_vty.c index aabfe5b..704f955 100644 --- a/openbsc/src/libbsc/abis_om2000_vty.c +++ b/openbsc/src/libbsc/abis_om2000_vty.c @@ -27,9 +27,9 @@ #include <arpa/inet.h> #include <openbsc/gsm_data.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <osmocom/gsm/tlv.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/debug.h> #include <openbsc/signal.h> #include <openbsc/abis_om2000.h> diff --git a/openbsc/src/libbsc/abis_rsl.c b/openbsc/src/libbsc/abis_rsl.c index cdb8e51..8cac832 100644 --- a/openbsc/src/libbsc/abis_rsl.c +++ b/openbsc/src/libbsc/abis_rsl.c @@ -41,7 +41,7 @@ #include <openbsc/rtp_proxy.h> #include <osmocom/gsm/rsl.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #define RSL_ALLOC_SIZE 1024 #define RSL_ALLOC_HEADROOM 128 diff --git a/openbsc/src/libbsc/bsc_api.c b/openbsc/src/libbsc/bsc_api.c index 273e775..bbd9b58 100644 --- a/openbsc/src/libbsc/bsc_api.c +++ b/openbsc/src/libbsc/bsc_api.c @@ -34,7 +34,7 @@ #include <osmocom/gsm/protocol/gsm_08_08.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #define GSM0808_T10_VALUE 6, 0 diff --git a/openbsc/src/libbsc/bsc_init.c b/openbsc/src/libbsc/bsc_init.c index ecdc8b9..127e9fb 100644 --- a/openbsc/src/libbsc/bsc_init.c +++ b/openbsc/src/libbsc/bsc_init.c @@ -31,7 +31,7 @@ #include <openbsc/paging.h> #include <openbsc/signal.h> #include <openbsc/chan_alloc.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/ipaccess.h> /* global pointer to the gsm network data structure */ diff --git a/openbsc/src/libbsc/bsc_msc.c b/openbsc/src/libbsc/bsc_msc.c index 508697a..e9a5113 100644 --- a/openbsc/src/libbsc/bsc_msc.c +++ b/openbsc/src/libbsc/bsc_msc.c @@ -23,8 +23,8 @@ #include <openbsc/debug.h> #include <openbsc/ipaccess.h> -#include <osmocore/write_queue.h> -#include <osmocore/talloc.h> +#include <osmocom/core/write_queue.h> +#include <osmocom/core/talloc.h> #include <arpa/inet.h> #include <sys/socket.h> diff --git a/openbsc/src/libbsc/bsc_rll.c b/openbsc/src/libbsc/bsc_rll.c index 722f3fa..f3eef99 100644 --- a/openbsc/src/libbsc/bsc_rll.c +++ b/openbsc/src/libbsc/bsc_rll.c @@ -23,9 +23,9 @@ #include <errno.h> #include <openbsc/debug.h> -#include <osmocore/talloc.h> -#include <osmocore/timer.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/linuxlist.h> #include <openbsc/bsc_rll.h> #include <openbsc/gsm_data.h> #include <openbsc/chan_alloc.h> diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c index bba72f2..dfa02bb 100644 --- a/openbsc/src/libbsc/bsc_vty.c +++ b/openbsc/src/libbsc/bsc_vty.c @@ -29,17 +29,17 @@ #include <arpa/inet.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #include <openbsc/gsm_data.h> #include <openbsc/e1_input.h> #include <openbsc/abis_nm.h> #include <openbsc/abis_om2000.h> -#include <osmocore/utils.h> +#include <osmocom/core/utils.h> #include <osmocom/gsm/gsm_utils.h> #include <openbsc/chan_alloc.h> #include <openbsc/meas_rep.h> #include <openbsc/db.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/vty.h> #include <openbsc/gprs_ns.h> #include <openbsc/system_information.h> diff --git a/openbsc/src/libbsc/chan_alloc.c b/openbsc/src/libbsc/chan_alloc.c index 167381b..f12e21b 100644 --- a/openbsc/src/libbsc/chan_alloc.c +++ b/openbsc/src/libbsc/chan_alloc.c @@ -32,7 +32,7 @@ #include <openbsc/debug.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) { diff --git a/openbsc/src/libbsc/e1_config.c b/openbsc/src/libbsc/e1_config.c index 958839d..bd6ebba 100644 --- a/openbsc/src/libbsc/e1_config.c +++ b/openbsc/src/libbsc/e1_config.c @@ -29,7 +29,7 @@ #include <openbsc/trau_mux.h> #include <openbsc/misdn.h> #include <openbsc/ipaccess.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/debug.h> #define SAPI_L2ML 0 diff --git a/openbsc/src/libbsc/gsm_04_08_utils.c b/openbsc/src/libbsc/gsm_04_08_utils.c index ac04825..1aab2ee 100644 --- a/openbsc/src/libbsc/gsm_04_08_utils.c +++ b/openbsc/src/libbsc/gsm_04_08_utils.c @@ -27,7 +27,7 @@ #include <errno.h> #include <netinet/in.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <osmocom/gsm/gsm48.h> #include <openbsc/abis_rsl.h> diff --git a/openbsc/src/libbsc/gsm_subscriber_base.c b/openbsc/src/libbsc/gsm_subscriber_base.c index caf84e7..11afb35 100644 --- a/openbsc/src/libbsc/gsm_subscriber_base.c +++ b/openbsc/src/libbsc/gsm_subscriber_base.c @@ -27,7 +27,7 @@ #include <string.h> #include <assert.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/gsm_subscriber.h> #include <openbsc/debug.h> diff --git a/openbsc/src/libbsc/handover_decision.c b/openbsc/src/libbsc/handover_decision.c index 5154653..3b81dde 100644 --- a/openbsc/src/libbsc/handover_decision.c +++ b/openbsc/src/libbsc/handover_decision.c @@ -24,12 +24,12 @@ #include <stdlib.h> #include <errno.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/meas_rep.h> #include <openbsc/signal.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/handover.h> #include <osmocom/gsm/gsm_utils.h> diff --git a/openbsc/src/libbsc/handover_logic.c b/openbsc/src/libbsc/handover_logic.c index f23cf1a..ad79f8a 100644 --- a/openbsc/src/libbsc/handover_logic.c +++ b/openbsc/src/libbsc/handover_logic.c @@ -28,7 +28,7 @@ #include <time.h> #include <netinet/in.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <osmocom/gsm/gsm_utils.h> @@ -37,7 +37,7 @@ #include <openbsc/abis_rsl.h> #include <openbsc/chan_alloc.h> #include <openbsc/signal.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/transaction.h> #include <openbsc/rtp_proxy.h> diff --git a/openbsc/src/libbsc/meas_proc.c b/openbsc/src/libbsc/meas_proc.c index ade1f2e..5ca013d 100644 --- a/openbsc/src/libbsc/meas_proc.c +++ b/openbsc/src/libbsc/meas_proc.c @@ -22,8 +22,8 @@ #include <stdlib.h> #include <errno.h> -#include <osmocore/talloc.h> -#include <osmocore/msgb.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/msgb.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/meas_rep.h> diff --git a/openbsc/src/libbsc/paging.c b/openbsc/src/libbsc/paging.c index 6502545..c542544 100644 --- a/openbsc/src/libbsc/paging.c +++ b/openbsc/src/libbsc/paging.c @@ -39,7 +39,7 @@ #include <assert.h> #include <openbsc/paging.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/debug.h> #include <openbsc/signal.h> #include <openbsc/abis_rsl.h> diff --git a/openbsc/src/libbsc/rest_octets.c b/openbsc/src/libbsc/rest_octets.c index 084f144..c040d26 100644 --- a/openbsc/src/libbsc/rest_octets.c +++ b/openbsc/src/libbsc/rest_octets.c @@ -26,7 +26,7 @@ #include <errno.h> #include <openbsc/gsm_data.h> -#include <osmocore/bitvec.h> +#include <osmocom/core/bitvec.h> #include <openbsc/rest_octets.h> /* generate SI1 rest octets */ diff --git a/openbsc/src/libbsc/system_information.c b/openbsc/src/libbsc/system_information.c index dc71938..1cbbcc9 100644 --- a/openbsc/src/libbsc/system_information.c +++ b/openbsc/src/libbsc/system_information.c @@ -30,8 +30,8 @@ #include <openbsc/gsm_data.h> #include <openbsc/abis_rsl.h> #include <openbsc/rest_octets.h> -#include <osmocore/bitvec.h> -#include <osmocore/utils.h> +#include <osmocom/core/bitvec.h> +#include <osmocom/core/utils.h> #include <openbsc/debug.h> #define GSM48_CELL_CHAN_DESC_SIZE 16 diff --git a/openbsc/src/libbsc/transaction.c b/openbsc/src/libbsc/transaction.c index 9b4af1a..180f9f9 100644 --- a/openbsc/src/libbsc/transaction.c +++ b/openbsc/src/libbsc/transaction.c @@ -22,7 +22,7 @@ #include <openbsc/gsm_data.h> #include <openbsc/mncc.h> #include <openbsc/debug.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/gsm_subscriber.h> #include <openbsc/gsm_04_08.h> #include <openbsc/mncc.h> diff --git a/openbsc/src/libcommon/common_vty.c b/openbsc/src/libcommon/common_vty.c index 84375a2..e974f2d 100644 --- a/openbsc/src/libcommon/common_vty.c +++ b/openbsc/src/libcommon/common_vty.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include <string.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/vty.h> #include <openbsc/gsm_data.h> diff --git a/openbsc/src/libcommon/debug.c b/openbsc/src/libcommon/debug.c index ea5db49..1372150 100644 --- a/openbsc/src/libcommon/debug.c +++ b/openbsc/src/libcommon/debug.c @@ -27,9 +27,9 @@ #include <time.h> #include <errno.h> -#include <osmocore/talloc.h> -#include <osmocore/utils.h> -#include <osmocore/logging.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/utils.h> +#include <osmocom/core/logging.h> #include <openbsc/gsm_data.h> #include <openbsc/gsm_subscriber.h> #include <openbsc/debug.h> diff --git a/openbsc/src/libcommon/gsm_data.c b/openbsc/src/libcommon/gsm_data.c index 19f2c94..cab1e4a 100644 --- a/openbsc/src/libcommon/gsm_data.c +++ b/openbsc/src/libcommon/gsm_data.c @@ -26,10 +26,10 @@ #include <netinet/in.h> -#include <osmocore/linuxlist.h> -#include <osmocore/talloc.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/talloc.h> #include <osmocom/gsm/gsm_utils.h> -#include <osmocore/statistics.h> +#include <osmocom/core/statistics.h> #include <openbsc/gsm_data.h> #include <openbsc/osmo_msc_data.h> diff --git a/openbsc/src/libcommon/socket.c b/openbsc/src/libcommon/socket.c index 363c6fe..42d7b48 100644 --- a/openbsc/src/libcommon/socket.c +++ b/openbsc/src/libcommon/socket.c @@ -33,12 +33,12 @@ #include <sys/ioctl.h> #include <arpa/inet.h> -#include <osmocore/select.h> +#include <osmocom/core/select.h> #include <osmocom/gsm/tlv.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <openbsc/debug.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 (*cb)(struct bsc_fd *fd, unsigned int what)) diff --git a/openbsc/src/libcommon/talloc_ctx.c b/openbsc/src/libcommon/talloc_ctx.c index 8e7ec23..ae6a156 100644 --- a/openbsc/src/libcommon/talloc_ctx.c +++ b/openbsc/src/libcommon/talloc_ctx.c @@ -1,4 +1,4 @@ -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/gsm_data.h> extern void *tall_msgb_ctx; diff --git a/openbsc/src/libgb/gprs_bssgp.c b/openbsc/src/libgb/gprs_bssgp.c index 91c5d22..b74791c 100644 --- a/openbsc/src/libgb/gprs_bssgp.c +++ b/openbsc/src/libgb/gprs_bssgp.c @@ -27,10 +27,10 @@ #include <netinet/in.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <osmocom/gsm/tlv.h> -#include <osmocore/talloc.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> diff --git a/openbsc/src/libgb/gprs_bssgp_util.c b/openbsc/src/libgb/gprs_bssgp_util.c index 548117a..b539323 100644 --- a/openbsc/src/libgb/gprs_bssgp_util.c +++ b/openbsc/src/libgb/gprs_bssgp_util.c @@ -24,9 +24,9 @@ #include <netinet/in.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <osmocom/gsm/tlv.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> diff --git a/openbsc/src/libgb/gprs_bssgp_vty.c b/openbsc/src/libgb/gprs_bssgp_vty.c index 07af92a..720c221 100644 --- a/openbsc/src/libgb/gprs_bssgp_vty.c +++ b/openbsc/src/libgb/gprs_bssgp_vty.c @@ -27,11 +27,11 @@ #include <arpa/inet.h> #include <openbsc/gsm_data.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <osmocom/gsm/tlv.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/debug.h> #include <openbsc/signal.h> #include <openbsc/gprs_ns.h> diff --git a/openbsc/src/libgb/gprs_ns.c b/openbsc/src/libgb/gprs_ns.c index facba35..877a065 100644 --- a/openbsc/src/libgb/gprs_ns.c +++ b/openbsc/src/libgb/gprs_ns.c @@ -59,11 +59,11 @@ #include <arpa/inet.h> #include <openbsc/gsm_data.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <osmocom/gsm/tlv.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/debug.h> #include <openbsc/signal.h> #include <openbsc/gprs_ns.h> diff --git a/openbsc/src/libgb/gprs_ns_frgre.c b/openbsc/src/libgb/gprs_ns_frgre.c index 106f410..98b1ad6 100644 --- a/openbsc/src/libgb/gprs_ns_frgre.c +++ b/openbsc/src/libgb/gprs_ns_frgre.c @@ -31,9 +31,9 @@ #include <netinet/ip.h> #include <arpa/inet.h> -#include <osmocore/select.h> -#include <osmocore/msgb.h> -#include <osmocore/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> #include <openbsc/socket.h> #include <openbsc/debug.h> diff --git a/openbsc/src/libgb/gprs_ns_vty.c b/openbsc/src/libgb/gprs_ns_vty.c index c649127..505dc3b 100644 --- a/openbsc/src/libgb/gprs_ns_vty.c +++ b/openbsc/src/libgb/gprs_ns_vty.c @@ -27,11 +27,11 @@ #include <arpa/inet.h> #include <openbsc/gsm_data.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <osmocom/gsm/tlv.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> +#include <osmocom/core/rate_ctr.h> #include <openbsc/debug.h> #include <openbsc/signal.h> #include <openbsc/gprs_ns.h> diff --git a/openbsc/src/libmgcp/mgcp_network.c b/openbsc/src/libmgcp/mgcp_network.c index b814d98..7167d58 100644 --- a/openbsc/src/libmgcp/mgcp_network.c +++ b/openbsc/src/libmgcp/mgcp_network.c @@ -29,8 +29,8 @@ #include <sys/socket.h> #include <arpa/inet.h> -#include <osmocore/msgb.h> -#include <osmocore/select.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/select.h> #include <openbsc/mgcp.h> #include <openbsc/mgcp_internal.h> diff --git a/openbsc/src/libmgcp/mgcp_protocol.c b/openbsc/src/libmgcp/mgcp_protocol.c index c9a9b7f..bca4b31 100644 --- a/openbsc/src/libmgcp/mgcp_protocol.c +++ b/openbsc/src/libmgcp/mgcp_protocol.c @@ -29,9 +29,9 @@ #include <limits.h> #include <unistd.h> -#include <osmocore/msgb.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> #include <openbsc/mgcp.h> #include <openbsc/mgcp_internal.h> diff --git a/openbsc/src/libmgcp/mgcp_vty.c b/openbsc/src/libmgcp/mgcp_vty.c index 2e695c8..be77b83 100644 --- a/openbsc/src/libmgcp/mgcp_vty.c +++ b/openbsc/src/libmgcp/mgcp_vty.c @@ -23,7 +23,7 @@ #include <sys/types.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/mgcp.h> #include <openbsc/mgcp_internal.h> diff --git a/openbsc/src/libmsc/db.c b/openbsc/src/libmsc/db.c index 95a7d36..3de6830 100644 --- a/openbsc/src/libmsc/db.c +++ b/openbsc/src/libmsc/db.c @@ -34,9 +34,9 @@ #include <openbsc/db.h> #include <openbsc/debug.h> -#include <osmocore/talloc.h> -#include <osmocore/statistics.h> -#include <osmocore/rate_ctr.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/statistics.h> +#include <osmocom/core/rate_ctr.h> static char *db_basename = NULL; static char *db_dirname = NULL; diff --git a/openbsc/src/libmsc/gsm_04_08.c b/openbsc/src/libmsc/gsm_04_08.c index aa8434c..695f43d 100644 --- a/openbsc/src/libmsc/gsm_04_08.c +++ b/openbsc/src/libmsc/gsm_04_08.c @@ -49,13 +49,13 @@ #include <openbsc/silent_call.h> #include <openbsc/bsc_api.h> #include <openbsc/osmo_msc.h> -#include <osmocore/bitvec.h> +#include <osmocom/core/bitvec.h> #include <osmocom/gsm/gsm48.h> #include <osmocom/gsm/gsm0480.h> #include <osmocom/gsm/gsm_utils.h> -#include <osmocore/msgb.h> -#include <osmocore/talloc.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> #include <osmocom/gsm/tlv.h> void *tall_locop_ctx; diff --git a/openbsc/src/libmsc/gsm_04_11.c b/openbsc/src/libmsc/gsm_04_11.c index 2475593..0f8d7c2 100644 --- a/openbsc/src/libmsc/gsm_04_11.c +++ b/openbsc/src/libmsc/gsm_04_11.c @@ -32,7 +32,7 @@ #include <time.h> #include <netinet/in.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <osmocom/gsm/tlv.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> @@ -44,7 +44,7 @@ #include <openbsc/abis_rsl.h> #include <openbsc/signal.h> #include <openbsc/db.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/transaction.h> #include <openbsc/paging.h> #include <openbsc/bsc_rll.h> diff --git a/openbsc/src/libmsc/gsm_04_80.c b/openbsc/src/libmsc/gsm_04_80.c index 4841912..240bfb3 100644 --- a/openbsc/src/libmsc/gsm_04_80.c +++ b/openbsc/src/libmsc/gsm_04_80.c @@ -36,7 +36,7 @@ #include <osmocom/gsm/gsm0480.h> #include <osmocom/gsm/gsm_utils.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <osmocom/gsm/tlv.h> static inline unsigned char *msgb_wrap_with_TL(struct msgb *msgb, u_int8_t tag) diff --git a/openbsc/src/libmsc/gsm_subscriber.c b/openbsc/src/libmsc/gsm_subscriber.c index db61f25..ff4a647 100644 --- a/openbsc/src/libmsc/gsm_subscriber.c +++ b/openbsc/src/libmsc/gsm_subscriber.c @@ -26,7 +26,7 @@ #include <string.h> #include <assert.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <osmocom/vty/vty.h> diff --git a/openbsc/src/libmsc/mncc.c b/openbsc/src/libmsc/mncc.c index 3630b91..1bed543 100644 --- a/openbsc/src/libmsc/mncc.c +++ b/openbsc/src/libmsc/mncc.c @@ -30,7 +30,7 @@ #include <openbsc/gsm_04_08.h> #include <openbsc/debug.h> #include <openbsc/mncc.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/gsm_data.h> #include <openbsc/transaction.h> #include <openbsc/rtp_proxy.h> diff --git a/openbsc/src/libmsc/mncc_builtin.c b/openbsc/src/libmsc/mncc_builtin.c index 0226b27..11355fb 100644 --- a/openbsc/src/libmsc/mncc_builtin.c +++ b/openbsc/src/libmsc/mncc_builtin.c @@ -31,7 +31,7 @@ #include <openbsc/gsm_04_08.h> #include <openbsc/debug.h> #include <openbsc/mncc.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/gsm_data.h> #include <openbsc/transaction.h> #include <openbsc/rtp_proxy.h> diff --git a/openbsc/src/libmsc/mncc_sock.c b/openbsc/src/libmsc/mncc_sock.c index 43ad136..576ed01 100644 --- a/openbsc/src/libmsc/mncc_sock.c +++ b/openbsc/src/libmsc/mncc_sock.c @@ -30,8 +30,8 @@ #include <sys/socket.h> #include <sys/un.h> -#include <osmocore/talloc.h> -#include <osmocore/select.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/select.h> #include <osmocom/gsm/protocol/gsm_04_08.h> #include <openbsc/debug.h> diff --git a/openbsc/src/libmsc/silent_call.c b/openbsc/src/libmsc/silent_call.c index 64ebdfd..83e27a9 100644 --- a/openbsc/src/libmsc/silent_call.c +++ b/openbsc/src/libmsc/silent_call.c @@ -24,7 +24,7 @@ #include <unistd.h> #include <errno.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <openbsc/signal.h> #include <openbsc/debug.h> #include <openbsc/paging.h> diff --git a/openbsc/src/libmsc/sms_queue.c b/openbsc/src/libmsc/sms_queue.c index 079755d..f0d3d37 100644 --- a/openbsc/src/libmsc/sms_queue.c +++ b/openbsc/src/libmsc/sms_queue.c @@ -37,7 +37,7 @@ #include <openbsc/gsm_subscriber.h> #include <openbsc/signal.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <osmocom/vty/vty.h> diff --git a/openbsc/src/libmsc/token_auth.c b/openbsc/src/libmsc/token_auth.c index 3404dd4..4a62e8d 100644 --- a/openbsc/src/libmsc/token_auth.c +++ b/openbsc/src/libmsc/token_auth.c @@ -20,7 +20,7 @@ */ #include <stdio.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/signal.h> #include <openbsc/gsm_data.h> #include <openbsc/gsm_04_11.h> diff --git a/openbsc/src/libmsc/vty_interface_layer3.c b/openbsc/src/libmsc/vty_interface_layer3.c index add5b05..8d6109b 100644 --- a/openbsc/src/libmsc/vty_interface_layer3.c +++ b/openbsc/src/libmsc/vty_interface_layer3.c @@ -29,7 +29,7 @@ #include <arpa/inet.h> -#include <osmocore/linuxlist.h> +#include <osmocom/core/linuxlist.h> #include <openbsc/gsm_data.h> #include <openbsc/gsm_subscriber.h> #include <openbsc/silent_call.h> @@ -37,9 +37,9 @@ #include <openbsc/e1_input.h> #include <openbsc/abis_nm.h> #include <osmocom/gsm/gsm_utils.h> -#include <osmocore/utils.h> +#include <osmocom/core/utils.h> #include <openbsc/db.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/signal.h> #include <openbsc/debug.h> #include <openbsc/vty.h> diff --git a/openbsc/src/libtrau/rtp_proxy.c b/openbsc/src/libtrau/rtp_proxy.c index eefc0e1..75f8256 100644 --- a/openbsc/src/libtrau/rtp_proxy.c +++ b/openbsc/src/libtrau/rtp_proxy.c @@ -28,10 +28,10 @@ #include <time.h> /* clock() */ #include <sys/utsname.h> /* uname() */ -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/gsm_data.h> -#include <osmocore/msgb.h> -#include <osmocore/select.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/select.h> #include <openbsc/debug.h> #include <openbsc/rtp_proxy.h> diff --git a/openbsc/src/libtrau/subchan_demux.c b/openbsc/src/libtrau/subchan_demux.c index 6bcf279..ee62d41 100644 --- a/openbsc/src/libtrau/subchan_demux.c +++ b/openbsc/src/libtrau/subchan_demux.c @@ -27,7 +27,7 @@ #include <openbsc/subchan_demux.h> #include <openbsc/trau_frame.h> #include <openbsc/debug.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/gsm_data.h> void *tall_tqe_ctx; diff --git a/openbsc/src/libtrau/trau_mux.c b/openbsc/src/libtrau/trau_mux.c index 712e22d..6451554 100644 --- a/openbsc/src/libtrau/trau_mux.c +++ b/openbsc/src/libtrau/trau_mux.c @@ -29,7 +29,7 @@ #include <openbsc/subchan_demux.h> #include <openbsc/e1_input.h> #include <openbsc/debug.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> u_int8_t gsm_fr_map[] = { 6, 6, 5, 5, 4, 4, 3, 3, diff --git a/openbsc/src/osmo-bsc/osmo_bsc_api.c b/openbsc/src/osmo-bsc/osmo_bsc_api.c index b8cbcf2..aead4c8 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_api.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_api.c @@ -21,8 +21,8 @@ #include <openbsc/osmo_msc_data.h> #include <openbsc/debug.h> -#include <osmocore/protocol/gsm_08_08.h> -#include <osmocore/gsm0808.h> +#include <osmocom/core/protocol/gsm_08_08.h> +#include <osmocom/core/gsm0808.h> #define return_when_not_connected(conn) \ if (!conn->sccp_con) {\ diff --git a/openbsc/src/osmo-bsc/osmo_bsc_bssap.c b/openbsc/src/osmo-bsc/osmo_bsc_bssap.c index f871131..f9dc79a 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_bssap.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_bssap.c @@ -26,8 +26,8 @@ #include <openbsc/mgcp.h> #include <openbsc/paging.h> -#include <osmocore/gsm0808.h> -#include <osmocore/protocol/gsm_08_08.h> +#include <osmocom/core/gsm0808.h> +#include <osmocom/core/protocol/gsm_08_08.h> #include <arpa/inet.h> diff --git a/openbsc/src/osmo-bsc/osmo_bsc_main.c b/openbsc/src/osmo-bsc/osmo_bsc_main.c index b5f64ab..e1a5e31 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_main.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_main.c @@ -26,8 +26,8 @@ #include <openbsc/signal.h> #include <openbsc/vty.h> -#include <osmocore/talloc.h> -#include <osmocore/process.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/process.h> #include <osmocom/sccp/sccp.h> diff --git a/openbsc/src/osmo-bsc/osmo_bsc_msc.c b/openbsc/src/osmo-bsc/osmo_bsc_msc.c index 2e8cf05..530171e 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_msc.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_msc.c @@ -27,7 +27,7 @@ #include <openbsc/osmo_msc_data.h> #include <openbsc/signal.h> -#include <osmocore/gsm0808.h> +#include <osmocom/core/gsm0808.h> #include <osmocom/sccp/sccp.h> diff --git a/openbsc/src/osmo-bsc/osmo_bsc_rf.c b/openbsc/src/osmo-bsc/osmo_bsc_rf.c index 5652c9d..6be9625 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_rf.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_rf.c @@ -26,8 +26,8 @@ #include <openbsc/signal.h> #include <openbsc/osmo_msc_data.h> -#include <osmocore/talloc.h> -#include <osmocore/protocol/gsm_12_21.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/protocol/gsm_12_21.h> #include <sys/socket.h> #include <sys/un.h> diff --git a/openbsc/src/osmo-bsc/osmo_bsc_sccp.c b/openbsc/src/osmo-bsc/osmo_bsc_sccp.c index 1abb473..bbe4ea5 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_sccp.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_sccp.c @@ -27,9 +27,9 @@ #include <openbsc/ipaccess.h> #include <openbsc/signal.h> -#include <osmocore/gsm0808.h> -#include <osmocore/talloc.h> -#include <osmocore/protocol/gsm_08_08.h> +#include <osmocom/core/gsm0808.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/protocol/gsm_08_08.h> #include <osmocom/sccp/sccp.h> diff --git a/openbsc/src/osmo-bsc/osmo_bsc_vty.c b/openbsc/src/osmo-bsc/osmo_bsc_vty.c index 1667742..6e9507d 100644 --- a/openbsc/src/osmo-bsc/osmo_bsc_vty.c +++ b/openbsc/src/osmo-bsc/osmo_bsc_vty.c @@ -22,7 +22,7 @@ #include <openbsc/osmo_msc_data.h> #include <openbsc/vty.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #define IPA_STR "IP.ACCESS specific\n" diff --git a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c index c8d9a62..ad82520 100644 --- a/openbsc/src/osmo-bsc_mgcp/mgcp_main.c +++ b/openbsc/src/osmo-bsc_mgcp/mgcp_main.c @@ -32,11 +32,11 @@ #include <sys/socket.h> #include <openbsc/debug.h> -#include <osmocore/msgb.h> -#include <osmocore/talloc.h> -#include <osmocore/process.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/process.h> #include <openbsc/gsm_data.h> -#include <osmocore/select.h> +#include <osmocom/core/select.h> #include <openbsc/mgcp.h> #include <openbsc/mgcp_internal.h> #include <osmocom/vty/telnet_interface.h> diff --git a/openbsc/src/osmo-bsc_nat/bsc_filter.c b/openbsc/src/osmo-bsc_nat/bsc_filter.c index 73e9878..5765a66 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_filter.c +++ b/openbsc/src/osmo-bsc_nat/bsc_filter.c @@ -25,8 +25,8 @@ #include <openbsc/ipaccess.h> #include <openbsc/debug.h> -#include <osmocore/talloc.h> -#include <osmocore/protocol/gsm_08_08.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/protocol/gsm_08_08.h> #include <osmocom/sccp/sccp.h> diff --git a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c index 9eac00b..0c10d84 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c +++ b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c @@ -28,9 +28,9 @@ #include <osmocom/sccp/sccp.h> -#include <osmocore/talloc.h> -#include <osmocore/gsm0808.h> -#include <osmocore/protocol/gsm_08_08.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/gsm0808.h> +#include <osmocom/core/protocol/gsm_08_08.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c index 643b3c4..21da1f8 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c @@ -44,11 +44,11 @@ #include <openbsc/socket.h> #include <openbsc/vty.h> -#include <osmocore/gsm0808.h> -#include <osmocore/talloc.h> -#include <osmocore/process.h> +#include <osmocom/core/gsm0808.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/process.h> -#include <osmocore/protocol/gsm_08_08.h> +#include <osmocom/core/protocol/gsm_08_08.h> #include <osmocom/vty/telnet_interface.h> #include <osmocom/vty/vty.h> diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c index cd294cc..6068333 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c @@ -29,11 +29,11 @@ #include <openbsc/ipaccess.h> #include <openbsc/vty.h> -#include <osmocore/linuxlist.h> -#include <osmocore/talloc.h> -#include <osmocore/gsm0808.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/gsm0808.h> -#include <osmocore/protocol/gsm_08_08.h> +#include <osmocom/core/protocol/gsm_08_08.h> #include <osmocom/sccp/sccp.h> diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c index 786db2d..af6671c 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c @@ -26,9 +26,9 @@ #include <openbsc/mgcp.h> #include <openbsc/vty.h> -#include <osmocore/talloc.h> -#include <osmocore/rate_ctr.h> -#include <osmocore/utils.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/rate_ctr.h> +#include <osmocom/core/utils.h> #include <osmocom/sccp/sccp.h> diff --git a/openbsc/src/osmo-bsc_nat/bsc_sccp.c b/openbsc/src/osmo-bsc_nat/bsc_sccp.c index 72de112..f7d868a 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_sccp.c +++ b/openbsc/src/osmo-bsc_nat/bsc_sccp.c @@ -25,7 +25,7 @@ #include <osmocom/sccp/sccp.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <string.h> #include <time.h> diff --git a/openbsc/src/osmo-bsc_nat/bsc_ussd.c b/openbsc/src/osmo-bsc_nat/bsc_ussd.c index c121abe..8174336 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_ussd.c +++ b/openbsc/src/osmo-bsc_nat/bsc_ussd.c @@ -25,10 +25,10 @@ #include <openbsc/ipaccess.h> #include <openbsc/socket.h> -#include <osmocore/protocol/gsm_08_08.h> -#include <osmocore/gsm0480.h> -#include <osmocore/talloc.h> -#include <osmocore/tlv.h> +#include <osmocom/core/protocol/gsm_08_08.h> +#include <osmocom/core/gsm0480.h> +#include <osmocom/core/talloc.h> +#include <osmocom/core/tlv.h> #include <osmocom/sccp/sccp.h> diff --git a/openbsc/src/osmo-nitb/bsc_hack.c b/openbsc/src/osmo-nitb/bsc_hack.c index 357ec7a..1d774eb 100644 --- a/openbsc/src/osmo-nitb/bsc_hack.c +++ b/openbsc/src/osmo-nitb/bsc_hack.c @@ -30,11 +30,11 @@ #include <getopt.h> #include <openbsc/db.h> -#include <osmocore/select.h> -#include <osmocore/process.h> +#include <osmocom/core/select.h> +#include <osmocom/core/process.h> #include <openbsc/debug.h> #include <openbsc/e1_input.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <openbsc/signal.h> #include <openbsc/osmo_msc.h> #include <openbsc/sms_queue.h> diff --git a/openbsc/src/utils/bs11_config.c b/openbsc/src/utils/bs11_config.c index acfbd3c..110d337 100644 --- a/openbsc/src/utils/bs11_config.c +++ b/openbsc/src/utils/bs11_config.c @@ -35,10 +35,10 @@ #include <openbsc/gsm_data.h> #include <openbsc/abis_nm.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <osmocom/gsm/tlv.h> #include <openbsc/debug.h> -#include <osmocore/select.h> +#include <osmocom/core/select.h> #include <openbsc/rs232.h> /* state of our bs11_config application */ diff --git a/openbsc/src/utils/rs232.c b/openbsc/src/utils/rs232.c index 7550571..5c20531 100644 --- a/openbsc/src/utils/rs232.c +++ b/openbsc/src/utils/rs232.c @@ -27,8 +27,8 @@ #include <termios.h> #include <fcntl.h> -#include <osmocore/select.h> -#include <osmocore/msgb.h> +#include <osmocom/core/select.h> +#include <osmocom/core/msgb.h> #include <openbsc/debug.h> #include <openbsc/gsm_data.h> #include <openbsc/rs232.h> diff --git a/openbsc/tests/channel/channel_test.c b/openbsc/tests/channel/channel_test.c index 4f3c593..258938c 100644 --- a/openbsc/tests/channel/channel_test.c +++ b/openbsc/tests/channel/channel_test.c @@ -22,7 +22,7 @@ #include <assert.h> -#include <osmocore/select.h> +#include <osmocom/core/select.h> #include <openbsc/gsm_subscriber.h> #include <openbsc/abis_rsl.h> diff --git a/openbsc/tests/mgcp/mgcp_test.c b/openbsc/tests/mgcp/mgcp_test.c index 4052377..e2ed4e2 100644 --- a/openbsc/tests/mgcp/mgcp_test.c +++ b/openbsc/tests/mgcp/mgcp_test.c @@ -20,7 +20,7 @@ #include <openbsc/mgcp.h> #include <openbsc/mgcp_internal.h> -#include <osmocore/talloc.h> +#include <osmocom/core/talloc.h> #include <string.h> static struct msgb *create_auep1()