8 years agoSigh. Cast away a warning.
guy [Wed, 15 Jun 2011 21:22:30 +0000 (21:22 +0000)]
Sigh.  Cast away a warning.

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

8 years agoConstify some arguments.
guy [Wed, 15 Jun 2011 20:21:45 +0000 (20:21 +0000)]
Constify some arguments.

Technically, %p must be given a void * as an argument (although the
representation of pointers on all platforms we deal with is the same for
all pointed-to types).

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

8 years agoConstify some arguments.
guy [Wed, 15 Jun 2011 20:13:42 +0000 (20:13 +0000)]
Constify some arguments.

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

8 years agoTry to squelch some compiler warnings.
guy [Wed, 15 Jun 2011 19:48:27 +0000 (19:48 +0000)]
Try to squelch some compiler warnings.

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

8 years agoSquelch some compiler warnings.
guy [Wed, 15 Jun 2011 19:36:43 +0000 (19:36 +0000)]
Squelch some compiler warnings.

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

8 years agoStrings are not writable, and the compiler warns that assigning a
guy [Wed, 15 Jun 2011 19:34:54 +0000 (19:34 +0000)]
Strings are not writable, and the compiler warns that assigning a
pointer to a string to a non-const pointer discards qualifiers; make the
err_info member of the wtap_reader structure a const pointer.

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

8 years agoSee if this squelches some compiler warnings.
guy [Wed, 15 Jun 2011 19:27:01 +0000 (19:27 +0000)]
See if this squelches some compiler warnings.

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

8 years agoSee if this squelches some compiler warnings.
guy [Wed, 15 Jun 2011 19:23:58 +0000 (19:23 +0000)]
See if this squelches some compiler warnings.

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

8 years agoFrom Ali Bahar via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6022
alagoutte [Wed, 15 Jun 2011 09:01:04 +0000 (09:01 +0000)]
From Ali Bahar via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6022
802.11 Disassociation Packet's "Reason Code" field is imprecisely decoded/described

From me :
* Display Reason code in decimal (not Hexa)
* Update list from last standard (802.11-2007 & 802.11n-2009)

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

8 years agoMake checkAPIs Happy
alagoutte [Wed, 15 Jun 2011 08:55:01 +0000 (08:55 +0000)]
Make checkAPIs Happy
Error: the blurb for field "Status" ("icmpv6.6lowpannd.da.status") has leading space in epan/dissectors/packet-icmpv6.c

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

8 years agoFrom Colin O'Flynn via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5363
alagoutte [Wed, 15 Jun 2011 08:52:38 +0000 (08:52 +0000)]
From Colin O'Flynn via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5363
Add latest 6lowpan-nd Support

From me :
* Add Description in Header Field
* Use FT_EUI64 for EUI64 Field

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

8 years agoFrom Colin O'Flynn via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5363
alagoutte [Wed, 15 Jun 2011 08:32:10 +0000 (08:32 +0000)]
From Colin O'Flynn via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5363

Fix some error in ICMPv6 dissector...

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

8 years agoPlease don't use prohibited APIs in new code:
stig [Tue, 14 Jun 2011 20:37:53 +0000 (20:37 +0000)]
Please don't use prohibited APIs in new code:
sprintf -> g_snprintf

Fixes coverity 1197 & 1198.

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

8 years agoFix for bug 6009:
jake [Mon, 13 Jun 2011 20:29:51 +0000 (20:29 +0000)]
Fix for bug 6009:
Information transfer rate is a 7 bit field.

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

8 years agoRemove not used cap_pipe_err_str.
darkjames [Mon, 13 Jun 2011 15:28:37 +0000 (15:28 +0000)]
Remove not used cap_pipe_err_str.

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

8 years agoHandle deprecated GtkTooltips.
etxrab [Mon, 13 Jun 2011 15:13:39 +0000 (15:13 +0000)]
Handle deprecated GtkTooltips.

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

