8 years agolocaltime() can return a NULL ptr.
wmeier [Tue, 12 Apr 2011 13:21:32 +0000 (13:21 +0000)]
localtime() can return a NULL ptr.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36580 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoCorrected switch-case flow.
stig [Tue, 12 Apr 2011 09:05:43 +0000 (09:05 +0000)]
Corrected switch-case flow.

Coverity 1184.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36579 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoIf we hit an EOF - wth->subtype_read returns FALSE, but sets *err to 0 -
guy [Tue, 12 Apr 2011 03:27:10 +0000 (03:27 +0000)]
If we hit an EOF - wth->subtype_read returns FALSE, but sets *err to 0 -
call file_error() to fetch any deferred error, so we report an error
rather than an "everything's OK" EOF.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36578 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Jakub Zawadzki: speed up random access to gzipped files, as per the
guy [Tue, 12 Apr 2011 02:40:14 +0000 (02:40 +0000)]
From Jakub Zawadzki: speed up random access to gzipped files, as per the
zran.c example in the zlib source.

This means that problems in the file's contents might not be reported
when a packet is read, as long as there's no problem in the contents of
the file up to the last bit of compressed data for the packet; we now
check for errors after finishing the sequential read of the file, at
least in some programs, so that shouldn't be an issue (the other
programs need to be changed to do so as well).  This is necessary in
order to be able to read all the packets we saw in the sequential pass;
it also lets us get a few more packets from truncated files in some

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36577 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAllow wtap_sequential_close() and wtap_close() to return an error; this
guy [Tue, 12 Apr 2011 01:36:12 +0000 (01:36 +0000)]
Allow wtap_sequential_close() and wtap_close() to return an error; this
may happen if, when reading a compressed file, we find an error in the
file's contents past the last packet (e.g., the file being cut short so
that we can't get a full buffer worth of compressed data), and that
reporting of that error is delayed (so that you can get all of the
packets that we *can* decompress).  Check for those errors, at least on
the sequential read pass (the only errors we should see when closing the
random stream are errors we've already seen in the sequential stream).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36576 f5534014-38df-0310-8fa8-9805f1628bb7

8 years ago"This file format can't be written to a pipe" and "this file format
guy [Tue, 12 Apr 2011 00:44:44 +0000 (00:44 +0000)]
"This file format can't be written to a pipe" and "this file format
can't be saved in compress form" are both equivalent to "this file file
format requires seeking when writing it".  Change the "can compress"
Boolean in the file format table to "writing requires seeking", give all
the entries the proper value, and do the checks for attempting to write
a file format to a pipe or write it in compressed format to common code.

This means we don't need to pass the "can't seek" flag to the dump open

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36575 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRegenerate the ANSI MAP, LDAP, and TETRA dissectors so that Coverity can
gerald [Mon, 11 Apr 2011 23:07:53 +0000 (23:07 +0000)]
Regenerate the ANSI MAP, LDAP, and TETRA dissectors so that Coverity can
locate their template files.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36569 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUse ws_open(), not open(), so we handle UTF-8 pathnames on Windows.
guy [Mon, 11 Apr 2011 22:19:01 +0000 (22:19 +0000)]
Use ws_open(), not open(), so we handle UTF-8 pathnames on Windows.

Update or remove some additional "we don't have ferror() in zlib"
comments to reflect the current reality.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36568 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRemove a no-longer-valid comment (we're not using zlib's I/O routines,
guy [Mon, 11 Apr 2011 22:11:44 +0000 (22:11 +0000)]
Remove a no-longer-valid comment (we're not using zlib's I/O routines,
and the routines we're now using guarantee that an error has occured in
that case).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36567 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoDon't assign to a proto_item* that is not used before being overwritten.
martinm [Mon, 11 Apr 2011 21:40:49 +0000 (21:40 +0000)]
Don't assign to a proto_item* that is not used before being overwritten.

Coverity 1017.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36566 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoShow Segment offset number in AM header root item.
martinm [Mon, 11 Apr 2011 21:34:47 +0000 (21:34 +0000)]
Show Segment offset number in AM header root item.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36565 f5534014-38df-0310-8fa8-9805f1628bb7

8 years ago- for UL/DL HARQ, show number of ms since previous tx
martinm [Mon, 11 Apr 2011 21:33:33 +0000 (21:33 +0000)]
- for UL/DL HARQ, show number of ms since previous tx
- for SR state-machine problems, show UEId in report
- incomplete beginnings of support for grouping/counting UEs per TTI

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36564 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoDon't use the zlib I/O routines for writing compressed files, either;
guy [Mon, 11 Apr 2011 21:33:22 +0000 (21:33 +0000)]
Don't use the zlib I/O routines for writing compressed files, either;
this frees us from worrying about zlib large file issues on the write
side, and also lets us clean up a few other things.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36563 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoNeither checksum_item nor length are used uninitialized, but for some reason,
cmaynard [Mon, 11 Apr 2011 18:40:36 +0000 (18:40 +0000)]
Neither checksum_item nor length are used uninitialized, but for some reason,
the OSX buildbots think they can be.  Initialize them to avoid a build failure.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36562 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd conversation tracking and tshark tap support to ICMPv6. Fixes bug 5810.
cmaynard [Mon, 11 Apr 2011 17:42:01 +0000 (17:42 +0000)]
Add conversation tracking and tshark tap support to ICMPv6.  Fixes bug 5810.
TODO: Add a Wireshark tap or look into possibly using the stats tree instead.
Also, like ICMP, the ICMPv6 payload appears to carry the sender's timestamp, so
it might be possible to make use of this information to estimate the total SRT.
(See bug 5770 for more details.)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36561 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoCID 898: Remove a not really used variable
jmayer [Mon, 11 Apr 2011 17:25:41 +0000 (17:25 +0000)]
CID 898: Remove a not really used variable

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36560 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix coverity CID 855: remove an unused variable
jmayer [Mon, 11 Apr 2011 17:21:15 +0000 (17:21 +0000)]
Fix coverity CID 855: remove an unused variable

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36559 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoDon't assign to a proto_item * if the value won't be used: Coverity 1036;
wmeier [Mon, 11 Apr 2011 15:17:22 +0000 (15:17 +0000)]
Don't assign to a proto_item * if the value won't be used: Coverity 1036;
Fix what appears to be a use of an incorrect tree: Coverity 1037;
- Remove uneeded #includes & re-order #includes;
- Do indentation and whitespace cleanup (e.g., "4 space tabs").

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36558 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoDon't assign to a proto_item * if the value won't be used: Coverity 912 & 913.
wmeier [Mon, 11 Apr 2011 14:45:54 +0000 (14:45 +0000)]
Don't assign to a proto_item * if the value won't be used: Coverity 912 & 913.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36557 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoDon't assign to a variable if the value won't be used: Coverity 964 & 965;
wmeier [Mon, 11 Apr 2011 14:41:14 +0000 (14:41 +0000)]
Don't assign to a variable if the value won't be used: Coverity 964 & 965;
- Move proto_register...() & proto_reg_handoff...() to the end of the file;
- Remove some unneeded #includes;
- Do some indentation and whitespace cleanup (e.g., "4-space tabs").

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36556 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoDon't assign to a proto_item * if the value won't be used: Coverity 928-932;
wmeier [Mon, 11 Apr 2011 14:28:18 +0000 (14:28 +0000)]
Don't assign to a proto_item * if the value won't be used: Coverity 928-932;
Also: remove some unneeded #includes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36555 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd proto_field_is_referenced. Fixes bug 5816.
cmaynard [Mon, 11 Apr 2011 13:44:31 +0000 (13:44 +0000)]
Add proto_field_is_referenced.  Fixes bug 5816.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36554 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUse g_strlcpy() instead of prohibited strncpy() to guarantee NULL-termination.
cmaynard [Mon, 11 Apr 2011 13:38:32 +0000 (13:38 +0000)]
Use g_strlcpy() instead of prohibited strncpy() to guarantee NULL-termination.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36553 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoBack out Jeff Morris's change to make the autostop file size 64-bit - it
guy [Mon, 11 Apr 2011 01:30:36 +0000 (01:30 +0000)]
Back out Jeff Morris's change to make the autostop file size 64-bit - it
didn't change the GUI code for setting the autostop file size, and that
broke the build.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36552 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoJeff Morris's change to make the autostop file size 64-bit. Fixes bug
guy [Mon, 11 Apr 2011 00:01:08 +0000 (00:01 +0000)]
Jeff Morris's change to make the autostop file size 64-bit.  Fixes bug

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36551 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoWe have to define ws_statb64 before declaring routines that use it.
guy [Sun, 10 Apr 2011 23:51:34 +0000 (23:51 +0000)]
We have to define ws_statb64 before declaring routines that use it.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36550 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoTo fill in a ws_statb64, you must use ws_fstat64.
guy [Sun, 10 Apr 2011 22:04:14 +0000 (22:04 +0000)]
To fill in a ws_statb64, you must use ws_fstat64.

Declare ws_stdio_stat64, as that's its new name.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36549 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agows_stdio_stat got renamed to ws_stdio_stat64.
guy [Sun, 10 Apr 2011 21:36:05 +0000 (21:36 +0000)]
ws_stdio_stat got renamed to ws_stdio_stat64.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36548 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRename ws_stat to ws_stat64, and make it take a pointer to a ws_statb64
guy [Sun, 10 Apr 2011 20:59:10 +0000 (20:59 +0000)]
Rename ws_stat to ws_stat64, and make it take a pointer to a ws_statb64
as an argument, along the lines of ws_fstat64, and, on Windows, make it
use _wstati64, to handle 64-bit file sizes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36547 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoDefine ws_statb64 as struct stat *within* the "not Windows" block.
guy [Sun, 10 Apr 2011 20:51:58 +0000 (20:51 +0000)]
Define ws_statb64 as struct stat *within* the "not Windows" block.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36546 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoDefine ws_statb64 to be the appropriate "struct XXX" for a
guy [Sun, 10 Apr 2011 19:56:06 +0000 (19:56 +0000)]
Define ws_statb64 to be the appropriate "struct XXX" for a
64-bit-file-size-capable stat call, and use it for ws_fstat64().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36545 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd ws_fstat64(), defined to be fstat on UN*X and _fstati64 on Windows.
guy [Sun, 10 Apr 2011 18:55:06 +0000 (18:55 +0000)]
Add ws_fstat64(), defined to be fstat on UN*X and _fstati64 on Windows.

Use it in some places where we're getting the file size.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36544 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agostrcpy -> strncpy.
stig [Sun, 10 Apr 2011 18:29:56 +0000 (18:29 +0000)]
strcpy -> strncpy.

Coverity 669.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36543 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUse AC_SYS_LARGEFILE to turn on large file support on platforms that
guy [Sun, 10 Apr 2011 18:22:47 +0000 (18:22 +0000)]
Use AC_SYS_LARGEFILE to turn on large file support on platforms that
support it.

Rename ws_lseek to ws_lseek64, as it should be given a 64-bit offset,
and have it use _lseeki64 on Windows, to try to get 64-bit offset
support; AC_SYS_LARGEFILE should cause lseek() to support 64-bit offsets
on UN*X if possible.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36542 f5534014-38df-0310-8fa8-9805f1628bb7

8 years ago1.5.1 → 1.5.2. Reenable Babel.
gerald [Sun, 10 Apr 2011 17:03:43 +0000 (17:03 +0000)]
1.5.1 → 1.5.2. Reenable Babel.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36540 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoPoint to RFC 1952 as a description of the gzip file format.
guy [Sun, 10 Apr 2011 17:01:13 +0000 (17:01 +0000)]
Point to RFC 1952 as a description of the gzip file format.

Point to pages for some other compressed file formats we might want to

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36539 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMove the definition of the structure pointed to by a FILE_T into
guy [Sun, 10 Apr 2011 16:53:32 +0000 (16:53 +0000)]
Move the definition of the structure pointed to by a FILE_T into
wiretap/file_wrappers.c; nothing outside of file_wrappers.c needs to
know what it looks like, it just passes around pointers to it.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36538 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoBuild 1.5.1. Temporarily disable the Babel dissector.
gerald [Sun, 10 Apr 2011 16:42:10 +0000 (16:42 +0000)]
Build 1.5.1. Temporarily disable the Babel dissector.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36537 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMinor whitespace fix.
gerald [Sun, 10 Apr 2011 16:40:29 +0000 (16:40 +0000)]
Minor whitespace fix.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36536 f5534014-38df-0310-8fa8-9805f1628bb7

8 years ago[Automatic manuf, services and enterprise-numbers update for 2011-04-10]
gerald [Sun, 10 Apr 2011 15:03:48 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-04-10]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36534 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoprefs_register_protocol() not needed since no prefs; Coverity #1185 (UNUSED_VALUE).
wmeier [Sun, 10 Apr 2011 15:01:18 +0000 (15:01 +0000)]
prefs_register_protocol() not needed since no prefs; Coverity #1185 (UNUSED_VALUE).
Also: #include <stdio.h> not needed.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36533 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Jakub Zawadzki via bug 5809:
stig [Sat, 9 Apr 2011 19:03:04 +0000 (19:03 +0000)]
From Jakub Zawadzki via bug 5809:
Compare frame number when columns are equal.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36532 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoDo some whitespace cleanup.
wmeier [Sat, 9 Apr 2011 17:18:52 +0000 (17:18 +0000)]
Do some whitespace cleanup.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36531 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoDon't assign to a proto_item * if the value won't be used: Coverity 911;
wmeier [Sat, 9 Apr 2011 17:17:47 +0000 (17:17 +0000)]
Don't assign to a proto_item * if the value won't be used: Coverity 911;
Fix bug wherein an item was apparently added to the wrong subtree: Coverity 910;
Remove unneeded #includes;
Do whitespace and indentation cleanup.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36530 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoDon't assign to a proto_item * if the value won't be used: Coverity 923-927;
wmeier [Sat, 9 Apr 2011 17:11:13 +0000 (17:11 +0000)]
Don't assign to a proto_item * if the value won't be used: Coverity 923-927;
Add braces around around certain code sections for indentation purposes;
Do some indentation & whitespace cleanup.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36529 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoDon't assign to a proto_item * if the value won't be used: Coverity 891 & 892;
wmeier [Sat, 9 Apr 2011 13:44:00 +0000 (13:44 +0000)]
Don't assign to a proto_item * if the value won't be used: Coverity 891 & 892;
Also: #include <stdlib.h> & <string.h> not req'd;  fix some indentation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36528 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoIn packet_list_dissect_and_cache_record(), set the columns to
guy [Sat, 9 Apr 2011 04:33:26 +0000 (04:33 +0000)]
In packet_list_dissect_and_cache_record(), set the columns to
*something* if we get an error reading the packet from the capture file,
rather than leaving them as null (which will cause a crash).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36527 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix Coverity CID 557.
gerald [Fri, 8 Apr 2011 21:21:32 +0000 (21:21 +0000)]
Fix Coverity CID 557.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36526 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoDon't assign to a proto_item * if the value won't be used: Coverity 990;
wmeier [Fri, 8 Apr 2011 20:06:56 +0000 (20:06 +0000)]
Don't assign to a proto_item * if the value won't be used: Coverity 990;
Add some missing code: improves display of "main_opcode" field: Coverity 991, 993 & 994;
Fix bug introduced a while back: "changeinfo4" field details aren't displayed: Coverity 992;
Add missing code so READDIR (V4) details  are shown in a subtree (as presumably was originally intended);
Fix some indentation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36525 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Pascal Quantin:
etxrab [Fri, 8 Apr 2011 19:54:07 +0000 (19:54 +0000)]
From Pascal Quantin:
A patch adding the missing hunks (it looks like extract_asn1_from_spec.pl script is mixing Windows and Linux line endings).

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36524 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoEnhance Vendor Specific Atheros IE
alagoutte [Fri, 8 Apr 2011 19:52:04 +0000 (19:52 +0000)]
Enhance Vendor Specific Atheros IE

* Replace proto_tree_add_ether/boolean by proto_tree_add_item
* use BASE_CUSTOM for XR beacon interval
* use ENC_* macro for encoding
* replace if(...) by switch(...) for type and subtype (more extensible if new (sub)type)
* add expert info when tag_len is incorrect

Fix also a minor issue with tag_end...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36523 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd a relative path to the "#line" directives we produce. Regenerate the
gerald [Fri, 8 Apr 2011 19:51:39 +0000 (19:51 +0000)]
Add a relative path to the "#line" directives we produce. Regenerate the
SNMP and SPNEGO dissectors to see if it helps Coverity locate the
original source files.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36522 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoJust make the fh member of a wtap_dumper_t a void * for now, and, in all
guy [Fri, 8 Apr 2011 17:42:20 +0000 (17:42 +0000)]
Just make the fh member of a wtap_dumper_t a void * for now, and, in all
calls that use it, cast it to whatever it's supposed to be.  Making it a
gzFile means you can't use any stdio macros that reach inside the
structure; making it a FILE *, as it used to be, amounts to trying to
use a FILE * as a void * if we're writing a compressed file out.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36521 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Pascal Quantin:
etxrab [Fri, 8 Apr 2011 17:36:53 +0000 (17:36 +0000)]
From Pascal Quantin:
Upgrade LTE RRC ASN.1 description to V9.6.0


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36520 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd Babel.
gerald [Fri, 8 Apr 2011 17:05:05 +0000 (17:05 +0000)]
Add Babel.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36519 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Juliusz Chroboczek via bug #5812: Dissector for the Babel Routing
sfisher [Fri, 8 Apr 2011 16:53:02 +0000 (16:53 +0000)]
From Juliusz Chroboczek via bug #5812: Dissector for the Babel Routing
Protocol (RFC 6126)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36518 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMake wtap plugins build on windows again.
etxrab [Fri, 8 Apr 2011 15:57:44 +0000 (15:57 +0000)]
Make wtap plugins build on windows again.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36517 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUse tvb_get_ephemeral_string()
etxrab [Fri, 8 Apr 2011 11:58:33 +0000 (11:58 +0000)]
Use tvb_get_ephemeral_string()
prefix hf vars with hf_sip

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36516 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoChange ng_file_read() to take only one size argument - and make it an
guy [Fri, 8 Apr 2011 01:57:02 +0000 (01:57 +0000)]
Change ng_file_read() to take only one size argument - and make it an
unsigned int - to match file_read().  Shrink some arguments, variables,
and structure members appropriately.

Fix an incorrect sizeof - sizeof a pointer is the size of the pointer,
not the size of what it points to.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36515 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoTo squelch some compiler warnings, temporarily cast the argument to
guy [Fri, 8 Apr 2011 01:55:25 +0000 (01:55 +0000)]
To squelch some compiler warnings, temporarily cast the argument to
ws_lseek() to the appropriate type for the second argument to _lseek()
for Windows or lseek() for UN*X; ultimately, we want to call the
appropriate 64-bit-offset seek routine if available, otherwise cast the
value down and hand it to the 32-bit-offset seek routine.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36514 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Jakub Zawadzki:
guy [Fri, 8 Apr 2011 00:28:37 +0000 (00:28 +0000)]
From Jakub Zawadzki:

Steal file_wrappers functions from zlib v2.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36513 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUse a unique variable name. Fixes Coverity CID 593.
gerald [Thu, 7 Apr 2011 23:52:37 +0000 (23:52 +0000)]
Use a unique variable name. Fixes Coverity CID 593.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36512 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoBe more picky about our sscanf integer field widths. Hopefully this will
gerald [Thu, 7 Apr 2011 23:16:05 +0000 (23:16 +0000)]
Be more picky about our sscanf integer field widths. Hopefully this will
help squelch Coverity CIDs 701-709.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36511 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Jakub Zawadzki:
guy [Thu, 7 Apr 2011 21:53:31 +0000 (21:53 +0000)]
From Jakub Zawadzki:

Introduce file_clearerr

I'm unsure of this patch,

gzclearerr() is used to clear the end-of-file mark, but for FILE
there's function which do the same (clearerr).

I created test program if clearerr() is needed for tailing file.
and it seems to work without it (at least on Linux, so for
!HAVE_LIBZ I commented it out).

For now this patch introduce file_clearerr macro, and define it
only when EOF marking must be cleared (i.e.  when HAVE_LIBZ and
HAVE_GZCLEARERR are defined).

So everything works like before, patch just to keep same prefix
for file interface :)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36510 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMake it possible to have a sub dissector dissect the status line diagnostic string...
etxrab [Thu, 7 Apr 2011 21:39:49 +0000 (21:39 +0000)]
Make it possible to have a sub dissector dissect the status line diagnostic string should it contain more than a string.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36509 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoDisplay frame numbers containing min & max SRT's. Other misc. display tweaks.
cmaynard [Thu, 7 Apr 2011 20:41:11 +0000 (20:41 +0000)]
Display frame numbers containing min & max SRT's.  Other misc. display tweaks.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36508 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Gisle Vanem: text_import_scanner_lex.h is no longer used.
morriss [Thu, 7 Apr 2011 20:04:01 +0000 (20:04 +0000)]
From Gisle Vanem: text_import_scanner_lex.h is no longer used.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36507 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoEnhance Tag Measurement Request & Report
alagoutte [Thu, 7 Apr 2011 16:16:47 +0000 (16:16 +0000)]
Enhance Tag Measurement Request & Report

* Replace proto_tree_add_uint*/boolean/text by proto_tree_add_item
* use ENC_* macro for encoding
* ...

My first commit !

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36506 f5534014-38df-0310-8fa8-9805f1628bb7

8 years ago(Trivial) Fix a typo & some indentation.
wmeier [Thu, 7 Apr 2011 14:07:54 +0000 (14:07 +0000)]
(Trivial) Fix a typo & some indentation.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36505 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUntil the minimum glib version requirement is changed from 2.4 to at least 2.8,
cmaynard [Thu, 7 Apr 2011 13:41:25 +0000 (13:41 +0000)]
Until the minimum glib version requirement is changed from 2.4 to at least 2.8,
use g_try_malloc() instead of g_try_malloc0().  This should make the Solaris
buildbot happy again.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36504 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix Coverity 1181: REVERSE_INULL & improve code:
sfisher [Wed, 6 Apr 2011 22:51:25 +0000 (22:51 +0000)]
Fix Coverity 1181: REVERSE_INULL & improve code:

 - Use g_try_malloc0() instead of g_malloc0() since the latter will
   fail and abort the program.  Leave the NULL return check.
 - Don't dereference pointer before checking that it's valid.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36503 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoEnhancement bug #5796: Add Atheros vendor specific 802.11 IE parsing
sfisher [Wed, 6 Apr 2011 19:57:39 +0000 (19:57 +0000)]
Enhancement bug #5796: Add Atheros vendor specific 802.11 IE parsing

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36502 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd computation of median and change standard deviation calculation to "sample"
cmaynard [Wed, 6 Apr 2011 19:48:11 +0000 (19:48 +0000)]
Add computation of median and change standard deviation calculation to "sample"
standard deviation.  Split statistics output onto 2 lines.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36501 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoEither remove or use unused values found by Coverity. Fixes CIDs
gerald [Wed, 6 Apr 2011 18:59:36 +0000 (18:59 +0000)]
Either remove or use unused values found by Coverity. Fixes CIDs

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36500 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd RoHC to the ethertypes.
etxrab [Wed, 6 Apr 2011 18:48:07 +0000 (18:48 +0000)]
Add RoHC to the ethertypes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36499 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Peter via bug #5798: Don't try to run svnversion if it isn't
sfisher [Wed, 6 Apr 2011 16:34:45 +0000 (16:34 +0000)]
From Peter via bug #5798: Don't try to run svnversion if it isn't

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36498 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Johan Wåhl:
etxrab [Wed, 6 Apr 2011 15:01:42 +0000 (15:01 +0000)]
From Johan Wåhl:
Add dissection of feature list flags.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36497 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUse the correct handle when registering "media_type" "application/vnd.3gpp2.sms"...
wmeier [Wed, 6 Apr 2011 12:19:38 +0000 (12:19 +0000)]
Use the correct handle when registering "media_type" "application/vnd.3gpp2.sms": Coverity 835.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36496 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFixed blurb for BER Error.
stig [Wed, 6 Apr 2011 09:59:21 +0000 (09:59 +0000)]
Fixed blurb for BER Error.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36495 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMade "BER Error" filterable.
stig [Wed, 6 Apr 2011 08:52:42 +0000 (08:52 +0000)]
Made "BER Error" filterable.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36494 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Jakub Zawadzki:
guy [Wed, 6 Apr 2011 07:09:56 +0000 (07:09 +0000)]
From Jakub Zawadzki:

file-wrappers.[ch] is used only for reading files, and mode is always

Attached patch removes 'mode' argument from file_open() & filed_open().

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36493 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Jakub Zawadzki: fix the type of an argument.
guy [Wed, 6 Apr 2011 06:59:19 +0000 (06:59 +0000)]
From Jakub Zawadzki: fix the type of an argument.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36492 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFrom Jakub Zawadzki:
guy [Wed, 6 Apr 2011 06:51:19 +0000 (06:51 +0000)]
From Jakub Zawadzki:

file_read(buf, bsize, count, file) macro is compilant with fread
function and takes elements count+ size of each element, however to make
it compilant with gzread() it always returns number of bytes.

In wiretap file_read() this is not really used, file_read is called
either with bsize set to 1 or count to 1.

Attached patch remove bsize argument from macro.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36491 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd a comment
etxrab [Wed, 6 Apr 2011 06:24:19 +0000 (06:24 +0000)]
Add a comment

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36490 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRFC5806 Diversion header
kukosa [Wed, 6 Apr 2011 06:20:50 +0000 (06:20 +0000)]
RFC5806 Diversion header

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36489 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMissing decoding for CalledPartyBCD number in CAMEL
etxrab [Wed, 6 Apr 2011 06:20:32 +0000 (06:20 +0000)]
Missing decoding for CalledPartyBCD number in CAMEL

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36488 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoIMHO capinfos, when finished processing, should exit with an error status
wmeier [Wed, 6 Apr 2011 01:41:03 +0000 (01:41 +0000)]
IMHO capinfos, when finished processing, should exit with an error status
 if an error occurred while processing.
E.G.,: For the default (no -C option):
  'capinfos invalid.xxx' or 'capinfos a.pcap invalid.xxx c.pcap'
 should exit with an error status
  (after processing all the input args) if there is an error for invalid.xxx.

With this fix, I expect fuzz-test.sh (and list_protos_in_cap.sh
and presumably other scripts) will work a bit more as as expected.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36487 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix Coverity 1062: UNUSED_VALUE
sfisher [Wed, 6 Apr 2011 00:07:52 +0000 (00:07 +0000)]
Fix Coverity 1062: UNUSED_VALUE

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36486 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoSet the correct properties ....
wmeier [Tue, 5 Apr 2011 23:26:56 +0000 (23:26 +0000)]
Set the correct properties ....

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36485 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoSet the correct properties ...
wmeier [Tue, 5 Apr 2011 23:03:21 +0000 (23:03 +0000)]
Set the correct properties ...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36484 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoUse the latest library tag, which updates GNUTLS. Add code to check for
gerald [Tue, 5 Apr 2011 22:38:12 +0000 (22:38 +0000)]
Use the latest library tag, which updates GNUTLS. Add code to check for
libintl-8.dll and add the GNUTLS version if needed.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36483 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMore manifest fixes.
gerald [Tue, 5 Apr 2011 22:33:37 +0000 (22:33 +0000)]
More manifest fixes.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36482 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoMark pinfo as unused with _U_ to avoid compiler warning.
cmaynard [Tue, 5 Apr 2011 20:50:49 +0000 (20:50 +0000)]
Mark pinfo as unused with _U_ to avoid compiler warning.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36481 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoAdd ICMP tap support, and add a tshark tap to measure such things as:
cmaynard [Tue, 5 Apr 2011 20:21:59 +0000 (20:21 +0000)]
Add ICMP tap support, and add a tshark tap to measure such things as:
  * Number of ICMP echo requests, replies, lost replies and percent loss.
  * Min, Max, Average SRT (Service Response Time), and standard deviation.
(This is my first tap, so hopefully I didn't miss something, but we'll see ...)
TODO: Add a Wireshark tap.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36480 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agofoo="\windows\style\pathname"; printf "$foo" isn't going to work too well in the...
wmeier [Tue, 5 Apr 2011 19:21:16 +0000 (19:21 +0000)]
foo="\windows\style\pathname"; printf "$foo"  isn't going to work too well in the general case ...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36479 f5534014-38df-0310-8fa8-9805f1628bb7

8 years ago1. Remove \r from tshark output so output OK on Windows cygwin bash.
wmeier [Tue, 5 Apr 2011 18:01:33 +0000 (18:01 +0000)]
1. Remove \r from tshark output so output OK on Windows cygwin bash.
2. Error messsages to stderr.
3. Check capinfos return value to verify that file is a valid capture file.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36478 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoFix a few more typos and reformat some of the comments.
cmaynard [Tue, 5 Apr 2011 17:27:30 +0000 (17:27 +0000)]
Fix a few more typos and reformat some of the comments.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36477 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoRemove the manifest as a prerequisite for packaging.
gerald [Tue, 5 Apr 2011 16:14:19 +0000 (16:14 +0000)]
Remove the manifest as a prerequisite for packaging.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36476 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoCompile fix: camel_obj_id -> obj_id.
stig [Tue, 5 Apr 2011 15:49:56 +0000 (15:49 +0000)]
Compile fix: camel_obj_id -> obj_id.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36475 f5534014-38df-0310-8fa8-9805f1628bb7

8 years agoActually get the oid string ...
etxrab [Tue, 5 Apr 2011 15:43:15 +0000 (15:43 +0000)]
Actually get the oid string ...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36474 f5534014-38df-0310-8fa8-9805f1628bb7