osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

tap_ui -> stat_tap_ui. 

The old routine had stat_ in the name, as the expectation was that they
were for statistics taps; that's still the expectation, so have stat_ in
the data structure and routine names.

Change-Id: Ic98d011012b8641173d41fa0ec4f4e625614370a
Reviewed-on: https://code.wireshark.org/review/5303
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2014-11-14 10:42:26 -08:00
parent 0e64efc81a
commit a21436eaed
58 changed files with 140 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/conversation_table.c
View File

@ -148,7 +148,7 @@ register_conversation_table(const int proto_id, gboolean hide_ports, tap_packet_
register_ct_t *table;
GString *conv_cmd_str = g_string_new("conv,");
GString *host_cmd_str = g_string_new("");
tap_ui ui_info;
stat_tap_ui ui_info;
table = g_new(register_ct_t,1);
@ -171,7 +171,7 @@ register_conversation_table(const int proto_id, gboolean hide_ports, tap_packet_
ui_info.index = -1;
ui_info.nparams = 0;
ui_info.params = NULL;
register_tap_ui(&ui_info, table);
register_stat_tap_ui(&ui_info, table);
g_string_free(conv_cmd_str, FALSE);
g_string_printf(host_cmd_str, "%s,%s", (get_hostlist_prefix_func(table) != NULL) ? get_hostlist_prefix_func(table)() : "host",
@ -183,7 +183,7 @@ register_conversation_table(const int proto_id, gboolean hide_ports, tap_packet_
ui_info.index = -1;
ui_info.nparams = 0;
ui_info.params = NULL;
register_tap_ui(&ui_info, table);
register_stat_tap_ui(&ui_info, table);
g_string_free(host_cmd_str, FALSE);
}

4
epan/stat_cmd_args.c
View File

@ -34,7 +34,7 @@
arguments.
*/
typedef struct _stat_cmd_arg {
tap_ui *ui;
stat_tap_ui *ui;
const char *cmd;
void (*func)(const char *arg, void* userdata);
void* userdata;
@ -74,7 +74,7 @@ register_stat_cmd_arg(const char *cmd, void (*func)(const char*, void*),void* us
}
void
register_tap_ui(tap_ui *ui, void *userdata)
register_stat_tap_ui(stat_tap_ui *ui, void *userdata)
{
stat_cmd_arg *newsca;

6
epan/stat_cmd_args.h
View File

@ -65,7 +65,7 @@ typedef struct _tap_param {
const enum_val_t *enum_vals;
} tap_param;
typedef struct _tap_ui {
typedef struct _stat_tap_ui {
register_stat_group_t group; /* group to which statistic belongs */
const char *title; /* title of statistic */
const char *cli_string; /* initial part of the "-z" argument for statistic */
@ -73,12 +73,12 @@ typedef struct _tap_ui {
gint index; /* initiate this value always with "-1" */
size_t nparams; /* number of parameters */
tap_param *params; /* pointer to table of parameter info */
} tap_ui;
} stat_tap_ui;
/*
* Register the parameters a tap takes.
*/
WS_DLL_PUBLIC void register_tap_ui(tap_ui *ui, void *userdata);
WS_DLL_PUBLIC void register_stat_tap_ui(stat_tap_ui *ui, void *userdata);
#ifdef __cplusplus
}

4
epan/wslua/wslua_util.c
View File

@ -264,7 +264,7 @@ WSLUA_FUNCTION wslua_register_stat_cmd_arg(lua_State* L) {
#define WSLUA_OPTARG_register_stat_cmd_arg_ACTION 2 /* Action */
const char* arg = luaL_checkstring(L,WSLUA_ARG_register_stat_cmd_arg_ARGUMENT);
statcmd_t* sc = (statcmd_t *)g_malloc0(sizeof(statcmd_t)); /* XXX leaked */
tap_ui ui_info;
stat_tap_ui ui_info;
sc->L = L;
lua_pushvalue(L, WSLUA_OPTARG_register_stat_cmd_arg_ACTION);
@ -278,7 +278,7 @@ WSLUA_FUNCTION wslua_register_stat_cmd_arg(lua_State* L) {
ui_info.index = -1;
ui_info.nparams = 0;
ui_info.params = NULL;
register_tap_ui(&ui_info, sc);
register_stat_tap_ui(&ui_info, sc);
return 0;
}

4
ui/cli/tap-afpstat.c
View File

@ -152,7 +152,7 @@ afpstat_init(const char *opt_arg, void *userdata _U_)
}
}
static tap_ui afpstat_ui = {
static stat_tap_ui afpstat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"afp,srt",
@ -165,7 +165,7 @@ static tap_ui afpstat_ui = {
void
register_tap_listener_afpstat(void)
{
register_tap_ui(&afpstat_ui, NULL);
register_stat_tap_ui(&afpstat_ui, NULL);
}
/*

4
ui/cli/tap-ansi_astat.c
View File

@ -153,7 +153,7 @@ ansi_a_stat_init(const char *opt_arg _U_, void *userdata _U_)
}
static tap_ui ansi_a_stat_ui = {
static stat_tap_ui ansi_a_stat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"ansi_a,",
@ -166,7 +166,7 @@ static tap_ui ansi_a_stat_ui = {
void
register_tap_listener_ansi_astat(void)
{
register_tap_ui(&ansi_a_stat_ui, NULL);
register_stat_tap_ui(&ansi_a_stat_ui, NULL);
}
/*

4
ui/cli/tap-bootpstat.c
View File

@ -174,7 +174,7 @@ dhcpstat_init(const char *opt_arg, void *userdata _U_)
}
}
static tap_ui dhcpstat_ui = {
static stat_tap_ui dhcpstat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"bootp,stat,",
@ -187,7 +187,7 @@ static tap_ui dhcpstat_ui = {
void
register_tap_listener_gtkdhcpstat(void)
{
register_tap_ui(&dhcpstat_ui, NULL);
register_stat_tap_ui(&dhcpstat_ui, NULL);
}
/*

4
ui/cli/tap-camelcounter.c
View File

@ -118,7 +118,7 @@ static void camelcounter_init(const char *opt_arg, void *userdata _U_)
}
}
static tap_ui camelcounter_ui = {
static stat_tap_ui camelcounter_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"camel,counter",
@ -131,7 +131,7 @@ static tap_ui camelcounter_ui = {
void /* Next line mandatory */
register_tap_listener_camelcounter(void)
{
register_tap_ui(&camelcounter_ui, NULL);
register_stat_tap_ui(&camelcounter_ui, NULL);
}
/*

4
ui/cli/tap-camelsrt.c
View File

@ -240,7 +240,7 @@ static void camelsrt_init(const char *opt_arg, void *userdata _U_)
gcamel_StatSRT = TRUE;
}
static tap_ui camelsrt_ui = {
static stat_tap_ui camelsrt_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"camel,srt",
@ -253,7 +253,7 @@ static tap_ui camelsrt_ui = {
void /* Next line mandatory */
register_tap_listener_camelsrt(void)
{
register_tap_ui(&camelsrt_ui, NULL);
register_stat_tap_ui(&camelsrt_ui, NULL);
}
/*

4
ui/cli/tap-comparestat.c
View File

@ -562,7 +562,7 @@ comparestat_init(const char *opt_arg, void *userdata _U_)
}
}
static tap_ui comparestat_ui = {
static stat_tap_ui comparestat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"compare,",
@ -575,7 +575,7 @@ static tap_ui comparestat_ui = {
void
register_tap_listener_comparestat(void)
{
register_tap_ui(&comparestat_ui, NULL);
register_stat_tap_ui(&comparestat_ui, NULL);
}
/*

4
ui/cli/tap-dcerpcstat.c
View File

@ -288,7 +288,7 @@ dcerpcstat_init(const char *opt_arg, void *userdata _U_)
}
}
static tap_ui dcerpcstat_ui = {
static stat_tap_ui dcerpcstat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"dcerpc,srt,",
@ -301,7 +301,7 @@ static tap_ui dcerpcstat_ui = {
void
register_tap_listener_dcerpcstat(void)
{
register_tap_ui(&dcerpcstat_ui, NULL);
register_stat_tap_ui(&dcerpcstat_ui, NULL);
}
/*

4
ui/cli/tap-diameter-avp.c
View File

@ -267,7 +267,7 @@ diameteravp_init(const char *opt_arg, void *userdata _U_)
}
}
static tap_ui diameteravp_ui = {
static stat_tap_ui diameteravp_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"diameter,avp",
@ -280,7 +280,7 @@ static tap_ui diameteravp_ui = {
void
register_tap_listener_diameteravp(void)
{
register_tap_ui(&diameteravp_ui, NULL);
register_stat_tap_ui(&diameteravp_ui, NULL);
}

4
ui/cli/tap-expert.c
View File

@ -262,7 +262,7 @@ static void expert_stat_init(const char *opt_arg, void *userdata _U_)
}
}
static tap_ui expert_stat_ui = {
static stat_tap_ui expert_stat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"expert",
@ -276,7 +276,7 @@ static tap_ui expert_stat_ui = {
void
register_tap_listener_expert_info(void)
{
register_tap_ui(&expert_stat_ui, NULL);
register_stat_tap_ui(&expert_stat_ui, NULL);
}
/*

12
ui/cli/tap-follow.c
View File

@ -984,7 +984,7 @@ followSsl(
}
}
static tap_ui followTcp_ui = {
static stat_tap_ui followTcp_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
STR_FOLLOW_TCP,
@ -994,7 +994,7 @@ static tap_ui followTcp_ui = {
NULL
};
static tap_ui followUdp_ui = {
static stat_tap_ui followUdp_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
STR_FOLLOW_UDP,
@ -1004,7 +1004,7 @@ static tap_ui followUdp_ui = {
NULL
};
static tap_ui followSsl_ui = {
static stat_tap_ui followSsl_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
STR_FOLLOW_SSL,
@ -1017,9 +1017,9 @@ static tap_ui followSsl_ui = {
void
register_tap_listener_follow(void)
{
register_tap_ui(&followTcp_ui, NULL);
register_tap_ui(&followUdp_ui, NULL);
register_tap_ui(&followSsl_ui, NULL);
register_stat_tap_ui(&followTcp_ui, NULL);
register_stat_tap_ui(&followUdp_ui, NULL);
register_stat_tap_ui(&followSsl_ui, NULL);
}
/*

4
ui/cli/tap-funnel.c
View File

@ -170,7 +170,7 @@ static void register_menu_cb(const char *name,
gpointer callback_data,
gboolean retap _U_) {
menu_cb_t *mcb = g_malloc(sizeof(menu_cb_t));
tap_ui ui_info;
stat_tap_ui ui_info;
mcb->callback = callback;
mcb->callback_data = callback_data;
@ -187,7 +187,7 @@ static void register_menu_cb(const char *name,
ui_info.index = -1;
ui_info.nparams = 0;
ui_info.params = NULL;
register_tap_ui(&ui_info, mcb);
register_stat_tap_ui(&ui_info, mcb);
}
void initialize_funnel_ops(void) {

4
ui/cli/tap-gsm_astat.c
View File

@ -339,7 +339,7 @@ gsm_a_stat_init(const char *opt_arg _U_, void *userdata _U_)
}
}
static tap_ui gsm_a_stat_ui = {
static stat_tap_ui gsm_a_stat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"gsm_a,",
@ -352,7 +352,7 @@ static tap_ui gsm_a_stat_ui = {
void
register_tap_listener_gsm_astat(void)
{
register_tap_ui(&gsm_a_stat_ui, NULL);
register_stat_tap_ui(&gsm_a_stat_ui, NULL);
}
/*

4
ui/cli/tap-h225counter.c
View File

@ -370,7 +370,7 @@ h225counter_init(const char *opt_arg, void *userdata _U_)
}
}
static tap_ui h225counter_ui = {
static stat_tap_ui h225counter_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"h225,counter",
@ -383,7 +383,7 @@ static tap_ui h225counter_ui = {
void
register_tap_listener_h225counter(void)
{
register_tap_ui(&h225counter_ui, NULL);
register_stat_tap_ui(&h225counter_ui, NULL);
}
/*

4
ui/cli/tap-h225rassrt.c
View File

@ -233,7 +233,7 @@ h225rassrt_init(const char *opt_arg, void *userdata _U_)
}
}
static tap_ui h225rassrt_ui = {
static stat_tap_ui h225rassrt_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"h225,srt",
@ -246,7 +246,7 @@ static tap_ui h225rassrt_ui = {
void
register_tap_listener_h225rassrt(void)
{
register_tap_ui(&h225rassrt_ui, NULL);
register_stat_tap_ui(&h225rassrt_ui, NULL);
}
/*

4
ui/cli/tap-hosts.c
View File

@ -137,7 +137,7 @@ hosts_init(const char *opt_arg, void *userdata _U_)
}
}
static tap_ui hosts_ui = {
static stat_tap_ui hosts_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
TAP_NAME,
@ -150,7 +150,7 @@ static tap_ui hosts_ui = {
void
register_tap_listener_hosts(void)
{
register_tap_ui(&hosts_ui, NULL);
register_stat_tap_ui(&hosts_ui, NULL);
}

4
ui/cli/tap-httpstat.c
View File

@ -320,7 +320,7 @@ gtk_httpstat_init(const char *opt_arg, void *userdata _U_)
http_init_hash(sp);
}
static tap_ui httpstat_ui = {
static stat_tap_ui httpstat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"http,stat,",
@ -333,7 +333,7 @@ static tap_ui httpstat_ui = {
void
register_tap_listener_gtkhttpstat(void)
{
register_tap_ui(&httpstat_ui, NULL);
register_stat_tap_ui(&httpstat_ui, NULL);
}
/*

4
ui/cli/tap-icmpstat.c
View File

@ -309,7 +309,7 @@ icmpstat_init(const char *opt_arg, void *userdata _U_)
}
}
static tap_ui icmpstat_ui = {
static stat_tap_ui icmpstat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"icmp,srt",
@ -322,7 +322,7 @@ static tap_ui icmpstat_ui = {
void
register_tap_listener_icmpstat(void)
{
register_tap_ui(&icmpstat_ui, NULL);
register_stat_tap_ui(&icmpstat_ui, NULL);
}
/*

4
ui/cli/tap-icmpv6stat.c
View File

@ -310,7 +310,7 @@ icmpv6stat_init(const char *opt_arg, void *userdata _U_)
}
}
static tap_ui icmpv6stat_ui = {
static stat_tap_ui icmpv6stat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"icmpv6,srt",
@ -323,7 +323,7 @@ static tap_ui icmpv6stat_ui = {
void
register_tap_listener_icmpv6stat(void)
{
register_tap_ui(&icmpv6stat_ui, NULL);
register_stat_tap_ui(&icmpv6stat_ui, NULL);
}
/*

4
ui/cli/tap-iostat.c
View File

@ -1496,7 +1496,7 @@ iostat_init(const char *opt_arg, void *userdata _U_)
}
}
static tap_ui iostat_ui = {
static stat_tap_ui iostat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"io,stat,",
@ -1509,7 +1509,7 @@ static tap_ui iostat_ui = {
void
register_tap_listener_iostat(void)
{
register_tap_ui(&iostat_ui, NULL);
register_stat_tap_ui(&iostat_ui, NULL);
}
/*

4
ui/cli/tap-macltestat.c
View File

@ -541,7 +541,7 @@ static void mac_lte_stat_init(const char *opt_arg, void *userdata _U_)
}
}
static tap_ui mac_lte_stat_ui = {
static stat_tap_ui mac_lte_stat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"mac-lte,stat",
@ -555,7 +555,7 @@ static tap_ui mac_lte_stat_ui = {
void
register_tap_listener_mac_lte_stat(void)
{
register_tap_ui(&mac_lte_stat_ui, NULL);
register_stat_tap_ui(&mac_lte_stat_ui, NULL);
}
/*

4
ui/cli/tap-megacostat.c
View File

@ -129,7 +129,7 @@ megacostat_init(const char *opt_arg, void *userdata _U_)
}
}
static tap_ui megacostat_ui = {
static stat_tap_ui megacostat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"megaco,rtd",
@ -144,7 +144,7 @@ register_tap_listener_megacostat(void)
{
/* We don't register this tap, if we don't have the megaco plugin loaded.*/
if (find_tap_id("megaco")) {
register_tap_ui(&megacostat_ui, NULL);
register_stat_tap_ui(&megacostat_ui, NULL);
}
}

4
ui/cli/tap-mgcpstat.c
View File

@ -213,7 +213,7 @@ mgcpstat_init(const char *opt_arg, void *userdata _U_)
}
}
static tap_ui mgcpstat_ui = {
static stat_tap_ui mgcpstat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"mgcp,rtd",
@ -228,7 +228,7 @@ register_tap_listener_mgcpstat(void)
{
/* We don't register this tap, if we don't have the mgcp plugin loaded.*/
if (find_tap_id("mgcp")) {
register_tap_ui(&mgcpstat_ui, NULL);
register_stat_tap_ui(&mgcpstat_ui, NULL);
}
}

4
ui/cli/tap-protocolinfo.c
View File

@ -130,7 +130,7 @@ protocolinfo_init(const char *opt_arg, void *userdata _U_)
}
}
static tap_ui protocolinfo_ui = {
static stat_tap_ui protocolinfo_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"proto,colinfo,",
@ -143,7 +143,7 @@ static tap_ui protocolinfo_ui = {
void
register_tap_listener_protocolinfo(void)
{
register_tap_ui(&protocolinfo_ui, NULL);
register_stat_tap_ui(&protocolinfo_ui, NULL);
}
/*

4
ui/cli/tap-protohierstat.c
View File

@ -206,7 +206,7 @@ protohierstat_init(const char *opt_arg, void *userdata _U_)
}
}
static tap_ui protohierstat_ui = {
static stat_tap_ui protohierstat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"io,phs",
@ -219,7 +219,7 @@ static tap_ui protohierstat_ui = {
void
register_tap_listener_protohierstat(void)
{
register_tap_ui(&protohierstat_ui, NULL);
register_stat_tap_ui(&protohierstat_ui, NULL);
}
/*

4
ui/cli/tap-radiusstat.c
View File

@ -229,7 +229,7 @@ radiusstat_init(const char *opt_arg, void *userdata _U_)
}
}
static tap_ui radiusstat_ui = {
static stat_tap_ui radiusstat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"radius,rtd",
@ -242,7 +242,7 @@ static tap_ui radiusstat_ui = {
void
register_tap_listener_radiusstat(void)
{
register_tap_ui(&radiusstat_ui, NULL);
register_stat_tap_ui(&radiusstat_ui, NULL);
}
/*

4
ui/cli/tap-rlcltestat.c
View File

@ -402,7 +402,7 @@ static void rlc_lte_stat_init(const char *opt_arg, void *userdata _U_)
/* Register this tap listener (need void on own so line register function found) */
static tap_ui rlc_lte_stat_ui = {
static stat_tap_ui rlc_lte_stat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"rlc-lte,stat",
@ -415,7 +415,7 @@ static tap_ui rlc_lte_stat_ui = {
void
register_tap_listener_rlc_lte_stat(void)
{
register_tap_ui(&rlc_lte_stat_ui, NULL);
register_stat_tap_ui(&rlc_lte_stat_ui, NULL);
}
/*

4
ui/cli/tap-rpcprogs.c
View File

@ -225,7 +225,7 @@ rpcprogs_init(const char *opt_arg _U_, void *userdata _U_)
}
}
static tap_ui rpcprogs_ui = {
static stat_tap_ui rpcprogs_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"rpc,programs",
@ -238,7 +238,7 @@ static tap_ui rpcprogs_ui = {
void
register_tap_listener_rpcprogs(void)
{
register_tap_ui(&rpcprogs_ui, NULL);
register_stat_tap_ui(&rpcprogs_ui, NULL);
}
/*

4
ui/cli/tap-rpcstat.c
View File

@ -342,7 +342,7 @@ rpcstat_init(const char *opt_arg, void *userdata _U_)
}
}
static tap_ui rpcstat_ui = {
static stat_tap_ui rpcstat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"rpc,srt,",
@ -355,7 +355,7 @@ static tap_ui rpcstat_ui = {
void
register_tap_listener_rpcstat(void)
{
register_tap_ui(&rpcstat_ui, NULL);
register_stat_tap_ui(&rpcstat_ui, NULL);
}
/*

4
ui/cli/tap-rtp.c
View File

@ -152,7 +152,7 @@ rtp_streams_stat_init(const char *opt_arg _U_, void *userdata _U_)
}
}
static tap_ui rtp_streams_stat_ui = {
static stat_tap_ui rtp_streams_stat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"rtp,streams",
@ -165,7 +165,7 @@ static tap_ui rtp_streams_stat_ui = {
void
register_tap_listener_rtp_streams(void)
{
register_tap_ui(&rtp_streams_stat_ui, NULL);
register_stat_tap_ui(&rtp_streams_stat_ui, NULL);
}
/*

4
ui/cli/tap-rtspstat.c
View File

@ -273,7 +273,7 @@ gtk_rtspstat_init(const char *opt_arg, void *userdata _U_)
rtsp_init_hash(sp);
}
static tap_ui rtspstat_ui = {
static stat_tap_ui rtspstat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"rtsp,stat,",
@ -286,7 +286,7 @@ static tap_ui rtspstat_ui = {
void
register_tap_listener_gtkrtspstat(void)
{
register_tap_ui(&rtspstat_ui, NULL);
register_stat_tap_ui(&rtspstat_ui, NULL);
}
/*

4
ui/cli/tap-scsistat.c
View File

@ -251,7 +251,7 @@ scsistat_init(const char *opt_arg, void* userdata _U_)
}
}
static tap_ui scsistat_ui = {
static stat_tap_ui scsistat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"scsi,srt,",
@ -264,7 +264,7 @@ static tap_ui scsistat_ui = {
void
register_tap_listener_scsistat(void)
{
register_tap_ui(&scsistat_ui, NULL);
register_stat_tap_ui(&scsistat_ui, NULL);
}
/*

4
ui/cli/tap-sctpchunkstat.c
View File

@ -241,7 +241,7 @@ sctpstat_init(const char *opt_arg, void *userdata _U_)
}
}
static tap_ui sctpstat_ui = {
static stat_tap_ui sctpstat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"sctp,stat",
@ -254,7 +254,7 @@ static tap_ui sctpstat_ui = {
void
register_tap_listener_sctpstat(void)
{
register_tap_ui(&sctpstat_ui, NULL);
register_stat_tap_ui(&sctpstat_ui, NULL);
}
/*

4
ui/cli/tap-sipstat.c
View File

@ -432,7 +432,7 @@ sipstat_init(const char *opt_arg, void *userdata _U_)
sip_init_hash(sp);
}
static tap_ui sipstat_ui = {
static stat_tap_ui sipstat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"sip,stat",
@ -445,7 +445,7 @@ static tap_ui sipstat_ui = {
void
register_tap_listener_sipstat(void)
{
register_tap_ui(&sipstat_ui, NULL);
register_stat_tap_ui(&sipstat_ui, NULL);
}
/*

4
ui/cli/tap-smbsids.c
View File

@ -85,7 +85,7 @@ smbsids_init(const char *opt_arg _U_, void *userdata _U_)
}
}
static tap_ui smbsids_ui = {
static stat_tap_ui smbsids_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"smb,sids",
@ -98,7 +98,7 @@ static tap_ui smbsids_ui = {
void
register_tap_listener_smbsids(void)
{
register_tap_ui(&smbsids_ui, NULL);
register_stat_tap_ui(&smbsids_ui, NULL);
}
/*

4
ui/cli/tap-smbstat.c
View File

@ -246,7 +246,7 @@ smbstat_init(const char *opt_arg, void *userdata _U_)
}
}
static tap_ui smbstat_ui = {
static stat_tap_ui smbstat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"smb,srt",
@ -259,7 +259,7 @@ static tap_ui smbstat_ui = {
void
register_tap_listener_smbstat(void)
{
register_tap_ui(&smbstat_ui, NULL);
register_stat_tap_ui(&smbstat_ui, NULL);
}
/*

4
ui/cli/tap-stats_tree.c
View File

@ -111,7 +111,7 @@ static void
register_stats_tree_tap (gpointer k _U_, gpointer v, gpointer p _U_)
{
stats_tree_cfg *cfg = (stats_tree_cfg *)v;
tap_ui ui_info;
stat_tap_ui ui_info;
cfg->pr = (tree_cfg_pres *)g_malloc(sizeof(tree_cfg_pres));
cfg->pr->init_string = g_strdup_printf("%s,tree", cfg->abbr);
@ -123,7 +123,7 @@ register_stats_tree_tap (gpointer k _U_, gpointer v, gpointer p _U_)
ui_info.index = -1;
ui_info.nparams = 0;
ui_info.params = NULL;
register_tap_ui(&ui_info, NULL);
register_stat_tap_ui(&ui_info, NULL);
}

4
ui/cli/tap-sv.c
View File

@ -73,7 +73,7 @@ svstat_init(const char *opt_arg _U_, void *userdata _U_)
}
}
static tap_ui svstat_ui = {
static stat_tap_ui svstat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"sv",
@ -86,7 +86,7 @@ static tap_ui svstat_ui = {
void
register_tap_listener_sv(void)
{
register_tap_ui(&svstat_ui, NULL);
register_stat_tap_ui(&svstat_ui, NULL);
}
/*

4
ui/cli/tap-wspstat.c
View File

@ -276,7 +276,7 @@ wspstat_init(const char *opt_arg, void *userdata _U_)
}
}
static tap_ui wspstat_ui = {
static stat_tap_ui wspstat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"wsp,stat,",
@ -289,7 +289,7 @@ static tap_ui wspstat_ui = {
void
register_tap_listener_wspstat(void)
{
register_tap_ui(&wspstat_ui, NULL);
register_stat_tap_ui(&wspstat_ui, NULL);
}
/*

4
ui/gtk/ansi_map_stat.c
View File

@ -350,7 +350,7 @@ ansi_map_stat_gtk_init(
ansi_map_stat_gtk_cb(NULL, NULL);
}
static tap_ui ansi_map_ui = {
static stat_tap_ui ansi_map_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"ansi_map",
@ -381,5 +381,5 @@ register_tap_listener_gtkansi_map_stat(void)
exit(1);
}
register_tap_ui(&ansi_map_ui, NULL);
register_stat_tap_ui(&ansi_map_ui, NULL);
}

4
ui/gtk/compare_stat.c
View File

@ -1046,7 +1046,7 @@ gtk_comparestat_cb(GtkAction *action _U_, gpointer user_data _U_)
window_present(dlg);
}
static tap_ui compare_stat_ui = {
static stat_tap_ui compare_stat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"compare",
@ -1059,7 +1059,7 @@ static tap_ui compare_stat_ui = {
void
register_tap_listener_gtkcomparestat(void)
{
register_tap_ui(&compare_stat_ui, NULL);
register_stat_tap_ui(&compare_stat_ui, NULL);
}
/*

4
ui/gtk/dcerpc_stat.c
View File

@ -714,7 +714,7 @@ void gtk_dcerpcstat_cb(GtkAction *action _U_, gpointer user_data _U_)
window_present(dlg);
}
static tap_ui dcerpcstat_ui = {
static stat_tap_ui dcerpcstat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"dcerpc,srt,",
@ -727,5 +727,5 @@ static tap_ui dcerpcstat_ui = {
void
register_tap_listener_gtkdcerpcstat(void)
{
register_tap_ui(&dcerpcstat_ui, NULL);
register_stat_tap_ui(&dcerpcstat_ui, NULL);
}

4
ui/gtk/expert_comp_dlg.c
View File

@ -1006,7 +1006,7 @@ expert_comp_dlg_launch(void)
}
}
static tap_ui expert_comp_ui = {
static stat_tap_ui expert_comp_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"expert_comp",
@ -1019,7 +1019,7 @@ static tap_ui expert_comp_ui = {
void
register_tap_listener_expert_comp(void)
{
register_tap_ui(&expert_comp_ui, NULL);
register_stat_tap_ui(&expert_comp_ui, NULL);
}
void

4
ui/gtk/flow_graph.c
View File

@ -395,7 +395,7 @@ flow_graph_launch(GtkAction *action _U_, gpointer user_data _U_)
}
/****************************************************************************/
static tap_ui flow_graph_ui = {
static stat_tap_ui flow_graph_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"flow_graph",
@ -408,7 +408,7 @@ static tap_ui flow_graph_ui = {
void
register_tap_listener_flow_graph(void)
{
register_tap_ui(&flow_graph_ui,NULL);
register_stat_tap_ui(&flow_graph_ui,NULL);
}
/*

40
ui/gtk/gsm_a_stat.c
View File

@ -627,7 +627,7 @@ gsm_a_stat_gtk_sacch_rr_init(
gsm_a_stat_gtk_sacch_rr_cb(NULL, NULL);
}
static tap_ui gsm_a_stat_bssmap_ui = {
static stat_tap_ui gsm_a_stat_bssmap_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"gsm_a,bssmap",
@ -637,7 +637,7 @@ static tap_ui gsm_a_stat_bssmap_ui = {
NULL
};
static tap_ui gsm_a_stat_dtap_mm_ui = {
static stat_tap_ui gsm_a_stat_dtap_mm_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"gsm_a,dtap_mm",
@ -647,7 +647,7 @@ static tap_ui gsm_a_stat_dtap_mm_ui = {
NULL
};
static tap_ui gsm_a_stat_dtap_rr_ui = {
static stat_tap_ui gsm_a_stat_dtap_rr_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"gsm_a,dtap_rr",
@ -657,7 +657,7 @@ static tap_ui gsm_a_stat_dtap_rr_ui = {
NULL
};
static tap_ui gsm_a_stat_dtap_cc_ui = {
static stat_tap_ui gsm_a_stat_dtap_cc_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"gsm_a,dtap_cc",
@ -667,7 +667,7 @@ static tap_ui gsm_a_stat_dtap_cc_ui = {
NULL
};
static tap_ui gsm_a_stat_dtap_gmm_ui = {
static stat_tap_ui gsm_a_stat_dtap_gmm_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"gsm_a,dtap_gmm",
@ -677,7 +677,7 @@ static tap_ui gsm_a_stat_dtap_gmm_ui = {
NULL
};
static tap_ui gsm_a_stat_dtap_sms_ui = {
static stat_tap_ui gsm_a_stat_dtap_sms_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"gsm_a,dtap_sms",
@ -687,7 +687,7 @@ static tap_ui gsm_a_stat_dtap_sms_ui = {
NULL
};
static tap_ui gsm_a_stat_dtap_sm_ui = {
static stat_tap_ui gsm_a_stat_dtap_sm_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"gsm_a,dtap_sm",
@ -697,7 +697,7 @@ static tap_ui gsm_a_stat_dtap_sm_ui = {
NULL
};
static tap_ui gsm_a_stat_dtap_ss_ui = {
static stat_tap_ui gsm_a_stat_dtap_ss_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"gsm_a,dtap_ss",
@ -707,7 +707,7 @@ static tap_ui gsm_a_stat_dtap_ss_ui = {
NULL
};
static tap_ui gsm_a_stat_dtap_tp_ui = {
static stat_tap_ui gsm_a_stat_dtap_tp_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"gsm_a,dtap_tp",
@ -717,7 +717,7 @@ static tap_ui gsm_a_stat_dtap_tp_ui = {
NULL
};
static tap_ui gsm_a_stat_sacch_rr_ui = {
static stat_tap_ui gsm_a_stat_sacch_rr_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"gsm_a,sacch",
@ -749,23 +749,23 @@ register_tap_listener_gtkgsm_a_stat(void)
exit(1);
}
register_tap_ui(&gsm_a_stat_bssmap_ui,NULL);
register_stat_tap_ui(&gsm_a_stat_bssmap_ui,NULL);
register_tap_ui(&gsm_a_stat_dtap_mm_ui,NULL);
register_stat_tap_ui(&gsm_a_stat_dtap_mm_ui,NULL);
register_tap_ui(&gsm_a_stat_dtap_rr_ui,NULL);
register_stat_tap_ui(&gsm_a_stat_dtap_rr_ui,NULL);
register_tap_ui(&gsm_a_stat_dtap_cc_ui,NULL);
register_stat_tap_ui(&gsm_a_stat_dtap_cc_ui,NULL);
register_tap_ui(&gsm_a_stat_dtap_gmm_ui,NULL);
register_stat_tap_ui(&gsm_a_stat_dtap_gmm_ui,NULL);
register_tap_ui(&gsm_a_stat_dtap_sms_ui,NULL);
register_stat_tap_ui(&gsm_a_stat_dtap_sms_ui,NULL);
register_tap_ui(&gsm_a_stat_dtap_sm_ui,NULL);
register_stat_tap_ui(&gsm_a_stat_dtap_sm_ui,NULL);
register_tap_ui(&gsm_a_stat_dtap_ss_ui,NULL);
register_stat_tap_ui(&gsm_a_stat_dtap_ss_ui,NULL);
register_tap_ui(&gsm_a_stat_dtap_tp_ui,NULL);
register_stat_tap_ui(&gsm_a_stat_dtap_tp_ui,NULL);
register_tap_ui(&gsm_a_stat_sacch_rr_ui,NULL);
register_stat_tap_ui(&gsm_a_stat_sacch_rr_ui,NULL);
}

4
ui/gtk/gsm_map_stat.c
View File

@ -451,7 +451,7 @@ gsm_map_stat_gtk_init(const char *opt_arg _U_,
}
static tap_ui gsm_map_stat_ui = {
static stat_tap_ui gsm_map_stat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"gsm_map",
@ -483,5 +483,5 @@ register_tap_listener_gtkgsm_map_stat(void)
exit(1);
}
register_tap_ui(&gsm_map_stat_ui, NULL);
register_stat_tap_ui(&gsm_map_stat_ui, NULL);
}

4
ui/gtk/iax2_analysis.c
View File

@ -3808,7 +3808,7 @@ iax2_analysis_init(const char *dummy _U_,void* userdata _U_)
}
/****************************************************************************/
static tap_ui iax2_analysis_ui = {
static stat_tap_ui iax2_analysis_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"IAX2", /* XXX - should be "iax2" */
@ -3821,7 +3821,7 @@ static tap_ui iax2_analysis_ui = {
void
register_tap_listener_iax2_analysis(void)
{
register_tap_ui(&iax2_analysis_ui,NULL);
register_stat_tap_ui(&iax2_analysis_ui,NULL);
}

4
ui/gtk/io_stat.c
View File

@ -2170,7 +2170,7 @@ gui_iostat_cb(GtkAction *action _U_, gpointer user_data _U_)
iostat_init(NULL,NULL);
}
static tap_ui iostat_ui = {
static stat_tap_ui iostat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"io,stat",
@ -2183,5 +2183,5 @@ static tap_ui iostat_ui = {
void
register_tap_listener_gtk_iostat(void)
{
register_tap_ui(&iostat_ui, NULL);
register_stat_tap_ui(&iostat_ui, NULL);
}

4
ui/gtk/mtp3_stat.c
View File

@ -420,7 +420,7 @@ mtp3_stat_gtk_init( const char *opt_arg _U_, void* userdata _U_)
}
static tap_ui mtp3_stat_ui = {
static stat_tap_ui mtp3_stat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"mtp3,msus",
@ -451,5 +451,5 @@ register_tap_listener_gtkmtp3_stat(void)
exit(1);
}
register_tap_ui(&mtp3_stat_ui, NULL);
register_stat_tap_ui(&mtp3_stat_ui, NULL);
}

4
ui/gtk/rpc_progs.c
View File

@ -426,7 +426,7 @@ gtk_rpcprogs_cb(GtkWidget *w _U_, gpointer data _U_)
gtk_rpcprogs_init("", NULL);
}
static tap_ui rpcprogs_ui = {
static stat_tap_ui rpcprogs_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"rpc,programs",
@ -439,5 +439,5 @@ static tap_ui rpcprogs_ui = {
void
register_tap_listener_gtkrpcprogs(void)
{
register_tap_ui(&rpcprogs_ui, NULL);
register_stat_tap_ui(&rpcprogs_ui, NULL);
}

4
ui/gtk/rpc_stat.c
View File

@ -523,7 +523,7 @@ gtk_rpcstat_cb(GtkAction *action _U_, gpointer user_data _U_)
}
static tap_ui rpcstat_ui = {
static stat_tap_ui rpcstat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"rpc,srt,",
@ -536,6 +536,6 @@ static tap_ui rpcstat_ui = {
void
register_tap_listener_gtkrpcstat(void)
{
register_tap_ui(&rpcstat_ui, NULL);
register_stat_tap_ui(&rpcstat_ui, NULL);
}

4
ui/gtk/rtp_analysis.c
View File

@ -4044,7 +4044,7 @@ rtp_analysis_init(const char *dummy _U_, void *userdata _U_)
}
/****************************************************************************/
static tap_ui rtp_analysis_ui = {
static stat_tap_ui rtp_analysis_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"rtp",
@ -4057,5 +4057,5 @@ static tap_ui rtp_analysis_ui = {
void
register_tap_listener_rtp_analysis(void)
{
register_tap_ui(&rtp_analysis_ui, NULL);
register_stat_tap_ui(&rtp_analysis_ui, NULL);
}

4
ui/gtk/tap_param_dlg.c
View File

@ -67,7 +67,7 @@ register_param_stat(tap_param_dlg *info, const char *name,
{
gchar *full_name;
const gchar *stock_id = NULL;
tap_ui ui_info;
stat_tap_ui ui_info;
/*
* This menu item will pop up a dialog box, so append "..."
@ -82,7 +82,7 @@ register_param_stat(tap_param_dlg *info, const char *name,
ui_info.index = -1;
ui_info.nparams = info->nparams;
ui_info.params = info->params;
register_tap_ui(&ui_info, NULL);
register_stat_tap_ui(&ui_info, NULL);
switch (group) {

4
ui/gtk/voip_calls_dlg.c
View File

@ -921,7 +921,7 @@ voip_flows_launch(GtkAction *action _U_, gpointer user_data _U_)
}
/****************************************************************************/
static tap_ui voip_calls_ui = {
static stat_tap_ui voip_calls_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"voip,calls",
@ -934,6 +934,6 @@ static tap_ui voip_calls_ui = {
void
register_tap_listener_voip_calls_dlg(void)
{
register_tap_ui(&voip_calls_ui, NULL);
register_stat_tap_ui(&voip_calls_ui, NULL);
}

4
ui/qt/io_graph_dialog.cpp
View File

@ -2164,7 +2164,7 @@ io_graph_init(const char *, void*) {
wsApp->emitStatCommandSignal("IOGraph", NULL, NULL);
}
static tap_ui io_stat_ui = {
static stat_tap_ui io_stat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"io,stat",
@ -2178,7 +2178,7 @@ extern "C" {
void
register_tap_listener_qt_iostat(void)
{
register_tap_ui(&io_stat_ui, NULL);
register_stat_tap_ui(&io_stat_ui, NULL);
}
}