8 years agoHandle deprecated GtkTooltips.
etxrab [Mon, 13 Jun 2011 14:54:33 +0000 (14:54 +0000)]
Handle deprecated GtkTooltips.

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

8 years ago[Automatic manuf, services and enterprise-numbers update for 2011-06-12]
gerald [Sun, 12 Jun 2011 15:03:37 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-06-12]

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

8 years agocfilter can be NULL. Handle this correctly.
tuexen [Sun, 12 Jun 2011 10:35:55 +0000 (10:35 +0000)]
cfilter can be NULL. Handle this correctly.
This should fix

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

8 years agoUse spaces uniformly in AC_WIRESHARK_PYTHON_CHECK.
guy [Sat, 11 Jun 2011 21:49:24 +0000 (21:49 +0000)]
Use spaces uniformly in AC_WIRESHARK_PYTHON_CHECK.

If we don't find python-config, set want_python to no, so the
end-of-configuration message says we're not using the Python
interpreter.  Also fix some cases where we were setting want_zlib rather
than want_python (cut-and-pasteo).

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

8 years agoJust as with autoconf, we need to include the Python cflags when
guy [Sat, 11 Jun 2011 20:24:24 +0000 (20:24 +0000)]
Just as with autoconf, we need to include the Python cflags when
building libwireshark.

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

8 years agoDo the Python embedding similarly to other "default = yes, if available"
guy [Sat, 11 Jun 2011 19:05:17 +0000 (19:05 +0000)]
Do the Python embedding similarly to other "default = yes, if available"

Add some quoting to the zlib tests, just in case the argument contains
white space.

Clean up capitalization of Lua and Python.

Link programs that use libwireshark with the Python libraries, and build
Epan with the Python cflags.

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

8 years agoInclude <Python.h> to get the Python version number.
guy [Sat, 11 Jun 2011 17:20:44 +0000 (17:20 +0000)]
Include <Python.h> to get the Python version number.

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

8 years agoThe "shared by every program in the Wireshark suite, including dumpcap"
guy [Sat, 11 Jun 2011 02:35:58 +0000 (02:35 +0000)]
The "shared by every program in the Wireshark suite, including dumpcap"
version information doesn't include Python version information (only
programs using libwireshark have that) or GeoIP version information
(ditto).  Don't include headers required only for that information;
hopefully this will keep dumpcap from requiring the Python library on

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

8 years agoMake the U3 and PortableApps "clean" and "distclean" targets more
gerald [Fri, 10 Jun 2011 17:25:55 +0000 (17:25 +0000)]
Make the U3 and PortableApps "clean" and "distclean" targets more
consistent with the NSIS targets.

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

8 years agoAdd some more error checking.
guy [Fri, 10 Jun 2011 17:16:09 +0000 (17:16 +0000)]
Add some more error checking.

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

8 years agoMake capture dialog compile with GTK3+
etxrab [Fri, 10 Jun 2011 16:27:53 +0000 (16:27 +0000)]
Make capture dialog compile with GTK3+

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

8 years agoSeemingly this is needed to...
etxrab [Fri, 10 Jun 2011 11:01:43 +0000 (11:01 +0000)]
Seemingly this is needed to...

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

8 years agoAdd casts to make it compile on some old ERHL box.
etxrab [Fri, 10 Jun 2011 08:31:14 +0000 (08:31 +0000)]
Add casts to make it compile on some old ERHL box.

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

8 years agoFrom Pascal Quantin:
etxrab [Fri, 10 Jun 2011 08:30:17 +0000 (08:30 +0000)]
From Pascal Quantin:
allowing Length Indicator 0x7ffb for RLC AM PDUs.

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

8 years agoFix capinfo: ** ERROR **: Unknown capture file type 61
darkjames [Fri, 10 Jun 2011 07:16:10 +0000 (07:16 +0000)]
Fix capinfo: ** ERROR **: Unknown capture file type 61

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

