diff options
Diffstat (limited to 'ui')
65 files changed, 289 insertions, 278 deletions
diff --git a/ui/cli/tap-camelsrt.c b/ui/cli/tap-camelsrt.c index f3d81269e6..13b213e63d 100644 --- a/ui/cli/tap-camelsrt.c +++ b/ui/cli/tap-camelsrt.c @@ -50,10 +50,10 @@ static void camelsrt_reset(void *phs) } -static int camelsrt_packet(void *phs, - packet_info *pinfo _U_, - epan_dissect_t *edt _U_, - const void *phi) +static tap_packet_status camelsrt_packet(void *phs, + packet_info *pinfo _U_, + epan_dissect_t *edt _U_, + const void *phi) { struct camelsrt_t *hs = (struct camelsrt_t *)phs; const struct camelsrt_info_t * pi = (const struct camelsrt_info_t *)phi; @@ -75,7 +75,7 @@ static int camelsrt_packet(void *phs, } } } - return 1; + return TAP_PACKET_REDRAW; } diff --git a/ui/cli/tap-diameter-avp.c b/ui/cli/tap-diameter-avp.c index f607ae2369..6815430dbc 100644 --- a/ui/cli/tap-diameter-avp.c +++ b/ui/cli/tap-diameter-avp.c @@ -112,10 +112,10 @@ diam_tree_to_csv(proto_node *node, gpointer data) return FALSE; } -static int +static tap_packet_status diameteravp_packet(void *pds, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pdi) { - int ret = 0; + tap_packet_status ret = TAP_PACKET_DONT_REDRAW; double resp_time = 0.; gboolean is_request = TRUE; guint32 cmd_code = 0; @@ -140,7 +140,7 @@ diameteravp_packet(void *pds, packet_info *pinfo, epan_dissect_t *edt _U_, const ds->frame = pinfo->num; ds->diammsg_toprocess = 0; } else { - ds->diammsg_toprocess += 1; + ds->diammsg_toprocess += 1; } /* Extract data from request/answer pair provided by diameter dissector.*/ diff --git a/ui/cli/tap-expert.c b/ui/cli/tap-expert.c index 3dc33aae2c..0d6bb99cbb 100644 --- a/ui/cli/tap-expert.c +++ b/ui/cli/tap-expert.c @@ -70,7 +70,7 @@ expert_stat_reset(void *tapdata) } /* Process stat struct for an expert frame */ -static gboolean +static tap_packet_status expert_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pointer) { @@ -99,12 +99,12 @@ expert_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U break; default: g_assert_not_reached(); - return FALSE; + return TAP_PACKET_DONT_REDRAW; } /* Don't store details at a lesser severity than we are interested in */ if (severity_level < lowest_report_level) { - return TRUE; + return TAP_PACKET_REDRAW; /* XXX - TAP_PACKET_DONT_REDRAW? */ } /* If a duplicate just bump up frequency. @@ -114,7 +114,7 @@ expert_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U if ((strcmp(ei->protocol, entry->protocol) == 0) && (strcmp(ei->summary, entry->summary) == 0)) { entry->frequency++; - return TRUE; + return TAP_PACKET_REDRAW; } } @@ -128,7 +128,7 @@ expert_stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U /* Store a copy of the expert entry */ g_array_append_val(data->ei_array[severity_level], tmp_entry); - return TRUE; + return TAP_PACKET_REDRAW; } /* Output for all of the items of one severity */ diff --git a/ui/cli/tap-gsm_astat.c b/ui/cli/tap-gsm_astat.c index ddd805c584..e56139b3bd 100644 --- a/ui/cli/tap-gsm_astat.c +++ b/ui/cli/tap-gsm_astat.c @@ -45,7 +45,7 @@ typedef struct _gsm_a_stat_t { } gsm_a_stat_t; -static int +static tap_packet_status gsm_a_stat_packet( void *tapdata, packet_info *pinfo _U_, @@ -92,7 +92,7 @@ gsm_a_stat_packet( /* * unsupported PD */ - return(0); + return(TAP_PACKET_DONT_REDRAW); } break; @@ -112,10 +112,10 @@ gsm_a_stat_packet( /* * unknown PDU type !!! */ - return(0); + return(TAP_PACKET_DONT_REDRAW); } - return(1); + return(TAP_PACKET_REDRAW); } diff --git a/ui/cli/tap-httpstat.c b/ui/cli/tap-httpstat.c index 184c0d98f2..dba569cf5b 100644 --- a/ui/cli/tap-httpstat.c +++ b/ui/cli/tap-httpstat.c @@ -197,7 +197,7 @@ httpstat_reset(void *psp ) } -static int +static tap_packet_status httpstat_packet(void *psp , packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pri) { const http_info_value_t *value = (const http_info_value_t *)pri; @@ -218,7 +218,7 @@ httpstat_packet(void *psp , packet_info *pinfo _U_, epan_dissect_t *edt _U_, con */ int i = value->response_code; if ((i < 100) || (i >= 600)) { - return 0; + return TAP_PACKET_DONT_REDRAW; } else if (i < 200) { key = 199; /* Hopefully, this status code will never be used */ @@ -239,7 +239,7 @@ httpstat_packet(void *psp , packet_info *pinfo _U_, epan_dissect_t *edt _U_, con sp->hash_responses, GUINT_TO_POINTER(key)); if (sc == NULL) - return 0; + return TAP_PACKET_DONT_REDRAW; } sc->packets++; } @@ -259,9 +259,9 @@ httpstat_packet(void *psp , packet_info *pinfo _U_, epan_dissect_t *edt _U_, con sc->packets++; } } else { - return 0; + return TAP_PACKET_DONT_REDRAW; } - return 1; + return TAP_PACKET_REDRAW; } diff --git a/ui/cli/tap-icmpstat.c b/ui/cli/tap-icmpstat.c index d1dfebb77f..628e567350 100644 --- a/ui/cli/tap-icmpstat.c +++ b/ui/cli/tap-icmpstat.c @@ -102,10 +102,10 @@ static gint compare_doubles(gconstpointer a, gconstpointer b) * "icmp" tap, the third parameter type is icmp_transaction_t. * * function returns : - * FALSE: no updates, no need to call (*draw) later - * TRUE: state has changed, call (*draw) sometime later + * TAP_PACKET_DONT_REDRAW: no updates, no need to call (*draw) later + * TAP_PACKET_REDRAW: state has changed, call (*draw) sometime later */ -static gboolean +static tap_packet_status icmpstat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data) { icmpstat_t *icmpstat = (icmpstat_t *)tapdata; @@ -113,13 +113,13 @@ icmpstat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, double resp_time, *rt; if (trans == NULL) - return FALSE; + return TAP_PACKET_DONT_REDRAW; if (trans->resp_frame) { resp_time = nstime_to_msec(&trans->resp_time); rt = g_new(double, 1); if (rt == NULL) - return FALSE; + return TAP_PACKET_DONT_REDRAW; *rt = resp_time; icmpstat->rt_list = g_slist_prepend(icmpstat->rt_list, rt); icmpstat->num_resps++; @@ -135,9 +135,9 @@ icmpstat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, } else if (trans->rqst_frame) icmpstat->num_rqsts++; else - return FALSE; + return TAP_PACKET_DONT_REDRAW; - return TRUE; + return TAP_PACKET_REDRAW; } diff --git a/ui/cli/tap-icmpv6stat.c b/ui/cli/tap-icmpv6stat.c index 04bcf973a8..517b704148 100644 --- a/ui/cli/tap-icmpv6stat.c +++ b/ui/cli/tap-icmpv6stat.c @@ -103,10 +103,10 @@ static gint compare_doubles(gconstpointer a, gconstpointer b) * "icmpv6" tap, the third parameter type is icmp_transaction_t. * * function returns : - * FALSE: no updates, no need to call (*draw) later - * TRUE: state has changed, call (*draw) sometime later + * TAP_PACKET_DONT_REDRAW: no updates, no need to call (*draw) later + * TAP_PACKET_REDRAW: state has changed, call (*draw) sometime later */ -static gboolean +static tap_packet_status icmpv6stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *data) { icmpv6stat_t *icmpv6stat = (icmpv6stat_t *)tapdata; @@ -114,13 +114,13 @@ icmpv6stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_ double resp_time, *rt; if (trans == NULL) - return FALSE; + return TAP_PACKET_DONT_REDRAW; if (trans->resp_frame) { resp_time = nstime_to_msec(&trans->resp_time); rt = g_new(double, 1); if (rt == NULL) - return FALSE; + return TAP_PACKET_DONT_REDRAW; *rt = resp_time; icmpv6stat->rt_list = g_slist_prepend(icmpv6stat->rt_list, rt); icmpv6stat->num_resps++; @@ -136,9 +136,9 @@ icmpv6stat_packet(void *tapdata, packet_info *pinfo _U_, epan_dissect_t *edt _U_ } else if (trans->rqst_frame) icmpv6stat->num_rqsts++; else - return FALSE; + return TAP_PACKET_DONT_REDRAW; - return TRUE; + return TAP_PACKET_REDRAW; } diff --git a/ui/cli/tap-iostat.c b/ui/cli/tap-iostat.c index 1928f97e68..4c328a8c35 100644 --- a/ui/cli/tap-iostat.c +++ b/ui/cli/tap-iostat.c @@ -78,7 +78,7 @@ typedef struct _io_stat_item_t { static guint64 last_relative_time; -static int +static tap_packet_status iostat_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt, const void *dummy _U_) { io_stat_t *parent; @@ -506,7 +506,7 @@ iostat_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt, const void *du break; } } - return TRUE; + return TAP_PACKET_REDRAW; } static int diff --git a/ui/cli/tap-macltestat.c b/ui/cli/tap-macltestat.c index cb35ce89e0..6513dc65b7 100644 --- a/ui/cli/tap-macltestat.c +++ b/ui/cli/tap-macltestat.c @@ -207,7 +207,7 @@ static void update_ueid_rnti_counts(guint16 rnti, guint16 ueid, mac_lte_stat_t * /* Process stat struct for a MAC LTE frame */ -static int +static tap_packet_status mac_lte_stat_packet(void *phs, packet_info *pinfo, epan_dissect_t *edt _U_, const void *phi) { @@ -220,7 +220,7 @@ mac_lte_stat_packet(void *phs, packet_info *pinfo, epan_dissect_t *edt _U_, const struct mac_lte_tap_info *si = (const struct mac_lte_tap_info *)phi; if (!hs) { - return 0; + return TAP_PACKET_DONT_REDRAW; } hs->common_stats.all_frames++; @@ -231,18 +231,18 @@ mac_lte_stat_packet(void *phs, packet_info *pinfo, epan_dissect_t *edt _U_, hs->common_stats.pch_frames++; hs->common_stats.pch_bytes += si->single_number_of_bytes; hs->common_stats.pch_paging_ids += si->number_of_paging_ids; - return 1; + return TAP_PACKET_REDRAW; case SI_RNTI: hs->common_stats.sib_frames++; hs->common_stats.sib_bytes += si->single_number_of_bytes; - return 1; + return TAP_PACKET_REDRAW; case NO_RNTI: hs->common_stats.mib_frames++; - return 1; + return TAP_PACKET_REDRAW; case RA_RNTI: hs->common_stats.rar_frames++; hs->common_stats.rar_entries += si->number_of_rars; - return 1; + return TAP_PACKET_REDRAW; case C_RNTI: case SPS_RNTI: /* Drop through for per-UE update */ @@ -250,7 +250,7 @@ mac_lte_stat_packet(void *phs, packet_info *pinfo, epan_dissect_t *edt _U_, default: /* Error */ - return 0; + return TAP_PACKET_DONT_REDRAW; } /* Check max UEs/tti counter */ @@ -304,7 +304,7 @@ mac_lte_stat_packet(void *phs, packet_info *pinfo, epan_dissect_t *edt _U_, /* Really should have a row pointer by now */ if (!te) { - return 0; + return TAP_PACKET_DONT_REDRAW; } /* Update entry with details from si */ @@ -315,12 +315,12 @@ mac_lte_stat_packet(void *phs, packet_info *pinfo, epan_dissect_t *edt _U_, if (si->direction == DIRECTION_UPLINK) { if (si->isPHYRetx) { te->stats.UL_retx_frames++; - return 1; + return TAP_PACKET_REDRAW; } if (si->crcStatusValid && (si->crcStatus != crc_success)) { te->stats.UL_CRC_errors++; - return 1; + return TAP_PACKET_REDRAW; } /* Update time range */ @@ -348,7 +348,7 @@ mac_lte_stat_packet(void *phs, packet_info *pinfo, epan_dissect_t *edt _U_, else { if (si->isPHYRetx) { te->stats.DL_retx_frames++; - return 1; + return TAP_PACKET_REDRAW; } if (si->crcStatusValid && (si->crcStatus != crc_success)) { @@ -370,7 +370,7 @@ mac_lte_stat_packet(void *phs, packet_info *pinfo, epan_dissect_t *edt _U_, /* Something went wrong! */ break; } - return 1; + return TAP_PACKET_REDRAW; } /* Update time range */ @@ -395,7 +395,7 @@ mac_lte_stat_packet(void *phs, packet_info *pinfo, epan_dissect_t *edt _U_, } - return 1; + return TAP_PACKET_REDRAW; } diff --git a/ui/cli/tap-protocolinfo.c b/ui/cli/tap-protocolinfo.c index e0c777b670..b5bd9d5958 100644 --- a/ui/cli/tap-protocolinfo.c +++ b/ui/cli/tap-protocolinfo.c @@ -31,7 +31,7 @@ typedef struct _pci_t { } pci_t; -static int +static tap_packet_status protocolinfo_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt, const void *dummy _U_) { pci_t *rs = (pci_t *)prs; @@ -48,6 +48,8 @@ protocolinfo_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt, const vo * * To prevent a crash, we check whether INFO column is writable * and, if not, we report that error and exit. + * + * XXX - report the error and just return TAP_PACKET_FAILED? */ if (!col_get_writable(pinfo->cinfo, COL_INFO)) { cmdarg_err("the proto,colinfo tap doesn't work if the INFO column isn't being printed."); @@ -55,7 +57,7 @@ protocolinfo_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt, const vo } gp = proto_get_finfo_ptr_array(edt->tree, rs->hf_index); if (!gp) { - return 0; + return TAP_PACKET_DONT_REDRAW; } for (i=0; i<gp->len; i++) { @@ -65,7 +67,7 @@ protocolinfo_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt, const vo wmem_free(NULL, str); } } - return 0; + return TAP_PACKET_DONT_REDRAW; } diff --git a/ui/cli/tap-protohierstat.c b/ui/cli/tap-protohierstat.c index 8009874725..dd1bed9229 100644 --- a/ui/cli/tap-protohierstat.c +++ b/ui/cli/tap-protohierstat.c @@ -53,7 +53,7 @@ new_phs_t(phs_t *parent) } -static int +static tap_packet_status protohierstat_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt, const void *dummy _U_) { phs_t *rs = (phs_t *)prs; @@ -62,13 +62,13 @@ protohierstat_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt, const v field_info *fi; if (!edt) { - return 0; + return TAP_PACKET_DONT_REDRAW; } if (!edt->tree) { - return 0; + return TAP_PACKET_DONT_REDRAW; } if (!edt->tree->first_child) { - return 0; + return TAP_PACKET_DONT_REDRAW; } for (node=edt->tree->first_child; node; node=node->next) { @@ -112,7 +112,7 @@ protohierstat_packet(void *prs, packet_info *pinfo, epan_dissect_t *edt, const v } rs = rs->child; } - return 1; + return TAP_PACKET_REDRAW; } static void diff --git a/ui/cli/tap-rlcltestat.c b/ui/cli/tap-rlcltestat.c index b46345d5a9..b376e8f89c 100644 --- a/ui/cli/tap-rlcltestat.c +++ b/ui/cli/tap-rlcltestat.c @@ -151,7 +151,7 @@ static rlc_lte_ep_t *alloc_rlc_lte_ep(const struct rlc_lte_tap_info *si, packet_ /* Process stat struct for a RLC LTE frame */ -static int +static tap_packet_status rlc_lte_stat_packet(void *phs, packet_info *pinfo, epan_dissect_t *edt _U_, const void *phi) { @@ -164,7 +164,7 @@ rlc_lte_stat_packet(void *phs, packet_info *pinfo, epan_dissect_t *edt _U_, /* Need this */ if (!hs) { - return 0; + return TAP_PACKET_DONT_REDRAW; } /* Inc top-level frame count */ @@ -176,12 +176,12 @@ rlc_lte_stat_packet(void *phs, packet_info *pinfo, epan_dissect_t *edt _U_, case CHANNEL_TYPE_BCCH_DL_SCH: hs->common_stats.bcch_frames++; hs->common_stats.bcch_bytes += si->pduLength; - return 1; + return TAP_PACKET_REDRAW; case CHANNEL_TYPE_PCCH: hs->common_stats.pcch_frames++; hs->common_stats.pcch_bytes += si->pduLength; - return 1; + return TAP_PACKET_REDRAW; default: break; @@ -218,7 +218,7 @@ rlc_lte_stat_packet(void *phs, packet_info *pinfo, epan_dissect_t *edt _U_, /* Really should have a row pointer by now */ if (!te) { - return 0; + return TAP_PACKET_DONT_REDRAW; } /* Update entry with details from si */ @@ -262,7 +262,7 @@ rlc_lte_stat_packet(void *phs, packet_info *pinfo, epan_dissect_t *edt _U_, te->stats.DL_total_missing += si->missingSNs; } - return 1; + return TAP_PACKET_REDRAW; } diff --git a/ui/cli/tap-rpcprogs.c b/ui/cli/tap-rpcprogs.c index 8581850b2e..02dcf4a200 100644 --- a/ui/cli/tap-rpcprogs.c +++ b/ui/cli/tap-rpcprogs.c @@ -46,7 +46,7 @@ typedef struct _rpc_program_t { static rpc_program_t *prog_list = NULL; static int already_enabled = 0; -static int +static tap_packet_status rpcprogs_packet(void *dummy1 _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pri) { const rpc_call_info_value *ri = (const rpc_call_info_value *)pri; @@ -120,7 +120,7 @@ rpcprogs_packet(void *dummy1 _U_, packet_info *pinfo, epan_dissect_t *edt _U_, c /* we are only interested in reply packets */ if (ri->request || !rp) { - return 0; + return TAP_PACKET_DONT_REDRAW; } /* calculate time delta between request and reply */ @@ -160,7 +160,7 @@ rpcprogs_packet(void *dummy1 _U_, packet_info *pinfo, epan_dissect_t *edt _U_, c } rp->num++; - return 1; + return TAP_PACKET_REDRAW; } diff --git a/ui/cli/tap-rtspstat.c b/ui/cli/tap-rtspstat.c index 3db29ceaf6..5a2519c14b 100644 --- a/ui/cli/tap-rtspstat.c +++ b/ui/cli/tap-rtspstat.c @@ -126,7 +126,7 @@ rtspstat_reset(void *psp ) } -static int +static tap_packet_status rtspstat_packet(void *psp , packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pri) { const rtsp_info_value_t *value = (const rtsp_info_value_t *)pri; @@ -147,7 +147,7 @@ rtspstat_packet(void *psp , packet_info *pinfo _U_, epan_dissect_t *edt _U_, con */ int i = value->response_code; if ((i < 100) || (i >= 600)) { - return 0; + return TAP_PACKET_DONT_REDRAW; } else if (i < 200) { key = 199; /* Hopefully, this status code will never be used */ @@ -168,7 +168,7 @@ rtspstat_packet(void *psp , packet_info *pinfo _U_, epan_dissect_t *edt _U_, con sp->hash_responses, GINT_TO_POINTER(key)); if (sc == NULL) - return 0; + return TAP_PACKET_DONT_REDRAW; } sc->packets++; } @@ -188,9 +188,9 @@ rtspstat_packet(void *psp , packet_info *pinfo _U_, epan_dissect_t *edt _U_, con sc->packets++; } } else { - return 0; + return TAP_PACKET_DONT_REDRAW; } - return 1; + return TAP_PACKET_REDRAW; } diff --git a/ui/cli/tap-sctpchunkstat.c b/ui/cli/tap-sctpchunkstat.c index cfb3d5376a..45dd4b9511 100644 --- a/ui/cli/tap-sctpchunkstat.c +++ b/ui/cli/tap-sctpchunkstat.c @@ -92,7 +92,7 @@ alloc_sctp_ep(const struct _sctp_info *si) -static int +static tap_packet_status sctpstat_packet(void *phs, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *phi) { @@ -103,7 +103,7 @@ sctpstat_packet(void *phs, packet_info *pinfo _U_, epan_dissect_t *edt _U_, cons guint8 chunk_type; if (!hs) - return (0); + return (TAP_PACKET_DONT_REDRAW); hs->number_of_packets++; @@ -131,7 +131,7 @@ sctpstat_packet(void *phs, packet_info *pinfo _U_, epan_dissect_t *edt _U_, cons } if (!te) - return (0); + return (TAP_PACKET_DONT_REDRAW); if (si->number_of_tvbs > 0) { @@ -144,7 +144,7 @@ sctpstat_packet(void *phs, packet_info *pinfo _U_, epan_dissect_t *edt _U_, cons te->chunk_count[CHUNK_TYPE(si->tvb[tvb_number])]++; } } - return (1); + return (TAP_PACKET_REDRAW); } diff --git a/ui/cli/tap-sipstat.c b/ui/cli/tap-sipstat.c index 988da5a89a..8bc521c7d1 100644 --- a/ui/cli/tap-sipstat.c +++ b/ui/cli/tap-sipstat.c @@ -248,7 +248,7 @@ sipstat_reset(void *psp ) /* Main entry point to SIP tap */ -static int +static tap_packet_status sipstat_packet(void *psp, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pri) { const sip_info_value_t *value = (const sip_info_value_t *)pri; @@ -306,7 +306,7 @@ sipstat_packet(void *psp, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const if ((i < 100) || (i >= 700)) { /* Forget about crazy values */ - return 0; + return TAP_PACKET_DONT_REDRAW; } else if (i < 200) { @@ -337,7 +337,7 @@ sipstat_packet(void *psp, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const sc = (sip_response_code_t *)g_hash_table_lookup(sp->hash_responses, &key); if (sc == NULL) { - return 0; + return TAP_PACKET_DONT_REDRAW; } } sc->packets++; @@ -369,10 +369,10 @@ sipstat_packet(void *psp, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const else { /* No request method set. Just ignore */ - return 0; + return TAP_PACKET_DONT_REDRAW; } - return 1; + return TAP_PACKET_REDRAW; } static void diff --git a/ui/cli/tap-smbsids.c b/ui/cli/tap-smbsids.c index 039a5acc49..2f4c306be5 100644 --- a/ui/cli/tap-smbsids.c +++ b/ui/cli/tap-smbsids.c @@ -27,10 +27,10 @@ void register_tap_listener_smbsids(void); -static int +static tap_packet_status smbsids_packet(void *pss _U_, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *psi _U_) { - return 1; + return TAP_PACKET_REDRAW; } static void diff --git a/ui/cli/tap-sv.c b/ui/cli/tap-sv.c index 5899777711..0b75edb598 100644 --- a/ui/cli/tap-sv.c +++ b/ui/cli/tap-sv.c @@ -26,7 +26,7 @@ void register_tap_listener_sv(void); -static int +static tap_packet_status sv_packet(void *prs _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *pri) { int i; @@ -40,7 +40,7 @@ sv_packet(void *prs _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void printf("\n"); - return 0; + return TAP_PACKET_DONT_REDRAW; } static void diff --git a/ui/cli/tap-wspstat.c b/ui/cli/tap-wspstat.c index 3f8c21c8b3..34300e1613 100644 --- a/ui/cli/tap-wspstat.c +++ b/ui/cli/tap-wspstat.c @@ -116,13 +116,13 @@ index2pdut(gint pdut) return pdut + 81; return 0; } -static int +static tap_packet_status wspstat_packet(void *psp, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *pri) { wspstat_t *sp = (wspstat_t *)psp; const wsp_info_value_t *value = (const wsp_info_value_t *)pri; gint idx = pdut2index(value->pdut); - int retour = 0; + tap_packet_status retour = TAP_PACKET_DONT_REDRAW; if (value->status_code != 0) { wsp_status_code_t *sc; @@ -140,14 +140,14 @@ wspstat_packet(void *psp, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const } else { sc->packets++; } - retour = 1; + retour = TAP_PACKET_REDRAW; } if (idx != 0) { sp->pdu_stats[idx].packets++; - retour = 1; + retour = TAP_PACKET_REDRAW; } return retour; } diff --git a/ui/mcast_stream.c b/ui/mcast_stream.c index 61280bf082..9711c9fb16 100644 --- a/ui/mcast_stream.c +++ b/ui/mcast_stream.c @@ -131,7 +131,7 @@ mcaststream_draw(void *ti_ptr) /****************************************************************************/ /* whenever a udp packet is seen by the tap listener */ -static gboolean +static tap_packet_status mcaststream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const void *arg2 _U_) { mcaststream_tapinfo_t *tapinfo = (mcaststream_tapinfo_t *)arg; @@ -150,16 +150,16 @@ mcaststream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const case AT_IPv4: /* 224.0.0.0/4 */ if (pinfo->net_dst.len == 0 || (((const guint8*)pinfo->net_dst.data)[0] & 0xf0) != 0xe0) - return FALSE; + return TAP_PACKET_DONT_REDRAW; break; case AT_IPv6: /* ff00::/8 */ /* XXX This includes DHCPv6. */ if (pinfo->net_dst.len == 0 || ((const guint8*)pinfo->net_dst.data)[0] != 0xff) - return FALSE; + return TAP_PACKET_DONT_REDRAW; break; default: - return FALSE; + return TAP_PACKET_DONT_REDRAW; } /* gather infos on the stream this packet is part of */ @@ -276,7 +276,7 @@ mcaststream_packet(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const buffusagecalc(tapinfo->allstreams, pinfo, mcast_stream_cumulemptyspeed*1000); /* end of sliding window */ - return 1; /* refresh output */ + return TAP_PACKET_REDRAW; /* refresh output */ } diff --git a/ui/qt/bluetooth_att_server_attributes_dialog.cpp b/ui/qt/bluetooth_att_server_attributes_dialog.cpp index 973c09d5ee..d13aa91cf4 100644 --- a/ui/qt/bluetooth_att_server_attributes_dialog.cpp +++ b/ui/qt/bluetooth_att_server_attributes_dialog.cpp @@ -32,7 +32,7 @@ static const int column_number_handle = 0; static const int column_number_uuid = 1; static const int column_number_uuid_name = 2; -static gboolean +static tap_packet_status btatt_handle_tap_packet(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *edt, const void* data) { tapinfo_t *tapinfo = (tapinfo_t *) tapinfo_ptr; @@ -40,7 +40,7 @@ btatt_handle_tap_packet(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *e if (tapinfo->tap_packet) tapinfo->tap_packet(tapinfo, pinfo, edt, data); - return TRUE; + return TAP_PACKET_REDRAW; } static void @@ -225,7 +225,7 @@ void BluetoothAttServerAttributesDialog::tapReset(void *tapinfo_ptr) } -gboolean BluetoothAttServerAttributesDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data) +tap_packet_status BluetoothAttServerAttributesDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data) { tapinfo_t *tapinfo = static_cast<tapinfo_t *>(tapinfo_ptr); BluetoothAttServerAttributesDialog *dialog = static_cast<BluetoothAttServerAttributesDialog *>(tapinfo->ui); @@ -236,10 +236,10 @@ gboolean BluetoothAttServerAttributesDialog::tapPacket(void *tapinfo_ptr, packet gchar *addr = NULL; if (dialog->file_closed_) - return FALSE; + return TAP_PACKET_DONT_REDRAW; if (pinfo->rec->rec_type != REC_TYPE_PACKET) - return FALSE; + return TAP_PACKET_DONT_REDRAW; if (pinfo->rec->presence_flags & WTAP_HAS_INTERFACE_ID) { gchar *interface; @@ -253,7 +253,7 @@ gboolean BluetoothAttServerAttributesDialog::tapPacket(void *tapinfo_ptr, packet if (interface && dialog->ui->interfaceComboBox->currentIndex() > 0) { if (dialog->ui->interfaceComboBox->currentText() != interface) - return TRUE; + return TAP_PACKET_REDRAW; } } @@ -266,7 +266,7 @@ gboolean BluetoothAttServerAttributesDialog::tapPacket(void *tapinfo_ptr, packet if (addr && dialog->ui->deviceComboBox->currentIndex() > 0) { if (dialog->ui->deviceComboBox->currentText() != addr) - return TRUE; + return TAP_PACKET_REDRAW; } handle.sprintf("0x%04x", tap_handles->handle); @@ -282,7 +282,7 @@ gboolean BluetoothAttServerAttributesDialog::tapPacket(void *tapinfo_ptr, packet if (item->text(column_number_handle) == handle && item->text(column_number_uuid) == uuid && item->text(column_number_uuid_name) == uuid_name) - return TRUE; + return TAP_PACKET_REDRAW; ++i_item; } } @@ -297,7 +297,7 @@ gboolean BluetoothAttServerAttributesDialog::tapPacket(void *tapinfo_ptr, packet dialog->ui->tableTreeWidget->resizeColumnToContents(i); } - return TRUE; + return TAP_PACKET_REDRAW; } void BluetoothAttServerAttributesDialog::interfaceCurrentIndexChanged(int) diff --git a/ui/qt/bluetooth_att_server_attributes_dialog.h b/ui/qt/bluetooth_att_server_attributes_dialog.h index 5566b3676e..e8b35f7dbb 100644 --- a/ui/qt/bluetooth_att_server_attributes_dialog.h +++ b/ui/qt/bluetooth_att_server_attributes_dialog.h @@ -64,7 +64,7 @@ private: QMenu context_menu_; static void tapReset(void *tapinfo_ptr); - static gboolean tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data); + static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data); private slots: void captureFileClosing(); diff --git a/ui/qt/bluetooth_device_dialog.cpp b/ui/qt/bluetooth_device_dialog.cpp index ff13eb646d..09d8c1a006 100644 --- a/ui/qt/bluetooth_device_dialog.cpp +++ b/ui/qt/bluetooth_device_dialog.cpp @@ -56,7 +56,7 @@ static const int row_number_page_timeout = 19; static const int row_number_simple_pairing_mode = 20; static const int row_number_voice_setting = 21; -static gboolean +static tap_packet_status bluetooth_device_tap_packet(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *edt, const void* data) { bluetooth_device_tapinfo_t *tapinfo = (bluetooth_device_tapinfo_t *) tapinfo_ptr; @@ -64,7 +64,7 @@ bluetooth_device_tap_packet(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_ if (tapinfo->tap_packet) tapinfo->tap_packet(tapinfo, pinfo, edt, data); - return TRUE; + return TAP_PACKET_REDRAW; } static void @@ -359,7 +359,7 @@ void BluetoothDeviceDialog::saveItemData(QTableWidgetItem *item, } -gboolean BluetoothDeviceDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data) +tap_packet_status BluetoothDeviceDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data) { bluetooth_device_tapinfo_t *tapinfo = static_cast<bluetooth_device_tapinfo_t *>(tapinfo_ptr); BluetoothDeviceDialog *dialog = static_cast<BluetoothDeviceDialog *>(tapinfo->ui); @@ -375,14 +375,14 @@ gboolean BluetoothDeviceDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, tableWidget = dialog->ui->tableWidget; if (!((!tap_device->is_local && tap_device->has_bd_addr) || (tap_device->is_local && tapinfo->is_local && tap_device->interface_id == tapinfo->interface_id && tap_device->adapter_id == tapinfo->adapter_id))) { - return TRUE; + return TAP_PACKET_REDRAW; } if (!tap_device->is_local && tap_device->has_bd_addr) { bd_addr.sprintf("%02x:%02x:%02x:%02x:%02x:%02x", tap_device->bd_addr[0], tap_device->bd_addr[1], tap_device->bd_addr[2], tap_device->bd_addr[3], tap_device->bd_addr[4], tap_device->bd_addr[5]); if (bd_addr != tapinfo->bdAddr) - return TRUE; + return TAP_PACKET_REDRAW; } if (tap_device->has_bd_addr) { @@ -616,7 +616,7 @@ gboolean BluetoothDeviceDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, dialog->ui->hintLabel->setText(QString(tr("%1 changes")).arg(*tapinfo->changes)); - return TRUE; + return TAP_PACKET_REDRAW; } void BluetoothDeviceDialog::interfaceCurrentIndexChanged(int) diff --git a/ui/qt/bluetooth_device_dialog.h b/ui/qt/bluetooth_device_dialog.h index b63acc1ac3..d5860a33f7 100644 --- a/ui/qt/bluetooth_device_dialog.h +++ b/ui/qt/bluetooth_device_dialog.h @@ -79,7 +79,7 @@ private: guint changes_; static void tapReset(void *tapinfo_ptr); - static gboolean tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data); + static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data); static void updateChanges(QTableWidget *tableWidget, QString value, const int row, guint *changes, packet_info *pinfo); static void saveItemData(QTableWidgetItem *item, bluetooth_device_tap_t *tap_device, packet_info *pinfo); diff --git a/ui/qt/bluetooth_devices_dialog.cpp b/ui/qt/bluetooth_devices_dialog.cpp index 242edd424c..ec6043bcbf 100644 --- a/ui/qt/bluetooth_devices_dialog.cpp +++ b/ui/qt/bluetooth_devices_dialog.cpp @@ -43,7 +43,7 @@ static const int column_number_hci_revision = 7; static const int column_number_is_local_adapter = 8; -static gboolean +static tap_packet_status bluetooth_device_tap_packet(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *edt, const void* data) { bluetooth_devices_tapinfo_t *tapinfo = (bluetooth_devices_tapinfo_t *) tapinfo_ptr; @@ -51,7 +51,7 @@ bluetooth_device_tap_packet(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_ if (tapinfo->tap_packet) tapinfo->tap_packet(tapinfo, pinfo, edt, data); - return TRUE; + return TAP_PACKET_REDRAW; } static void @@ -253,7 +253,7 @@ void BluetoothDevicesDialog::tapReset(void *tapinfo_ptr) bluetooth_devices_dialog->ui->tableTreeWidget->clear(); } -gboolean BluetoothDevicesDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data) +tap_packet_status BluetoothDevicesDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data) { bluetooth_devices_tapinfo_t *tapinfo = static_cast<bluetooth_devices_tapinfo_t *>(tapinfo_ptr); BluetoothDevicesDialog *dialog = static_cast<BluetoothDevicesDialog *>(tapinfo->ui); @@ -264,10 +264,10 @@ gboolean BluetoothDevicesDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo QTreeWidgetItem *item = NULL; if (dialog->file_closed_) - return FALSE; + return TAP_PACKET_DONT_REDRAW; if (pinfo->rec->rec_type != REC_TYPE_PACKET) - return FALSE; + return TAP_PACKET_DONT_REDRAW; if (pinfo->rec->presence_flags & WTAP_HAS_INTERFACE_ID) { gchar *interface; @@ -281,7 +281,7 @@ gboolean BluetoothDevicesDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo if (interface && dialog->ui->interfaceComboBox->currentIndex() > 0) { if (dialog->ui->interfaceComboBox->currentText() != interface) - return TRUE; + return TAP_PACKET_REDRAW; } } @@ -370,7 +370,7 @@ gboolean BluetoothDevicesDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo dialog->ui->hintLabel->setText(QString(tr("%1 items; Right click for more option; Double click for device details")).arg(dialog->ui->tableTreeWidget->topLevelItemCount())); - return TRUE; + return TAP_PACKET_REDRAW; } void BluetoothDevicesDialog::interfaceCurrentIndexChanged(int) diff --git a/ui/qt/bluetooth_devices_dialog.h b/ui/qt/bluetooth_devices_dialog.h index 94d14043a1..4d07e1ec2f 100644 --- a/ui/qt/bluetooth_devices_dialog.h +++ b/ui/qt/bluetooth_devices_dialog.h @@ -65,7 +65,7 @@ private: QMenu context_menu_; static void tapReset(void *tapinfo_ptr); - static gboolean tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data); + static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data); private slots: void captureFileClosing(); diff --git a/ui/qt/bluetooth_hci_summary_dialog.cpp b/ui/qt/bluetooth_hci_summary_dialog.cpp index 19b82f0542..044a6beb7d 100644 --- a/ui/qt/bluetooth_hci_summary_dialog.cpp +++ b/ui/qt/bluetooth_hci_summary_dialog.cpp @@ -44,7 +44,7 @@ static const int column_number_reason = 7; static const int column_number_hardware_error = 8; static const int column_number_occurrence = 9; -static gboolean +static tap_packet_status bluetooth_hci_summary_tap_packet(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *edt, const void* data) { bluetooth_hci_summary_tapinfo_t *tapinfo = (bluetooth_hci_summary_tapinfo_t *) tapinfo_ptr; @@ -52,7 +52,7 @@ bluetooth_hci_summary_tap_packet(void *tapinfo_ptr, packet_info *pinfo, epan_dis if (tapinfo->tap_packet) tapinfo->tap_packet(tapinfo, pinfo, edt, data); - return TRUE; + return TAP_PACKET_REDRAW; } static void @@ -332,7 +332,7 @@ void BluetoothHciSummaryDialog::tapReset(void *tapinfo_ptr) dialog->item_hardware_errors_->setText(column_number_occurrence, "0"); } -gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data) +tap_packet_status BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data) { bluetooth_hci_summary_tapinfo_t *tapinfo = static_cast<bluetooth_hci_summary_tapinfo_t *>(tapinfo_ptr); BluetoothHciSummaryDialog *dialog = static_cast<BluetoothHciSummaryDialog *>(tapinfo->ui); @@ -346,10 +346,10 @@ gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pi QString name; if (dialog->file_closed_) - return FALSE; + return TAP_PACKET_DONT_REDRAW; if (pinfo->rec->rec_type != REC_TYPE_PACKET) - return FALSE; + return TAP_PACKET_DONT_REDRAW; name = tr("Unknown"); @@ -365,7 +365,7 @@ gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pi if (interface && dialog->ui->interfaceComboBox->currentIndex() > 0) { if (dialog->ui->interfaceComboBox->currentText() != interface) - return TRUE; + return TAP_PACKET_REDRAW; } } @@ -377,7 +377,7 @@ gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pi if (dialog->ui->adapterComboBox->currentIndex() > 0) { if (dialog->ui->adapterComboBox->currentText() != adapter) - return TRUE; + return TAP_PACKET_REDRAW; } switch (tap_hci->type) { @@ -768,7 +768,7 @@ gboolean BluetoothHciSummaryDialog::tapPacket(void *tapinfo_ptr, packet_info *pi dialog->ui->tableTreeWidget->resizeColumnToContents(i); } - return TRUE; + return TAP_PACKET_REDRAW; } void BluetoothHciSummaryDialog::interfaceCurrentIndexChanged(int) diff --git a/ui/qt/bluetooth_hci_summary_dialog.h b/ui/qt/bluetooth_hci_summary_dialog.h index 1d3c299a18..0595031ffa 100644 --- a/ui/qt/bluetooth_hci_summary_dialog.h +++ b/ui/qt/bluetooth_hci_summary_dialog.h @@ -79,7 +79,7 @@ private: QTreeWidgetItem *item_hardware_errors_; static void tapReset(void *tapinfo_ptr); - static gboolean tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data); + static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data); private slots: void captureFileClosing(); diff --git a/ui/qt/gsm_map_summary_dialog.cpp b/ui/qt/gsm_map_summary_dialog.cpp index 0d37d75980..49aa13259a 100644 --- a/ui/qt/gsm_map_summary_dialog.cpp +++ b/ui/qt/gsm_map_summary_dialog.cpp @@ -337,7 +337,7 @@ gsm_map_summary_reset(void *tapdata) } -static gboolean +static tap_packet_status gsm_map_summary_packet(void *tapdata, packet_info *, epan_dissect_t *, const void *gmtr_ptr) { gsm_map_stat_t *gm_stat = (gsm_map_stat_t *)tapdata; @@ -354,7 +354,7 @@ gsm_map_summary_packet(void *tapdata, packet_info *, epan_dissect_t *, const voi gm_stat->size_rr[gm_tap_rec->opcode] += gm_tap_rec->size; } - return(FALSE); /* We have no draw callback */ + return(TAP_PACKET_DONT_REDRAW); /* We have no draw callback */ } void diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp index 4e45127864..e1cf0117b8 100644 --- a/ui/qt/iax2_analysis_dialog.cpp +++ b/ui/qt/iax2_analysis_dialog.cpp @@ -613,21 +613,21 @@ void Iax2AnalysisDialog::tapReset(void *tapinfoptr) iax2_analysis_dialog->resetStatistics(); } -gboolean Iax2AnalysisDialog::tapPacket(void *tapinfoptr, packet_info *pinfo, struct epan_dissect *, const void *iax2info_ptr) +tap_packet_status Iax2AnalysisDialog::tapPacket(void *tapinfoptr, packet_info *pinfo, struct epan_dissect *, const void *iax2info_ptr) { Iax2AnalysisDialog *iax2_analysis_dialog = dynamic_cast<Iax2AnalysisDialog *>((Iax2AnalysisDialog*)tapinfoptr); - if (!iax2_analysis_dialog) return FALSE; + if (!iax2_analysis_dialog) return TAP_PACKET_DONT_REDRAW; const iax2_info_t *iax2info = (const iax2_info_t *)iax2info_ptr; - if (!iax2info) return FALSE; + if (!iax2info) return TAP_PACKET_DONT_REDRAW; /* we ignore packets that are not displayed */ if (pinfo->fd->passed_dfilter == 0) - return FALSE; + return TAP_PACKET_DONT_REDRAW; /* we ignore packets that carry no data */ if (iax2info->payload_len < 1) - return FALSE; + return TAP_PACKET_DONT_REDRAW; /* is it the forward direction? */ else if ((cmp_address(&(iax2_analysis_dialog->fwd_id_.src_addr), &(pinfo->src)) == 0) @@ -645,7 +645,7 @@ gboolean Iax2AnalysisDialog::tapPacket(void *tapinfoptr, packet_info *pinfo, str iax2_analysis_dialog->addPacket(false, pinfo, iax2info); } - return FALSE; + return TAP_PACKET_DONT_REDRAW; } void Iax2AnalysisDialog::tapDraw(void *tapinfoptr) diff --git a/ui/qt/iax2_analysis_dialog.h b/ui/qt/iax2_analysis_dialog.h index 81f55875f9..e03a524e3d 100644 --- a/ui/qt/iax2_analysis_dialog.h +++ b/ui/qt/iax2_analysis_dialog.h @@ -108,7 +108,7 @@ private: // Tap callbacks static void tapReset(void *tapinfo_ptr); - static gboolean tapPacket(void *tapinfo_ptr, packet_info *pinfo, struct epan_dissect *, const void *iax2info_ptr); + static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, struct epan_dissect *, const void *iax2info_ptr); static void tapDraw(void *tapinfo_ptr); void resetStatistics(); diff --git a/ui/qt/io_graph_dialog.cpp b/ui/qt/io_graph_dialog.cpp index 8edcd3ccfe..7f2f5e0cb1 100644 --- a/ui/qt/io_graph_dialog.cpp +++ b/ui/qt/io_graph_dialog.cpp @@ -2055,11 +2055,11 @@ void IOGraph::tapReset(void *iog_ptr) } // "tap_packet" callback for register_tap_listener -gboolean IOGraph::tapPacket(void *iog_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *) +tap_packet_status IOGraph::tapPacket(void *iog_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *) { IOGraph *iog = static_cast<IOGraph *>(iog_ptr); if (!pinfo || !iog) { - return FALSE; + return TAP_PACKET_DONT_REDRAW; } int idx = get_io_graph_index(pinfo, iog->interval_); @@ -2068,7 +2068,7 @@ gboolean IOGraph::tapPacket(void *iog_ptr, packet_info *pinfo, epan_dissect_t *e /* some sanity checks */ if ((idx < 0) || (idx >= max_io_items_)) { iog->cur_idx_ = max_io_items_ - 1; - return FALSE; + return TAP_PACKET_DONT_REDRAW; } /* update num_items */ @@ -2092,7 +2092,7 @@ gboolean IOGraph::tapPacket(void *iog_ptr, packet_info *pinfo, epan_dissect_t *e } if (!update_io_graph_item(iog->items_, idx, pinfo, adv_edt, iog->hf_index_, iog->val_units_, iog->interval_)) { - return FALSE; + return TAP_PACKET_DONT_REDRAW; } // qDebug() << "=tapPacket" << iog->name_ << idx << iog->hf_index_ << iog->val_units_ << iog->num_items_; @@ -2100,7 +2100,7 @@ gboolean IOGraph::tapPacket(void *iog_ptr, packet_info *pinfo, epan_dissect_t *e if (recalc) { emit iog->requestRecalc(); } - return TRUE; + return TAP_PACKET_REDRAW; } // "tap_draw" callback for register_tap_listener diff --git a/ui/qt/io_graph_dialog.h b/ui/qt/io_graph_dialog.h index 036d84dd8f..184d3a97a3 100644 --- a/ui/qt/io_graph_dialog.h +++ b/ui/qt/io_graph_dialog.h @@ -92,7 +92,7 @@ signals: private: // Callbacks for register_tap_listener static void tapReset(void *iog_ptr); - static gboolean tapPacket(void *iog_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *data); + static tap_packet_status tapPacket(void *iog_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *data); static void tapDraw(void *iog_ptr); void calculateScaledValueUnit(); diff --git a/ui/qt/lbm_lbtrm_transport_dialog.cpp b/ui/qt/lbm_lbtrm_transport_dialog.cpp index 24657869a0..dc593d8bd3 100644 --- a/ui/qt/lbm_lbtrm_transport_dialog.cpp +++ b/ui/qt/lbm_lbtrm_transport_dialog.cpp @@ -1323,7 +1323,7 @@ void LBMLBTRMTransportDialog::resetTap(void * tap_data) info->clearMaps(); } -gboolean LBMLBTRMTransportDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t *, const void * tap_info) +tap_packet_status LBMLBTRMTransportDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t *, const void * tap_info) { if (pinfo->fd->passed_dfilter == 1) { @@ -1332,7 +1332,7 @@ gboolean LBMLBTRMTransportDialog::tapPacket(void * tap_data, packet_info * pinfo info->processPacket(pinfo, tapinfo); } - return (TRUE); + return (TAP_PACKET_REDRAW); } void LBMLBTRMTransportDialog::drawTreeItems(void *) diff --git a/ui/qt/lbm_lbtrm_transport_dialog.h b/ui/qt/lbm_lbtrm_transport_dialog.h index 0c208b274f..b19f800bf7 100644 --- a/ui/qt/lbm_lbtrm_transport_dialog.h +++ b/ui/qt/lbm_lbtrm_transport_dialog.h @@ -18,6 +18,7 @@ #include "cfile.h" #include <epan/packet_info.h> +#include <epan/tap.h> #include <QDialog> class QHeaderView; @@ -65,7 +66,7 @@ class LBMLBTRMTransportDialog : public QDialog void resetReceiversDetail(void); void fillTree(void); static void resetTap(void * tap_data); - static gboolean tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t * edt, const void * stream_info); + static tap_packet_status tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t * edt, const void * stream_info); static void drawTreeItems(void * tap_data); void loadSourceDataDetails(LBMLBTRMSourceTransportEntry * transport); void loadSourceRXDataDetails(LBMLBTRMSourceTransportEntry * transport); diff --git a/ui/qt/lbm_lbtru_transport_dialog.cpp b/ui/qt/lbm_lbtru_transport_dialog.cpp index 2052318134..920287b622 100644 --- a/ui/qt/lbm_lbtru_transport_dialog.cpp +++ b/ui/qt/lbm_lbtru_transport_dialog.cpp @@ -1742,7 +1742,7 @@ void LBMLBTRUTransportDialog::resetTap(void * tap_data) info->clearMaps(); } -gboolean LBMLBTRUTransportDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t *, const void * tap_info) +tap_packet_status LBMLBTRUTransportDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t *, const void * tap_info) { if (pinfo->fd->passed_dfilter == 1) { @@ -1751,7 +1751,7 @@ gboolean LBMLBTRUTransportDialog::tapPacket(void * tap_data, packet_info * pinfo info->processPacket(pinfo, tapinfo); } - return (TRUE); + return (TAP_PACKET_REDRAW); } void LBMLBTRUTransportDialog::drawTreeItems(void *) diff --git a/ui/qt/lbm_lbtru_transport_dialog.h b/ui/qt/lbm_lbtru_transport_dialog.h index 84bdd467bb..cb57c70fed 100644 --- a/ui/qt/lbm_lbtru_transport_dialog.h +++ b/ui/qt/lbm_lbtru_transport_dialog.h @@ -18,6 +18,7 @@ #include "cfile.h" #include <epan/packet_info.h> +#include <epan/tap.h> #include <QDialog> class QHeaderView; @@ -67,7 +68,7 @@ class LBMLBTRUTransportDialog : public QDialog void resetReceiversDetail(void); void fillTree(void); static void resetTap(void * tap_data); - static gboolean tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t * edt, const void * stream_info); + static tap_packet_status tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t * edt, const void * stream_info); static void drawTreeItems(void * tap_data); void loadSourceDataDetails(LBMLBTRUSourceTransportEntry * transport); void loadSourceRXDataDetails(LBMLBTRUSourceTransportEntry * transport); diff --git a/ui/qt/lbm_stream_dialog.cpp b/ui/qt/lbm_stream_dialog.cpp index 732c59d393..c93d1958e2 100644 --- a/ui/qt/lbm_stream_dialog.cpp +++ b/ui/qt/lbm_stream_dialog.cpp @@ -399,7 +399,7 @@ void LBMStreamDialog::resetTap(void * tap_data) dialog->m_ui->lbm_stream_TreeWidget->clear(); } -gboolean LBMStreamDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t *, const void * stream_info) +tap_packet_status LBMStreamDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t *, const void * stream_info) { if (pinfo->fd->passed_dfilter == 1) { @@ -408,7 +408,7 @@ gboolean LBMStreamDialog::tapPacket(void * tap_data, packet_info * pinfo, epan_d info->processPacket(pinfo, tapinfo); } - return (TRUE); + return (TAP_PACKET_REDRAW); } void LBMStreamDialog::drawTreeItems(void *) diff --git a/ui/qt/lbm_stream_dialog.h b/ui/qt/lbm_stream_dialog.h index 8e1eb595b6..1ba87c75b1 100644 --- a/ui/qt/lbm_stream_dialog.h +++ b/ui/qt/lbm_stream_dialog.h @@ -18,6 +18,7 @@ #include "cfile.h" #include <epan/packet_info.h> +#include <epan/tap.h> #include <QDialog> namespace Ui @@ -49,7 +50,7 @@ class LBMStreamDialog : public QDialog void fillTree(void); static void resetTap(void * tap_data); - static gboolean tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t * edt, const void * stream_info); + static tap_packet_status tapPacket(void * tap_data, packet_info * pinfo, epan_dissect_t * edt, const void * stream_info); static void drawTreeItems(void * tap_data); private slots: diff --git a/ui/qt/lte_mac_statistics_dialog.cpp b/ui/qt/lte_mac_statistics_dialog.cpp index 012f65f1fb..b356364d28 100644 --- a/ui/qt/lte_mac_statistics_dialog.cpp +++ b/ui/qt/lte_mac_statistics_dialog.cpp @@ -712,14 +712,14 @@ void LteMacStatisticsDialog::tapReset(void *ws_dlg_ptr) //--------------------------------------------------------------------------------------- // Process tap info from a new packet. -// Returns TRUE if a redraw is needed. -gboolean LteMacStatisticsDialog::tapPacket(void *ws_dlg_ptr, struct _packet_info *, epan_dissect *, const void *mac_lte_tap_info_ptr) +// Returns TAP_PACKET_REDRAW if a redraw is needed, TAP_PACKET_DONT_REDRAW otherwise. +tap_packet_status LteMacStatisticsDialog::tapPacket(void *ws_dlg_ptr, struct _packet_info *, epan_dissect *, const void *mac_lte_tap_info_ptr) { // Look up dialog and tap info. LteMacStatisticsDialog *ws_dlg = static_cast<LteMacStatisticsDialog *>(ws_dlg_ptr); const mac_lte_tap_info *mlt_info = (const mac_lte_tap_info *) mac_lte_tap_info_ptr; if (!ws_dlg || !mlt_info) { - return FALSE; + return TAP_PACKET_DONT_REDRAW; } // Update common stats. @@ -727,7 +727,7 @@ gboolean LteMacStatisticsDialog::tapPacket(void *ws_dlg_ptr, struct _packet_info // Nothing more to do if tap entry isn't for a UE. if ((mlt_info->rntiType != C_RNTI) && (mlt_info->rntiType != SPS_RNTI)) { - return FALSE; + return TAP_PACKET_DONT_REDRAW; } // Look for an existing UE to match this tap info. @@ -757,7 +757,7 @@ gboolean LteMacStatisticsDialog::tapPacket(void *ws_dlg_ptr, struct _packet_info // Update the UE item with info from tap! mac_ue_ti->update(mlt_info); - return TRUE; + return TAP_PACKET_REDRAW; } // Return total number of frames tapped. diff --git a/ui/qt/lte_mac_statistics_dialog.h b/ui/qt/lte_mac_statistics_dialog.h index 8ba8ec15cc..79f79306e4 100644 --- a/ui/qt/lte_mac_statistics_dialog.h +++ b/ui/qt/lte_mac_statistics_dialog.h @@ -52,7 +52,7 @@ private: // Callbacks for register_tap_listener static void tapReset(void *ws_dlg_ptr); - static gboolean tapPacket(void *ws_dlg_ptr, struct _packet_info *, struct epan_dissect *, const void *mac_lte_tap_info_ptr); + static tap_packet_status tapPacket(void *ws_dlg_ptr, struct _packet_info *, struct epan_dissect *, const void *mac_lte_tap_info_ptr); static void tapDraw(void *ws_dlg_ptr); virtual const QString filterExpression(); diff --git a/ui/qt/lte_rlc_statistics_dialog.cpp b/ui/qt/lte_rlc_statistics_dialog.cpp index 36ce1b127f..e87d703df3 100644 --- a/ui/qt/lte_rlc_statistics_dialog.cpp +++ b/ui/qt/lte_rlc_statistics_dialog.cpp @@ -771,14 +771,14 @@ void LteRlcStatisticsDialog::tapReset(void *ws_dlg_ptr) } // Process the tap info from a dissected RLC PDU. -// Returns TRUE if a redraw is needed. -gboolean LteRlcStatisticsDialog::tapPacket(void *ws_dlg_ptr, struct _packet_info *, epan_dissect *, const void *rlc_lte_tap_info_ptr) +// Returns TAP_PACKET_REDRAW if a redraw is needed, TAP_PACKET_DONT_REDRAW otherwise. +tap_packet_status LteRlcStatisticsDialog::tapPacket(void *ws_dlg_ptr, struct _packet_info *, epan_dissect *, const void *rlc_lte_tap_info_ptr) { // Look up dialog. LteRlcStatisticsDialog *ws_dlg = static_cast<LteRlcStatisticsDialog *>(ws_dlg_ptr); const rlc_lte_tap_info *rlt_info = (const rlc_lte_tap_info *) rlc_lte_tap_info_ptr; if (!ws_dlg || !rlt_info) { - return FALSE; + return TAP_PACKET_DONT_REDRAW; } ws_dlg->incFrameCount(); @@ -807,7 +807,7 @@ gboolean LteRlcStatisticsDialog::tapPacket(void *ws_dlg_ptr, struct _packet_info // Update the UE from the information in the tap structure. ue_ti->update(rlt_info); - return TRUE; + return TAP_PACKET_REDRAW; } void LteRlcStatisticsDialog::tapDraw(void *ws_dlg_ptr) diff --git a/ui/qt/lte_rlc_statistics_dialog.h b/ui/qt/lte_rlc_statistics_dialog.h index 659350d808..aedaa22bd8 100644 --- a/ui/qt/lte_rlc_statistics_dialog.h +++ b/ui/qt/lte_rlc_statistics_dialog.h @@ -47,7 +47,7 @@ private: // Callbacks for register_tap_listener static void tapReset(void *ws_dlg_ptr); - static gboolean tapPacket(void *ws_dlg_ptr, struct _packet_info *, struct epan_dissect *, const void *rlc_lte_tap_info_ptr); + static tap_packet_status tapPacket(void *ws_dlg_ptr, struct _packet_info *, struct epan_dissect *, const void *rlc_lte_tap_info_ptr); static void tapDraw(void *ws_dlg_ptr); void updateHeaderLabels(); diff --git a/ui/qt/models/expert_info_model.cpp b/ui/qt/models/expert_info_model.cpp index 6f16fec56d..7cb5848cc1 100644 --- a/ui/qt/models/expert_info_model.cpp +++ b/ui/qt/models/expert_info_model.cpp @@ -375,23 +375,23 @@ void ExpertInfoModel::tapReset(void *eid_ptr) model->clear(); } -gboolean ExpertInfoModel::tapPacket(void *eid_ptr, struct _packet_info *pinfo, struct epan_dissect *, const void *data) +tap_packet_status ExpertInfoModel::tapPacket(void *eid_ptr, struct _packet_info *pinfo, struct epan_dissect *, const void *data) { ExpertInfoModel *model = static_cast<ExpertInfoModel*>(eid_ptr); expert_info_t *expert_info = (expert_info_t *) data; - gboolean draw_required = FALSE; + tap_packet_status status = TAP_PACKET_DONT_REDRAW; if (!pinfo || !model || !expert_info) - return FALSE; + return TAP_PACKET_DONT_REDRAW; model->addExpertInfo(*expert_info); if (model->numEvents((enum ExpertSeverity)expert_info->severity) < 1) - draw_required = TRUE; + status = TAP_PACKET_REDRAW; model->eventCounts_[(enum ExpertSeverity)expert_info->severity]++; - return draw_required; + return status; } void ExpertInfoModel::tapDraw(void *eid_ptr) diff --git a/ui/qt/models/expert_info_model.h b/ui/qt/models/expert_info_model.h index 50c9c61dae..ce22fb8d74 100644 --- a/ui/qt/models/expert_info_model.h +++ b/ui/qt/models/expert_info_model.h @@ -20,6 +20,7 @@ #include <ui/qt/capture_file.h> #include <epan/expert.h> +#include <epan/tap.h> #include <epan/column-utils.h> class ExpertPacketItem @@ -112,7 +113,7 @@ public: // Callbacks for register_tap_listener static void tapReset(void *eid_ptr); - static gboolean tapPacket(void *eid_ptr, struct _packet_info *pinfo, struct epan_dissect *, const void *data); + static tap_packet_status tapPacket(void *eid_ptr, struct _packet_info *pinfo, struct epan_dissect *, const void *data); static void tapDraw(void *eid_ptr); private: diff --git a/ui/qt/mtp3_summary_dialog.cpp b/ui/qt/mtp3_summary_dialog.cpp index 199fd99433..5c5f6ee270 100644 --- a/ui/qt/mtp3_summary_dialog.cpp +++ b/ui/qt/mtp3_summary_dialog.cpp @@ -298,7 +298,7 @@ mtp3_summary_reset( } -static gboolean +static tap_packet_status mtp3_summary_packet( void *tapdata, packet_info *, @@ -314,8 +314,9 @@ mtp3_summary_packet( /* * we thought this si_code was not used ? * is MTP3_NUM_SI_CODE out of date ? + * XXX - if this is an error, report it and return TAP_PACKET_FAILED. */ - return(FALSE); + return(TAP_PACKET_DONT_REDRAW); } /* @@ -341,8 +342,9 @@ mtp3_summary_packet( { /* * too many + * XXX - report an error and return TAP_PACKET_FAILED? */ - return(FALSE); + return(TAP_PACKET_DONT_REDRAW); } mtp3_num_used++; @@ -353,7 +355,7 @@ mtp3_summary_packet( (*stat_p)[i].mtp3_si_code[data_p->mtp3_si_code].num_msus++; (*stat_p)[i].mtp3_si_code[data_p->mtp3_si_code].size += data_p->size; - return(TRUE); + return(TAP_PACKET_REDRAW); } void diff --git a/ui/qt/rtp_analysis_dialog.cpp b/ui/qt/rtp_analysis_dialog.cpp index 46046cf787..51b6547bfe 100644 --- a/ui/qt/rtp_analysis_dialog.cpp +++ b/ui/qt/rtp_analysis_dialog.cpp @@ -656,20 +656,20 @@ void RtpAnalysisDialog::tapReset(void *tapinfo_ptr) rtp_analysis_dialog->resetStatistics(); } -gboolean RtpAnalysisDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *rtpinfo_ptr) +tap_packet_status RtpAnalysisDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *rtpinfo_ptr) { RtpAnalysisDialog *rtp_analysis_dialog = dynamic_cast<RtpAnalysisDialog *>((RtpAnalysisDialog*)tapinfo_ptr); - if (!rtp_analysis_dialog) return FALSE; + if (!rtp_analysis_dialog) return TAP_PACKET_DONT_REDRAW; const struct _rtp_info *rtpinfo = (const struct _rtp_info *)rtpinfo_ptr; - if (!rtpinfo) return FALSE; + if (!rtpinfo) return TAP_PACKET_DONT_REDRAW; /* we ignore packets that are not displayed */ if (pinfo->fd->passed_dfilter == 0) - return FALSE; + return TAP_PACKET_DONT_REDRAW; /* also ignore RTP Version != 2 */ else if (rtpinfo->info_version != 2) - return FALSE; + return TAP_PACKET_DONT_REDRAW; /* is it the forward direction? */ else if (rtpstream_id_equal_pinfo_rtp_info(&(rtp_analysis_dialog->fwd_statinfo_.id),pinfo,rtpinfo)) { @@ -680,7 +680,7 @@ gboolean RtpAnalysisDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epa rtp_analysis_dialog->addPacket(false, pinfo, rtpinfo); } - return FALSE; + return TAP_PACKET_DONT_REDRAW; } void RtpAnalysisDialog::tapDraw(void *tapinfo_ptr) diff --git a/ui/qt/rtp_analysis_dialog.h b/ui/qt/rtp_analysis_dialog.h index 652058f1ac..2e1971c430 100644 --- a/ui/qt/rtp_analysis_dialog.h +++ b/ui/qt/rtp_analysis_dialog.h @@ -115,7 +115,7 @@ private: // Tap callbacks static void tapReset(void *tapinfo_ptr); - static gboolean tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *rtpinfo_ptr); + static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *rtpinfo_ptr); static void tapDraw(void *tapinfo_ptr); void resetStatistics(); diff --git a/ui/qt/rtp_player_dialog.cpp b/ui/qt/rtp_player_dialog.cpp index d6d2c1f6e1..52fe9d93aa 100644 --- a/ui/qt/rtp_player_dialog.cpp +++ b/ui/qt/rtp_player_dialog.cpp @@ -557,24 +557,24 @@ void RtpPlayerDialog::setPlayPosition(double secs) } } -gboolean RtpPlayerDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *rtpinfo_ptr) +tap_packet_status RtpPlayerDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *rtpinfo_ptr) { RtpPlayerDialog *rtp_player_dialog = dynamic_cast<RtpPlayerDialog *>((RtpPlayerDialog*)tapinfo_ptr); - if (!rtp_player_dialog) return FALSE; + if (!rtp_player_dialog) return TAP_PACKET_DONT_REDRAW; const struct _rtp_info *rtpinfo = (const struct _rtp_info *)rtpinfo_ptr; - if (!rtpinfo) return FALSE; + if (!rtpinfo) return TAP_PACKET_DONT_REDRAW; /* we ignore packets that are not displayed */ if (pinfo->fd->passed_dfilter == 0) - return FALSE; + return TAP_PACKET_DONT_REDRAW; /* also ignore RTP Version != 2 */ else if (rtpinfo->info_version != 2) - return FALSE; + return TAP_PACKET_DONT_REDRAW; rtp_player_dialog->addPacket(pinfo, rtpinfo); - return FALSE; + return TAP_PACKET_DONT_REDRAW; } void RtpPlayerDialog::addPacket(packet_info *pinfo, const _rtp_info *rtpinfo) diff --git a/ui/qt/rtp_player_dialog.h b/ui/qt/rtp_player_dialog.h index d9e2581059..c1bc38c6be 100644 --- a/ui/qt/rtp_player_dialog.h +++ b/ui/qt/rtp_player_dialog.h @@ -118,7 +118,7 @@ private: // Tap callbacks // static void tapReset(void *tapinfo_ptr); - static gboolean tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *rtpinfo_ptr); + static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *rtpinfo_ptr); static void tapDraw(void *tapinfo_ptr); void addPacket(packet_info *pinfo, const struct _rtp_info *rtpinfo); diff --git a/ui/qt/voip_calls_dialog.cpp b/ui/qt/voip_calls_dialog.cpp index a39a900613..c72200949b 100644 --- a/ui/qt/voip_calls_dialog.cpp +++ b/ui/qt/voip_calls_dialog.cpp @@ -157,14 +157,14 @@ void VoipCallsDialog::changeEvent(QEvent *event) // voip_calls_tapinfo_t *tapinfo = (voip_calls_tapinfo_t *) tapinfo_ptr; //} -gboolean VoipCallsDialog::tapPacket(void *, packet_info *, epan_dissect_t *, const void *) +tap_packet_status VoipCallsDialog::tapPacket(void *, packet_info *, epan_dissect_t *, const void *) { #ifdef QT_MULTIMEDIA_LIB // voip_calls_tapinfo_t *tapinfo = (voip_calls_tapinfo_t *) tapinfo_ptr; // add_rtp_packet for voip player. -// return TRUE; +// return TAP_PACKET_REDRAW; #endif - return FALSE; + return TAP_PACKET_DONT_REDRAW; } void VoipCallsDialog::tapDraw(void *tapinfo_ptr) diff --git a/ui/qt/voip_calls_dialog.h b/ui/qt/voip_calls_dialog.h index 658be731d8..ef29cf829a 100644 --- a/ui/qt/voip_calls_dialog.h +++ b/ui/qt/voip_calls_dialog.h @@ -69,7 +69,7 @@ private: // Tap callbacks // static void tapReset(void *tapinfo_ptr); - static gboolean tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data); + static tap_packet_status tapPacket(void *tapinfo_ptr, packet_info *pinfo, epan_dissect_t *, const void *data); static void tapDraw(void *tapinfo_ptr); void updateCalls(); diff --git a/ui/qt/wireless_timeline.cpp b/ui/qt/wireless_timeline.cpp index baac452847..c222bb14e3 100644 --- a/ui/qt/wireless_timeline.cpp +++ b/ui/qt/wireless_timeline.cpp @@ -349,14 +349,14 @@ void WirelessTimeline::tap_timeline_reset(void* tapdata) timeline->radio_packet_list = g_hash_table_new(g_direct_hash, g_direct_equal); } -gboolean WirelessTimeline::tap_timeline_packet(void *tapdata, packet_info* pinfo, epan_dissect_t* edt _U_, const void *data) +tap_packet_status WirelessTimeline::tap_timeline_packet(void *tapdata, packet_info* pinfo, epan_dissect_t* edt _U_, const void *data) { WirelessTimeline* timeline = (WirelessTimeline*)tapdata; const struct wlan_radio *wlan_radio_info = (const struct wlan_radio *)data; /* Save the radio information in our own (GUI) hashtable */ g_hash_table_insert(timeline->radio_packet_list, GUINT_TO_POINTER(pinfo->num), (gpointer)wlan_radio_info); - return FALSE; + return TAP_PACKET_DONT_REDRAW; } struct wlan_radio* WirelessTimeline::get_wlan_radio(guint32 packet_num) diff --git a/ui/qt/wireless_timeline.h b/ui/qt/wireless_timeline.h index 2c2d83913a..9a2972f067 100644 --- a/ui/qt/wireless_timeline.h +++ b/ui/qt/wireless_timeline.h @@ -28,6 +28,7 @@ #include <epan/prefs.h> #include <epan/plugin_if.h> +#include <epan/tap.h> #include <epan/timestamp.h> #include <epan/dissectors/packet-ieee80211-radio.h> @@ -71,7 +72,7 @@ public slots: protected: static void tap_timeline_reset(void* tapdata); - static gboolean tap_timeline_packet(void *tapdata, packet_info* pinfo, epan_dissect_t* edt, const void *data); + static tap_packet_status tap_timeline_packet(void *tapdata, packet_info* pinfo, epan_dissect_t* edt, const void *data); struct wlan_radio* get_wlan_radio(guint32 packet_num); diff --git a/ui/qt/wireshark_dialog.cpp b/ui/qt/wireshark_dialog.cpp index 2c7498a56e..d9535b7524 100644 --- a/ui/qt/wireshark_dialog.cpp +++ b/ui/qt/wireshark_dialog.cpp @@ -100,7 +100,7 @@ void WiresharkDialog::updateWidgets() setWindowTitleFromSubtitle(); } -bool WiresharkDialog::registerTapListener(const char *tap_name, void *tap_data, const char *filter, guint flags, void(*tap_reset)(void *), gboolean(*tap_packet)(void *, struct _packet_info *, struct epan_dissect *, const void *), void(*tap_draw)(void *)) +bool WiresharkDialog::registerTapListener(const char *tap_name, void *tap_data, const char *filter, guint flags, void (*tap_reset)(void *), tap_packet_status (*tap_packet)(void *, struct _packet_info *, struct epan_dissect *, const void *), void (*tap_draw)(void *)) { GString *error_string = register_tap_listener(tap_name, tap_data, filter, flags, tap_reset, tap_packet, tap_draw, NULL); diff --git a/ui/qt/wireshark_dialog.h b/ui/qt/wireshark_dialog.h index 57ec1eacb6..a91e6c5659 100644 --- a/ui/qt/wireshark_dialog.h +++ b/ui/qt/wireshark_dialog.h @@ -26,6 +26,8 @@ // BaseCaptureDialog, CaptureHelperDialog (or rename CaptureFileDialog to something else - WiresharkFileDialog). // TapDialog might make sense as well. +#include <epan/tap.h> + #include "capture_file.h" #include "geometry_state_dialog.h" @@ -93,7 +95,7 @@ protected: bool registerTapListener(const char *tap_name, void *tap_data, const char *filter, guint flags, void (*tap_reset)(void *tapdata), - gboolean (*tap_packet)(void *tapdata, struct _packet_info *pinfo, struct epan_dissect *edt, const void *data), + tap_packet_status (*tap_packet)(void *tapdata, struct _packet_info *pinfo, struct epan_dissect *edt, const void *data), void (*tap_draw)(void *tap_data)); /** diff --git a/ui/qt/wlan_statistics_dialog.cpp b/ui/qt/wlan_statistics_dialog.cpp index d6ecd64614..4e84a401f7 100644 --- a/ui/qt/wlan_statistics_dialog.cpp +++ b/ui/qt/wlan_statistics_dialog.cpp @@ -558,17 +558,17 @@ void WlanStatisticsDialog::tapReset(void *ws_dlg_ptr) ws_dlg->packet_count_ = 0; } -gboolean WlanStatisticsDialog::tapPacket(void *ws_dlg_ptr, _packet_info *, epan_dissect *, const void *wlan_hdr_ptr) +tap_packet_status WlanStatisticsDialog::tapPacket(void *ws_dlg_ptr, _packet_info *, epan_dissect *, const void *wlan_hdr_ptr) { WlanStatisticsDialog *ws_dlg = static_cast<WlanStatisticsDialog *>(ws_dlg_ptr); const wlan_hdr_t *wlan_hdr = (const wlan_hdr_t *)wlan_hdr_ptr; - if (!ws_dlg || !wlan_hdr) return FALSE; + if (!ws_dlg || !wlan_hdr) return TAP_PACKET_DONT_REDRAW; guint16 frame_type = wlan_hdr->type & 0xff0; if (!((frame_type == 0x0) || (frame_type == 0x20) || (frame_type == 0x30)) || ((frame_type == 0x20) && DATA_FRAME_IS_NULL(wlan_hdr->type))) { /* Not a management or non null data or extension frame; let's skip it */ - return FALSE; + return TAP_PACKET_DONT_REDRAW; } ws_dlg->packet_count_++; @@ -595,7 +595,7 @@ gboolean WlanStatisticsDialog::tapPacket(void *ws_dlg_ptr, _packet_info *, epan_ } wn_ti->update(wlan_hdr); - return TRUE; + return TAP_PACKET_REDRAW; } void WlanStatisticsDialog::tapDraw(void *ws_dlg_ptr) diff --git a/ui/qt/wlan_statistics_dialog.h b/ui/qt/wlan_statistics_dialog.h index 1dc2507741..2bc1233e45 100644 --- a/ui/qt/wlan_statistics_dialog.h +++ b/ui/qt/wlan_statistics_dialog.h @@ -32,7 +32,7 @@ private: // Callbacks for register_tap_listener static void tapReset(void *ws_dlg_ptr); - static gboolean tapPacket(void *ws_dlg_ptr, struct _packet_info *, struct epan_dissect *, const void *wlan_hdr_ptr); + static tap_packet_status tapPacket(void *ws_dlg_ptr, struct _packet_info *, struct epan_dissect *, const void *wlan_hdr_ptr); static void tapDraw(void *ws_dlg_ptr); virtual const QString filterExpression(); diff --git a/ui/tap-rlc-graph.c b/ui/tap-rlc-graph.c index af1a982451..354ee9499e 100644 --- a/ui/tap-rlc-graph.c +++ b/ui/tap-rlc-graph.c @@ -50,7 +50,7 @@ gboolean compare_rlc_headers(guint16 ueid1, guint16 channelType1, guint16 channe /* This is the tap function used to identify a list of channels found in the current frame. It is only used for the single, currently selected frame. */ -static gboolean +static tap_packet_status tap_lte_rlc_packet(void *pct, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *vip) { int n; @@ -85,7 +85,7 @@ tap_lte_rlc_packet(void *pct, packet_info *pinfo _U_, epan_dissect_t *edt _U_, c th->num_hdrs++; } - return FALSE; /* i.e. no immediate redraw requested */ + return TAP_PACKET_DONT_REDRAW; /* i.e. no immediate redraw requested */ } /* Return an array of tap_info structs that were found while dissecting the current frame @@ -170,7 +170,7 @@ rlc_lte_tap_info *select_rlc_lte_session(capture_file *cf, } /* This is the tapping function to update stats when dissecting the whole packet list */ -static gboolean rlc_lte_tap_for_graph_data(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) +static tap_packet_status rlc_lte_tap_for_graph_data(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) { struct rlc_graph *graph = (struct rlc_graph *)pct; const rlc_lte_tap_info *rlchdr = (const rlc_lte_tap_info*)vip; @@ -224,7 +224,7 @@ static gboolean rlc_lte_tap_for_graph_data(void *pct, packet_info *pinfo, epan_d graph->last_segment = segment; } - return FALSE; /* i.e. no immediate redraw requested */ + return TAP_PACKET_DONT_REDRAW; /* i.e. no immediate redraw requested */ } /* If don't have a channel, try to get one from current frame, then read all frames looking for data diff --git a/ui/tap-rtp-common.c b/ui/tap-rtp-common.c index d5a991fd14..d8d04f1583 100644 --- a/ui/tap-rtp-common.c +++ b/ui/tap-rtp-common.c @@ -355,7 +355,7 @@ static void rtp_write_sample(rtpdump_info_t* rtpdump_info, FILE* file) /****************************************************************************/ /* whenever a RTP packet is seen by the tap listener */ -int rtpstream_packet_cb(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const void *arg2) +tap_packet_status rtpstream_packet_cb(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, const void *arg2) { rtpstream_tapinfo_t *tapinfo = (rtpstream_tapinfo_t *)arg; const struct _rtp_info *rtpinfo = (const struct _rtp_info *)arg2; @@ -428,7 +428,7 @@ int rtpstream_packet_cb(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, /* increment the packets counter of all streams */ ++(tapinfo->npackets); - return 1; /* refresh output */ + return TAP_PACKET_REDRAW; /* refresh output */ } else if (tapinfo->mode == TAP_SAVE) { if (rtpstream_info_cmp(&new_stream_info, tapinfo->filter_stream_fwd)==0) { @@ -448,7 +448,7 @@ int rtpstream_packet_cb(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_, tapinfo->tap_mark_packet(tapinfo, pinfo->fd); } } - return 0; + return TAP_PACKET_DONT_REDRAW; } /****************************************************************************/ diff --git a/ui/tap-rtp-common.h b/ui/tap-rtp-common.h index a15cf722f1..a51264224f 100644 --- a/ui/tap-rtp-common.h +++ b/ui/tap-rtp-common.h @@ -119,7 +119,7 @@ void rtpstream_reset(rtpstream_tapinfo_t *tapinfo); void rtpstream_reset_cb(void*); void rtp_write_header(rtpstream_info_t*, FILE*); -int rtpstream_packet_cb(void*, packet_info*, epan_dissect_t *, const void *); +tap_packet_status rtpstream_packet_cb(void*, packet_info*, epan_dissect_t *, const void *); /** * Evaluate rtpstream_info_t calculations diff --git a/ui/tap-sctp-analysis.c b/ui/tap-sctp-analysis.c index 3747f4df3a..1694f29fe0 100644 --- a/ui/tap-sctp-analysis.c +++ b/ui/tap-sctp-analysis.c @@ -320,7 +320,7 @@ add_address(address *vadd, sctp_assoc_info_t *info, guint16 direction) return info; } -static gboolean +static tap_packet_status packet(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data) { const struct _sctp_info *sctp_info = (const struct _sctp_info *)data; @@ -1229,7 +1229,7 @@ packet(void *tapdata _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const voi tsn_free(sack); free_address(&tmp_info.src); free_address(&tmp_info.dst); - return TRUE; + return TAP_PACKET_REDRAW; } diff --git a/ui/tap-tcp-stream.c b/ui/tap-tcp-stream.c index 036f775525..f0ce7144cd 100644 --- a/ui/tap-tcp-stream.c +++ b/ui/tap-tcp-stream.c @@ -36,7 +36,7 @@ typedef struct _tcp_scan_t { } tcp_scan_t; -static gboolean +static tap_packet_status tapall_tcpip_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) { tcp_scan_t *ts = (tcp_scan_t *)pct; @@ -96,7 +96,7 @@ tapall_tcpip_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, cons ts->last = segment; } - return FALSE; + return TAP_PACKET_DONT_REDRAW; } /* here we collect all the external data we will ever need */ @@ -227,7 +227,7 @@ typedef struct _th_t { struct tcpheader *tcphdrs[MAX_SUPPORTED_TCP_HEADERS]; } th_t; -static gboolean +static tap_packet_status tap_tcpip_packet(void *pct, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *vip) { int n; @@ -261,7 +261,7 @@ tap_tcpip_packet(void *pct, packet_info *pinfo _U_, epan_dissect_t *edt _U_, con th->num_hdrs++; } - return FALSE; + return TAP_PACKET_DONT_REDRAW; } /* XXX should be enhanced so that if we have multiple TCP layers in the trace diff --git a/ui/tap_export_pdu.c b/ui/tap_export_pdu.c index b5e12b2693..5d5a11986f 100644 --- a/ui/tap_export_pdu.c +++ b/ui/tap_export_pdu.c @@ -24,7 +24,7 @@ #include "tap_export_pdu.h" /* Main entry point to the tap */ -static gboolean +static tap_packet_status export_pdu_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt, const void *data) { const exp_pdu_data_t *exp_pdu_data = (const exp_pdu_data_t *)data; @@ -62,7 +62,7 @@ export_pdu_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt, const } /* XXX: should the rec.rec_header.packet_header.pseudo_header be set to the pinfo's pseudo-header? */ - /* XXX: report errors! */ + /* XXX: report errors and return TAP_PACKET_FAILED! */ if (!wtap_dump(exp_pdu_tap_data->wdh, &rec, packet_buf, &err, &err_info)) { switch (err) { @@ -78,7 +78,7 @@ export_pdu_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt, const g_free(packet_buf); g_free(rec.opt_comment); - return FALSE; /* Do not redraw */ + return TAP_PACKET_DONT_REDRAW; /* Do not redraw */ } int diff --git a/ui/voip_calls.c b/ui/voip_calls.c index 566a4e29eb..ae305ad101 100644 --- a/ui/voip_calls.c +++ b/ui/voip_calls.c @@ -497,7 +497,7 @@ static void insert_to_graph_t38(voip_calls_tapinfo_t *tapinfo, packet_info *pinf /****************************************************************************/ /* whenever a rtp event packet is seen by the tap listener */ -static int +static tap_packet_status rtp_event_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *rtp_event_info) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_rtp_event_); @@ -505,14 +505,14 @@ rtp_event_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _ /* do not consider RTP events packets without a setup frame */ if (pi->info_setup_frame_num == 0) { - return FALSE; + return TAP_PACKET_DONT_REDRAW; } tapinfo->rtp_evt_frame_num = pinfo->num; tapinfo->rtp_evt = pi->info_rtp_evt; tapinfo->rtp_evt_end = pi->info_end; - return FALSE; + return TAP_PACKET_DONT_REDRAW; } /****************************************************************************/ @@ -580,7 +580,7 @@ rtp_reset(void *tap_offset_ptr) /****************************************************************************/ /* whenever a RTP packet is seen by the tap listener */ -static gboolean +static tap_packet_status rtp_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, void const *rtp_info_ptr) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_rtp_); @@ -593,7 +593,7 @@ rtp_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, void c /* do not consider RTP packets without a setup frame */ if (rtp_info->info_setup_frame_num == 0) { - return FALSE; + return TAP_PACKET_DONT_REDRAW; } if (tapinfo->tap_packet) { @@ -629,7 +629,7 @@ rtp_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, void c /* if this is a duplicated RTP Event End, just return */ if ((tapinfo->rtp_evt_frame_num == pinfo->num) && !strinfo && (tapinfo->rtp_evt_end == TRUE)) { - return FALSE; + return TAP_PACKET_DONT_REDRAW; } /* not in the list? then create a new entry */ @@ -681,7 +681,7 @@ rtp_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, void c tapinfo->redraw |= REDRAW_RTP; - return FALSE; + return TAP_PACKET_DONT_REDRAW; } /****************************************************************************/ @@ -876,7 +876,7 @@ remove_tap_listener_rtp(voip_calls_tapinfo_t *tap_id_base) /****************************************************************************/ /* whenever a T38 packet is seen by the tap listener */ -static gboolean +static tap_packet_status t38_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *t38_info_ptr) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_t38_); @@ -958,7 +958,7 @@ t38_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const /* at this point we should have found the call num for this t38 packets belong */ if (conv_num == -1) { - return FALSE; + return TAP_PACKET_DONT_REDRAW; } /* add the item to the graph list */ @@ -1024,7 +1024,7 @@ t38_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const tapinfo->redraw |= REDRAW_T38; - return TRUE; /* refresh output */ + return TAP_PACKET_REDRAW; /* refresh output */ } /****************************************************************************/ @@ -1081,7 +1081,7 @@ free_sip_info(gpointer p) { /****************************************************************************/ /* whenever a SIP packet is seen by the tap listener */ -static gboolean +static tap_packet_status sip_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt , const void *SIPinfo) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_sip_); @@ -1102,7 +1102,7 @@ sip_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt , /* do not consider packets without call_id */ if (pi->tap_call_id ==NULL) { - return FALSE; + return TAP_PACKET_DONT_REDRAW; } key=pi->tap_call_id; /* init the hash table */ @@ -1252,7 +1252,7 @@ TODO: is useful but not perfect, what is appended is truncated when displayed in tapinfo->redraw |= REDRAW_SIP; - return TRUE; /* refresh output */ + return TAP_PACKET_REDRAW; /* refresh output */ } /****************************************************************************/ @@ -1303,7 +1303,7 @@ remove_tap_listener_sip_calls(voip_calls_tapinfo_t *tap_id_base) /****************************************************************************/ /* whenever a isup_ packet is seen by the tap listener */ -static gboolean +static tap_packet_status isup_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *isup_info) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_isup_); @@ -1321,7 +1321,7 @@ isup_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, /* check if the lower layer is MTP matching the frame number */ if (tapinfo->mtp3_frame_num != pinfo->num) - return FALSE; + return TAP_PACKET_DONT_REDRAW; /* check whether we already have a call with these parameters in the list */ list = g_queue_peek_nth_link(tapinfo->callsinfos, 0); @@ -1453,7 +1453,7 @@ isup_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, tapinfo->redraw |= REDRAW_ISUP; - return TRUE; /* refresh output */ + return TAP_PACKET_REDRAW; /* refresh output */ } /****************************************************************************/ @@ -1506,7 +1506,7 @@ remove_tap_listener_isup_calls(voip_calls_tapinfo_t *tap_id_base) /****************************************************************************/ /* whenever a mtp3_ packet is seen by the tap listener */ -static gboolean +static tap_packet_status mtp3_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *mtp3_info) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_mtp3_); @@ -1519,10 +1519,10 @@ mtp3_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt tapinfo->mtp3_ni = pi->addr_opc.ni; tapinfo->mtp3_frame_num = pinfo->num; - return FALSE; + return TAP_PACKET_DONT_REDRAW; } -static gboolean +static tap_packet_status m3ua_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *mtp3_info) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_m3ua_); @@ -1535,7 +1535,7 @@ m3ua_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt tapinfo->mtp3_ni = pi->addr_opc.ni; tapinfo->mtp3_frame_num = pinfo->num; - return FALSE; + return TAP_PACKET_DONT_REDRAW; } /****************************************************************************/ @@ -1595,7 +1595,7 @@ static const e_guid_t guid_allzero = {0, 0, 0, { 0, 0, 0, 0, 0, 0, 0, 0 } }; /****************************************************************************/ /* whenever a q931_ packet is seen by the tap listener */ -static gboolean +static tap_packet_status q931_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *q931_info) { GList *list,*list2; @@ -1852,7 +1852,7 @@ q931_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, tapinfo->redraw |= REDRAW_Q931; - return TRUE; /* refresh output */ + return TAP_PACKET_REDRAW; /* refresh output */ } /****************************************************************************/ @@ -1934,7 +1934,7 @@ free_h225_info(gpointer p) { } /****************************************************************************/ /* whenever a H225 packet is seen by the tap listener */ -static gboolean +static tap_packet_status h225_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *H225info) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_h225_); @@ -1952,12 +1952,12 @@ h225_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, /* OR, if not guid and is H225 return because doesn't belong to a call */ if ((memcmp(&pi->guid, &guid_allzero, GUID_LEN) == 0)) if ( ((pi->msg_type == H225_RAS) && ((pi->msg_tag < 18) || (pi->msg_tag > 20))) || (pi->msg_type != H225_RAS) ) - return FALSE; + return TAP_PACKET_DONT_REDRAW; /* if it is RAS LCF or LRJ*/ if ( (pi->msg_type == H225_RAS) && ((pi->msg_tag == 19) || (pi->msg_tag == 20))) { /* if the LCF/LRJ doesn't match to a LRQ, just return */ - if (!pi->request_available) return FALSE; + if (!pi->request_available) return TAP_PACKET_DONT_REDRAW; /* check whether we already have a call with this request SeqNum */ list = g_queue_peek_nth_link(tapinfo->callsinfos, 0); @@ -2144,7 +2144,7 @@ h225_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, tapinfo->redraw |= REDRAW_H225; - return TRUE; /* refresh output */ + return TAP_PACKET_REDRAW; /* refresh output */ } /****************************************************************************/ @@ -2243,7 +2243,7 @@ h245_add_label(voip_calls_tapinfo_t *tapinfo, guint32 new_frame_num, const gchar /****************************************************************************/ /* whenever a H245dg packet is seen by the tap listener (when H245 tunneling is ON) */ -static gboolean +static tap_packet_status h245dg_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *H245info) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_h245dg_); @@ -2305,7 +2305,7 @@ h245dg_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *ed tapinfo->redraw |= REDRAW_H245DG; - return TRUE; /* refresh output */ + return TAP_PACKET_REDRAW; /* refresh output */ } /****************************************************************************/ @@ -2362,7 +2362,7 @@ remove_tap_listener_h245dg_calls(voip_calls_tapinfo_t *tap_id_base) /****************************TAP for SDP PROTOCOL ***************************/ /****************************************************************************/ /* whenever a SDP packet is seen by the tap listener */ -static gboolean +static tap_packet_status sdp_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *SDPinfo) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_sdp_); @@ -2380,7 +2380,7 @@ sdp_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _ tapinfo->redraw |= REDRAW_SDP; - return TRUE; /* refresh output */ + return TAP_PACKET_REDRAW; /* refresh output */ } /****************************************************************************/ @@ -2542,7 +2542,7 @@ mgcp_dialed_digits(gchar *signalStr, gchar **dialedDigits) /****************************************************************************/ /* whenever a MGCP packet is seen by the tap listener */ -static gboolean +static tap_packet_status mgcp_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *MGCPinfo) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_mgcp_); @@ -2603,7 +2603,7 @@ mgcp_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, fromEndpoint = FALSE; newcall = TRUE; } - if (!newcall) return FALSE; + if (!newcall) return TAP_PACKET_DONT_REDRAW; } } else if ( ((pi->mgcp_type == MGCP_RESPONSE) && pi->request_available) || ((pi->mgcp_type == MGCP_REQUEST) && pi->is_duplicate) ) { @@ -2635,8 +2635,8 @@ mgcp_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, listGraph = g_list_next(listGraph); } /* if there is not a matching request, just return */ - if (callsinfo == NULL) return FALSE; - } else return FALSE; + if (callsinfo == NULL) return TAP_PACKET_DONT_REDRAW; + } else return TAP_PACKET_DONT_REDRAW; /* not in the list? then create a new entry */ if (callsinfo==NULL) { @@ -2758,7 +2758,7 @@ mgcp_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, tapinfo->redraw |= REDRAW_MGCP; - return TRUE; /* refresh output */ + return TAP_PACKET_REDRAW; /* refresh output */ } /****************************************************************************/ @@ -2815,7 +2815,7 @@ remove_tap_listener_mgcp_calls(voip_calls_tapinfo_t *tap_id_base) /****************************************************************************/ /* whenever a ACTRACE packet is seen by the tap listener */ -static gboolean +static tap_packet_status actrace_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *ACTRACEinfo) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_actrace_); @@ -2891,7 +2891,7 @@ actrace_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *e tapinfo->redraw |= REDRAW_ACTRACE; - return TRUE; /* refresh output */ + return TAP_PACKET_REDRAW; /* refresh output */ } /****************************************************************************/ @@ -2947,7 +2947,7 @@ remove_tap_listener_actrace_calls(voip_calls_tapinfo_t *tap_id_base) type == GCP_CMD_CTX_ATTR_AUDIT_REQ ) -static gboolean +static tap_packet_status h248_calls_packet_common(voip_calls_tapinfo_t *tapinfo, packet_info *pinfo, epan_dissect_t *edt, const void *prot_info, guint32 redraw_bit) { const gcp_cmd_t *cmd = (const gcp_cmd_t *)prot_info; GList *list; @@ -2957,7 +2957,7 @@ h248_calls_packet_common(voip_calls_tapinfo_t *tapinfo, packet_info *pinfo, epan gchar mgw_addr[128]; if (cmd->ctx->id == NULL_CONTEXT || cmd->ctx->id == ALL_CONTEXTS ) { - return FALSE; + return TAP_PACKET_DONT_REDRAW; } if ( gcp_is_req(cmd->type) ) { @@ -3040,10 +3040,10 @@ h248_calls_packet_common(voip_calls_tapinfo_t *tapinfo, packet_info *pinfo, epan tapinfo->redraw |= redraw_bit; - return TRUE; + return TAP_PACKET_REDRAW; } -static gboolean +static tap_packet_status h248_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *prot_info) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_h248_); @@ -3061,7 +3061,7 @@ h248_calls_draw(void *tap_offset_ptr) } } -static gboolean +static tap_packet_status megaco_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *prot_info) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_megaco_); @@ -3133,7 +3133,7 @@ static const voip_protocol sccp_proto_map[] = { #define SP2VP(ap) ((ap) < SCCP_PLOAD_NUM_PLOADS ? sccp_proto_map[(ap)] : TEL_SCCP) const value_string* sccp_payload_values; -static gboolean +static tap_packet_status sccp_calls(voip_calls_tapinfo_t *tapinfo, packet_info *pinfo, epan_dissect_t *edt, const void *prot_info, guint32 redraw_bit) { const sccp_msg_info_t* msg = (const sccp_msg_info_t *)prot_info; sccp_assoc_info_t* assoc = msg->data.co.assoc; @@ -3233,10 +3233,10 @@ sccp_calls(voip_calls_tapinfo_t *tapinfo, packet_info *pinfo, epan_dissect_t *ed tapinfo->redraw |= redraw_bit; - return TRUE; + return TAP_PACKET_REDRAW; } -static gboolean +static tap_packet_status sccp_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *prot_info) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_sccp_); @@ -3255,7 +3255,7 @@ sccp_calls_draw(void *tap_offset_ptr) } } -static gboolean +static tap_packet_status sua_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *prot_info) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_sua_); @@ -3319,7 +3319,7 @@ remove_tap_listener_sccp_calls(voip_calls_tapinfo_t *tap_id_base) /****************************TAP for UNISTIM ********************************/ /****************************************************************************/ -static gboolean +static tap_packet_status unistim_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *unistim_info) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_unistim_); @@ -3778,7 +3778,7 @@ unistim_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *e tapinfo->redraw |= REDRAW_UNISTIM; - return TRUE; + return TAP_PACKET_REDRAW; } /****************************************************************************/ @@ -3847,7 +3847,7 @@ static const voip_call_state skinny_tap_voip_state[] = { VOIP_REJECTED }; -static gboolean +static tap_packet_status skinny_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *skinny_info) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_skinny_); @@ -3859,7 +3859,7 @@ skinny_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *ed gchar *comment; if (si == NULL || (si->callId == 0 && si->passThroughPartyId == 0)) - return FALSE; + return TAP_PACKET_DONT_REDRAW; /* check whether we already have this context in the list */ list = g_queue_peek_nth_link(tapinfo->callsinfos, 0); while (list) @@ -3939,7 +3939,7 @@ skinny_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *ed tapinfo->redraw |= REDRAW_SKINNY; - return TRUE; + return TAP_PACKET_REDRAW; } /****************************************************************************/ @@ -4004,7 +4004,7 @@ static void free_iax2_info(gpointer p) { /****************************************************************************/ /* whenever a IAX2 packet is seen by the tap listener */ -static gboolean +static tap_packet_status iax2_calls_packet( void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *iax2_info) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_iax2_); @@ -4015,7 +4015,7 @@ iax2_calls_packet( void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt iax2_info_t *tmp_iax2info; if (ii == NULL || ii->ptype != IAX2_FULL_PACKET || (ii->scallno == 0 && ii->dcallno == 0)) - return FALSE; + return TAP_PACKET_DONT_REDRAW; /* check whether we already have this context in the list */ list = g_queue_peek_nth_link(tapinfo->callsinfos, 0); while (list) @@ -4037,7 +4037,7 @@ iax2_calls_packet( void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt if (callsinfo==NULL) { /* We only care about real calls, i.e., no registration stuff */ if (ii->ftype != AST_FRAME_IAX || ii->csub != IAX_COMMAND_NEW) - return FALSE; + return TAP_PACKET_DONT_REDRAW; callsinfo = (voip_calls_info_t *)g_malloc0(sizeof(voip_calls_info_t)); callsinfo->call_state = VOIP_NO_STATE; callsinfo->call_active_state = VOIP_ACTIVE; @@ -4077,7 +4077,7 @@ iax2_calls_packet( void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt tapinfo->redraw |= REDRAW_IAX2; - return TRUE; + return TAP_PACKET_REDRAW; } @@ -4138,7 +4138,7 @@ remove_tap_listener_iax2_calls(voip_calls_tapinfo_t *tap_id_base) /****************************************************************************/ /* voip_calls_packet and voip_calls_init_tap appear to be dead code. We don't have a "voip" tap. */ -static gboolean +static tap_packet_status voip_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, const void *VoIPinfo) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_voip_); @@ -4202,7 +4202,7 @@ voip_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, tapinfo->redraw |= REDRAW_VOIP; - return TRUE; + return TAP_PACKET_REDRAW; } /****************************************************************************/ @@ -4254,7 +4254,7 @@ remove_tap_listener_voip_calls(voip_calls_tapinfo_t *tap_id_base) /****************************************************************************/ /* whenever a prot_ packet is seen by the tap listener */ #if 0 -static gboolean +static tap_packet_status prot_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prot_info _U_) { voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_prot_); @@ -4268,7 +4268,7 @@ prot_calls_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt tapinfo->redraw = REDRAW_PROT; - return TRUE; + return TAP_PACKET_REDRAW; } /****************************************************************************/ |