6 years agoFrom Jiri Engelthaler via
Evan Huus [Mon, 26 Aug 2013 16:23:55 +0000 (16:23 -0000)]
From Jiri Engelthaler via

Add support for bitmask set for signed integer types.

svn path=/trunk/; revision=51522

6 years agoMake the UDP port preference a range.
Anders Broman [Mon, 26 Aug 2013 05:14:53 +0000 (05:14 -0000)]
Make the UDP port preference a range.

svn path=/trunk/; revision=51521

6 years agoMake all expert info filterable. Display filter names may need review, but at least...
Michael Mann [Mon, 26 Aug 2013 00:54:48 +0000 (00:54 -0000)]
Make all expert info filterable.  Display filter names may need review, but at least the filtering is in place.

svn path=/trunk/; revision=51520

6 years agoCheck our recently-added signal pipe in statistics mode.
Gerald Combs [Sun, 25 Aug 2013 22:41:54 +0000 (22:41 -0000)]
Check our recently-added signal pipe in statistics mode.

svn path=/trunk/; revision=51519

6 years agoBatch of filterable expert infos.
Michael Mann [Sun, 25 Aug 2013 21:01:11 +0000 (21:01 -0000)]
Batch of filterable expert infos.

svn path=/trunk/; revision=51518

6 years agoSimplify adding and deletetion of port ranges by adding new methods.
Anders Broman [Sun, 25 Aug 2013 18:48:26 +0000 (18:48 -0000)]
Simplify adding and deletetion of port ranges by adding new methods.
If no one has any objection I'll edit the deocumentation later.

svn path=/trunk/; revision=51517

6 years agoMake sure our ldap_call_response_t struct is always completely initialized,
Evan Huus [Sun, 25 Aug 2013 17:31:15 +0000 (17:31 -0000)]
Make sure our ldap_call_response_t struct is always completely initialized,
fixing a "Conditional jump or move depends on uninitialised value" error found
by valgrind fuzzing.

svn path=/trunk/; revision=51516

6 years agoValgrind requires more resources than running normally. Bump limits to 1.5x
Evan Huus [Sun, 25 Aug 2013 17:23:15 +0000 (17:23 -0000)]
Valgrind requires more resources than running normally. Bump limits to 1.5x
normal when fuzzing with valgrind, as otherwise half the menagerie runs out of

svn path=/trunk/; revision=51515

6 years agoConvert XMPP dissector suite to wmem.
Evan Huus [Sun, 25 Aug 2013 14:38:06 +0000 (14:38 -0000)]
Convert XMPP dissector suite to wmem.

svn path=/trunk/; revision=51514

6 years agoReplace some emem with wmem.
Evan Huus [Sun, 25 Aug 2013 14:23:13 +0000 (14:23 -0000)]
Replace some emem with wmem.

svn path=/trunk/; revision=51512

6 years ago[Automatic manuf, services and enterprise-numbers update for 2013-08-25]
Gerald Combs [Sun, 25 Aug 2013 14:03:39 +0000 (14:03 -0000)]
[Automatic manuf, services and enterprise-numbers update for 2013-08-25]

svn path=/trunk/; revision=51510

6 years agoFrom Chris Pane via
Evan Huus [Sat, 24 Aug 2013 16:26:49 +0000 (16:26 -0000)]
From Chris Pane via

Fix unregistered hf assertion in 1722.1 entity descriptors.

From me: #if0 out even more unused hfs, what is with this dissector?

svn path=/trunk/; revision=51509

6 years agoUse the correct length field when tagging the SSID. Fixes the first valgrind
Evan Huus [Sat, 24 Aug 2013 12:13:11 +0000 (12:13 -0000)]
Use the correct length field when tagging the SSID. Fixes the first valgrind
fuzz failure.

svn path=/trunk/; revision=51508

6 years agoFrom Tommy Wu:
Anders Broman [Sat, 24 Aug 2013 07:50:46 +0000 (07:50 -0000)]
From Tommy Wu:
Handle ERROR-SPEC: mandatory object, with an empty value.

svn path=/trunk/; revision=51507

6 years agoTool to help convert current expert_add_info_format() calls into filterable expert...
Michael Mann [Sat, 24 Aug 2013 01:42:43 +0000 (01:42 -0000)]
Tool to help convert current expert_add_info_format() calls into filterable expert info API.  It's not as helpful as because the expert string is usually too long to take the ei_ variable name or display filter string as is, but it does do the batch "search and replace" nicely and makes finding common expert info easier.

