nat: Move the callstats to a new header file due sccp usage
The bsc_nat.h is included by common_vty.c so we may not used sccp_types.h in the bsc_nat.h header file. Move the callstats to a new file and include it where it is needed.
This commit is contained in:
parent
7e9b039a94
commit
ab22335378
|
@ -32,7 +32,6 @@
|
|||
#include <osmocom/core/rate_ctr.h>
|
||||
#include <osmocom/core/statistics.h>
|
||||
#include <osmocom/gsm/protocol/gsm_04_08.h>
|
||||
#include <osmocom/sccp/sccp_types.h>
|
||||
|
||||
#include <regex.h>
|
||||
|
||||
|
@ -336,33 +335,6 @@ struct bsc_nat_ussd_con {
|
|||
struct osmo_timer_list auth_timeout;
|
||||
};
|
||||
|
||||
struct bsc_nat_call_stats {
|
||||
struct llist_head entry;
|
||||
|
||||
struct sccp_source_reference remote_ref;
|
||||
struct sccp_source_reference src_ref; /* as seen by the MSC */
|
||||
|
||||
/* mgcp options */
|
||||
uint32_t ci;
|
||||
int bts_rtp_port;
|
||||
int net_rtp_port;
|
||||
struct in_addr bts_addr;
|
||||
struct in_addr net_addr;
|
||||
|
||||
|
||||
/* as witnessed by the NAT */
|
||||
uint32_t net_ps;
|
||||
uint32_t net_os;
|
||||
uint32_t bts_pr;
|
||||
uint32_t bts_or;
|
||||
uint32_t bts_expected;
|
||||
uint32_t bts_jitter;
|
||||
int bts_loss;
|
||||
|
||||
uint32_t trans_id;
|
||||
int msc_endpoint;
|
||||
};
|
||||
|
||||
struct bsc_nat_reject_cause {
|
||||
int lu_reject_cause;
|
||||
int cm_reject_cause;
|
||||
|
|
|
@ -0,0 +1,55 @@
|
|||
/*
|
||||
* (C) 2010-2012 by Holger Hans Peter Freyther <zecke@selfish.org>
|
||||
* (C) 2010-2012 by On-Waves
|
||||
* All Rights Reserved
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation; either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef BSC_NAT_CALLSTATS_H
|
||||
#define BSC_NAT_CALLSTATS_H
|
||||
|
||||
#include <osmocom/core/linuxlist.h>
|
||||
|
||||
#include <osmocom/sccp/sccp_types.h>
|
||||
|
||||
struct bsc_nat_call_stats {
|
||||
struct llist_head entry;
|
||||
|
||||
struct sccp_source_reference remote_ref;
|
||||
struct sccp_source_reference src_ref; /* as seen by the MSC */
|
||||
|
||||
/* mgcp options */
|
||||
uint32_t ci;
|
||||
int bts_rtp_port;
|
||||
int net_rtp_port;
|
||||
struct in_addr bts_addr;
|
||||
struct in_addr net_addr;
|
||||
|
||||
|
||||
/* as witnessed by the NAT */
|
||||
uint32_t net_ps;
|
||||
uint32_t net_os;
|
||||
uint32_t bts_pr;
|
||||
uint32_t bts_or;
|
||||
uint32_t bts_expected;
|
||||
uint32_t bts_jitter;
|
||||
int bts_loss;
|
||||
|
||||
uint32_t trans_id;
|
||||
int msc_endpoint;
|
||||
};
|
||||
|
||||
#endif
|
|
@ -43,6 +43,7 @@
|
|||
*/
|
||||
|
||||
#include <openbsc/bsc_nat.h>
|
||||
#include <openbsc/bsc_nat_callstats.h>
|
||||
#include <openbsc/bsc_nat_sccp.h>
|
||||
#include <openbsc/gsm_data.h>
|
||||
#include <openbsc/debug.h>
|
||||
|
|
Loading…
Reference in New Issue