X-Git-Url: http://git.samba.org/samba.git/?p=obnox%2Fwireshark%2Fwip.git;a=blobdiff_plain;f=packet-range.c;h=ed9955e09447ec9b5da622fd7c370f202a018cde;hp=0171b5115a4e9d607e49742f83b82eecc1c5fc9e;hb=7326e8cb033ced26cb30c09f7f225b388ba050af;hpb=52b29c1e0d8421313b1ae1e9f8f5ae5eb26df00f diff --git a/packet-range.c b/packet-range.c index 0171b5115a..ed9955e094 100644 --- a/packet-range.c +++ b/packet-range.c @@ -6,8 +6,8 @@ * Dick Gooris * Ulf Lamping * - * Ethereal - Network traffic analyzer - * By Gerald Combs + * Wireshark - Network traffic analyzer + * By Gerald Combs * Copyright 1998 Gerald Combs * * This program is free software; you can redistribute it and/or @@ -29,6 +29,7 @@ #include "config.h" #endif +#include #include #include @@ -41,150 +42,214 @@ #include "packet-range.h" /* (re-)calculate the packet counts (except the user specified range) */ -void packet_range_calc(packet_range_t *range) { - guint32 current_count; - guint32 mark_low; - guint32 mark_high; - guint32 displayed_mark_low; - guint32 displayed_mark_high; - frame_data *packet; - - - range->selected_packet = 0L; - - mark_low = 0L; - mark_high = 0L; - range->mark_range_cnt = 0L; - - displayed_mark_low = 0L; - displayed_mark_high = 0L; - range->displayed_cnt = 0L; - range->displayed_marked_cnt = 0L; - range->displayed_mark_range_cnt=0L; - - /* The next for-loop is used to obtain the amount of packets to be processed - * and is used to present the information in the Save/Print As widget. - * We have different types of ranges: All the packets, the number - * of packets of a marked range, a single packet, and a user specified - * packet range. The last one is not calculated here since this - * data must be entered in the widget by the user. - */ - - current_count = 0; - for(packet = cfile.plist; packet != NULL; packet = packet->next) { - current_count++; - if (cfile.current_frame == packet) { - range->selected_packet = current_count; - } - if (packet->flags.passed_dfilter) { - range->displayed_cnt++; - } - if (packet->flags.marked) { +static void packet_range_calc(packet_range_t *range) { + guint32 framenum; + guint32 mark_low; + guint32 mark_high; + guint32 displayed_mark_low; + guint32 displayed_mark_high; + frame_data *packet; + + + range->selected_packet = 0L; + + mark_low = 0L; + mark_high = 0L; + range->mark_range_cnt = 0L; + range->ignored_cnt = 0L; + range->ignored_marked_cnt = 0L; + range->ignored_mark_range_cnt = 0L; + range->ignored_user_range_cnt = 0L; + + displayed_mark_low = 0L; + displayed_mark_high = 0L; + range->displayed_cnt = 0L; + range->displayed_marked_cnt = 0L; + range->displayed_mark_range_cnt=0L; + range->displayed_ignored_cnt = 0L; + range->displayed_ignored_marked_cnt = 0L; + range->displayed_ignored_mark_range_cnt = 0L; + range->displayed_ignored_user_range_cnt = 0L; + + /* This doesn't work unless you have a full set of frame_data + * structures for all packets in the capture, which is not, + * for example, the case when TShark is doing a one-pass + * read of a file or a live capture. + */ + if (cfile.frames != NULL) { + /* The next for-loop is used to obtain the amount of packets + * to be processed and is used to present the information in + * the Save/Print As widget. + * We have different types of ranges: All the packets, the number + * of packets of a marked range, a single packet, and a user specified + * packet range. The last one is not calculated here since this + * data must be entered in the widget by the user. + */ + + for(framenum = 1; framenum <= cfile.count; framenum++) { + packet = frame_data_sequence_find(cfile.frames, framenum); + + if (cfile.current_frame == packet) { + range->selected_packet = framenum; + } if (packet->flags.passed_dfilter) { - range->displayed_marked_cnt++; - if (displayed_mark_low == 0) { - displayed_mark_low = current_count; + range->displayed_cnt++; + } + if (packet->flags.marked) { + if (packet->flags.ignored) { + range->ignored_marked_cnt++; + } + if (packet->flags.passed_dfilter) { + range->displayed_marked_cnt++; + if (packet->flags.ignored) { + range->displayed_ignored_marked_cnt++; + } + if (displayed_mark_low == 0) { + displayed_mark_low = framenum; + } + if (framenum > displayed_mark_high) { + displayed_mark_high = framenum; + } + } + + if (mark_low == 0) { + mark_low = framenum; } - if (current_count > displayed_mark_high) { - displayed_mark_high = current_count; + if (framenum > mark_high) { + mark_high = framenum; } } + if (packet->flags.ignored) { + range->ignored_cnt++; + if (packet->flags.passed_dfilter) { + range->displayed_ignored_cnt++; + } + } + } + + for(framenum = 1; framenum <= cfile.count; framenum++) { + packet = frame_data_sequence_find(cfile.frames, framenum); - if (mark_low == 0) { - mark_low = current_count; + if (framenum >= mark_low && + framenum <= mark_high) + { + range->mark_range_cnt++; + if (packet->flags.ignored) { + range->ignored_mark_range_cnt++; + } } - if (current_count > mark_high) { - mark_high = current_count; + + if (framenum >= displayed_mark_low && + framenum <= displayed_mark_high) + { + if (packet->flags.passed_dfilter) { + range->displayed_mark_range_cnt++; + if (packet->flags.ignored) { + range->displayed_ignored_mark_range_cnt++; + } + } } - } - } - - current_count = 0; - for(packet = cfile.plist; packet != NULL; packet = packet->next) { - current_count++; - - if (current_count >= mark_low && - current_count <= mark_high) - { - range->mark_range_cnt++; - } - - if (current_count >= displayed_mark_low && - current_count <= displayed_mark_high) - { - if (packet->flags.passed_dfilter) { - range->displayed_mark_range_cnt++; - } - } - } - - /* in case we marked just one packet, we add 1. */ - /*if (cfile.marked_count != 0) { - range->mark_range = mark_high - mark_low + 1; - }*/ - - /* in case we marked just one packet, we add 1. */ - /*if (range->displayed_marked_cnt != 0) { - range->displayed_mark_range = displayed_mark_high - displayed_mark_low + 1; - }*/ + } + +#if 0 + /* in case we marked just one packet, we add 1. */ + if (cfile.marked_count != 0) { + range->mark_range = mark_high - mark_low + 1; + } + + /* in case we marked just one packet, we add 1. */ + if (range->displayed_marked_cnt != 0) { + range->displayed_mark_range = displayed_mark_high - displayed_mark_low + 1; + } +#endif + } } /* (re-)calculate the user specified packet range counts */ -void packet_range_calc_user(packet_range_t *range) { - guint32 current_count; - frame_data *packet; - - range->user_range_cnt = 0L; - range->displayed_user_range_cnt = 0L; - - current_count = 0; - for(packet = cfile.plist; packet != NULL; packet = packet->next) { - current_count++; - - if (value_is_in_range(&range->user_range, current_count)) { - range->user_range_cnt++; - if (packet->flags.passed_dfilter) { - range->displayed_user_range_cnt++; - } - } - } +static void packet_range_calc_user(packet_range_t *range) { + guint32 framenum; + frame_data *packet; + + range->user_range_cnt = 0L; + range->ignored_user_range_cnt = 0L; + range->displayed_user_range_cnt = 0L; + range->displayed_ignored_user_range_cnt = 0L; + + /* This doesn't work unless you have a full set of frame_data + * structures for all packets in the capture, which is not, + * for example, the case when TShark is doing a one-pass + * read of a file or a live capture. + */ + if (cfile.frames != NULL) { + for(framenum = 1; framenum <= cfile.count; framenum++) { + packet = frame_data_sequence_find(cfile.frames, framenum); + + if (value_is_in_range(range->user_range, framenum)) { + range->user_range_cnt++; + if (packet->flags.ignored) { + range->ignored_user_range_cnt++; + } + if (packet->flags.passed_dfilter) { + range->displayed_user_range_cnt++; + if (packet->flags.ignored) { + range->displayed_ignored_user_range_cnt++; + } + } + } + } + } } /* init the range struct */ void packet_range_init(packet_range_t *range) { - range->process = range_process_all; - range->process_filtered = FALSE; - range_init(&range->user_range); + range->process = range_process_all; + range->process_filtered = FALSE; + range->remove_ignored = FALSE; + range->user_range = range_empty(); + + /* calculate all packet range counters */ + packet_range_calc(range); + packet_range_calc_user(range); +} - /* calculate all packet range counters */ - packet_range_calc(range); - packet_range_calc_user(range); +/* check whether the packet range is OK */ +convert_ret_t packet_range_check(packet_range_t *range) { + if (range->process == range_process_user_range && range->user_range == NULL) { + /* Not valid - return the error. */ + return range->user_range_status; + } + return CVT_NO_ERROR; } /* init the processing run */ void packet_range_process_init(packet_range_t *range) { - /* "enumeration" values */ - range->marked_range_active = FALSE; - range->selected_done = FALSE; - - if (range->process_filtered == FALSE) { - range->marked_range_left = range->mark_range_cnt; - } else { - range->marked_range_left = range->displayed_mark_range_cnt; - } + /* Check that, if an explicit range was selected, it's valid. */ + /* "enumeration" values */ + range->marked_range_active = FALSE; + range->selected_done = FALSE; + + if (range->process_filtered == FALSE) { + range->marked_range_left = range->mark_range_cnt; + } else { + range->marked_range_left = range->displayed_mark_range_cnt; + } } /* do we have to process all packets? */ gboolean packet_range_process_all(packet_range_t *range) { - return range->process == range_process_all && !range->process_filtered; + return range->process == range_process_all && !range->process_filtered && !range->remove_ignored; } /* do we have to process this packet? */ range_process_e packet_range_process_packet(packet_range_t *range, frame_data *fdata) { + if (range->remove_ignored && fdata->flags.ignored) { + return range_process_next; + } + switch(range->process) { case(range_process_all): break; @@ -219,7 +284,7 @@ range_process_e packet_range_process_packet(packet_range_t *range, frame_data *f } break; case(range_process_user_range): - if (value_is_in_range(&range->user_range, fdata->num) == FALSE) { + if (value_is_in_range(range->user_range, fdata->num) == FALSE) { return range_process_next; } break; @@ -246,8 +311,23 @@ range_process_e packet_range_process_packet(packet_range_t *range, frame_data *f void packet_range_convert_str(packet_range_t *range, const gchar *es) { - /* XXX - check for errors */ - range_convert_str(&range->user_range, es, cfile.count); + range_t *new_range; + convert_ret_t ret; + + if (range->user_range != NULL) + g_free(range->user_range); + ret = range_convert_str(&new_range, es, cfile.count); + if (ret != CVT_NO_ERROR) { + /* range isn't valid */ + range->user_range = NULL; + range->user_range_status = ret; + range->user_range_cnt = 0L; + range->ignored_user_range_cnt = 0L; + range->displayed_user_range_cnt = 0L; + range->displayed_ignored_user_range_cnt = 0L; + return; + } + range->user_range = new_range; /* calculate new user specified packet range counts */ packet_range_calc_user(range);