svn path=/trunk/; revision=51506

6 years agoIf the proto_tree_add_text string is just "%s", assume it won't be converted (it...
Michael Mann [Sat, 24 Aug 2013 01:38:43 +0000 (01:38 -0000)]
If the proto_tree_add_text string is just "%s", assume it won't be converted (it's usually a header that has the same field filterable in its subtree)

svn path=/trunk/; revision=51505

6 years agoFrom Simon Zhong: Convert several proto_tree_add_text into filterable expert info.
Michael Mann [Sat, 24 Aug 2013 01:25:14 +0000 (01:25 -0000)]
From Simon Zhong: Convert several proto_tree_add_text into filterable expert info.

From me: Make "Reserved" fields filterable.  This was enough to pacify, but part of the reason it was complaining in the first place is that many hf items are passed into info_to_display, which will end up calling a proto_tree_add_xxx function, rather than calling a proto_tree_add_xxx function directly.  Cursory glance says info_to_display could probably just be replaced with direct proto_tree_add_xxx calls.

svn path=/trunk/; revision=51504

6 years agoCan't use [ as an alias for "test" in configure scripts, as [ and ] are
Guy Harris [Sat, 24 Aug 2013 01:01:04 +0000 (01:01 -0000)]
Can't use [ as an alias for "test" in configure scripts, as [ and ] are
quoting characters; use test instead.

svn path=/trunk/; revision=51503

6 years agoAdd a routine to create a dummy signal pipe and pass it to dumpcap when
Gerald Combs [Sat, 24 Aug 2013 00:12:27 +0000 (00:12 -0000)]
Add a routine to create a dummy signal pipe and pass it to dumpcap when
gathering interface statistics. This should help dumpcap exit properly
if its parent process crashes or is killed.

svn path=/trunk/; revision=51502

6 years agoTo handle the hypothetical case of an OS X release offering a choice of
Guy Harris [Fri, 23 Aug 2013 23:57:09 +0000 (23:57 -0000)]
To handle the hypothetical case of an OS X release offering a choice of
installing command-line developer tools with no SDKs but with a standard
UN*Xy /usr/include or of installing Full Frontal Xcode, if the user
didn't specify building against an SDK, check to see whether we *have*
any SDKs and, if not, don't set the deployment target.

svn path=/trunk/; revision=51501

6 years agoClang, clang, clang went the warning....
Guy Harris [Fri, 23 Aug 2013 23:51:52 +0000 (23:51 -0000)]
Clang, clang, clang went the warning....

Fix a memset (drb_mapping is a pointer, so its size is the size of a
pointer; we want the size of what it points to).

svn path=/trunk/; revision=51500

6 years agoTo handle the hypothetical case of an OS X release offering a choice of
Guy Harris [Fri, 23 Aug 2013 23:27:07 +0000 (23:27 -0000)]
To handle the hypothetical case of an OS X release offering a choice of
installing command-line developer tools with no SDKs but with a standard
UN*Xy /usr/include or of installing Full Frontal Xcode, check to see
whether we *have* any SDKs and, if not, don't try to find the
appropriate SDK for the release and use it.

svn path=/trunk/; revision=51499

6 years agoPut back missing space between --disable-cups and --without-libtiff.
Guy Harris [Fri, 23 Aug 2013 22:59:16 +0000 (22:59 -0000)]
Put back missing space between --disable-cups and --without-libtiff.
Should fix bug 9073.

svn path=/trunk/; revision=51498

6 years agoChocolatey wants to install NSIS in "c:\Program Files" no matter what. Try
Gerald Combs [Fri, 23 Aug 2013 22:18:49 +0000 (22:18 -0000)]
Chocolatey wants to install NSIS in "c:\Program Files" no matter what. Try
to locate makensis automatically, similar to the way we locate Python.

svn path=/trunk/; revision=51497

6 years agoAssume we always have GNU diff and that we can use --strip-trailing-cr.
Gerald Combs [Fri, 23 Aug 2013 21:17:56 +0000 (21:17 -0000)]
Assume we always have GNU diff and that we can use --strip-trailing-cr.

svn path=/trunk/; revision=51496

6 years agoCorrectly reference EXTRA_LIBFILES. Make sure QMAKE_EXTENSION_SHLIB
Gerald Combs [Fri, 23 Aug 2013 20:47:33 +0000 (20:47 -0000)]
is set.  Adjust some wildcards.

svn path=/trunk/; revision=51495

