obnox/wireshark/wip.git
7 years agoAdd Gaurav Tungatkar.
cmaynard [Fri, 30 Dec 2011 19:19:19 +0000 (19:19 +0000)]
Add Gaurav Tungatkar.

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

7 years agoFix formatting issues.
stig [Fri, 30 Dec 2011 15:49:02 +0000 (15:49 +0000)]
Fix formatting issues.

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

7 years agoFix 'encoding-arg' for ptvcursor_add_with_subtree(): TRUE=>ENC_LITTLE_ENDIAN, etc
wmeier [Fri, 30 Dec 2011 15:30:32 +0000 (15:30 +0000)]
Fix 'encoding-arg' for ptvcursor_add_with_subtree(): TRUE=>ENC_LITTLE_ENDIAN, etc

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

7 years agoRegenerated packet-h245.c (should have been included in SVN #40311: add_new_data_sour...
wmeier [Fri, 30 Dec 2011 15:28:04 +0000 (15:28 +0000)]
Regenerated packet-h245.c (should have been included in SVN #40311: add_new_data_source() needed in several places).

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

7 years agoFrom Fred Fierling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6698
alagoutte [Fri, 30 Dec 2011 11:07:04 +0000 (11:07 +0000)]
From Fred Fierling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6698
Updates for newest profile identifier database, ZigBee 053298r19

Corrects error in Samsung manufacturer code in r18.

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

7 years agoWe don't have any links to activate if we don't have pcap.
guy [Fri, 30 Dec 2011 07:31:18 +0000 (07:31 +0000)]
We don't have any links to activate if we don't have pcap.

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

7 years agoMake the links in the "WinPcap doesn't appear to be installed" text
guy [Fri, 30 Dec 2011 07:07:20 +0000 (07:07 +0000)]
Make the links in the "WinPcap doesn't appear to be installed" text
active.

Get rid of hard returns, and make it word wrap.

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

7 years agoClean up word wrapping a bit.
guy [Fri, 30 Dec 2011 04:26:33 +0000 (04:26 +0000)]
Clean up word wrapping a bit.

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

7 years agoFor the "don't have WinPcap" case, put up some stuff in the welcome
guy [Fri, 30 Dec 2011 00:52:15 +0000 (00:52 +0000)]
For the "don't have WinPcap" case, put up some stuff in the welcome
screen discussing that.  (XXX - those links should be made live.)

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

7 years agoI had a capture_errs.c but capture-wpcap.c eated it.
guy [Fri, 30 Dec 2011 00:17:50 +0000 (00:17 +0000)]
I had a capture_errs.c but capture-wpcap.c eated it.

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

7 years agoGet rid of extra blank line.
guy [Thu, 29 Dec 2011 23:34:20 +0000 (23:34 +0000)]
Get rid of extra blank line.

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

7 years agoLeave it up to dumpcap to determine whether WinPcap was loaded and, if
guy [Thu, 29 Dec 2011 23:33:29 +0000 (23:33 +0000)]
Leave it up to dumpcap to determine whether WinPcap was loaded and, if
it wasn't, whether it matters; that way you can still capture from a
pipe (named or "-" for standard input) even if you don't have WinPcap.

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

7 years agoLeave it up to dumpcap to determine whether WinPcap was loaded and, if
guy [Thu, 29 Dec 2011 23:21:18 +0000 (23:21 +0000)]
Leave it up to dumpcap to determine whether WinPcap was loaded and, if
it wasn't, whether it matters; that way you can still capture from a
pipe (named or "-" for standard input) even if you don't have WinPcap.

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

7 years agoSwallow cant_load_winpcap_err() up into capture-wpcap.c, so that
guy [Thu, 29 Dec 2011 23:09:42 +0000 (23:09 +0000)]
Swallow cant_load_winpcap_err() up into capture-wpcap.c, so that
anything that uses WinPcap can use that message text in its error
messages.

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

7 years agoAdd an additional DONT_HAVE_PCAP return value from get_interface_list()
guy [Thu, 29 Dec 2011 22:49:49 +0000 (22:49 +0000)]
Add an additional DONT_HAVE_PCAP return value from get_interface_list()
and capture_interface_list().  Return it if, on Windows, we ask for the
interface list but don't have WinPcap installed.  Handle it like
CANT_GET_INTERFACE_LIST.

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

7 years agoJust hard-code the error for "can't load WinPcap"; the one that
guy [Thu, 29 Dec 2011 22:06:22 +0000 (22:06 +0000)]
Just hard-code the error for "can't load WinPcap"; the one that
cant_load_winpcap_err() has some redundant gunk in it.

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

7 years agoOn Windows, if we can't open a capture device, check whether WinPcap is
guy [Thu, 29 Dec 2011 21:59:24 +0000 (21:59 +0000)]
On Windows, if we can't open a capture device, check whether WinPcap is
loaded and, if not, report that as the problem, rather than suggesting
that you didn't specify the proper interface.

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

7 years agoForgot the buffer length argument to g_snprintf().
guy [Thu, 29 Dec 2011 21:43:59 +0000 (21:43 +0000)]
Forgot the buffer length argument to g_snprintf().

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

7 years agoIf pcap_open_live() or pcap_open() fails due to not having WinPcap,
guy [Thu, 29 Dec 2011 21:18:08 +0000 (21:18 +0000)]
If pcap_open_live() or pcap_open() fails due to not having WinPcap,
supply an appropriate error string.

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

7 years agoAFAIKT sys/stat.h, sys/types.h, sys/socket.h, winsock2.h, inet_v6_defs.h #includes...
wmeier [Thu, 29 Dec 2011 21:08:53 +0000 (21:08 +0000)]
AFAIKT sys/stat.h, sys/types.h, sys/socket.h, winsock2.h, inet_v6_defs.h  #includes aren't needed.
also: Add #include <epan/packet.h>  (altho included by one of the other includes).

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

7 years agoAFAIKT sys/types.h, sys/socket.h, winsock2.h, inet_v6_defs.h #includes aren't needed.
wmeier [Thu, 29 Dec 2011 20:44:19 +0000 (20:44 +0000)]
AFAIKT sys/types.h, sys/socket.h, winsock2.h, inet_v6_defs.h #includes aren't needed.

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

7 years agoDo whitespace cleanup; Reformat long lines;
wmeier [Thu, 29 Dec 2011 20:23:18 +0000 (20:23 +0000)]
Do whitespace cleanup; Reformat long lines;
Move proto_register...() to be near the end of the file.

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

7 years agoDefine GTK_DISABLE_DEPRECATED only if GTK lt 3.2 since
wmeier [Thu, 29 Dec 2011 16:58:41 +0000 (16:58 +0000)]
Define GTK_DISABLE_DEPRECATED only if GTK lt 3.2 since
GTK 3.2 deprecates GtkVBox & GtkHBox which are currently used extensively by Wireshark.

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

7 years agoFix LTP multiple bundle bug and allow LTP/DCCP. Fixes https://bugs.wireshark.org...
cmaynard [Thu, 29 Dec 2011 16:22:02 +0000 (16:22 +0000)]
Fix LTP multiple bundle bug and allow LTP/DCCP.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5035

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

7 years agoSet filter text after connecting to filter string callback so the
stig [Thu, 29 Dec 2011 11:54:08 +0000 (11:54 +0000)]
Set filter text after connecting to filter string callback so the
initial filter will be syntax checked.

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

7 years agoFixed a typo: btyes -> bytes
stig [Thu, 29 Dec 2011 11:44:22 +0000 (11:44 +0000)]
Fixed a typo: btyes -> bytes

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

7 years agoAdd PLACE_OF_INTEREST_SIGN, a.k.a. the OS X Command key symbol. Annotate
gerald [Thu, 29 Dec 2011 00:12:22 +0000 (00:12 +0000)]
Add PLACE_OF_INTEREST_SIGN, a.k.a. the OS X Command key symbol. Annotate
entries with their decimal and hexadecimal values. Add a modeline blurb.

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

7 years agoAdd 'extern "C"' wrappers and #include guards to various header files.
gerald [Thu, 29 Dec 2011 00:08:47 +0000 (00:08 +0000)]
Add 'extern "C"' wrappers and #include guards to various header files.

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

7 years agoPrepend the sita_phdr fields with "sita_" to make them less
gerald [Wed, 28 Dec 2011 23:39:14 +0000 (23:39 +0000)]
Prepend the sita_phdr fields with "sita_" to make them less
collision-prone.

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

7 years agoAdd some CMake files and directories.
gerald [Wed, 28 Dec 2011 22:57:02 +0000 (22:57 +0000)]
Add some CMake files and directories.

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

7 years agoRemove some NSIS 1.x cruft.
gerald [Wed, 28 Dec 2011 22:42:40 +0000 (22:42 +0000)]
Remove some NSIS 1.x cruft.

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

7 years agoSimplify wireshark.nsi a bit by copying DLLs from the wireshark-gtk2
gerald [Wed, 28 Dec 2011 22:37:38 +0000 (22:37 +0000)]
Simplify wireshark.nsi a bit by copying DLLs from the wireshark-gtk2
directory.  This picks up any DEP/ASLR-related changes. Run peflags on
more DLLs.

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

7 years agoAdd "peflags" to the list of required executables. Use it to make sure
gerald [Wed, 28 Dec 2011 20:29:13 +0000 (20:29 +0000)]
Add "peflags" to the list of required executables. Use it to make sure
the DLLs we use have DEP and ASLR enabled.

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

7 years agoFix Coverity CID 1342: UNUSED_VALUE
cmaynard [Wed, 28 Dec 2011 17:02:43 +0000 (17:02 +0000)]
Fix Coverity CID 1342: UNUSED_VALUE

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

7 years agoAdd missing break; Fixes Coverity CID 1343.
cmaynard [Wed, 28 Dec 2011 16:59:17 +0000 (16:59 +0000)]
Add missing break;  Fixes Coverity CID 1343.

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

7 years agomin() -> MIN().
cmaynard [Wed, 28 Dec 2011 16:53:50 +0000 (16:53 +0000)]
min() -> MIN().

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

7 years agoFix memory leaks involving tvb_get_string[z]().
cmaynard [Wed, 28 Dec 2011 16:36:57 +0000 (16:36 +0000)]
Fix memory leaks involving tvb_get_string[z]().

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

7 years agoadd_new_data_source() needed in several places.
wmeier [Wed, 28 Dec 2011 16:09:45 +0000 (16:09 +0000)]
add_new_data_source() needed in several places.

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

7 years agoAdd svn:executable property
wmeier [Wed, 28 Dec 2011 15:23:56 +0000 (15:23 +0000)]
Add svn:executable property

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

7 years agoAdd tshark option '-G heuristic-decodes' to dump heuristic dissector tables.
wmeier [Wed, 28 Dec 2011 15:05:59 +0000 (15:05 +0000)]
Add tshark option '-G heuristic-decodes' to dump heuristic dissector tables.

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

7 years agoRemove a not really relevant comment.
wmeier [Wed, 28 Dec 2011 15:01:17 +0000 (15:01 +0000)]
Remove a not really relevant comment.

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

7 years agoRemove unneeded #includes;
wmeier [Wed, 28 Dec 2011 14:57:43 +0000 (14:57 +0000)]
Remove unneeded #includes;
Reformat some long lines;
Convert '4 space tabs' to spaces.

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

7 years agoAdd a "-G ftypes" option, which dumps our supprted FT_… names and
gerald [Tue, 27 Dec 2011 20:35:41 +0000 (20:35 +0000)]
Add a "-G ftypes" option, which dumps our supprted FT_… names and
descriptions. Captitalize and fix up the descriptions. Use its output to
create the field type list in the wireshark-filter man page.

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

7 years agoTighten up format string used for date/time parse;
wmeier [Tue, 27 Dec 2011 18:54:32 +0000 (18:54 +0000)]
Tighten up format string used for date/time parse;
Use 'static' in function definitions to match function declarations;
Do minor reformatting.

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

7 years agoFrom Jim Young via bug 5580: Only update the time elapsed between the previous displa...
cmaynard [Tue, 27 Dec 2011 18:16:12 +0000 (18:16 +0000)]
From Jim Young via bug 5580: Only update the time elapsed between the previous displayed packet and this packet if the packet is actually displayed.  Ref: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5580

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

7 years agoFix a comment. Correct a few typos.
cmaynard [Tue, 27 Dec 2011 17:46:25 +0000 (17:46 +0000)]
Fix a comment.  Correct a few typos.

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

7 years agoCorrected some obvious typos.
cmaynard [Tue, 27 Dec 2011 17:34:01 +0000 (17:34 +0000)]
Corrected some obvious typos.

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

7 years agoUse tvb_get_ntoh48() instead of tvb_get_ntohs() || tvb_get_ntohl().
cmaynard [Tue, 27 Dec 2011 17:08:33 +0000 (17:08 +0000)]
Use tvb_get_ntoh48() instead of tvb_get_ntohs() || tvb_get_ntohl().

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

7 years agoUse tvb_ether_to_str() instead of ether_to_str(ep_tvb_memdup()). Add modelines.
cmaynard [Tue, 27 Dec 2011 16:51:59 +0000 (16:51 +0000)]
Use tvb_ether_to_str() instead of ether_to_str(ep_tvb_memdup()).  Add modelines.

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

7 years agoInitialise variables.
etxrab [Tue, 27 Dec 2011 11:08:52 +0000 (11:08 +0000)]
Initialise variables.

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

7 years agoFrom Gaurav Tungatkar:
etxrab [Tue, 27 Dec 2011 10:48:04 +0000 (10:48 +0000)]
From Gaurav Tungatkar:

support extended ICMP for multi-part messages as specified by
RFC 4884. Additionally, it adds support for the Interface Information Object
extension to ICMP as specified by RFC 5837.
1. RFC 4884 - This redefines certain ICMP messages to support multi-part
messages with extensions. It adds a length field to the ICMP header and defines
an extension structure to define extension objects that can be appended to the
selected ICMP messages. It retains backward compatibility with messages that do
not support the extensions defined by this RFC.
2. RFC 5837 - This defines an extension object to identify the interface and
next-hop information to selected ICMP messages.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6632

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

7 years agoDissect Service Option Profile.
etxrab [Tue, 27 Dec 2011 10:15:00 +0000 (10:15 +0000)]
Dissect Service Option Profile.

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

7 years agoDisplay the meaning of the special values of the Stop MTCH field.
martinm [Tue, 27 Dec 2011 00:27:46 +0000 (00:27 +0000)]
Display the meaning of the special values of the Stop MTCH field.

From Pascal Quantin

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

7 years agoThat's the 3GPP spec for this protocol layer, right?
guy [Mon, 26 Dec 2011 23:00:33 +0000 (23:00 +0000)]
That's the 3GPP spec for this protocol layer, right?

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

7 years agoUpdate ICMPv6 to last IANA Parameters (2011-12-21)
alagoutte [Mon, 26 Dec 2011 14:59:50 +0000 (14:59 +0000)]
Update ICMPv6 to last IANA Parameters (2011-12-21)
* RFC3775 => RFC6275
* draft-ietf-6lowpan-nd-17 => draft-ietf-6lowpan-nd-18

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

7 years agoUpdate IKEv2 to last IANA Parameters (2011-12-19)
alagoutte [Mon, 26 Dec 2011 14:00:22 +0000 (14:00 +0000)]
Update IKEv2 to last IANA Parameters (2011-12-19)
RFC-kivinen-ipsecme-secure-password-framework-03 => RFC6467

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

7 years ago[Automatic manuf, services and enterprise-numbers update for 2011-12-25]
gerald [Sun, 25 Dec 2011 15:03:26 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-12-25]

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

7 years agoRevisit the spec, value is 16 bits.
etxrab [Sun, 25 Dec 2011 11:48:31 +0000 (11:48 +0000)]
Revisit the spec, value is 16 bits.

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

7 years agoUse packet-radius.c to dissect embedded AVP:s.
etxrab [Sun, 25 Dec 2011 11:25:39 +0000 (11:25 +0000)]
Use packet-radius.c to dissect embedded AVP:s.

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

7 years agoUse tvb accessors rather than directly accessing tvb struct.
wmeier [Fri, 23 Dec 2011 16:14:06 +0000 (16:14 +0000)]
Use tvb accessors rather than directly accessing tvb struct.

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

7 years agoUse ENC_LITTLE_ENDIAN instead of TRUE as encoding argument to proto_tree_add_bitmask_...
cmaynard [Fri, 23 Dec 2011 14:31:24 +0000 (14:31 +0000)]
Use ENC_LITTLE_ENDIAN instead of TRUE as encoding argument to proto_tree_add_bitmask_text().

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

7 years agoUpdate/simplify the list of some of the stuff I worked on.
cmaynard [Fri, 23 Dec 2011 14:20:53 +0000 (14:20 +0000)]
Update/simplify the list of some of the stuff I worked on.

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

7 years agoUse item lenght when dissecting Additional Session Info.
etxrab [Thu, 22 Dec 2011 22:31:26 +0000 (22:31 +0000)]
Use item lenght when dissecting Additional Session Info.

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

7 years agoAlphabetize the list of encapsulation types via "mergecap -T" as well as the list...
cmaynard [Thu, 22 Dec 2011 21:52:16 +0000 (21:52 +0000)]
Alphabetize the list of encapsulation types via "mergecap -T" as well as the list of capture file types via "mergecap -F".

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

7 years agoAppease the buildbots.
cmaynard [Thu, 22 Dec 2011 19:41:13 +0000 (19:41 +0000)]
Appease the buildbots.

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

7 years agoRevert some of the changes made as part of the patch from bug 6194 committed in r3832...
cmaynard [Thu, 22 Dec 2011 19:22:43 +0000 (19:22 +0000)]
Revert some of the changes made as part of the patch from bug 6194 committed in r38326.  Also, change the 3 separate reserved bit fields to a single 3-bit reserved field to more closely match the spec.  Lastly, in accordance with NOTE 2 of Table 3-1 of the spec, display the connection id, whatever it is, rather than assuming it's zero just because the Com bit isn't set.

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

7 years agoMissed in last commit, define symbol for new RNTI type...
martinm [Thu, 22 Dec 2011 18:45:15 +0000 (18:45 +0000)]
Missed in last commit, define symbol for new RNTI type...

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

7 years ago(Trivial) Indentation, whitespace & formatting cleanup.
wmeier [Thu, 22 Dec 2011 18:13:18 +0000 (18:13 +0000)]
(Trivial) Indentation, whitespace & formatting cleanup.

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

7 years agoAdd two missing calls to add_new_data_source().
wmeier [Thu, 22 Dec 2011 18:09:06 +0000 (18:09 +0000)]
Add two missing calls to add_new_data_source().

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

7 years agoSupport for MCH PDUs (introduced in R9 for MBMS).
martinm [Thu, 22 Dec 2011 18:05:48 +0000 (18:05 +0000)]
Support for MCH PDUs (introduced in R9 for MBMS).

From Pascal Quantin.

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

7 years agoWhat is the airspeed velocity of an unladen swallow?
cmaynard [Thu, 22 Dec 2011 14:49:43 +0000 (14:49 +0000)]
What is the airspeed velocity of an unladen swallow?

aspell and my own spelling preferences do not always agree with the spelling variations used by folks across the pond.  Revert a couple of spelling changes.

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

7 years agoThe encapsulation following WTAP_ENCAP_ARCNET is
guy [Thu, 22 Dec 2011 09:22:35 +0000 (09:22 +0000)]
The encapsulation following WTAP_ENCAP_ARCNET is
WTAP_ENCAP_ARCNET_LINUX; update various tables mapping Wiretap
encapsulations to file-type encapsulations.  Get rid of some trailing
"sorry, that's not supported" entries while we're at it.

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

7 years agoFrom Naoyoshi Ueda:
etxrab [Thu, 22 Dec 2011 07:03:42 +0000 (07:03 +0000)]
From Naoyoshi Ueda:

Enable decryption of TLS 1.2.

 Add some cipher suites from RFC5246 and RFC5289.

Fixed a bug in the handling of stream cipher.
(The explicit IV field in the application record doesn't exist when stream ciphers are used. But the original code handles it as if one-byte IV exists.)

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6688

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

7 years agoFrom Fred Fierling:
etxrab [Thu, 22 Dec 2011 06:55:31 +0000 (06:55 +0000)]
From Fred Fierling:
Update the ZigBee dissectors to the latest profile identifier database,
05-3298-18.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6693

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

7 years agoUse ENC_LITTLE_ENDIAN instead of TRUE as endian argument to proto_tree_add_bitmask_te...
cmaynard [Thu, 22 Dec 2011 02:17:11 +0000 (02:17 +0000)]
Use ENC_LITTLE_ENDIAN instead of TRUE as endian argument to proto_tree_add_bitmask_text().

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

7 years agoSet encoding to ENC_BIG_ENDIAN instead of the incorrect encoding of TRUE.
cmaynard [Thu, 22 Dec 2011 01:57:20 +0000 (01:57 +0000)]
Set encoding to ENC_BIG_ENDIAN instead of the incorrect encoding of TRUE.

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

7 years agoRework some code in tvbtest to fix an issue when testing composite tvbs.
wmeier [Wed, 21 Dec 2011 23:42:17 +0000 (23:42 +0000)]
Rework some code in tvbtest to fix an issue when testing composite tvbs.

tvbtest now completes all the tvb tests successfully (including those for composite tvbs) !!

In addition, running tvbtest under valgrind shows no memory leaks.

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

7 years agoFix a Windows compile error.
wmeier [Wed, 21 Dec 2011 21:49:10 +0000 (21:49 +0000)]
Fix a Windows compile error.

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

7 years agoAdd code to allow tvbuff memory leak testing (using valgrind, for example).
wmeier [Wed, 21 Dec 2011 21:40:25 +0000 (21:40 +0000)]
Add code to allow tvbuff memory leak testing (using valgrind, for example).

Essentially: tvbtest.c patch from Robert G. Jakabosky:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6573

Also: Update tvbtest code slightly to reflect the revised tvbuffs code
committed in SVN #40264;
 (Composite tvbs should not be individually freed).

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

7 years agoAvoid a potential buffer overflow (and fix some typos). Resolves bug 6391: https...
cmaynard [Wed, 21 Dec 2011 21:34:37 +0000 (21:34 +0000)]
Avoid a potential buffer overflow (and fix some typos).  Resolves bug 6391: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6391

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

7 years agoRemove no longer relevant comment about incrementing tvb usage count to prevent freei...
wmeier [Wed, 21 Dec 2011 18:57:42 +0000 (18:57 +0000)]
Remove no longer relevant comment about incrementing tvb usage count to prevent freeing tvbs.

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

7 years agoA simplified version of tvbuffs:
wmeier [Wed, 21 Dec 2011 17:39:02 +0000 (17:39 +0000)]
A simplified version of tvbuffs:
- Essentially no changes from current dissector de facto tvbuff usage;
- Do away with 'usage_counts' and with 'used_in' GSLists;
- Manage tvb chains via a simple doubly linked list.
- API changes:
  a. tvb_increment_usage_count() and tvb_decrement_usage_count() no
     longer exist;
  b. tvb_free_chain() can only be called for the 'top-level' (initial)
     tvb of a chain) or for a tvb not in a chain.
  c. tvb_free() now just calls tvb_free_chain() [should have no impact
     on existing  dissectors].

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

7 years agoFrom jingzhang via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6590
alagoutte [Wed, 21 Dec 2011 15:03:39 +0000 (15:03 +0000)]
From jingzhang via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6590
Make wireshark to support SKINNY new version

Current wireshark version can not support the new skinny packets when the header version == "14 00 00 00". It should be the same handling process with "12 00 00 00"(CM7_MSG_TYPE_B), So we added the same function to support CM7_MSG_TYPE_C(we defined it by ourselves, just want to keep the consistency with CM7_MSG_TYPE_B).

From me :
Fix encoding attribut (via fix-encoding.args.pl)

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

7 years agoFix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Wed, 21 Dec 2011 14:58:07 +0000 (14:58 +0000)]
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFrom Alexander Koeppe via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6689
alagoutte [Wed, 21 Dec 2011 14:28:51 +0000 (14:28 +0000)]
From Alexander Koeppe via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6689
Avoid string.h in packet-mpls.c

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

7 years agoFrom Jelmer Vernooij via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6686
alagoutte [Wed, 21 Dec 2011 14:21:17 +0000 (14:21 +0000)]
From Jelmer Vernooij via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6686
Dissector for the bzr smart server protocol

The attached patch adds basic support for dissecting the bzr smart server protocol ( http://wiki.wireshark.org/Bazaar ).

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

7 years agoFrom Jelmer Vernooij via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6686
alagoutte [Wed, 21 Dec 2011 14:20:34 +0000 (14:20 +0000)]
From Jelmer Vernooij via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6686
Dissector for the bzr smart server protocol

The attached patch adds basic support for dissecting the bzr smart server protocol ( http://wiki.wireshark.org/Bazaar ).

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

7 years agoFix indent and add modelines information
alagoutte [Wed, 21 Dec 2011 14:18:28 +0000 (14:18 +0000)]
Fix indent and add modelines information

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

7 years agoUse correct reported_length for a tvb_new_subset() (not that it makes a difference...
wmeier [Wed, 21 Dec 2011 03:44:23 +0000 (03:44 +0000)]
Use correct reported_length for a tvb_new_subset() (not that it makes a difference in this case).

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

7 years agoImprove this error message (example output based on attachment in bug #6665):
sfisher [Tue, 20 Dec 2011 21:53:50 +0000 (21:53 +0000)]
Improve this error message (example output based on attachment in bug #6665):

    OOPS: ',' in 'tpncp.fxs_ana,og_voltage_beading'

Now:

    Invalid character ',' in filter name 'tpncp.fxs_ana,og_voltage_beading'

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

7 years agoAvoid dupliacte entries in col_proto
etxrab [Tue, 20 Dec 2011 19:34:52 +0000 (19:34 +0000)]
Avoid dupliacte entries in col_proto

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

7 years agoAdd some additional links to more up to date specfications.
cmaynard [Tue, 20 Dec 2011 18:18:08 +0000 (18:18 +0000)]
Add some additional links to more up to date specfications.

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

7 years agoFor a DNSSL lifetime of 0, add some useful text.
cmaynard [Tue, 20 Dec 2011 18:15:52 +0000 (18:15 +0000)]
For a DNSSL lifetime of 0, add some useful text.

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

7 years agoChecking scmUDID for NULL is pointless since the pointer has already been dereference...
cmaynard [Tue, 20 Dec 2011 17:59:51 +0000 (17:59 +0000)]
Checking scmUDID for NULL is pointless since the pointer has already been dereferenced.  If g_byte_array_new() can return NULL, then the code should be modified to protect against deferencing the NULL pointer much sooner than this.

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

7 years agoCorrect a few typos.
cmaynard [Tue, 20 Dec 2011 17:53:44 +0000 (17:53 +0000)]
Correct a few typos.

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

7 years agoAdd support for dissecting AT commands in USB URB_CONTROL packets. Fixes https:...
cmaynard [Mon, 19 Dec 2011 23:44:01 +0000 (23:44 +0000)]
Add support for dissecting AT commands in USB URB_CONTROL packets.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6037

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

7 years agoTighten up conversation port matching once the 2nd port is known. Fixes https:/...
cmaynard [Mon, 19 Dec 2011 17:59:34 +0000 (17:59 +0000)]
Tighten up conversation port matching once the 2nd port is known.  Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5727

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

7 years agoUpdates from David Wei.
etxrab [Mon, 19 Dec 2011 16:57:17 +0000 (16:57 +0000)]
Updates from David Wei.

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

7 years agoCreate "Dehunked Entity Body" with O(N) rather than O(N^2) efffort.
wmeier [Sun, 18 Dec 2011 18:31:30 +0000 (18:31 +0000)]
Create "Dehunked Entity Body" with O(N) rather than O(N^2) efffort.
[Actually 1 g_malloc() + N tvb_memcpy() instead of
~ N g_malloc()/g_free() + N*(N+1)/2 tvb_memcpy() where N = number of chunks].

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

7 years agoFix Coverity CID's 1339 and 1340: UNUSED_VALUE.
cmaynard [Sun, 18 Dec 2011 16:38:31 +0000 (16:38 +0000)]
Fix Coverity CID's 1339 and 1340: UNUSED_VALUE.

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