tuexen [Wed, 11 May 2011 12:51:01 +0000 (12:51 +0000)]
Fix a wrong name in a debug print statement.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37061
f5534014-38df-0310-8fa8-
9805f1628bb7
martinm [Wed, 11 May 2011 11:10:30 +0000 (11:10 +0000)]
Support multiple Scheduling Requests in one PDU.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37060
f5534014-38df-0310-8fa8-
9805f1628bb7
kukosa [Wed, 11 May 2011 07:31:18 +0000 (07:31 +0000)]
Export wtap_fstat()
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37059
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Wed, 11 May 2011 02:06:22 +0000 (02:06 +0000)]
From Michael Chen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5863 :
5. A guaranteed null pointer access violation is fixed in packet-ssl-utils.c
when DTLS succeeded in dissecting its payload.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37058
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Wed, 11 May 2011 01:39:10 +0000 (01:39 +0000)]
Use consistent casing in hf_ descriptions and expert infos.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37057
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Wed, 11 May 2011 01:11:50 +0000 (01:11 +0000)]
From Peter Paluch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5893 :
- Put back the hf_ variables removed from the last patch
- Change the verbose protocol name to the (now) official spelling "VLAN
Trunking Protocol" instead of "Virtual Trunk Protocol"
- Made the "Info" column more informative by placing the message type and
selected key information into it, instead of just the verbose protocol name
- Corrected an error in the handling of the Advert-Request message where the
Management Domain Name field was not parsed properly, resulting in wrong
parsing of the remainder of the entire Advert-Request message
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37056
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Wed, 11 May 2011 01:06:37 +0000 (01:06 +0000)]
Eliminate redundant blurbs
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37055
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 10 May 2011 21:53:10 +0000 (21:53 +0000)]
file_read() can return -1; don't just blindly add it to a previous
file_read() return value. Use wtap_file_read_expected_bytes() in a
number of places.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37054
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 10 May 2011 20:17:31 +0000 (20:17 +0000)]
file_read() can return -1; don't just blindly add it to a previous
file_read() return value. Use wtap_file_read_expected_bytes() in a
number of places.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37053
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Tue, 10 May 2011 18:52:37 +0000 (18:52 +0000)]
From Olivier Crete via bug 5761: Compute the FCI size correctly for RTCP RTPFB.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37052
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 10 May 2011 18:43:40 +0000 (18:43 +0000)]
Add missing line of code: Fixes Coverity 1042 (UNUSED);
Remove unneeded lines of code: Coverity 1043 (UNUSED).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37051
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 10 May 2011 17:44:36 +0000 (17:44 +0000)]
Remove some unneeded lines of code: Coverity 1063;
Also: remonve someunneeded #includes.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37050
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Tue, 10 May 2011 17:40:29 +0000 (17:40 +0000)]
Add support for USB CDC Ethernet. Resolves bug 4819.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37049
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Tue, 10 May 2011 17:28:46 +0000 (17:28 +0000)]
Don't assign to unused variable: Coverity 1068 & 1069.
Remove some related no longer needed code and variables;
Also: Fix a typo and reword a comment.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37048
f5534014-38df-0310-8fa8-
9805f1628bb7
tuexen [Tue, 10 May 2011 17:25:45 +0000 (17:25 +0000)]
Remove unused variable to avoid a warning which breaks the build.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37047
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Tue, 10 May 2011 17:06:20 +0000 (17:06 +0000)]
Add subversion Id and Wireshark copyright.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37046
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Tue, 10 May 2011 17:04:05 +0000 (17:04 +0000)]
Add USB/AT dissector, submitted by Tyson Key via bug 5868 with some
modifications by me as described/documented in the bug report.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37045
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Tue, 10 May 2011 16:05:14 +0000 (16:05 +0000)]
Make sure we set a variable.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37044
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Tue, 10 May 2011 16:02:54 +0000 (16:02 +0000)]
Fix two cases of dead code reported by Coverity as CID 376.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37043
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Tue, 10 May 2011 15:37:06 +0000 (15:37 +0000)]
Fix two cases of comparisons begin made against incorrect values following a
mask operation. Also, initialize g_rohc_info if pinfo->packet_data is !NULL.
Fixes Coverity ID's 1187, 1188 and 1190.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37042
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 10 May 2011 15:20:09 +0000 (15:20 +0000)]
On behalf of Ericsson update the A11 dissector.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37041
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Tue, 10 May 2011 15:13:46 +0000 (15:13 +0000)]
When closing capture file, set number of frames to 0. It fix bug #5903.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37040
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Tue, 10 May 2011 14:22:17 +0000 (14:22 +0000)]
Allow both PPP and ISO/IEC 13818-1 over USB to be dissected using heuristics.
Resolves bug 4814.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37039
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 10 May 2011 07:58:33 +0000 (07:58 +0000)]
From Sijin N K:
Missing hf declaration for cn_id.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5901
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37038
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 10 May 2011 07:23:00 +0000 (07:23 +0000)]
Fix a typo.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37037
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 10 May 2011 06:03:56 +0000 (06:03 +0000)]
Forgot to comment out UI_MANAGER
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37036
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 10 May 2011 05:31:45 +0000 (05:31 +0000)]
More GUIManager stuff.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37035
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Mon, 9 May 2011 19:29:40 +0000 (19:29 +0000)]
We probably shouldn't call pcap-ng "experimental" any more.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37033
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 9 May 2011 17:53:45 +0000 (17:53 +0000)]
Note that compressed Windows Sniffer files might have a CRC, just not
one computed the right way (as specified by RFC 1952).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37032
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Mon, 9 May 2011 12:59:57 +0000 (12:59 +0000)]
Add sl_ API to libwireshark.def
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37031
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Mon, 9 May 2011 12:52:55 +0000 (12:52 +0000)]
Convert SLAB_-s, to sl_-API.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37030
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Mon, 9 May 2011 12:49:39 +0000 (12:49 +0000)]
Comment out dead code.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37029
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Mon, 9 May 2011 09:05:35 +0000 (09:05 +0000)]
Skipp tango.xml for now...as not having it causes a warning.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37028
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Mon, 9 May 2011 08:55:35 +0000 (08:55 +0000)]
Initial commit of slab allocator (sl_* API)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37027
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 9 May 2011 08:12:26 +0000 (08:12 +0000)]
Get rid of the fd member of a wth structure; the FILE_T's in that
structure include a file descriptor. Add a wtap_fstat() for the file
readers that use file times to generate time stamps (we really need a
way to say "this file has no time stamps" or "this file has only
relative time stamps).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37026
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 9 May 2011 05:30:59 +0000 (05:30 +0000)]
From Jakub Zawadzki: for file read progress bars, use the raw offset in
the file, rather than the offset in the uncompressed data stream. That
way we don't get the "hey, we're more than 100% into the file, better
refigure this" surprise.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37025
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 9 May 2011 03:48:41 +0000 (03:48 +0000)]
If a gzipped file's name ends in .caz, don't check the CRC - it's
probably a compressed file from the Windows Sniffer, and they don't
bother setting the CRC.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37024
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 9 May 2011 02:55:31 +0000 (02:55 +0000)]
Support SMB_FIND_FILE_UNIX_INFO2.
Don't use "link destination" for file names in SMB_FIND_FILE_UNIX.
Link to the page for Microsoft's public protocol specifications and to
the Samba Wiki page for the UNIX extensions.
Fix a typo in a variable name.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37023
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Mon, 9 May 2011 02:42:58 +0000 (02:42 +0000)]
Count padding bytes against the transaction data byte count.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37022
f5534014-38df-0310-8fa8-
9805f1628bb7
rbalint [Sun, 8 May 2011 21:55:11 +0000 (21:55 +0000)]
Note that README.Debian contains the procedure of setting up capture
rights for regular users on Debian systems.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37021
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Sun, 8 May 2011 20:22:18 +0000 (20:22 +0000)]
There is no guarantee that, just because there's a UAT item for a given
LINKTYPE_USERn encapsulation with a protocol name - even if the protocol
name was valid at the time the entry was made, it might not be valid now
(e.g., if you no longer have a plugin), *and* the protocol lookup done
in the UI is case-insensitive but the lookup done later is
case-sensitive (this needs to be cleaned up somehow).
For now, just handle the case where encap->payload_proto is NULL.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37020
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Sun, 8 May 2011 15:03:55 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-05-08]
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37017
f5534014-38df-0310-8fa8-
9805f1628bb7
rbalint [Sun, 8 May 2011 10:56:23 +0000 (10:56 +0000)]
If no interface is found for capturing show this information
and direct user to Capture Help instead of showing the empty list of
interfaces and capture options.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37016
f5534014-38df-0310-8fa8-
9805f1628bb7
alagoutte [Sun, 8 May 2011 10:23:53 +0000 (10:23 +0000)]
Add FT_EUI64 Field Type
* Remove proto_tree_add_eui64 function from 802.15.4 Dissector
* Replace print_eui64/print_eui64 by eui64_to_str/get_eui64_name
* Update Documentation (README.dev)
* Add new function in libwireshark.def
* Support of encoding for tvb_eui64_to_str
* Use FT_EUI64 for ICMPv6, CAPWAP, Zbee ... dissector
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37015
f5534014-38df-0310-8fa8-
9805f1628bb7
jake [Sat, 7 May 2011 14:50:36 +0000 (14:50 +0000)]
From Jens Osterkamp:
The following patch adds some code to decode the EVB TLV being standardized in
the upcoming IEEE 802.1Qbg draft 0.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37014
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Fri, 6 May 2011 20:45:34 +0000 (20:45 +0000)]
Move fpinf dereference after NULL check.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37012
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Fri, 6 May 2011 19:39:47 +0000 (19:39 +0000)]
Huzaifa Sidhpurwala of Red Hat Security Response Team discovered that we
could dereferene a NULL pointer if we had a corrupted Diameter
dictionary.
Additionally, it was possible to push an invalid input buffer onto the
include stack.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37011
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Fri, 6 May 2011 15:05:51 +0000 (15:05 +0000)]
From Tamás Regõs:
Make it possible to load Tango AVP:s if you have them.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37010
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Fri, 6 May 2011 12:28:11 +0000 (12:28 +0000)]
VALS(& -> VALS(
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37009
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Fri, 6 May 2011 11:39:11 +0000 (11:39 +0000)]
Add note about ::/96 being deprecated.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37008
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Fri, 6 May 2011 03:59:44 +0000 (03:59 +0000)]
Use strtoul() rather than sscanf to parse octal and hex numbers in
escape sequences; sscanf is a bit heavyweight, and using strtoul() also
squelches some "return value ignored" warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37007
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 6 May 2011 01:54:07 +0000 (01:54 +0000)]
Prefix the message class names with RELOAD_ to prevent collisions.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37006
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 6 May 2011 01:47:16 +0000 (01:47 +0000)]
From Ed Day via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5890 :
ASN.1 files in trunk/asn1/qsig contain syntax errors that prevent them from
being compiled by a standard ASN.1 compiler. A patch of modified files is
attached along with General-Error-List.asn which was missing completely.
From me: add the new asn file to the list of source files. Add SVN Id tag to
the new file.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37005
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 6 May 2011 01:27:54 +0000 (01:27 +0000)]
From Peter Paluch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5893 :
Add support for VTP Join messages.
From me: rather than add the first and last VLANs with separate hf_ variables
and the masked ones with proto_tree_add_text(), use one hf_ variable for all the
VLAN IDs.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37004
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 6 May 2011 01:09:04 +0000 (01:09 +0000)]
From Marc Petit-Huguenin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5894 :
- Use "RELOAD" everywhere.
- Fix invalid variable name "reload_framing.probe_information.type".
- Fix various names to match the spec.
- Dissect the X.509 certificate embedded in RELOAD messages.
- Use tls_signature_algorithm and tls_hash_algorithm tables in
packet-ssl-utils.
From me: take out the tabs. Keep the long dissector name when registering the
protocols.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37003
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Thu, 5 May 2011 21:41:51 +0000 (21:41 +0000)]
Forgot to remove my editor's tabs before committing...
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37002
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Thu, 5 May 2011 21:15:33 +0000 (21:15 +0000)]
Fix false positive compiler warnings:
address_to_str.c:157: warning: 'cur.len' may be used uninitialized in this function
address_to_str.c:157: warning: 'best.len' may be used uninitialized in this function
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37001
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Thu, 5 May 2011 20:48:21 +0000 (20:48 +0000)]
Introduce ip6_to_str_buf_len (little cleaner version of inet_ntop6 from wsutil/inet_ntop.c)
and use it instead of inet_ntop(AF_INET6, ...)
- Add MAX_IP6_STR_LEN define.
- use MAX_IP6_STR_LEN as a buffer size when ip6_to_str_buf() is used.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37000
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Thu, 5 May 2011 20:46:02 +0000 (20:46 +0000)]
Apply rev 14059 to non-Windows: update the display with new packets every 500
msec (instead of every 1000msec).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36999
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Thu, 5 May 2011 16:41:52 +0000 (16:41 +0000)]
Subtract (not add!) preamble length from remaining buffer length.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36998
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Thu, 5 May 2011 14:20:22 +0000 (14:20 +0000)]
Fix decoding of CP56Time2a timestamp. Resolves bug 5889.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36997
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Thu, 5 May 2011 06:55:12 +0000 (06:55 +0000)]
Cleanup: replace se_alloc+memcpy combo with single se_memdup().
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36996
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Thu, 5 May 2011 05:23:05 +0000 (05:23 +0000)]
More GUIManager stuff.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36995
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 5 May 2011 01:08:17 +0000 (01:08 +0000)]
packet-xtp.h used only in packet-xtp.c; Move packet-xtp.h contents to packet-xtp.c
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36994
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 5 May 2011 00:48:54 +0000 (00:48 +0000)]
Don't assign to unused variable: Coverity 1132 [UNUSED].
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36993
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 5 May 2011 00:31:54 +0000 (00:31 +0000)]
Fix two cases of assignment to unused variables: Coverity 1030 & 1031 [UNUSED];
Also: #include <stdio.h> not req'd.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36992
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Thu, 5 May 2011 00:15:59 +0000 (00:15 +0000)]
Fix two unused variable assignments: Coverity 1140.
Also: fix some indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36991
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 4 May 2011 23:56:29 +0000 (23:56 +0000)]
Fix 3 memory leaks: unused g_malloc(): Coverity 1148-1150 [UNUSED];
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36990
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Wed, 4 May 2011 22:48:51 +0000 (22:48 +0000)]
Fix Coverity 1191: DEADCODE;
Use consistent indentation.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36989
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Wed, 4 May 2011 21:19:04 +0000 (21:19 +0000)]
Cleanup: g_malloc can't return NULL, remove checks for them.
XXX, should this code use g_try_malloc instead?
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36988
f5534014-38df-0310-8fa8-
9805f1628bb7
sfisher [Wed, 4 May 2011 19:42:51 +0000 (19:42 +0000)]
From Nick Glass via bug #5887: DACP (apple remote) enhancement to DAAP
dissector.
Me: Add Nick to AUTHORS file.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36987
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Wed, 4 May 2011 19:32:35 +0000 (19:32 +0000)]
Cleanup: replace sizeof(arr)/sizeof(arr[0]) with shorter array_length(arr)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36986
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 4 May 2011 19:02:42 +0000 (19:02 +0000)]
More GUIManager stuff.
Note Use GUI manager needs to be set in gui_stet_menu.h too,
to use it.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36985
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Wed, 4 May 2011 17:24:48 +0000 (17:24 +0000)]
From Pascal Quantin:
Add an expert check for the MS Classmark 2 decoding in UE EUTRA Capability message and a few missing message type display in the column text.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36984
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Wed, 4 May 2011 15:24:14 +0000 (15:24 +0000)]
Once we start printing an "opened up" (tshark -O) tree, print the entire
subtree. Otherwise subitems whose abbreviation doesn't match the protocol name
(such as text items) won't get printed.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36983
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 3 May 2011 22:09:18 +0000 (22:09 +0000)]
More GUIManager stuff.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36982
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 3 May 2011 20:23:57 +0000 (20:23 +0000)]
More GUIManager stuff.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36981
f5534014-38df-0310-8fa8-
9805f1628bb7
darkjames [Tue, 3 May 2011 18:27:08 +0000 (18:27 +0000)]
Packet editor:
- support for FT_IPv4
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36980
f5534014-38df-0310-8fa8-
9805f1628bb7
sfisher [Tue, 3 May 2011 17:38:26 +0000 (17:38 +0000)]
From Jose Pico via bug #5884: Corrected export_object smb segmentation
fault
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36979
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 3 May 2011 16:51:08 +0000 (16:51 +0000)]
Do some prep work on GUIManager code, if you enable it it will break as the menus.c changes are not commited.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36978
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Tue, 3 May 2011 16:45:37 +0000 (16:45 +0000)]
Do some prep work on GUIManager code, if you enable it it will break as the menus.c changes are not commited.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36977
f5534014-38df-0310-8fa8-
9805f1628bb7
cmaynard [Tue, 3 May 2011 15:38:22 +0000 (15:38 +0000)]
Wrap text of description for -O.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36976
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 3 May 2011 09:14:56 +0000 (09:14 +0000)]
Note what NetMon 3 actually uses various types for.
For the ones that are used for raw IP, use WTAP_ENCAP_RAW_IP. (Yes,
NetMon checks for v4 vs. v6 for all of them.)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36975
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 3 May 2011 08:49:41 +0000 (08:49 +0000)]
Set the pseudo-header regardless of whether we have a trailer or not.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36974
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 3 May 2011 08:22:25 +0000 (08:22 +0000)]
It appears that, in NetMon 802.11 captures, management frames have an
FCS and data frames don't have an FCS; I don't know about control
frames.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36973
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 3 May 2011 05:50:30 +0000 (05:50 +0000)]
Squelch a compiler warning - but note, in a comment, a real problem the
warning points out.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36972
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 3 May 2011 05:28:39 +0000 (05:28 +0000)]
Fix indentation (tab stops are not guaranteed to be every 4 spaces).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36971
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 3 May 2011 05:26:10 +0000 (05:26 +0000)]
From Tom Brezinski - fix for bug 5869:
This patch incorporates the following fixes from the patch attached to
bug 5671 with changes as noted below:
1.) Files where the packet header and packet data are noncontiguous are
handled improperly, resulting in read misalignment and ultimately the
error message, "Observer: bad record: Invalid magic number 0xXXXXXXXX."
This bug is caused by not obeying the packet_entry_header.offset_to_frame
field.
2.) Daylight savings time is not properly accounted for in files using
local time encoding.
3.) As of Observer/GigaStor v13.10 (bug 5671 incorrectly stated v14),
timestamps in the file format changed from local time encoding to GMT
encoding. Wiretap has been changed to support reading both formats.
Patch submitted with bug 5671 added a separate file type to allow
writing local format. This patch does not add the separate file type
and always writes GMT.
4.) The wtap_dumper.bytes_dumped field is not being properly incremented
as data is written to files.
This patch also incorporates the following additional enhancements /
fixes not in bug 5671:
1.) Support for reading BFR files which contain Fibre Channel captures.
Test file Fibre_Channel_Capture.bfr attached.
2.) Support for modified file header used in upcoming v15. New header
file format takes an unused byte from the version string to allow for a
larger offset to the first packet to be specified. Test file
V15_Lrg_Hdr_Test.bfr is attached, it is also a fuzz test as the number
of TLV items given in the header is less then the actual.
3.) It was found that if the number of TLV items given in the header was
larger then present it would fail to open the file. Test file
V9_Num_TLVs_Too_Big.bfr is attached.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36970
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 3 May 2011 04:48:02 +0000 (04:48 +0000)]
Don't bother checking for gzgets(), as we don't use it, and don't even
need to use its presence in zlib as a proxy for "not the crufty old zlib
that comes with some versions of X11".
Do, however, check for inflatePrime() there, instead, just in case the
crufty old zlib that comes with some versions of X11 lack it; this is to
prevent the configure script from assuming a shiny new zlib by testing
with a non-X11 program, causing the build to fail when you build
Wireshark.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36969
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 3 May 2011 02:03:25 +0000 (02:03 +0000)]
One bit suffices for the "columnized" and "colorized" flags in the
packet list store, and there's one PacketListRecord for every packet, so
that can save some space...
...especially if we move them after all the pointers, rather than before
the pointers, so they don't collectively take up 8 bytes on an LP64 or
LLP64 platform due to pointers having to be 8-byte aligned.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36968
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 3 May 2011 01:19:55 +0000 (01:19 +0000)]
TShark doesn't need column text attached to each frame; move col_text
and col_text_len from the frame_data structure to the PacketRecord
structure.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36967
f5534014-38df-0310-8fa8-
9805f1628bb7
guy [Tue, 3 May 2011 00:22:35 +0000 (00:22 +0000)]
Fix a comment.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36966
f5534014-38df-0310-8fa8-
9805f1628bb7
sfisher [Mon, 2 May 2011 16:40:19 +0000 (16:40 +0000)]
From Peter Paluch via bug #5877: EIGRP dissector enhancement for RS/EOT
flags
Me: Add Peter to AUTHORS file.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36965
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Mon, 2 May 2011 14:27:48 +0000 (14:27 +0000)]
Fix the (fuzzed) memory allocation failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5880 :
Don't attempt to reassemble a message if the length of the fragment is negative.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36964
f5534014-38df-0310-8fa8-
9805f1628bb7
stig [Mon, 2 May 2011 14:06:33 +0000 (14:06 +0000)]
Support content-type x-gzip and x-deflate, as described in RFC2616 as
equivalent to gzip and deflate.
This fixes bug 5882.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36963
f5534014-38df-0310-8fa8-
9805f1628bb7
wmeier [Mon, 2 May 2011 02:06:52 +0000 (02:06 +0000)]
For "per packet" file encapsulation, display a list of the encapsulations seen ("long form" report).
Example:
File type: Microsoft NetMon 2.x
File encapsulation: Per packet
IEEE 802.11 plus Network Monitor radio header
ToDo: For the tabular form report display the list of per-packet encapsulations seen.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36962
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Sun, 1 May 2011 15:03:48 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-05-01]
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36959
f5534014-38df-0310-8fa8-
9805f1628bb7
gerald [Sat, 30 Apr 2011 17:43:05 +0000 (17:43 +0000)]
Check our PDU length. Fixes the infinite loop found in bug 5876.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36958
f5534014-38df-0310-8fa8-
9805f1628bb7
etxrab [Sat, 30 Apr 2011 08:36:00 +0000 (08:36 +0000)]
Use correct signature on callbacks.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36957
f5534014-38df-0310-8fa8-
9805f1628bb7
morriss [Fri, 29 Apr 2011 18:30:16 +0000 (18:30 +0000)]
Oops, the Windows HAVE_GZCLEARERR stuff did work; take out the rest.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36956
f5534014-38df-0310-8fa8-
9805f1628bb7