8 years agoAdd a hack to prevent a gcc warning "ignoring return value of 'strtoul'..."
wmeier [Fri, 10 Jun 2011 02:10:44 +0000 (02:10 +0000)]
Add a hack to prevent a gcc warning "ignoring return value of 'strtoul'..."
for some gcc configurations (see _FORTIFY_SOURCE).
This hack is used instead of storing the result returned by strtoul() in a
dummy variable so as to prevent a gcc 4.6 with -Wextra warning:
 "set but not used ...".

TBD: will this hack pass muster with other validators
     such as Coverity, CLang, & etc ?

For much gory detail: see the message thread starting at:

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

8 years agoAdd another cast.
gerald [Thu, 9 Jun 2011 23:14:57 +0000 (23:14 +0000)]
Add another cast.

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

8 years agoThe only place where we care about zlib is file_wrappers.c; include
guy [Thu, 9 Jun 2011 22:46:00 +0000 (22:46 +0000)]
The only place where we care about zlib is file_wrappers.c; include
<zlib.h> there, rather than wtap-int.h.  That obviates the need to
include config.h earlier in ascend_scanner.l; revert the previous
change, so we don't require a version of Flex that supports %top.

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

8 years agoAdd a couple of casts to make Visual C++ happy.
gerald [Thu, 9 Jun 2011 22:42:44 +0000 (22:42 +0000)]
Add a couple of casts to make Visual C++ happy.

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

8 years agoFix possible compilation errors.
darkjames [Thu, 9 Jun 2011 22:01:57 +0000 (22:01 +0000)]
Fix possible compilation errors.

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

8 years ago- Add something to columns when using mime-encap
darkjames [Thu, 9 Jun 2011 21:37:19 +0000 (21:37 +0000)]
- Add something to columns when using  mime-encap
- Replace decoders in wiretap/CMakeLists.txt

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

8 years ago- Replace jpeg_jfif decoder, with more generic mime_file (no more 64KB limit!).
darkjames [Thu, 9 Jun 2011 21:21:06 +0000 (21:21 +0000)]
- Replace jpeg_jfif decoder, with more generic mime_file (no more 64KB limit!).
- Add new dissector packet-mime-encap which understands mime_file fragmentation.

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

8 years agoMove the copyright notice and the config.h include to the top of the
gerald [Thu, 9 Jun 2011 21:13:40 +0000 (21:13 +0000)]
Move the copyright notice and the config.h include to the top of the
file so that we have the proper definitions in place for large file
support on Solaris (bug 6102).

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

8 years agoMake sure we don't write invalid record lengths.
gerald [Thu, 9 Jun 2011 18:31:39 +0000 (18:31 +0000)]
Make sure we don't write invalid record lengths.

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

8 years agoSimplify timestamp checking: only check the packet's timestamp if
morriss [Thu, 9 Jun 2011 18:27:11 +0000 (18:27 +0000)]
Simplify timestamp checking: only check the packet's timestamp if
check_startstop is set.

Refuse to write packets that do not fit in the file type we're writing.  This
allows fuzz testing to be done on JPEGs without generating bogus files (with
packets bigger than the maximum packet size).  This fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6010 .

Note that this is only a problem with editcap is run with -T to force the
encapsulation type.

Maybe this needs a more generic solution (e.g., should this check be done in
the wiretap routines?), but at least for now it'll pacify the buildbot.

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

8 years agoFrom Colin O'Flynn via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5980
alagoutte [Thu, 9 Jun 2011 18:02:13 +0000 (18:02 +0000)]
From Colin O'Flynn via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5980
Add draft-ietf-6man-rpl-routing-header-03 Support (RH4 RPL Routing Header)

From me :
* Display Bytes of Address and Full Address (Generated)
* Fix some Whitespace and minor enhance...

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

