diff options
author | Guy Harris <guy@alum.mit.edu> | 2004-09-04 01:32:13 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2004-09-04 01:32:13 +0000 |
commit | 3c7631aa32de7a630bd48eec5ef5b67f3c6cdb10 (patch) | |
tree | ad801a014e03217ed71f957d22ad55b8bc00c9ac /epan/packet-range.c | |
parent | 22c088b8ab19622f935953ab6e12456025564c4b (diff) |
Split the pure range stuff out into separate files, exporting their own
functions.
svn path=/trunk/; revision=11892
Diffstat (limited to 'epan/packet-range.c')
-rw-r--r-- | epan/packet-range.c | 215 |
1 files changed, 5 insertions, 210 deletions
diff --git a/epan/packet-range.c b/epan/packet-range.c index c786afb3f9..c88717e966 100644 --- a/epan/packet-range.c +++ b/epan/packet-range.c @@ -40,10 +40,6 @@ #include "globals.h" - -static gboolean packet_is_in_range(packet_range_t *range, guint32 val); - - /* (re-)calculate the packet counts (except the user specified range) */ void packet_range_calc(packet_range_t *range) { guint32 current_count; @@ -146,7 +142,7 @@ void packet_range_calc_user(packet_range_t *range) { for(packet = cfile.plist; packet != NULL; packet = packet->next) { current_count++; - if (packet_is_in_range(range, 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++; @@ -161,9 +157,7 @@ void packet_range_init(packet_range_t *range) { range->process = range_process_all; range->process_filtered = FALSE; - range->nranges = 0; - range->ranges[range->nranges].low = 0L; - range->ranges[range->nranges].high = 0L; + range_init(&range->user_range); /* calculate all packet range counters */ packet_range_calc(range); @@ -225,7 +219,7 @@ range_process_e packet_range_process_packet(packet_range_t *range, frame_data *f } break; case(range_process_user_range): - if (packet_is_in_range(range, fdata->num) == FALSE) { + if (value_is_in_range(&range->user_range, fdata->num) == FALSE) { return range_process_next; } break; @@ -245,214 +239,15 @@ range_process_e packet_range_process_packet(packet_range_t *range, frame_data *f /******************** Range Entry Parser *********************************/ -/* Converts a range string to a fast comparable array of ranges. +/* Converts a range string to a user range. * The parameter 'es' points to the string to be converted, and is defined in * the Save/Print-As widget. - * - * This function fills the array ranges containing low and high values indexed - * by a global variable nranges. After having called this function, the function - * packet_is_in_range() determines whether a given (packet) number is within - * the range or not. - * - * In case of a single packet number, we make a range where low is equal to high. - * We strip any characters other than commas, digits, or hyphens. We take care - * on wrongly entered ranges; opposite order will be taken care of. - * - * The following syntax is accepted : - * - * 1-20,30-40 Range from 1 to 20, and packets 30 to 40 - * -20,30 Range from 1 to 20, and packet 30 - * 20,30,40- Packet number 20, 30, and the range from 40 to the end - * 20-10,30-25 Range from 10 to 20, and from 25 to 30 - * - All packets */ void packet_range_convert_str(packet_range_t *range, const gchar *es) { - gchar EntryStr[255], OrgStr[255], value[255], p; - guint i, j=0; - guint32 tmp, val; - gboolean hyphenseen; - - /* Reset the number of ranges we are going to find */ - range->nranges = 0; - range->ranges[range->nranges].low = 0L; - range->ranges[range->nranges].high = 0L; - - /* Make a copy of the string, and check the validity of the input */ - strcpy(OrgStr,es); - if (strlen(OrgStr) == 0 ) { - return; - } - - /* Only keep digits, commas, and hyphens. */ - for (i=0; i<=strlen(OrgStr); i++) { - if ( isdigit((guchar)OrgStr[i]) || OrgStr[i] == '-' || OrgStr[i] == ',' ) { - EntryStr[j++] = OrgStr[i]; - } - } - EntryStr[j] = '\0'; - - /* Remove any starting commas */ - strcpy(OrgStr,EntryStr); - i = 0; - while (OrgStr[i] == ',') { - i++; - } - strcpy(EntryStr,OrgStr+i); - - /* Remove any double commas */ - strcpy(OrgStr,EntryStr); - p = ','; - j = 0; - for (i=0; i<=strlen(OrgStr); i++) { - if ( OrgStr[i] != ',' || p != ',') { - EntryStr[j++] = OrgStr[i]; - } - p = OrgStr[i]; - } - EntryStr[j] = '\0'; - - /* Remove any double hyphens */ - strcpy(OrgStr,EntryStr); - p = '-'; - j = 0; - for (i=0; i<=strlen(OrgStr); i++) { - if (OrgStr[i] != '-' || p != '-' || i == 0) { - EntryStr[j++] = OrgStr[i]; - } - p = OrgStr[i]; - } - EntryStr[j] = '\0'; - - /* Remove any trailing commas */ - i = strlen(EntryStr) - 1; - while (EntryStr[i] == ',') { - EntryStr[i] = '\0'; - i--; - } - - /* The entry string is now filtered, and ready for further parsing */ - /* printf("Function : packet_range_convert_str EntryStr = %s\n",EntryStr); */ - - /* Now we are going to process the ranges separately until we get a comma, - * or end of string. - * - * We build a structure array called ranges of high and low values. After the - * following loop, we have the nranges variable which tells how many ranges - * were found. The number of individual ranges is limited to 'MaxRanges' - */ - - j = 0; - hyphenseen = FALSE; - for (i=0; i<=strlen(EntryStr);i++) { - - /* Copy the digit string until a no-digit character is seen */ - if (isdigit((guchar)EntryStr[i])) { - value[j++] = EntryStr[i]; - continue; - } - - /* Terminate the digit string, and convert it */ - value[j] = '\0'; - val=atol(value); - j=0; - - /* In case we see a hyphen, store the value we read in the low part - * of ranges. In case it is a trailer hyphen, store the low value, and - * set the high value to the maximum of packets captured. - */ - if (EntryStr[i] == '-') { - /* If this is a trailer hyphen, then treat it in a different - * way, then the high value is the maximum number of packets counted - * and we are ready - */ - if (i == strlen(EntryStr)-1) { - range->ranges[range->nranges].low = val; - range->ranges[range->nranges].high = cfile.count; - range->nranges++; - break; - } else { - /* Store the low value of the range */ - range->ranges[range->nranges].low = val; - } - hyphenseen=TRUE; - continue; - } - - /* In case we see a comma, or end of string */ - if (EntryStr[i] == ',' || i == strlen(EntryStr)) { - if (hyphenseen) { - /* Normal treatment: store the high value range in ranges */ - range->ranges[range->nranges].high = val; - } else { - /* We did not see a hyphen and we get a comma, then this must - * be a single packet number */ - range->ranges[range->nranges].low = val; - range->ranges[range->nranges].high = val; - } - hyphenseen=FALSE; - } - - /* Increase the index for the number of ranges we found, and protect - * against wildly outside array bound jumps */ - range->nranges++; - if (range->nranges > MaxRange) { - range->nranges--; - } - } - range->nranges--; - - /* Now we are going through the low and high values, and check - * whether they are in a proper order. Low should be equal or lower - * than high. So, go through the loop and swap if needed. - */ - for (i=0; i <= range->nranges; i++) { - if (range->ranges[i].low > range->ranges[i].high) { - tmp = range->ranges[i].low; - range->ranges[i].low = range->ranges[i].high; - range->ranges[i].high = tmp; - } - } - - /* In case we want to know what the result ranges are : - * - * for (i=0; i <= nranges; i++) { - * printf("Function : packet_range_convert_str L=%u \t H=%u\n",ranges[i].low,ranges[i].high); - * } - * - */ + range_convert_str(&range->user_range, es, cfile.count); /* calculate new user specified packet range counts */ packet_range_calc_user(range); } /* packet_range_convert_str */ - -/* This function returns TRUE if a given value is within one of the ranges - * stored in the ranges array. - */ -static gboolean packet_is_in_range(packet_range_t *range, guint32 val) -{ - guint i; - - for (i=0; i <= range->nranges; i++) { - if (val >= range->ranges[i].low && val <= range->ranges[i].high) - return TRUE; - } - return(FALSE); -} - -#if 0 -/* This is a debug function to check the range functionality */ -static void packet_is_in_range_check(packet_range_t *range, guint32 val) -{ - - /* Print the result for a given value */ - printf("Function : packet_is_in_range_check Number %u\t",val); - - if (packet_is_in_range(range, val)) { - printf("is in range\n"); - } else { - printf("is not in range\n"); - } -} -#endif |