diff options
| author | Michael Tüxen <tuexen@fh-muenster.de> | 2009-05-03 15:09:23 +0000 |
|---|---|---|
| committer | Michael Tüxen <tuexen@fh-muenster.de> | 2009-05-03 15:09:23 +0000 |
| commit | 2d894fdd243525ff112d4846925d1ff9593d4ff4 (patch) | |
| tree | 96f4e171516d3e374107e0dac793798bd1c24c24 /wiretap/pcapng.c | |
| parent | 5cbbebaf4aa743bcbe288a3b23f79426b6f989de (diff) | |
| download | wireshark-2d894fdd243525ff112d4846925d1ff9593d4ff4.tar.gz wireshark-2d894fdd243525ff112d4846925d1ff9593d4ff4.tar.bz2 wireshark-2d894fdd243525ff112d4846925d1ff9593d4ff4.zip | |
Improve handling of if_tsresol option.
svn path=/trunk/; revision=28261
Diffstat (limited to 'wiretap/pcapng.c')
| -rw-r--r-- | wiretap/pcapng.c | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/wiretap/pcapng.c b/wiretap/pcapng.c index b00de45e54..5f2ac9388b 100644 --- a/wiretap/pcapng.c +++ b/wiretap/pcapng.c @@ -583,18 +583,30 @@ pcapng_read_if_descr_block(FILE_T fh, pcapng_block_header_t *bh, pcapng_t *pn, } break; case(9): /* if_tsresol */ - if(oh.option_length == 1) { + if (oh.option_length == 1) { + guint64 base; + guint64 result; + guint8 i, exponent; + wblock->data.if_descr.if_tsresol = option_content[0]; - switch (wblock->data.if_descr.if_tsresol) { - case(6): - time_units_per_second = 1000000; - break; - case(9): - time_units_per_second = 1000000000; - break; - default: - pcapng_debug1("pcapng_open: if_tsresol %u not implemented, timestamp conversion omitted", - wblock->data.if_descr.if_tsresol); + if (wblock->data.if_descr.if_tsresol & 0x80) { + base = 2; + } else { + base = 10; + } + exponent = (guint8)(wblock->data.if_descr.if_tsresol & 0x7f); + if (((base == 2) && (exponent < 64)) || ((base == 10) && (exponent < 20))) { + result = 1; + for (i = 0; i < exponent; i++) { + result *= base; + } + time_units_per_second = result; + } else { + time_units_per_second = G_MAXUINT64; + } + if (time_units_per_second > (((guint64)1) << 32)) { + pcapng_debug1("pcapng_open: time conversion might be inaccurate", + wblock->data.if_descr.if_tsresol); } pcapng_debug1("pcapng_read_if_descr_block: if_tsresol %u", wblock->data.if_descr.if_tsresol); } else { |