8 years agoOnly count an ACK if it's part of an existing conversation, otherwise we
gerald [Thu, 9 Jun 2011 17:30:13 +0000 (17:30 +0000)]
Only count an ACK if it's part of an existing conversation, otherwise we
get a lot of false positives.

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

8 years agoAdd ws-coding-style.cfg to dist.
etxrab [Thu, 9 Jun 2011 12:54:44 +0000 (12:54 +0000)]
Add ws-coding-style.cfg to dist.

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

8 years agoAdd casts to make it compile on some old ERHL box.
etxrab [Thu, 9 Jun 2011 08:51:30 +0000 (08:51 +0000)]
Add casts to make it compile on some old ERHL box.

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

8 years agoFrom Francesco Fondelli:
etxrab [Thu, 9 Jun 2011 08:28:04 +0000 (08:28 +0000)]
From Francesco Fondelli:
Add crustyfy .cfg file

I found it useful on some inetnal dissector where the indentation
was relay messed up so I think it's a usfel tool to have in the toolbox.
I don't think we should run it on every file.


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

8 years agoFrom Madhusudhan M:
etxrab [Thu, 9 Jun 2011 06:36:40 +0000 (06:36 +0000)]
From Madhusudhan M:
Cisco and Vodafone Diameter AVP:s

I have axtracted the relevant vendor AVP:s and separated them out in Vendor specific xml files.

Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5972

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

8 years agoAs pointed out by Jakub Zawadzki:
jmayer [Wed, 8 Jun 2011 21:33:38 +0000 (21:33 +0000)]
As pointed out by Jakub Zawadzki:
While updating to the current cmake version of FindZLIB I missed
a Wireshark specific addition. Add it back.

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

8 years agoLimit the lengths of some of our patterns. Fixes an infinite loop found
gerald [Wed, 8 Jun 2011 20:58:44 +0000 (20:58 +0000)]
Limit the lengths of some of our patterns. Fixes an infinite loop found
when trying to read a TPNCP data file.

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

8 years ago* Add Keep Going bit flag in insert command
alagoutte [Wed, 8 Jun 2011 18:26:50 +0000 (18:26 +0000)]
* Add Keep Going bit flag in insert command
* Replace tab by space

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

8 years agoAdd GTK3 cmake options. It doesn't build, just like its configure pendant.
jmayer [Wed, 8 Jun 2011 18:10:03 +0000 (18:10 +0000)]
Add GTK3 cmake options. It doesn't build, just like its configure pendant.

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

8 years agoFix a typo (spotted by Pascal Quantin).
martinm [Wed, 8 Jun 2011 17:10:40 +0000 (17:10 +0000)]
Fix a typo (spotted by Pascal Quantin).

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

8 years agoThe passed-in filter string can no longer be NULL, so use strlen instead of testing...
martinm [Wed, 8 Jun 2011 17:08:27 +0000 (17:08 +0000)]
The passed-in filter string can no longer be NULL, so use strlen instead of testing pointer.

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

8 years agoLast patch removed $Id$ head line
jmayer [Wed, 8 Jun 2011 17:07:06 +0000 (17:07 +0000)]
Last patch removed $Id$ head line

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

8 years agoCopy over changes from cmake git HEAD.
jmayer [Wed, 8 Jun 2011 16:24:36 +0000 (16:24 +0000)]
Copy over changes from cmake git HEAD.

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

8 years agoThis fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6008
tuexen [Wed, 8 Jun 2011 14:12:47 +0000 (14:12 +0000)]
This fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6008

Clear the list of interfaces before adding new interfaces.
Also fix an endless loop which would occur in case of an error
when getting remote interfaces.

From Irene Ruengeler.

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

8 years agoTry to fix the Ubuntu buildbot.
etxrab [Wed, 8 Jun 2011 13:11:51 +0000 (13:11 +0000)]
Try to fix the Ubuntu buildbot.

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

