diff options
Diffstat (limited to 'ui/packet_range.h')
| -rw-r--r-- | ui/packet_range.h | 75 |
1 files changed, 39 insertions, 36 deletions
diff --git a/ui/packet_range.h b/ui/packet_range.h index 0328fc87..70727db4 100644 --- a/ui/packet_range.h +++ b/ui/packet_range.h @@ -26,7 +26,7 @@ extern "C" { #endif /* __cplusplus */ -extern guint32 curr_selected_frame; +extern uint32_t curr_selected_frame; typedef enum { range_process_all, @@ -39,9 +39,9 @@ typedef enum { typedef struct packet_range_tag { /* values coming from the UI */ packet_range_e process; /* which range to process */ - gboolean process_filtered; /* captured or filtered packets */ - gboolean remove_ignored; /* remove ignored packets */ - gboolean include_dependents; /* True if packets which are dependents of others should be processed */ + bool process_filtered; /* captured or filtered packets */ + bool remove_ignored; /* remove ignored packets */ + bool include_dependents; /* True if packets which are dependents of others should be processed */ /* user specified range(s) and, if null, error status */ range_t *user_range; @@ -53,35 +53,35 @@ typedef struct packet_range_tag { /* current packet counts (captured) */ capture_file *cf; /* Associated capture file. */ - guint32 mark_range_cnt; /* packets in marked range */ - guint32 user_range_cnt; /* packets in user specified range */ - guint32 selection_range_cnt; /* packets in the selected range */ - guint32 marked_plus_depends_cnt; - guint32 mark_range_plus_depends_cnt; - guint32 user_range_plus_depends_cnt; - guint32 selected_plus_depends_cnt; - guint32 ignored_cnt; /* packets ignored */ - guint32 ignored_marked_cnt; /* packets ignored and marked */ - guint32 ignored_mark_range_cnt; /* packets ignored in marked range */ - guint32 ignored_user_range_cnt; /* packets ignored in user specified range */ - guint32 ignored_selection_range_cnt; /* packets ignored in the selected range */ + uint32_t mark_range_cnt; /* packets in marked range */ + uint32_t user_range_cnt; /* packets in user specified range */ + uint32_t selection_range_cnt; /* packets in the selected range */ + uint32_t marked_plus_depends_cnt; + uint32_t mark_range_plus_depends_cnt; + uint32_t user_range_plus_depends_cnt; + uint32_t selected_plus_depends_cnt; + uint32_t ignored_cnt; /* packets ignored */ + uint32_t ignored_marked_cnt; /* packets ignored and marked */ + uint32_t ignored_mark_range_cnt; /* packets ignored in marked range */ + uint32_t ignored_user_range_cnt; /* packets ignored in user specified range */ + uint32_t ignored_selection_range_cnt; /* packets ignored in the selected range */ /* current packet counts (displayed) */ - guint32 displayed_cnt; - guint32 displayed_plus_dependents_cnt; - guint32 displayed_marked_cnt; - guint32 displayed_mark_range_cnt; - guint32 displayed_user_range_cnt; - guint32 displayed_marked_plus_depends_cnt; - guint32 displayed_mark_range_plus_depends_cnt; - guint32 displayed_user_range_plus_depends_cnt; - guint32 displayed_selection_range_cnt; - guint32 displayed_selected_plus_depends_cnt; - guint32 displayed_ignored_cnt; - guint32 displayed_ignored_marked_cnt; - guint32 displayed_ignored_mark_range_cnt; - guint32 displayed_ignored_user_range_cnt; - guint32 displayed_ignored_selection_range_cnt; + uint32_t displayed_cnt; + uint32_t displayed_plus_dependents_cnt; + uint32_t displayed_marked_cnt; + uint32_t displayed_mark_range_cnt; + uint32_t displayed_user_range_cnt; + uint32_t displayed_marked_plus_depends_cnt; + uint32_t displayed_mark_range_plus_depends_cnt; + uint32_t displayed_user_range_plus_depends_cnt; + uint32_t displayed_selection_range_cnt; + uint32_t displayed_selected_plus_depends_cnt; + uint32_t displayed_ignored_cnt; + uint32_t displayed_ignored_marked_cnt; + uint32_t displayed_ignored_mark_range_cnt; + uint32_t displayed_ignored_user_range_cnt; + uint32_t displayed_ignored_selection_range_cnt; /* Sets of the chosen frames plus any they depend on for each case */ GHashTable *marked_plus_depends; @@ -94,8 +94,8 @@ typedef struct packet_range_tag { GHashTable *displayed_selected_plus_depends; /* "enumeration" values */ - gboolean marked_range_active; /* marked range is currently processed */ - guint32 marked_range_left; /* marked range packets left to do */ + bool marked_range_active; /* marked range is currently processed */ + uint32_t marked_range_left; /* marked range packets left to do */ } packet_range_t; typedef enum { @@ -117,17 +117,20 @@ extern convert_ret_t packet_range_check(packet_range_t *range); extern void packet_range_process_init(packet_range_t *range); /* do we have to process all packets? */ -extern gboolean packet_range_process_all(packet_range_t *range); +extern bool packet_range_process_all(packet_range_t *range); /* do we have to process this packet? */ extern range_process_e packet_range_process_packet(packet_range_t *range, frame_data *fdata); /* convert user given string to the internal user specified range representation */ -extern void packet_range_convert_str(packet_range_t *range, const gchar *es); +extern void packet_range_convert_str(packet_range_t *range, const char *es); /* convert user given string to the internal selection specified range representation */ -extern void packet_range_convert_selection_str(packet_range_t *range, const gchar *es); +extern void packet_range_convert_selection_str(packet_range_t *range, const char *es); +/* return the number of packets that will be processed. + */ +extern uint32_t packet_range_count(const packet_range_t *range); #ifdef __cplusplus } #endif /* __cplusplus */ |