From ff397edf385cc055fe1665780c3a5395ee9d48be Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sun, 8 May 2011 10:29:23 +0200 Subject: Adopt to recent libosmocore namespace changes and libosmogsm --- include/bsc_data.h | 14 +++++++------- include/bsc_sccp.h | 8 ++++---- include/bss_patch.h | 2 +- include/cellmgr_debug.h | 2 +- include/counter.h | 2 +- include/ipaccess.h | 6 +++--- include/mgcp/mgcp.h | 6 +++--- include/mgcp/mgcp_internal.h | 6 +++--- include/mgcp_ss7.h | 8 ++++---- include/msc_connection.h | 18 +++++++++--------- include/mtp_data.h | 16 ++++++++-------- include/sctp_m2ua.h | 6 +++--- include/ss7_application.h | 6 +++--- include/thread.h | 6 +++--- include/udp_input.h | 2 +- 15 files changed, 54 insertions(+), 54 deletions(-) (limited to 'include') diff --git a/include/bsc_data.h b/include/bsc_data.h index 3588ac8..ecd0747 100644 --- a/include/bsc_data.h +++ b/include/bsc_data.h @@ -24,10 +24,10 @@ #include "mtp_data.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -38,8 +38,8 @@ struct msc_connection; struct mtp_m2ua_transport; struct mtp_udp_data { - struct write_queue write_queue; - struct timer_list snmp_poll; + struct osmo_wqueue write_queue; + struct osmo_timer_list snmp_poll; struct llist_head links; }; @@ -83,7 +83,7 @@ struct bsc_data { /* inject */ int allow_inject; - struct bsc_fd inject_fd; + struct osmo_fd inject_fd; /* m2ua code */ struct sctp_m2ua_transport *m2ua_trans; diff --git a/include/bsc_sccp.h b/include/bsc_sccp.h index 6b4f6c4..0a1adb0 100644 --- a/include/bsc_sccp.h +++ b/include/bsc_sccp.h @@ -23,10 +23,10 @@ #include -#include -#include +#include +#include -#include +#include #include @@ -50,7 +50,7 @@ struct active_sccp_con { int released_from_msc; /* timeout for waiting for the RLC */ - struct timer_list rlc_timeout; + struct osmo_timer_list rlc_timeout; /* how often did we send a RLSD this */ unsigned int rls_tries; diff --git a/include/bss_patch.h b/include/bss_patch.h index d068e5f..6529619 100644 --- a/include/bss_patch.h +++ b/include/bss_patch.h @@ -21,7 +21,7 @@ #ifndef bss_patch_h #define bss_patch_h -#include +#include #include diff --git a/include/cellmgr_debug.h b/include/cellmgr_debug.h index e5d7738..c6d553d 100644 --- a/include/cellmgr_debug.h +++ b/include/cellmgr_debug.h @@ -2,7 +2,7 @@ #define CELLMGR_DEBUG_H #define DEBUG -#include +#include /* Debuag Areas of the code */ enum { diff --git a/include/counter.h b/include/counter.h index 631781c..781187a 100644 --- a/include/counter.h +++ b/include/counter.h @@ -22,7 +22,7 @@ #ifndef counter_h #define counter_h -#include +#include enum { MTP_LSET_TOTA_IN_MSG, diff --git a/include/ipaccess.h b/include/ipaccess.h index 4cf3a28..1658bd4 100644 --- a/include/ipaccess.h +++ b/include/ipaccess.h @@ -1,7 +1,7 @@ #ifndef _IPACCESS_H #define _IPACCESS_H -#include +#include #define IPA_TCP_PORT_OML 3002 #define IPA_TCP_PORT_RSL 3003 @@ -42,8 +42,8 @@ enum ipaccess_id_tags { /* * methods for parsing and sending a message */ -int ipaccess_rcvmsg_base(struct msgb *msg, struct bsc_fd *bfd); -struct msgb *ipaccess_read_msg(struct bsc_fd *bfd, int *error); +int ipaccess_rcvmsg_base(struct msgb *msg, struct osmo_fd *bfd); +struct msgb *ipaccess_read_msg(struct osmo_fd *bfd, int *error); void ipaccess_prepend_header(struct msgb *msg, int proto); int ipaccess_send_id_ack(int fd); int ipaccess_send_id_req(int fd); diff --git a/include/mgcp/mgcp.h b/include/mgcp/mgcp.h index 2bd6eb5..da8f77b 100644 --- a/include/mgcp/mgcp.h +++ b/include/mgcp/mgcp.h @@ -25,8 +25,8 @@ #include "cellmgr_debug.h" -#include -#include +#include +#include #include @@ -152,7 +152,7 @@ struct mgcp_config { struct in_addr transcoder_in; int transcoder_remote_base; - struct write_queue gw_fd; + struct osmo_wqueue gw_fd; struct mgcp_port_range bts_ports; struct mgcp_port_range net_ports; diff --git a/include/mgcp/mgcp_internal.h b/include/mgcp/mgcp_internal.h index 838e84c..137a608 100644 --- a/include/mgcp/mgcp_internal.h +++ b/include/mgcp/mgcp_internal.h @@ -23,7 +23,7 @@ #ifndef OPENBSC_MGCP_DATA_H #define OPENBSC_MGCP_DATA_H -#include +#include #define CI_UNUSED 0 @@ -66,8 +66,8 @@ struct mgcp_rtp_end { /* * Each end has a socket... */ - struct bsc_fd rtp; - struct bsc_fd rtcp; + struct osmo_fd rtp; + struct osmo_fd rtcp; int local_port; int local_alloc; diff --git a/include/mgcp_ss7.h b/include/mgcp_ss7.h index 45828e8..35f5b9c 100644 --- a/include/mgcp_ss7.h +++ b/include/mgcp_ss7.h @@ -22,8 +22,8 @@ #ifndef mgcp_ss7_h #define mgcp_ss7_h -#include -#include +#include +#include #include @@ -31,11 +31,11 @@ struct mgcp_ss7 { struct mgcp_config *cfg; - struct write_queue mgcp_fd; + struct osmo_wqueue mgcp_fd; struct msgb *mgcp_msg; /* timer */ - struct timer_list poll_timer; + struct osmo_timer_list poll_timer; /* thread handling */ struct thread_notifier *cmd_queue; diff --git a/include/msc_connection.h b/include/msc_connection.h index 7d3d354..94754d7 100644 --- a/include/msc_connection.h +++ b/include/msc_connection.h @@ -20,9 +20,9 @@ #ifndef MSC_CONNECTION_H #define MSC_CONNECTION_H -#include -#include -#include +#include +#include +#include #include @@ -42,22 +42,22 @@ struct msc_connection { /* connection management */ int msc_link_down; - struct write_queue msc_connection; - struct timer_list reconnect_timer; + struct osmo_wqueue msc_connection; + struct osmo_timer_list reconnect_timer; int first_contact; /* time to wait for first message from MSC */ - struct timer_list msc_timeout; + struct osmo_timer_list msc_timeout; int msc_time; /* timeouts for the msc connection */ int ping_time; int pong_time; - struct timer_list ping_timeout; - struct timer_list pong_timeout; + struct osmo_timer_list ping_timeout; + struct osmo_timer_list pong_timeout; /* mgcp messgaes */ - struct write_queue mgcp_agent; + struct osmo_wqueue mgcp_agent; /* application pointer */ struct ss7_application *app; diff --git a/include/mtp_data.h b/include/mtp_data.h index a8f9463..bb6805b 100644 --- a/include/mtp_data.h +++ b/include/mtp_data.h @@ -20,9 +20,9 @@ #ifndef mtp_data_h #define mtp_data_h -#include -#include -#include +#include +#include +#include struct bsc_data; struct mtp_link; @@ -86,8 +86,8 @@ struct mtp_link_set { /* statistics for routing */ int timeout_t18; int timeout_t20; - struct timer_list T18; - struct timer_list T20; + struct osmo_timer_list T18; + struct osmo_timer_list T20; /* custom data */ struct bsc_data *bsc; @@ -110,7 +110,7 @@ struct mtp_link { int available; - struct timer_list link_activate; + struct osmo_timer_list link_activate; /* link test routine */ uint8_t test_ptrn[14]; @@ -122,8 +122,8 @@ struct mtp_link { int was_up; int slta_misses; - struct timer_list t1_timer; - struct timer_list t2_timer; + struct osmo_timer_list t1_timer; + struct osmo_timer_list t2_timer; /* statistics */ struct rate_ctr_group *ctrg; diff --git a/include/sctp_m2ua.h b/include/sctp_m2ua.h index 2ae1472..96ee200 100644 --- a/include/sctp_m2ua.h +++ b/include/sctp_m2ua.h @@ -21,7 +21,7 @@ #include "mtp_data.h" #include -#include +#include #include #include @@ -36,7 +36,7 @@ struct mtp_link; struct sctp_m2ua_transport { int started; struct llist_head conns; - struct bsc_fd bsc; + struct osmo_fd bsc; struct llist_head links; }; @@ -69,7 +69,7 @@ struct sctp_m2ua_conn { uint8_t asp_ident[4]; int asp_up; - struct write_queue queue; + struct osmo_wqueue queue; struct sctp_m2ua_transport *trans; }; diff --git a/include/ss7_application.h b/include/ss7_application.h index 1b4d412..22bbb2e 100644 --- a/include/ss7_application.h +++ b/include/ss7_application.h @@ -21,8 +21,8 @@ #ifndef SS7_APPLICATION_H #define SS7_APPLICATION_H -#include -#include +#include +#include struct bsc_data; struct msc_connection; @@ -73,7 +73,7 @@ struct ss7_application { /* handling for the NAT/State handling */ struct llist_head sccp_connections; - struct timer_list reset_timeout; + struct osmo_timer_list reset_timeout; struct mtp_link_set *target_link; int forward_only; int reset_count; diff --git a/include/thread.h b/include/thread.h index aab4260..6708547 100644 --- a/include/thread.h +++ b/include/thread.h @@ -20,8 +20,8 @@ #ifndef thread_h #define thread_h -#include -#include +#include +#include #include @@ -29,7 +29,7 @@ * routines for dealing with threads */ struct thread_notifier { - struct bsc_fd bfd; + struct osmo_fd bfd; int no_write; int fd[2]; diff --git a/include/udp_input.h b/include/udp_input.h index 7c95384..68fe4b3 100644 --- a/include/udp_input.h +++ b/include/udp_input.h @@ -23,7 +23,7 @@ #define c7_udp_input_h #include -#include +#include #define UDP_FORMAT_SIMPLE_UDP 2 #define UDP_FORMAT_SIMPLE_TCP 3 -- cgit v1.2.3