6 years agoAdd a test for rawshark.
Gerald Combs [Fri, 23 Aug 2013 18:54:22 +0000 (18:54 -0000)]
Add a test for rawshark.

svn path=/trunk/; revision=51494

6 years agoInitialize our wtap_pkthdr struct so that we don't try to dereference an
Gerald Combs [Fri, 23 Aug 2013 18:42:51 +0000 (18:42 -0000)]
Initialize our wtap_pkthdr struct so that we don't try to dereference an
invalid opt_comment pointer down the line.

svn path=/trunk/; revision=51493

6 years agoMention BPF JIT in User Guide
Balint Reczey [Fri, 23 Aug 2013 18:11:47 +0000 (18:11 -0000)]
Mention BPF JIT in User Guide

svn path=/trunk/; revision=51492

6 years agoMake sure we call epan_free() before epan_cleanup() similar to r51342.
Gerald Combs [Fri, 23 Aug 2013 17:10:32 +0000 (17:10 -0000)]
Make sure we call epan_free() before epan_cleanup() similar to r51342.

svn path=/trunk/; revision=51491

6 years agoSimplify logic a bit now that we do not use anymore GUINT_TO_POINTER macro
Pascal Quantin [Fri, 23 Aug 2013 12:51:07 +0000 (12:51 -0000)]
Simplify logic a bit now that we do not use anymore GUINT_TO_POINTER macro

svn path=/trunk/; revision=51490

6 years agoFrom Martin Mathieson:
Pascal Quantin [Fri, 23 Aug 2013 10:42:11 +0000 (10:42 -0000)]
From Martin Mathieson:
Follow-up of r51429 that
- uses accessors to lazily allocate a private_data struct and returns the different parts based upon their use
- includes the v1130 DRX Config

svn path=/trunk/; revision=51489

6 years agoOutput a warning about kernel BPF JIT compiler beeing activated.
Anders Broman [Fri, 23 Aug 2013 05:25:30 +0000 (05:25 -0000)]
Output a warning about kernel BPF JIT compiler beeing activated.

svn path=/trunk/; revision=51488

6 years agoOutput a warning about kernel BPF JIT compiler beeing activated.
Anders Broman [Fri, 23 Aug 2013 05:21:25 +0000 (05:21 -0000)]
Output a warning about kernel BPF JIT compiler beeing activated.

svn path=/trunk/; revision=51487

6 years agoBatch of filterable expert infos.
Michael Mann [Fri, 23 Aug 2013 03:17:34 +0000 (03:17 -0000)]
Batch of filterable expert infos.

svn path=/trunk/; revision=51486

6 years agoWhen we close a main window, delete the welcome screen, which in turn
Gerald Combs [Fri, 23 Aug 2013 02:34:51 +0000 (02:34 -0000)]
When we close a main window, delete the welcome screen, which in turn
deletes the interface list, which in turn kills off the dumpcap process
it may be running. This should hopefully keep us from leaving dumpcap
processes running in the background on Windows. (Am I the only one
running QtShark on that platform?)

svn path=/trunk/; revision=51485

6 years agoPurge some emem.
Evan Huus [Fri, 23 Aug 2013 00:51:04 +0000 (00:51 -0000)]
Purge some emem.
- In kingfisher it wasn't even needed, just use a variable on the stack.
- In SDP convert to wmem. Use auto-resetting trees to avoid the need for an init
  routine and somewhat simplify that whole thing.

svn path=/trunk/; revision=51484