8 years agoAssign to a dummy variable to squelch the warning.
etxrab [Wed, 8 Jun 2011 12:05:49 +0000 (12:05 +0000)]
Assign to a dummy variable to squelch the warning.

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

8 years agoMove the warning "...SercosIII heuristic dissector cannot be registered.." to the...
etxrab [Wed, 8 Jun 2011 12:02:38 +0000 (12:02 +0000)]
Move the warning "...SercosIII heuristic dissector cannot be registered.." to the handoff routine as sercosIII most probably will
not have registered it's name when opensafty's register routine is executed e.g the warning will always be printed.

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

8 years agoFrom Roland Knall via bug 6007:
stig [Wed, 8 Jun 2011 07:03:53 +0000 (07:03 +0000)]
From Roland Knall via bug 6007:
Remove plugins/interlink from CMake.

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

8 years agoRemove the interlinki plugin dir as it's now a builtin dissector.
etxrab [Wed, 8 Jun 2011 05:27:39 +0000 (05:27 +0000)]
Remove the interlinki plugin dir as it's now a builtin dissector.

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

8 years agoRemove theinterlinki plugin dir as it's now a builtin dissector.
etxrab [Wed, 8 Jun 2011 05:23:17 +0000 (05:23 +0000)]
Remove theinterlinki plugin dir as it's now a builtin dissector.

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

8 years agoFrom Michael Mann:
etxrab [Wed, 8 Jun 2011 05:20:43 +0000 (05:20 +0000)]
From Michael Mann:
Make interlink built-in dissector (from plugin).

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

8 years agoRemove the sercosiii plugin dir as it's now a builtin dissector.
etxrab [Wed, 8 Jun 2011 05:06:02 +0000 (05:06 +0000)]
Remove the sercosiii plugin dir as it's now a builtin dissector.

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

8 years agoRemove the sercosiii plugin dir as it's now a builtin dissector.
etxrab [Wed, 8 Jun 2011 04:55:29 +0000 (04:55 +0000)]
Remove the sercosiii plugin dir as it's now a builtin dissector.

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

8 years agoDidn't need to introduce that variable.
guy [Wed, 8 Jun 2011 04:49:35 +0000 (04:49 +0000)]
Didn't need to introduce that variable.

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

8 years agoTry to squelch the warning about not using the return value of strtoul()
guy [Wed, 8 Jun 2011 04:07:15 +0000 (04:07 +0000)]
Try to squelch the warning about not using the return value of strtoul()
- we really *are* using it just for its side-effects if it fails; its
return value is not the best way to check for failure, as the failure
return values are also valid return values on success.

While we're at it, check for it setting errno, which is one of the
better ways to check for failure.

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

8 years agoThe SERCOS III dissector is now built-in.
guy [Wed, 8 Jun 2011 01:37:18 +0000 (01:37 +0000)]
The SERCOS III dissector is now built-in.

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

