aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors')
-rw-r--r--epan/dissectors/packet-ansi_a.c12
-rw-r--r--epan/dissectors/packet-ansi_map.c6
-rw-r--r--epan/dissectors/packet-bootp.c6
-rw-r--r--epan/dissectors/packet-camel.c6
-rw-r--r--epan/dissectors/packet-gsm_a_common.c62
-rw-r--r--epan/dissectors/packet-gsm_map.c6
-rw-r--r--epan/dissectors/packet-h225.c6
-rw-r--r--epan/dissectors/packet-mtp3.c6
-rw-r--r--epan/dissectors/packet-rpc.c6
-rw-r--r--epan/dissectors/packet-sip.c6
-rw-r--r--epan/dissectors/packet-wsp.c6
11 files changed, 64 insertions, 64 deletions
diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c
index cfc165ac26..2b4bddc877 100644
--- a/epan/dissectors/packet-ansi_a.c
+++ b/epan/dissectors/packet-ansi_a.c
@@ -10590,7 +10590,7 @@ typedef enum
static stat_tap_table_item dtap_stat_fields[] = {{TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "IEI", "0x%02x "}, {TABLE_ITEM_STRING, TAP_ALIGN_LEFT, "Message Name", "%-50s"},
{TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "Count", "%d"}};
-static void ansi_a_dtap_stat_init(new_stat_tap_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void ansi_a_dtap_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
{
int num_fields = sizeof(dtap_stat_fields)/sizeof(stat_tap_table_item);
stat_tap_table* table = new_stat_tap_init_table("ANSI A-I/F DTAP Statistics", num_fields, 0, NULL, gui_callback, gui_data);
@@ -10658,7 +10658,7 @@ ansi_a_stat_reset(stat_tap_table* table)
static stat_tap_table_item bsmap_stat_fields[] = {{TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "IEI", "0x%02x "}, {TABLE_ITEM_STRING, TAP_ALIGN_LEFT, "Message Name", "%-50s"},
{TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "Count", "%d"}};
-static void ansi_a_bsmap_stat_init(new_stat_tap_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void ansi_a_bsmap_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
{
int num_fields = sizeof(bsmap_stat_fields)/sizeof(stat_tap_table_item);
stat_tap_table* table = new_stat_tap_init_table("ANSI A-I/F BSMAP Statistics", num_fields, 0, NULL, gui_callback, gui_data);
@@ -12756,7 +12756,7 @@ proto_register_ansi_a(void)
gint **ett;
gint ett_len = (NUM_INDIVIDUAL_ELEMS+MAX_NUM_DTAP_MSG+MAX_NUM_BSMAP_MSG+MAX_NUM_ELEM_1+NUM_FWD_MS_INFO_REC+NUM_REV_MS_INFO_REC) * sizeof(gint *);
- static new_stat_tap_ui dtap_stat_table = {
+ static stat_tap_table_ui dtap_stat_table = {
REGISTER_STAT_GROUP_TELEPHONY_ANSI,
"A-I/F DTAP Statistics",
"ansi_a",
@@ -12771,7 +12771,7 @@ proto_register_ansi_a(void)
NULL
};
- static new_stat_tap_ui bsmap_stat_table = {
+ static stat_tap_table_ui bsmap_stat_table = {
REGISTER_STAT_GROUP_TELEPHONY_ANSI,
"A-I/F BSMAP Statistics",
"ansi_a",
@@ -12903,8 +12903,8 @@ proto_register_ansi_a(void)
g_free(ett);
- register_new_stat_tap_ui(&dtap_stat_table);
- register_new_stat_tap_ui(&bsmap_stat_table);
+ register_stat_tap_table_ui(&dtap_stat_table);
+ register_stat_tap_table_ui(&bsmap_stat_table);
}
diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c
index 7df0aa8790..1274fab375 100644
--- a/epan/dissectors/packet-ansi_map.c
+++ b/epan/dissectors/packet-ansi_map.c
@@ -16108,7 +16108,7 @@ static stat_tap_table_item stat_fields[] = {{TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "
{TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "Count", " %d "}, {TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "Total Bytes", " %d "},
{TABLE_ITEM_FLOAT, TAP_ALIGN_RIGHT, "Avg Bytes", " %8.2f "}};
-static void ansi_map_stat_init(new_stat_tap_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void ansi_map_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
{
int num_fields = sizeof(stat_fields)/sizeof(stat_tap_table_item);
stat_tap_table* table = new_stat_tap_init_table("ANSI MAP Operation Statistics", num_fields, 0, "ansi_map.op_code", gui_callback, gui_data);
@@ -19504,7 +19504,7 @@ void proto_register_ansi_map(void) {
};
/* TAP STAT INFO */
- static new_stat_tap_ui stat_table = {
+ static stat_tap_table_ui stat_table = {
REGISTER_STAT_GROUP_TELEPHONY_ANSI,
"Map Operation Statistics",
"ansi_map",
@@ -19560,7 +19560,7 @@ void proto_register_ansi_map(void) {
register_init_routine(&ansi_map_init);
register_cleanup_routine(&ansi_map_cleanup);
- register_new_stat_tap_ui(&stat_table);
+ register_stat_tap_table_ui(&stat_table);
}
/*
diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c
index ffd8ca32a8..5415d0fec2 100644
--- a/epan/dissectors/packet-bootp.c
+++ b/epan/dissectors/packet-bootp.c
@@ -5617,7 +5617,7 @@ typedef enum
static stat_tap_table_item bootp_stat_fields[] = {{TABLE_ITEM_STRING, TAP_ALIGN_LEFT, "DHCP Message Type", "%-25s"}, {TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "Packets", "%d"}};
-static void bootp_stat_init(new_stat_tap_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void bootp_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
{
int num_fields = sizeof(bootp_stat_fields)/sizeof(stat_tap_table_item);
stat_tap_table* table = new_stat_tap_init_table("DHCP Statistics", num_fields, 0, NULL, gui_callback, gui_data);
@@ -7828,7 +7828,7 @@ proto_register_bootp(void)
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
};
- static new_stat_tap_ui bootp_stat_table = {
+ static stat_tap_table_ui bootp_stat_table = {
REGISTER_STAT_GROUP_UNSORTED,
"DHCP (BOOTP) Statistics",
"bootp",
@@ -7903,7 +7903,7 @@ proto_register_bootp(void)
"Custom BootP/DHCP Options (Excl. suboptions)",
bootp_uat);
- register_new_stat_tap_ui(&bootp_stat_table);
+ register_stat_tap_table_ui(&bootp_stat_table);
}
void
diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c
index 3e825b0ee9..b865e620e8 100644
--- a/epan/dissectors/packet-camel.c
+++ b/epan/dissectors/packet-camel.c
@@ -8181,7 +8181,7 @@ typedef enum
static stat_tap_table_item camel_stat_fields[] = {{TABLE_ITEM_STRING, TAP_ALIGN_LEFT, "Message Type or Reason", "%-25s"}, {TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "Count", "%d"}};
-static void camel_stat_init(new_stat_tap_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void camel_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
{
int num_fields = sizeof(camel_stat_fields)/sizeof(stat_tap_table_item);
stat_tap_table* table = new_stat_tap_init_table("CAMEL Message Counters", num_fields, 0, NULL, gui_callback, gui_data);
@@ -10651,7 +10651,7 @@ void proto_register_camel(void) {
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
};
- static new_stat_tap_ui camel_stat_table = {
+ static stat_tap_table_ui camel_stat_table = {
REGISTER_STAT_GROUP_TELEPHONY_GSM,
"CAMEL Messages and Response Status",
PSNAME,
@@ -10723,7 +10723,7 @@ void proto_register_camel(void) {
camel_tap=register_tap(PSNAME);
register_srt_table(proto_camel, PSNAME, 1, camelstat_packet, camelstat_init, NULL);
- register_new_stat_tap_ui(&camel_stat_table);
+ register_stat_tap_table_ui(&camel_stat_table);
}
/*
diff --git a/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c
index 445ef5b7c0..a58a30546a 100644
--- a/epan/dissectors/packet-gsm_a_common.c
+++ b/epan/dissectors/packet-gsm_a_common.c
@@ -3528,7 +3528,7 @@ static stat_tap_table_item gsm_a_stat_fields[] = {
{TABLE_ITEM_UINT, TAP_ALIGN_RIGHT, "Count", "%d"}
};
-static void gsm_a_stat_init(new_stat_tap_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data, const char *table_title, const value_string *msg_strings)
+static void gsm_a_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data, const char *table_title, const value_string *msg_strings)
{
int num_fields = sizeof(gsm_a_stat_fields)/sizeof(stat_tap_table_item);
stat_tap_table* table;
@@ -3560,61 +3560,61 @@ static void gsm_a_stat_init(new_stat_tap_ui* new_stat, new_stat_tap_gui_init_cb
}
}
-static void gsm_a_bssmap_stat_init(new_stat_tap_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void gsm_a_bssmap_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
{
gsm_a_stat_init(new_stat, gui_callback, gui_data,
"GSM A-I/F BSSMAP Statistics", gsm_a_bssmap_msg_strings);
}
-static void gsm_a_dtap_mm_stat_init(new_stat_tap_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void gsm_a_dtap_mm_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
{
gsm_a_stat_init(new_stat, gui_callback, gui_data,
"GSM A-I/F DTAP Mobility Management Statistics", gsm_a_dtap_msg_mm_strings);
}
-static void gsm_a_dtap_rr_stat_init(new_stat_tap_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void gsm_a_dtap_rr_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
{
gsm_a_stat_init(new_stat, gui_callback, gui_data,
"GSM A-I/F DTAP Radio Resource Management Statistics", gsm_a_dtap_msg_rr_strings);
}
-static void gsm_a_dtap_cc_stat_init(new_stat_tap_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void gsm_a_dtap_cc_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
{
gsm_a_stat_init(new_stat, gui_callback, gui_data,
"GSM A-I/F DTAP Call Control Statistics", gsm_a_dtap_msg_cc_strings);
}
-static void gsm_a_dtap_gmm_stat_init(new_stat_tap_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void gsm_a_dtap_gmm_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
{
gsm_a_stat_init(new_stat, gui_callback, gui_data,
"GSM A-I/F DTAP GPRS Mobility Management Statistics", gsm_a_dtap_msg_gmm_strings);
}
-static void gsm_a_dtap_sm_stat_init(new_stat_tap_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void gsm_a_dtap_sm_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
{
gsm_a_stat_init(new_stat, gui_callback, gui_data,
"GSM A-I/F DTAP GPRS Session Management Statistics", gsm_a_dtap_msg_sm_strings);
}
-static void gsm_a_dtap_sms_stat_init(new_stat_tap_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void gsm_a_dtap_sms_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
{
gsm_a_stat_init(new_stat, gui_callback, gui_data,
"GSM A-I/F DTAP Short Message Service Statistics", gsm_a_dtap_msg_sms_strings);
}
-static void gsm_a_dtap_tp_stat_init(new_stat_tap_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void gsm_a_dtap_tp_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
{
gsm_a_stat_init(new_stat, gui_callback, gui_data,
"GSM A-I/F DTAP Special Conformance Testing Functions", gsm_a_dtap_msg_tp_strings);
}
-static void gsm_a_dtap_ss_stat_init(new_stat_tap_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void gsm_a_dtap_ss_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
{
gsm_a_stat_init(new_stat, gui_callback, gui_data,
"GSM A-I/F DTAP Supplementary Services Statistics", gsm_a_dtap_msg_ss_strings);
}
-static void gsm_a_sacch_rr_stat_init(new_stat_tap_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void gsm_a_sacch_rr_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
{
gsm_a_stat_init(new_stat, gui_callback, gui_data,
"GSM A-I/F SACCH Statistics", gsm_a_rr_short_pd_msg_strings);
@@ -4665,7 +4665,7 @@ proto_register_gsm_a_common(void)
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
};
- static new_stat_tap_ui gsm_a_bssmap_stat_table = {
+ static stat_tap_table_ui gsm_a_bssmap_stat_table = {
REGISTER_STAT_GROUP_TELEPHONY_GSM,
"A-Interface BSSMAP",
"gsm_a",
@@ -4680,7 +4680,7 @@ proto_register_gsm_a_common(void)
NULL
};
- static new_stat_tap_ui gsm_a_dtap_mm_stat_table = {
+ static stat_tap_table_ui gsm_a_dtap_mm_stat_table = {
REGISTER_STAT_GROUP_TELEPHONY_GSM,
"A-Interface DTAP Mobility Management",
"gsm_a",
@@ -4695,7 +4695,7 @@ proto_register_gsm_a_common(void)
NULL
};
- static new_stat_tap_ui gsm_a_dtap_rr_stat_table = {
+ static stat_tap_table_ui gsm_a_dtap_rr_stat_table = {
REGISTER_STAT_GROUP_TELEPHONY_GSM,
"A-Interface DTAP Radio Resource Management",
"gsm_a",
@@ -4710,7 +4710,7 @@ proto_register_gsm_a_common(void)
NULL
};
- static new_stat_tap_ui gsm_a_dtap_cc_stat_table = {
+ static stat_tap_table_ui gsm_a_dtap_cc_stat_table = {
REGISTER_STAT_GROUP_TELEPHONY_GSM,
"A-Interface DTAP Call Control",
"gsm_a",
@@ -4725,7 +4725,7 @@ proto_register_gsm_a_common(void)
NULL
};
- static new_stat_tap_ui gsm_a_dtap_gmm_stat_table = {
+ static stat_tap_table_ui gsm_a_dtap_gmm_stat_table = {
REGISTER_STAT_GROUP_TELEPHONY_GSM,
"A-Interface DTAP GPRS Mobility Management",
"gsm_a",
@@ -4740,7 +4740,7 @@ proto_register_gsm_a_common(void)
NULL
};
- static new_stat_tap_ui gsm_a_dtap_sm_stat_table = {
+ static stat_tap_table_ui gsm_a_dtap_sm_stat_table = {
REGISTER_STAT_GROUP_TELEPHONY_GSM,
"A-Interface DTAP GPRS Session Management",
"gsm_a",
@@ -4755,7 +4755,7 @@ proto_register_gsm_a_common(void)
NULL
};
- static new_stat_tap_ui gsm_a_dtap_sms_stat_table = {
+ static stat_tap_table_ui gsm_a_dtap_sms_stat_table = {
REGISTER_STAT_GROUP_TELEPHONY_GSM,
"A-Interface DTAP Short Message Service",
"gsm_a",
@@ -4770,7 +4770,7 @@ proto_register_gsm_a_common(void)
NULL
};
- static new_stat_tap_ui gsm_a_dtap_tp_stat_table = {
+ static stat_tap_table_ui gsm_a_dtap_tp_stat_table = {
REGISTER_STAT_GROUP_TELEPHONY_GSM,
"A-Interface DTAP Special Conformance Testing Functions",
"gsm_a",
@@ -4785,7 +4785,7 @@ proto_register_gsm_a_common(void)
NULL
};
- static new_stat_tap_ui gsm_a_dtap_ss_stat_table = {
+ static stat_tap_table_ui gsm_a_dtap_ss_stat_table = {
REGISTER_STAT_GROUP_TELEPHONY_GSM,
"A-Interface DTAP Supplementary Services",
"gsm_a",
@@ -4800,7 +4800,7 @@ proto_register_gsm_a_common(void)
NULL
};
- static new_stat_tap_ui gsm_a_sacch_rr_stat_table = {
+ static stat_tap_table_ui gsm_a_sacch_rr_stat_table = {
REGISTER_STAT_GROUP_TELEPHONY_GSM,
"A-Interface SACCH",
"gsm_a",
@@ -4838,16 +4838,16 @@ proto_register_gsm_a_common(void)
gsm_a_tap = register_tap("gsm_a");
- register_new_stat_tap_ui(&gsm_a_bssmap_stat_table);
- register_new_stat_tap_ui(&gsm_a_dtap_mm_stat_table);
- register_new_stat_tap_ui(&gsm_a_dtap_rr_stat_table);
- register_new_stat_tap_ui(&gsm_a_dtap_cc_stat_table);
- register_new_stat_tap_ui(&gsm_a_dtap_gmm_stat_table);
- register_new_stat_tap_ui(&gsm_a_dtap_sms_stat_table);
- register_new_stat_tap_ui(&gsm_a_dtap_sm_stat_table);
- register_new_stat_tap_ui(&gsm_a_dtap_ss_stat_table);
- register_new_stat_tap_ui(&gsm_a_dtap_tp_stat_table);
- register_new_stat_tap_ui(&gsm_a_sacch_rr_stat_table);
+ register_stat_tap_table_ui(&gsm_a_bssmap_stat_table);
+ register_stat_tap_table_ui(&gsm_a_dtap_mm_stat_table);
+ register_stat_tap_table_ui(&gsm_a_dtap_rr_stat_table);
+ register_stat_tap_table_ui(&gsm_a_dtap_cc_stat_table);
+ register_stat_tap_table_ui(&gsm_a_dtap_gmm_stat_table);
+ register_stat_tap_table_ui(&gsm_a_dtap_sms_stat_table);
+ register_stat_tap_table_ui(&gsm_a_dtap_sm_stat_table);
+ register_stat_tap_table_ui(&gsm_a_dtap_ss_stat_table);
+ register_stat_tap_table_ui(&gsm_a_dtap_tp_stat_table);
+ register_stat_tap_table_ui(&gsm_a_sacch_rr_stat_table);
}
/*
diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c
index f80a29f487..9be6a9c525 100644
--- a/epan/dissectors/packet-gsm_map.c
+++ b/epan/dissectors/packet-gsm_map.c
@@ -22496,7 +22496,7 @@ static stat_tap_table_item gsm_map_stat_fields[] = {
{TABLE_ITEM_FLOAT, TAP_ALIGN_RIGHT, "Avg Bytes", "%d"},
};
-static void gsm_map_stat_init(new_stat_tap_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void gsm_map_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
{
int num_fields = sizeof(gsm_map_stat_fields)/sizeof(stat_tap_table_item);
stat_tap_table* table;
@@ -30602,7 +30602,7 @@ void proto_register_gsm_map(void) {
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
};
- static new_stat_tap_ui gsm_map_stat_table = {
+ static stat_tap_table_ui gsm_map_stat_table = {
REGISTER_STAT_GROUP_TELEPHONY_GSM,
"MAP Operation",
"gsm_map",
@@ -30727,7 +30727,7 @@ void proto_register_gsm_map(void) {
"When enabled, dissector will use the non 3GPP standard extensions from Ericsson (that can override the standard ones)",
&pref_ericsson_proprietary_ext);
- register_new_stat_tap_ui(&gsm_map_stat_table);
+ register_stat_tap_table_ui(&gsm_map_stat_table);
}
/*
diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c
index 37bcbe9ffb..d9dc8edf9f 100644
--- a/epan/dissectors/packet-h225.c
+++ b/epan/dissectors/packet-h225.c
@@ -7900,7 +7900,7 @@ static guint facility_reason_idx[FACILITY_REASONS];
static guint other_idx;
-static void h225_stat_init(new_stat_tap_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void h225_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
{
int num_fields = sizeof(h225_stat_fields)/sizeof(stat_tap_table_item);
stat_tap_table* table = new_stat_tap_init_table("H.225 Messages and Message Reasons", num_fields, 0, NULL, gui_callback, gui_data);
@@ -11612,7 +11612,7 @@ void proto_register_h225(void) {
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
};
- static new_stat_tap_ui h225_stat_table = {
+ static stat_tap_table_ui h225_stat_table = {
REGISTER_STAT_GROUP_TELEPHONY,
"H.225",
PFNAME,
@@ -11675,7 +11675,7 @@ void proto_register_h225(void) {
register_rtd_table(proto_h225_ras, PFNAME, NUM_RAS_STATS, 1, ras_message_category, h225rassrt_packet, NULL);
- register_new_stat_tap_ui(&h225_stat_table);
+ register_stat_tap_table_ui(&h225_stat_table);
oid_add_from_string("Version 1","0.0.8.2250.0.1");
oid_add_from_string("Version 2","0.0.8.2250.0.2");
diff --git a/epan/dissectors/packet-mtp3.c b/epan/dissectors/packet-mtp3.c
index f251b5657a..40d1dfb9c1 100644
--- a/epan/dissectors/packet-mtp3.c
+++ b/epan/dissectors/packet-mtp3.c
@@ -791,7 +791,7 @@ static stat_tap_table_item mtp3_stat_fields[] = {
{TABLE_ITEM_FLOAT, TAP_ALIGN_RIGHT, "Avg Bytes", "%f"},
};
-static void mtp3_stat_init(new_stat_tap_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void mtp3_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
{
int num_fields = sizeof(mtp3_stat_fields)/sizeof(stat_tap_table_item);
stat_tap_table* table;
@@ -1031,7 +1031,7 @@ proto_register_mtp3(void)
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
};
- static new_stat_tap_ui mtp3_stat_table = {
+ static stat_tap_table_ui mtp3_stat_table = {
REGISTER_STAT_GROUP_TELEPHONY_MTP3,
"MTP3 Statistics",
"mtp3",
@@ -1099,7 +1099,7 @@ proto_register_mtp3(void)
"Decode the spare bits of the SIO as the MSU priority (a national option in ITU)",
&mtp3_show_itu_priority);
- register_new_stat_tap_ui(&mtp3_stat_table);
+ register_stat_tap_table_ui(&mtp3_stat_table);
}
void
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index c8abc674af..933da9b6fd 100644
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@@ -3851,7 +3851,7 @@ static stat_tap_table_item rpc_prog_stat_fields[] = {
{TABLE_ITEM_FLOAT, TAP_ALIGN_RIGHT, "Avg SRT (s)", "%.2f"}
};
-static void rpc_prog_stat_init(new_stat_tap_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void rpc_prog_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
{
int num_fields = sizeof(rpc_prog_stat_fields)/sizeof(stat_tap_table_item);
stat_tap_table* table;
@@ -4242,7 +4242,7 @@ proto_register_rpc(void)
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
};
- static new_stat_tap_ui rpc_prog_stat_table = {
+ static stat_tap_table_ui rpc_prog_stat_table = {
REGISTER_STAT_GROUP_UNSORTED,
"ONC-RPC Programs",
"rpc",
@@ -4302,7 +4302,7 @@ proto_register_rpc(void)
rpc_tap = register_tap("rpc");
register_srt_table(proto_rpc, NULL, 1, rpcstat_packet, rpcstat_init, rpcstat_param);
- register_new_stat_tap_ui(&rpc_prog_stat_table);
+ register_stat_tap_table_ui(&rpc_prog_stat_table);
/*
* Init the hash tables. Dissectors for RPC protocols must
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index 9723f4e3d0..b495aa6c4d 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -4835,7 +4835,7 @@ static stat_tap_table_item sip_stat_fields[] = {
{TABLE_ITEM_FLOAT, TAP_ALIGN_RIGHT, "Max Setup (s)", "%8.2f"},
};
-static void sip_stat_init(new_stat_tap_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void sip_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
{
/* XXX Should we have a single request + response table instead? */
int num_fields = sizeof(sip_stat_fields)/sizeof(stat_tap_table_item);
@@ -6300,7 +6300,7 @@ void proto_register_sip(void)
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
};
- static new_stat_tap_ui sip_stat_table = {
+ static stat_tap_table_ui sip_stat_table = {
REGISTER_STAT_GROUP_TELEPHONY,
"SIP Statistics",
"sip",
@@ -6409,7 +6409,7 @@ void proto_register_sip(void)
ext_hdr_subdissector_table = register_dissector_table("sip.hdr", "SIP Extension header", FT_STRING, BASE_NONE, DISSECTOR_TABLE_NOT_ALLOW_DUPLICATE);
- register_new_stat_tap_ui(&sip_stat_table);
+ register_stat_tap_table_ui(&sip_stat_table);
/* compile patterns */
ws_mempbrk_compile(&pbrk_comma_semi, ",;");
diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c
index 372319b409..6ea68954f9 100644
--- a/epan/dissectors/packet-wsp.c
+++ b/epan/dissectors/packet-wsp.c
@@ -5561,7 +5561,7 @@ static stat_tap_table_item wsp_stat_fields[] = {
static int unknown_pt_idx;
static int unknown_sc_idx;
-static void wsp_stat_init(new_stat_tap_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
+static void wsp_stat_init(stat_tap_table_ui* new_stat, new_stat_tap_gui_init_cb gui_callback, void* gui_data)
{
int num_fields = sizeof(wsp_stat_fields)/sizeof(stat_tap_table_item);
stat_tap_table* pt_table = new_stat_tap_init_table("PDU Types", num_fields, 0, NULL, gui_callback, gui_data);
@@ -7317,7 +7317,7 @@ proto_register_sir(void)
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
};
- static new_stat_tap_ui wsp_stat_table = {
+ static stat_tap_table_ui wsp_stat_table = {
REGISTER_STAT_GROUP_TELEPHONY,
"WAP-WSP Packet Counter",
"wsp",
@@ -7347,7 +7347,7 @@ proto_register_sir(void)
proto_register_field_array(proto_sir, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
- register_new_stat_tap_ui(&wsp_stat_table);
+ register_stat_tap_table_ui(&wsp_stat_table);
}