6 years agoFor the Windows Open dialog for capture files, get rid of the "(*.*)" in
Guy Harris [Fri, 23 Aug 2013 00:06:26 +0000 (00:06 -0000)]
For the Windows Open dialog for capture files, get rid of the "(*.*)" in
the "All Files" entry (the current UI guidelines from Microsoft say to
do so, and that's what Paint does, at least), and add an "All Capture
Files" entry with all the file extensions for the file types we support
(it'll pick up all text files, but there's not much we can do about
that, and it won't pick up files with *no* extension or weird
extensions, such as you might get from UN*X systems or from WinDump
commands, but at least it'll filter out some other crud).

Fix what appear to be memory leaks; that should be backported unless
I've missed something and they aren't leaks.

Fix an out-of-date comment, and add an additional comment.

svn path=/trunk/; revision=51481

Gerald Combs [Thu, 22 Aug 2013 22:33:19 +0000 (22:33 -0000)]
macdeployqt to build our OS X bundle.

svn path=/trunk/; revision=51480

6 years agoproto: simplify proto_tree_add_pi() remove out pointer to field_info *
Jakub Zawadzki [Thu, 22 Aug 2013 21:20:50 +0000 (21:20 -0000)]
proto: simplify proto_tree_add_pi() remove out pointer to field_info *

field_info can be already get using PNODE_FINFO(return_value)

svn path=/trunk/; revision=51479

6 years agoConvert more dissectors to use hfinfo instead of hfindex.
Jakub Zawadzki [Thu, 22 Aug 2013 20:54:50 +0000 (20:54 -0000)]
Convert more dissectors to use hfinfo instead of hfindex.

svn path=/trunk/; revision=51478

6 years agoRemove tree check when dissecting PCCH message so as to avoid filtering expert info...
Pascal Quantin [Thu, 22 Aug 2013 19:55:25 +0000 (19:55 -0000)]
Remove tree check when dissecting PCCH message so as to avoid filtering expert info on first pass

svn path=/trunk/; revision=51477

6 years agofix compiler warning on Debian wheezy (gcc 4.7.2)
Martin Kaiser [Thu, 22 Aug 2013 18:49:31 +0000 (18:49 -0000)]
fix compiler warning on Debian wheezy (gcc 4.7.2)

dumpcap.c:193:10: error: ignoring return value of ‘write’, declared with
attribute warn_unused_result [-Werror=unused-result]

for some reason, using (void)write(fd, ...) did not do the trick

svn path=/trunk/; revision=51476

6 years agoOnly enable the Linux kernel BPF JIT compiler if we're on Linux.
Guy Harris [Thu, 22 Aug 2013 17:36:30 +0000 (17:36 -0000)]
Only enable the Linux kernel BPF JIT compiler if we're on Linux.

Unless we're going to do something if that fails, there's no point in
having enable_kernel_bpf_jit_compiler() return a success/failure

Fix indentation.

svn path=/trunk/; revision=51475

6 years agoFixed building documentation for Lua classes and functions containing digits.
Stig Bjørlykke [Thu, 22 Aug 2013 17:22:25 +0000 (17:22 -0000)]
Fixed building documentation for Lua classes and functions containing digits.

svn path=/trunk/; revision=51474

6 years agoOn request from Tommy Wu:
Anders Broman [Thu, 22 Aug 2013 17:21:20 +0000 (17:21 -0000)]
On request from Tommy Wu:
Enable Diameter over UDP dissection as there is an application using it.

svn path=/trunk/; revision=51473

6 years agoEnable Kernel BPF JIT compiler from dumpcap.
Anders Broman [Thu, 22 Aug 2013 17:20:09 +0000 (17:20 -0000)]
Enable Kernel BPF JIT compiler from dumpcap.

svn path=/trunk/; revision=51472

6 years agoFix clang warning: comma at end of enumerator list
Chris Maynard [Thu, 22 Aug 2013 17:03:19 +0000 (17:03 -0000)]
Fix clang warning: comma at end of enumerator list

svn path=/trunk/; revision=51471

6 years agoAdded TvbRange strsize().
Stig Bjørlykke [Thu, 22 Aug 2013 11:58:32 +0000 (11:58 -0000)]
Added TvbRange strsize().

svn path=/trunk/; revision=51470

6 years agoFrom Stephen Donnelly <>:
Guy Harris [Thu, 22 Aug 2013 03:43:39 +0000 (03:43 -0000)]
From Stephen Donnelly <>:

Move the check for vwr files *after* the check for ERF files, as it
sometimes thinks ERF files are VWR files.

svn path=/trunk/; revision=51467

6 years agoBack out the previous change, so I can check it in again with the
Guy Harris [Thu, 22 Aug 2013 03:42:15 +0000 (03:42 -0000)]
Back out the previous change, so I can check it in again with the
*correct* checkin message.  Sigh....

svn path=/trunk/; revision=51466

6 years agoCopy over r51462 from trunk:
Guy Harris [Thu, 22 Aug 2013 03:40:30 +0000 (03:40 -0000)]
Copy over r51462 from trunk:

  r51462 | guy | 2013-08-21 20:21:47 -0700 (Wed, 21 Aug 2013) | 8 lines

  What was I thinking?  ".caz" is used for compressed *Windows* Sniffer
  files (which are just gzipped uncompressed Windows Sniffer files, albeit
  with the checksum computed differently in some fashion, or perhaps just
  being computed incorrectly), not compressed *DOS* Sniffer files (which
  use their own form of compression, which doesn't compress the entire
  file, just most of it, and which use the same extensions as uncompressed
  DOS Sniffer files).

svn path=/trunk/; revision=51465

6 years agoWhat was I thinking? ".caz" is used for compressed *Windows* Sniffer
Guy Harris [Thu, 22 Aug 2013 03:21:47 +0000 (03:21 -0000)]
What was I thinking?  ".caz" is used for compressed *Windows* Sniffer
files (which are just gzipped uncompressed Windows Sniffer files, albeit
with the checksum computed differently in some fashion, or perhaps just
being computed incorrectly), not compressed *DOS* Sniffer files (which
use their own form of compression, which doesn't compress the entire
file, just most of it, and which use the same extensions as uncompressed
DOS Sniffer files).

svn path=/trunk/; revision=51462

6 years agoMove a brace outside an #ifdef, it was confusing vim's folding.
Evan Huus [Thu, 22 Aug 2013 02:29:32 +0000 (02:29 -0000)]
Move a brace outside an #ifdef, it was confusing vim's folding.

svn path=/trunk/; revision=51461

6 years agoDon't look at packet or byte limits during the second pass of two-pass analysis.
Evan Huus [Thu, 22 Aug 2013 02:19:22 +0000 (02:19 -0000)]
Don't look at packet or byte limits during the second pass of two-pass analysis.
The limits are enforced during the first pass, and frames that get dropped from
the first pass for this reason aren't available to the second pass at all, so
checking again is redundant.

svn path=/trunk/; revision=51460

6 years agoThe export PDU mechanism creates a new capture which contains only the
Martin Kaiser [Wed, 21 Aug 2013 21:44:48 +0000 (21:44 -0000)]
The export PDU mechanism creates a new capture which contains only the
exported PDUs. The currently opened capture file is closed.

Make sure that this does not discard any unsaved data. Ask the user for
confirmation and save the changes before running the export.

svn path=/trunk/; revision=51459

6 years agoFrom Michael Reschly
Martin Kaiser [Wed, 21 Aug 2013 20:24:39 +0000 (20:24 -0000)]
From Michael Reschly
Support dissection of TLS Application Layer Protocol Negotiation

from me:
fix indentation, add check for minimum ext_len, encoding for string hf

svn path=/trunk/; revision=51458

6 years agoMake it possible to add custom Diameter AVP .xml files and distribute them by adding...
Anders Broman [Wed, 21 Aug 2013 19:53:57 +0000 (19:53 -0000)]
Make it possible to add custom Diameter AVP .xml files and distribute them by adding the file name to separate files and leave the "normal" makefiles untouched.

svn path=/trunk/; revision=51457

6 years agoArrange that "make distcheck" use the GUI configure flags used to
Guy Harris [Wed, 21 Aug 2013 18:39:39 +0000 (18:39 -0000)]
Arrange that "make distcheck" use the GUI configure flags used to
configure Wireshark, so we don't, for example, do "make distcheck" with
no options, and thus default to GTK+ 3, on a system without GTK+ 3 where
Wireshark was configured with --with-gtk2.  (This also means that if
we're configuring only with Qt, or with GTK+ *and* Qt, "make distcheck"
will check with those.)

svn path=/trunk/; revision=51456

6 years agoFix typo errors
Pascal Quantin [Wed, 21 Aug 2013 17:58:16 +0000 (17:58 -0000)]
Fix typo errors

svn path=/trunk/; revision=51455

6 years agoFully parenthesize the isprint() macro.
Chris Maynard [Wed, 21 Aug 2013 17:26:49 +0000 (17:26 -0000)]
Fully parenthesize the isprint() macro.

svn path=/trunk/; revision=51454

6 years agoFromChun-Yeow via
Alexis La Goutte [Wed, 21 Aug 2013 17:05:20 +0000 (17:05 -0000)]
FromChun-Yeow via
Add Support of Decoding 802.11s Mesh Channel Switch Parameter Element

From me:
Remove some trailing whitespace
Add subtree for flag
Change typo of display filter

svn path=/trunk/; revision=51453

6 years agoFrom Dario Lombardo via
Alexis La Goutte [Wed, 21 Aug 2013 17:04:51 +0000 (17:04 -0000)]
From Dario Lombardo via Added expert info to DNS dissector for negative TTL values

According to RFC, TTL valid values are the positive values of a 32 bit signed field. This means that, despite the negative values can be put in a packet, they should be ignored. Wireshark prints them correctly, but a warning expert info could be useful.

svn path=/trunk/; revision=51452

6 years agosmall fix for r51448 isprint() is locale aware, we want just ascii
Jakub Zawadzki [Wed, 21 Aug 2013 17:01:05 +0000 (17:01 -0000)]
small fix for r51448 isprint() is locale aware, we want just ascii

svn path=/trunk/; revision=51451

6 years agoFix Coverity CID's 1063706-1063710: Out-of-bounds read (OVERRUN_STATIC)
Chris Maynard [Wed, 21 Aug 2013 14:08:42 +0000 (14:08 -0000)]
Fix Coverity CID's 1063706-1063710: Out-of-bounds read (OVERRUN_STATIC)

svn path=/trunk/; revision=51450

6 years agoNo need to initialize length_remaining to 0.
Chris Maynard [Tue, 20 Aug 2013 22:53:26 +0000 (22:53 -0000)]
No need to initialize length_remaining to 0.

svn path=/trunk/; revision=51449

6 years agoSimplify find_delimiter() by making use of tvb_find_guint8().
Chris Maynard [Tue, 20 Aug 2013 22:42:46 +0000 (22:42 -0000)]
Simplify find_delimiter() by making use of tvb_find_guint8().
In sss_string():
 -> Protect against tvb_length_remaining() possibly returning -1.
 -> Fix off-by-1 potential buffer overflow condition.
 -> Use isprint() rather than "do-it-yourself" code.
 -> Remove the extra unnecessary "length_remaining" checks in the for() loop.

#BACKPORT(1.10, 1.8)

svn path=/trunk/; revision=51448

6 years agoClean-up ipxnet hash table in host_name_lookup_cleanup. Should fix the buildbot
Evan Huus [Tue, 20 Aug 2013 22:41:49 +0000 (22:41 -0000)]
Clean-up ipxnet hash table in host_name_lookup_cleanup. Should fix the buildbot
test suite failures.

svn path=/trunk/; revision=51447

6 years agoWhitespace changes. Add modelines.
Chris Maynard [Tue, 20 Aug 2013 21:21:10 +0000 (21:21 -0000)]
Whitespace changes.  Add modelines.

svn path=/trunk/; revision=51446

6 years agoFix for bug #9034: Composite TVBs aren't supported by tvb_find_guint8()
Jakub Zawadzki [Tue, 20 Aug 2013 19:56:57 +0000 (19:56 -0000)]
Fix for bug #9034: Composite TVBs aren't supported by tvb_find_guint8()

Add generic tvb_find_guint8, tvb_pbrk_guint8

svn path=/trunk/; revision=51445

6 years agoComposite tvb (tvb_memcpy/tvb_get_ptr): don't assert with offset == tvb->length,...
Jakub Zawadzki [Tue, 20 Aug 2013 19:54:42 +0000 (19:54 -0000)]
Composite tvb (tvb_memcpy/tvb_get_ptr): don't assert with offset == tvb->length, and 0 length

svn path=/trunk/; revision=51444

6 years agoIf packet was modified fallback to generic clone
Jakub Zawadzki [Tue, 20 Aug 2013 19:53:24 +0000 (19:53 -0000)]
If packet was modified fallback to generic clone

svn path=/trunk/; revision=51443

6 years agoFix clang warnings: Value stored to '[offset|length]' is never read.
Chris Maynard [Tue, 20 Aug 2013 18:50:40 +0000 (18:50 -0000)]
Fix clang warnings: Value stored to '[offset|length]' is never read.

svn path=/trunk/; revision=51442

6 years agoFix clang warnings: Value stored to '[decrypted_]offset' is never read.
Chris Maynard [Tue, 20 Aug 2013 18:46:46 +0000 (18:46 -0000)]
Fix clang warnings: Value stored to '[decrypted_]offset' is never read.

svn path=/trunk/; revision=51441

6 years agoFix clang warning: Value stored to 'netl' is never read.
Chris Maynard [Tue, 20 Aug 2013 18:30:46 +0000 (18:30 -0000)]
Fix clang warning: Value stored to 'netl' is never read.
Other misc. whitespace changes.

svn path=/trunk/; revision=51440

6 years agoFix several instances of clang warnings: Value stored to 'length' is never read
Chris Maynard [Tue, 20 Aug 2013 17:25:17 +0000 (17:25 -0000)]
Fix several instances of clang warnings: Value stored to 'length' is never read
Also, whitespace changes (tabs ->spaces, indentation) and add modelines.

svn path=/trunk/; revision=51439

6 years agoFix for
Jörg Mayer [Tue, 20 Aug 2013 06:35:45 +0000 (06:35 -0000)]
Fix for
[  6%] Building C object epan/CMakeFiles/epan.dir/addr_resolv.c.o
/home/jmayer/work/wireshark/svn/trunk/epan/addr_resolv.c:1927:1: error: unused function
      'get_ipxnetbyname' [-Werror,-Wunused-function]
get_ipxnetbyname(const gchar *name)
/home/jmayer/work/wireshark/svn/trunk/epan/addr_resolv.c:2009:1: error: unused function
      'add_ipxnet_name' [-Werror,-Wunused-function]

by #if 0/#endif the functions. If they really are not needed any more
they should be removed.

svn path=/trunk/; revision=51438

6 years agoMark an unused parameter.
Anders Broman [Tue, 20 Aug 2013 05:27:48 +0000 (05:27 -0000)]
Mark an unused parameter.

svn path=/trunk/; revision=51437

6 years agoUse g_hash_table() for ipxnet name resolution.
Anders Broman [Tue, 20 Aug 2013 05:06:26 +0000 (05:06 -0000)]
Use g_hash_table() for ipxnet name resolution.

svn path=/trunk/; revision=51436

6 years agoFrom Tommy Wu:
Anders Broman [Tue, 20 Aug 2013 05:04:45 +0000 (05:04 -0000)]
From Tommy Wu:
Update Octet 7 of Indication IE.

svn path=/trunk/; revision=51435

6 years agoAdd a valgrind suppressions file set to suppress the zlib error which otherwise
Evan Huus [Tue, 20 Aug 2013 03:21:06 +0000 (03:21 -0000)]
Add a valgrind suppressions file set to suppress the zlib error which otherwise
pops up immediately on the fuzzbot. Hopefully there won't be too many more of

svn path=/trunk/; revision=51434

6 years agoAnother acknowledgment number tweak: If the ACK flag wasn't set such that the base_se...
Chris Maynard [Mon, 19 Aug 2013 22:06:48 +0000 (22:06 -0000)]
Another acknowledgment number tweak: If the ACK flag wasn't set such that the base_seq wasn't subtracted from it, then if we need to recover absolute values later on, don't add the base_seq value back either.

svn path=/trunk/; revision=51433

6 years agoWhen using relative sequence numbers, don't scale acknowledgment numbers unless the...
Chris Maynard [Mon, 19 Aug 2013 21:41:49 +0000 (21:41 -0000)]
When using relative sequence numbers, don't scale acknowledgment numbers unless the ACK bit is actually set; otherwise doing so results in many erroneous packets matching a filter such as, "(tcp.ack > 0) && (tcp.flags.ack == 0)".  With this change, the number of expert infos noting non-zero acknowledgment numbers when the ACK bit is not set is the same as the number of packets that are displayed when applying the above display filter regardless of whether using relative or absolute sequence numbers.  (Tested using the menagerie's mond.pcap file)

svn path=/trunk/; revision=51432

6 years agoSomeone is bound to miss these expert info items, so add back expert info items for...
Chris Maynard [Mon, 19 Aug 2013 21:17:04 +0000 (21:17 -0000)]
Someone is bound to miss these expert info items, so add back expert info items for ack and urgent pointer when their respective flags are not set; however, don't indicate "Broken TCP" and only add them as Notes rather than as Warnings as was previously the case prior to r51356 since nowhere does it indicate these fields must be zero when their respective bits aren't set.

Speaking of r51356, a clarification to its commit message is in order: Initially my intention was to only add the urgent pointer field when the URG bit was set; however, I then noticed that the acknowledgment number field was always being added irrespective of the ACK bit.  Had I made the change as I originally intended, it would have introduced an inconsistency.  After some deliberation, I opted for consistency, but botched the commit message.

svn path=/trunk/; revision=51431

6 years agoFix Coverity CID 1063335: Unused pointer value.
Chris Maynard [Mon, 19 Aug 2013 19:59:52 +0000 (19:59 -0000)]
Fix Coverity CID 1063335: Unused pointer value.

svn path=/trunk/; revision=51430

6 years agoGather together dedicated DRX configuration, and make sure that it
Martin Mathieson [Mon, 19 Aug 2013 17:06:42 +0000 (17:06 -0000)]
Gather together dedicated DRX configuration, and make sure that it
is internally consistent.

TODO: include r11 sequence that can overwrite some of these values.
TODO: actx->private_data gets reused for several purposes, need to
separate these uses out and avoid possible conflicts...

svn path=/trunk/; revision=51429

6 years agoFix :
Pascal Quantin [Mon, 19 Aug 2013 16:56:05 +0000 (16:56 -0000)]
Fix :
Update DDS RTPS Vendor and Product Ids based on

svn path=/trunk/; revision=51428

6 years agoChange some dissectors to use pinfo memory pool instead of malloc if it can trigger...
Pascal Quantin [Mon, 19 Aug 2013 14:55:41 +0000 (14:55 -0000)]
Change some dissectors to use pinfo memory pool instead of malloc if it can trigger an exception between between buffer allocation and tvb_set_free_cb call

svn path=/trunk/; revision=51427

6 years agoDo not use ephemeral memory when adding a new data source
Pascal Quantin [Mon, 19 Aug 2013 11:11:11 +0000 (11:11 -0000)]
Do not use ephemeral memory when adding a new data source

svn path=/trunk/; revision=51424

6 years agoDo not use ephemeral memory when adding a new data source
Pascal Quantin [Mon, 19 Aug 2013 10:39:43 +0000 (10:39 -0000)]
Do not use ephemeral memory when adding a new data source

svn path=/trunk/; revision=51423

6 years agoBugfix SGI Nsym disambiguation is unconditionally displayed when dissecting VHT,...
Michael Mann [Mon, 19 Aug 2013 00:11:50 +0000 (00:11 -0000)]
Bugfix SGI Nsym disambiguation is unconditionally displayed when dissecting VHT, bug 8989 (

From Karl Beldan


svn path=/trunk/; revision=51422

6 years agoOne more 64/32-conversion fix for rtpproxy
Evan Huus [Sun, 18 Aug 2013 21:31:07 +0000 (21:31 -0000)]
One more 64/32-conversion fix for rtpproxy

svn path=/trunk/; revision=51421

6 years agoTake another stab at
Evan Huus [Sun, 18 Aug 2013 20:09:05 +0000 (20:09 -0000)]
Take another stab at
packet-rtpproxy.c:226: warning: implicit conversion shortens 64-bit value into a
32-bit value

svn path=/trunk/; revision=51420

6 years agoAdd a cast to try and fix
Evan Huus [Sun, 18 Aug 2013 20:04:52 +0000 (20:04 -0000)]
Add a cast to try and fix
packet-rtpproxy.c:226: warning: implicit conversion shortens 64-bit value into
a 32-bit value

I'm not quite sure what's going on here, all the values in use are either gint
or guint so they should all be the same size?

svn path=/trunk/; revision=51419

6 years agoUse epan scope for one XML DTD string to fix a small leak.
Evan Huus [Sun, 18 Aug 2013 19:59:28 +0000 (19:59 -0000)]
Use epan scope for one XML DTD string to fix a small leak.

svn path=/trunk/; revision=51418

6 years agoFrom Peter Lemenkov via
Evan Huus [Sun, 18 Aug 2013 19:49:08 +0000 (19:49 -0000)]
From Peter Lemenkov via

Dissector for the Sippy RTPproxy controlling protocol. RTPproxy is a well-known
(among SIP-engineers) application and it operates using its own simple
text-based protocol. There are several competing products but all of them
implements it (sometimes slightly extending).

svn path=/trunk/; revision=51417

6 years agoaddr_resolution_dlg.c: In function 'ipv6_hash_table_to_texbuff':
Anders Broman [Sun, 18 Aug 2013 19:18:20 +0000 (19:18 -0000)]
addr_resolution_dlg.c: In function 'ipv6_hash_table_to_texbuff':
addr_resolution_dlg.c:185: warning: unused parameter 'key'

svn path=/trunk/; revision=51416

6 years agoUse g_hastable() for IPv6 name reslution.
Anders Broman [Sun, 18 Aug 2013 19:02:48 +0000 (19:02 -0000)]
Use g_hastable() for IPv6 name reslution.

svn path=/trunk/; revision=51415

6 years ago[Automatic manuf, services and enterprise-numbers update for 2013-08-18]
Gerald Combs [Sun, 18 Aug 2013 14:03:49 +0000 (14:03 -0000)]
[Automatic manuf, services and enterprise-numbers update for 2013-08-18]

svn path=/trunk/; revision=51412

6 years agoBluetooth: HCI: Synchronize and update Voice command. Bug 9050 (https://bugs.wiresha...
Michael Mann [Sun, 18 Aug 2013 02:32:23 +0000 (02:32 -0000)]
Bluetooth: HCI: Synchronize and update Voice command.  Bug 9050 (

From Michal Labedzki.

svn path=/trunk/; revision=51411