8 years agoFix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warning.
wmeier [Tue, 7 Jun 2011 23:05:53 +0000 (23:05 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warning.

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

8 years agoFix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
wmeier [Tue, 7 Jun 2011 23:03:12 +0000 (23:03 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
Also: whitespace cleanup.

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

8 years agoFix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
wmeier [Tue, 7 Jun 2011 22:59:19 +0000 (22:59 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
Also: do some whitespace cleanup.

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

8 years agoFix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
wmeier [Tue, 7 Jun 2011 22:50:49 +0000 (22:50 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
Also: whitespace cleanup in some cases.

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

8 years agoFix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings
wmeier [Tue, 7 Jun 2011 22:28:55 +0000 (22:28 +0000)]
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings

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

8 years agoFrom Daniel Willmann: Lontalk protocol (EIA-709.1)
wmeier [Tue, 7 Jun 2011 21:10:44 +0000 (21:10 +0000)]
From Daniel Willmann: Lontalk protocol (EIA-709.1)

Attached is a dissector for the Lontalk protocol (EIA-709.1). This dissector
registers as a subdissector of the CN/IP protocol.

Some code (mostly definitions) were taken from Bug #2252

From me: minor mostly cosmetic changes.


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

8 years agoPut packet-cnip.c in the right group (DISSECTOR_SRC not ASN1_DISSECTOR_SRC).
wmeier [Tue, 7 Jun 2011 21:02:29 +0000 (21:02 +0000)]
Put packet-cnip.c in the right group (DISSECTOR_SRC not ASN1_DISSECTOR_SRC).

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

8 years agoMove packet-sercosiii.c to be a builtin dissector.
etxrab [Tue, 7 Jun 2011 20:33:26 +0000 (20:33 +0000)]
Move packet-sercosiii.c to be a builtin dissector.

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

8 years agoFrom Daniel Willmann: dissector for EIA-852 protocol (Component Network over IP)
wmeier [Tue, 7 Jun 2011 18:56:24 +0000 (18:56 +0000)]
From Daniel Willmann: dissector for EIA-852 protocol (Component Network over IP)

Attached is a dissector for CN/IP protocol described in EIA-852. It is mainly
used to encapsulate and send Lontalk (EIA-709.1) or EIA-600 frames over UDP (or

This dissector can only decode the common header and data frames can be decoded
by further dissectors.


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

8 years agoAdd more missing files.
etxrab [Tue, 7 Jun 2011 15:05:45 +0000 (15:05 +0000)]
Add more missing files.

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

8 years agoDelete no longer used .h file
etxrab [Tue, 7 Jun 2011 14:16:40 +0000 (14:16 +0000)]
Delete no longer used .h file

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

8 years agoAdd files to distribution.
etxrab [Tue, 7 Jun 2011 14:15:50 +0000 (14:15 +0000)]
Add files to distribution.

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

8 years agoWhen doing remote capturing using WinPCap, dumpcap crashes inside the WinPCap
tuexen [Tue, 7 Jun 2011 12:23:15 +0000 (12:23 +0000)]
When doing remote capturing using WinPCap, dumpcap crashes inside the WinPCap
library when no capture filter is used. Then cfilter is NULL and
capture_loop_init_filter() does not call compile_capture_filter() and
pcap_setfilter(). Providing an empty string instead of NULL works around
the problem.

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

8 years agoAdd description of LOAD stats for tshark to the manpage
sahlberg [Tue, 7 Jun 2011 10:27:44 +0000 (10:27 +0000)]
Add description of LOAD stats for tshark to the manpage

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

8 years agoAdded code to distinguish conversations between different RTUs that happen to use...
grahamb [Mon, 6 Jun 2011 22:32:37 +0000 (22:32 +0000)]
Added code to distinguish conversations between different RTUs that happen to use the same address\port pair.

Based on patch supplied by Kelvin Proctor.


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

8 years agoAdd links to libtool's recommendations for library versions.
gerald [Mon, 6 Jun 2011 21:40:40 +0000 (21:40 +0000)]
Add links to libtool's recommendations for library versions.

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

8 years agoBump the version.
gerald [Mon, 6 Jun 2011 21:03:49 +0000 (21:03 +0000)]
Bump the version.

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

8 years agoFrom Pascal Quantin:
etxrab [Mon, 6 Jun 2011 20:01:53 +0000 (20:01 +0000)]
From Pascal Quantin:
Add the following enhancements to the UMTS RLC dissector
(as specified in 3GPP 25.322 v9.2.0):
- UDP framing protocol to allow dissection of RLC PDUs over UDP (like what is
done for LTE MAC/RLC/PDCP protocols)
- 15 bits Length Indicator support (both with variable and fixed LI size)
- Poll type SUFI
- enhanced dissection of LIST, Relative List and Bitmap SUFI
- dissection of Reset and Reset Ack Control PDU
- an option to decode RLC headers only
- an option to skip SDU reassembly

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

8 years agoFix Unix compilation error...
sfisher [Mon, 6 Jun 2011 19:49:31 +0000 (19:49 +0000)]
Fix Unix compilation error...

packet-3g-a11.c:135: warning: 'hf_a11_fqi_granted_qos' defined but not used

... by removing definition

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

8 years agoFrom Michael Mann:
etxrab [Mon, 6 Jun 2011 19:45:51 +0000 (19:45 +0000)]
From Michael Mann:

I made 2 changes when merging the source into a single file:
1. Changed filtername to "siii" to match display filter fields (was quicker
than changing all display filter fields to "sercosiii"
2. Converted the "ett_siii arrays" to a single value.   Each subtree doesn't
need its own ett_ value.


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

8 years agoOn behalf of Ericsson - enhance A11 dissection.
etxrab [Mon, 6 Jun 2011 19:17:32 +0000 (19:17 +0000)]
On behalf of Ericsson - enhance A11 dissection.

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

8 years agoBump the wiretap version.
gerald [Mon, 6 Jun 2011 16:29:23 +0000 (16:29 +0000)]
Bump the wiretap version.

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

8 years agoWarn if there are > 2 padding subheaders at the beginning of a frame.
martinm [Mon, 6 Jun 2011 16:07:09 +0000 (16:07 +0000)]
Warn if there are > 2 padding subheaders at the beginning of a frame.

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

8 years agoWe're now using fop-1.0 on Windows;
wmeier [Mon, 6 Jun 2011 15:32:40 +0000 (15:32 +0000)]
We're now using fop-1.0 on Windows;
Also: remove trailing whitespace from lines.

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

8 years agoMake the windows builds work again.
etxrab [Mon, 6 Jun 2011 13:34:53 +0000 (13:34 +0000)]
Make the windows builds work again.

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

8 years agoAdd support for LOAD() calculations to tshark too just like I incorrectly
sahlberg [Mon, 6 Jun 2011 10:34:51 +0000 (10:34 +0000)]
Add support for LOAD() calculations to tshark too just like I incorrectly
stated it had at SNIA years ago.

Example :
tshark -n -r ../captures/smbwrite.cap
  -z "io,stat,0.001,LOAD(smb.time)smb.time" -q

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

8 years agoFrom Roland Knall:
etxrab [Mon, 6 Jun 2011 10:32:19 +0000 (10:32 +0000)]
From Roland Knall:
Modbus/TCP: Calculating the drop-out criteria for special data dissection fails.

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

8 years agoAvoid no-newline-at-end-of-file warning.
martinm [Mon, 6 Jun 2011 09:40:30 +0000 (09:40 +0000)]
Avoid no-newline-at-end-of-file warning.

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

8 years agoFrom Roland Knall via bug 5996:
stig [Mon, 6 Jun 2011 08:33:33 +0000 (08:33 +0000)]
From Roland Knall via bug 5996:
Corrected old-style function definition.

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

8 years agoFrom Roland Knall via bug 5995:
stig [Mon, 6 Jun 2011 07:09:49 +0000 (07:09 +0000)]
From Roland Knall via bug 5995:
Fix CMake build.

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

8 years agoAdd support for PARAM_ENUM tap parameters, and use the tap_param_dlg
guy [Mon, 6 Jun 2011 01:04:56 +0000 (01:04 +0000)]
Add support for PARAM_ENUM tap parameters, and use the tap_param_dlg
stuff for the SCSI SRT tap.

Get rid of include of gtk/filter_dlg.h in stats taps that don't need it.

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

8 years agoClean up indentation - use 4-space indentation uniformly. (No tabs -
guy [Sun, 5 Jun 2011 23:16:14 +0000 (23:16 +0000)]
Clean up indentation - use 4-space indentation uniformly.  (No tabs -
tab stops aren't necessarily every 4 spaces.)

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