7 years agoFrom Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6377, with...
cmaynard [Tue, 8 Nov 2011 19:37:55 +0000 (19:37 +0000)]
From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6377, with the tshark man page update by me: tshark -z io,stat,interval,"[SUM|MIN|MAX|AVG](field)field [and filter]" should support floating point.

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

7 years agoTry to fix defined but not used warnings.
etxrab [Tue, 8 Nov 2011 19:30:51 +0000 (19:30 +0000)]
Try to fix defined but not used warnings.

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

7 years agoCleanup in svn:ignore after the change to build the ASN.1 dissectors
stig [Tue, 8 Nov 2011 19:21:00 +0000 (19:21 +0000)]
Cleanup in svn:ignore after the change to build the ASN.1 dissectors
directly into epan/dissectors (revision 39333).

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

7 years agopacket_info's in_error_pkt is now a bitfield like in_gre_pkt.
cmaynard [Tue, 8 Nov 2011 18:39:11 +0000 (18:39 +0000)]
packet_info's in_error_pkt is now a bitfield like in_gre_pkt.

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

7 years agoFix message_type defined but unused compiler warning/error. There are 3
sfisher [Tue, 8 Nov 2011 18:15:39 +0000 (18:15 +0000)]
Fix message_type defined but unused compiler warning/error.  There are 3
more problems that I'll mail to -dev.

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

7 years agopacket-sbc-ap-template.c:138: warning: unused variable 'offset'
etxrab [Tue, 8 Nov 2011 18:06:18 +0000 (18:06 +0000)]
packet-sbc-ap-template.c:138: warning: unused variable 'offset'

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

7 years agoGet rid of set-but-not-used warnings.
etxrab [Tue, 8 Nov 2011 17:39:01 +0000 (17:39 +0000)]
Get rid of set-but-not-used warnings.

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

7 years agoAdd a dissector for http://tools.ietf.org/html/draft-mahalingam-dutt-dcops-vxlan-00
etxrab [Tue, 8 Nov 2011 17:36:12 +0000 (17:36 +0000)]
Add a dissector for tools.ietf.org/html/draft-mahalingam-dutt-dcops-vxlan-00

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

7 years agoUse the correct length for the NAS message container.
etxrab [Tue, 8 Nov 2011 17:31:23 +0000 (17:31 +0000)]
Use the correct length for the NAS message container.

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

7 years agoAdd SBc Application Part (SBc-AP) to build.
etxrab [Tue, 8 Nov 2011 17:28:55 +0000 (17:28 +0000)]
Add SBc Application Part (SBc-AP) to build.

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

7 years agoImprove ICMP conversation tracking, especially when capturing on multiple interfaces...
cmaynard [Tue, 8 Nov 2011 17:25:22 +0000 (17:25 +0000)]
Improve ICMP conversation tracking, especially when capturing on multiple interfaces and one of them is a GRE tunnel.  Resolves bug 5770, which was reopened.

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

7 years agoAdd SBc Application Part (SBc-AP) dir
etxrab [Tue, 8 Nov 2011 17:17:05 +0000 (17:17 +0000)]
Add SBc Application Part (SBc-AP) dir

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

7 years agoRemove a duplicate "TID" found by checkAPIs.pl.
gerald [Tue, 8 Nov 2011 16:49:49 +0000 (16:49 +0000)]
Remove a duplicate "TID" found by checkAPIs.pl.

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

7 years agoFrom Pontus Fuchs via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6548
alagoutte [Tue, 8 Nov 2011 14:45:35 +0000 (14:45 +0000)]
From Pontus Fuchs via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6548
80211 QoS Control: Add Raw TID

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

7 years agoMake some variables volatile to avoid warnings with my gcc version.
martinm [Tue, 8 Nov 2011 14:32:13 +0000 (14:32 +0000)]
Make some variables volatile to avoid warnings with my gcc version.

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

7 years agoFrom Iain Arnell via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6546
alagoutte [Tue, 8 Nov 2011 12:50:13 +0000 (12:50 +0000)]
From Iain Arnell via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6546
packet-ajp13 fails to detect end of request body

AJP13 may use two different packets to signify end of request body;
either zero length packet, or packet with zero length content. The ajp13
dissector already recognizes the former; this patch adds support for the

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

7 years agoChange the use of threads from "mostly always, depending on your
gerald [Mon, 7 Nov 2011 23:42:53 +0000 (23:42 +0000)]
Change the use of threads from "mostly always, depending on your
configure options and Gtk+ and GLib versions" to "always".

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

7 years agoFrom Tyson Key via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6155
alagoutte [Mon, 7 Nov 2011 16:56:16 +0000 (16:56 +0000)]
From Tyson Key via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6155
Dissector for the USB Integrated Circuit Card Interface Device Class (CCID)

I've implemented a reasonable subset of a dissector for the USB CCID specification (as described at http://www.usb.org/developers/devclass_docs/DWG_Smart-Card_CCID_Rev110.pdf), during the course of experimenting with an ACS ACR122U ISO 14443 card reader and MiFare tokens.

It currently identifies all of the message types listed in that specification,ng.

From me:
* Fix Clang Warning
* Remove trailing whitespace from lines
* Fix Checkhf (Remove a unused entry)
* Added packet-rfid-mifare to Makefile.common and CMakeLists.txt

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

7 years agoDo not return from within a TRY/CATCH/ENDTRY because this will make the
stig [Mon, 7 Nov 2011 16:09:41 +0000 (16:09 +0000)]
Do not return from within a TRY/CATCH/ENDTRY because this will make the
except stack invalid, and will lead to a crash.

In this case it was when doing compare functions on a FT_PROTOCOL.

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

7 years agoDo not return from within a TRY/CATCH/ENDTRY because this will make the
stig [Mon, 7 Nov 2011 07:41:03 +0000 (07:41 +0000)]
Do not return from within a TRY/CATCH/ENDTRY because this will make the
except stack invalid, and will lead to a crash.

In this case it was when calling a dissector from a table in a Lua script.

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

7 years agoAttempt to fix the RCS ID.
guy [Sun, 6 Nov 2011 20:20:14 +0000 (20:20 +0000)]
Attempt to fix the RCS ID.

NULL out blurbs that just give the field name.

This is C code, so it shouldn't be executable; get rid of

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

7 years agoFrom Tyson Key via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6161
alagoutte [Sun, 6 Nov 2011 19:19:07 +0000 (19:19 +0000)]
From Tyson Key via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6161
Dissector for the NXP MiFare Protocol

I've just finished writing a dissector for the NXP-proprietary MiFare Protocol, as used alongside ISO 14443-A by a popular range of contactless (not-so-smart) cards, and various emulations, variants and clones thereof.

It currently supports all of the commands listed in http://www.nxp.com/documents/data_sheet/MF1S703x.pdf that also happen to be supported by LibNFC (http://code.google.com/p/libnfc/) - modulo the "NAK" and CRC bytes, since I haven't found examples of their usage in my USB traces, and I didn't want to hand-craft (probably incorrect) examples for testing.

From me:
* Fix Clang Warning
* Remove trailing whitespace from lines;
* Added packet-rfid-mifare to Makefile.common and CMakeLists.txt
* Add Modelines information

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

7 years agoFrom Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6545
alagoutte [Sun, 6 Nov 2011 19:02:36 +0000 (19:02 +0000)]
From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6545
DVB-CI / CI+ fix clang warning about unused variable

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

7 years agoFrom Robert G. Jakabosky via bug 5575:
stig [Sun, 6 Nov 2011 17:39:13 +0000 (17:39 +0000)]
From Robert G. Jakabosky via bug 5575:
Fix memory errors in Lua dissectors.
- Free Tvb when created from ByteArray.
- Free TvbRange correctly.
- Free string from get_persconffile_path and get_datafile_path.
- Some code cleanup.

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

7 years ago[Automatic manuf, services and enterprise-numbers update for 2011-11-06]
gerald [Sun, 6 Nov 2011 15:03:27 +0000 (15:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-11-06]

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

7 years agoDissect RIM related IEs
etxrab [Sun, 6 Nov 2011 08:18:26 +0000 (08:18 +0000)]
Dissect RIM related IEs

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

7 years agoAdd a preference to select whether to use LAPD or DPNSS as the protocol
guy [Sat, 5 Nov 2011 20:47:11 +0000 (20:47 +0000)]
Add a preference to select whether to use LAPD or DPNSS as the protocol
on the D channel.

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

7 years agoFix what I think is a typo in the introductory comment.
guy [Sat, 5 Nov 2011 20:45:39 +0000 (20:45 +0000)]
Fix what I think is a typo in the introductory comment.

Set the protocol column (perhaps there should be separate names for the
DPNSS layer 2 and layer 3 protocols).

The DPNSS layer 2 protocol appears to be Yet Another HDLC Derivative;
put in a comment noting that we might want to use the xDLC control field
dissector code.

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

7 years agoFix what I assume is a typo in the introductory comment.
guy [Sat, 5 Nov 2011 20:43:56 +0000 (20:43 +0000)]
Fix what I assume is a typo in the introductory comment.

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

7 years agoUpdates based on stuff seen in a new capture.
guy [Fri, 4 Nov 2011 23:59:07 +0000 (23:59 +0000)]
Updates based on stuff seen in a new capture.

I'm leaving debug messages in, but #if 0'ed out, for now.

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

7 years agoGet rid of non-ASCII characters in comments.
guy [Fri, 4 Nov 2011 18:43:23 +0000 (18:43 +0000)]
Get rid of non-ASCII characters in comments.

Convert "4-space tabs" to spaces.

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

7 years agoDissect RIM Routing Address Discriminator and RAN Transparent Container.
etxrab [Fri, 4 Nov 2011 17:39:54 +0000 (17:39 +0000)]
Dissect RIM Routing Address Discriminator and RAN Transparent Container.

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

7 years agoDissect RIMInformation.
etxrab [Fri, 4 Nov 2011 17:37:38 +0000 (17:37 +0000)]
Dissect RIMInformation.

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

7 years agoOnly have the option to turn off syntax check capture filter
stig [Fri, 4 Nov 2011 17:02:33 +0000 (17:02 +0000)]
Only have the option to turn off syntax check capture filter
if not using threads.

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

7 years agoTerminate a value_string.
morriss [Fri, 4 Nov 2011 13:41:12 +0000 (13:41 +0000)]
Terminate a value_string.

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

7 years agoFrom Roland Knall via bug 6538:
stig [Fri, 4 Nov 2011 08:15:29 +0000 (08:15 +0000)]
From Roland Knall via bug 6538:
Use CRC routines from wsutil + some Code-Clang Analysis fixes.

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

7 years agoFix GRE Key entry
etxrab [Thu, 3 Nov 2011 22:01:05 +0000 (22:01 +0000)]
Fix GRE Key entry

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

7 years agoFrom Roland Knall via bug 6539:
stig [Thu, 3 Nov 2011 20:58:29 +0000 (20:58 +0000)]
From Roland Knall via bug 6539:
Implementing generic CRC8 and CRC16 functions for openSAFETY in wsutil.

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

7 years agoFrom Roland Knall via bug 6538:
stig [Thu, 3 Nov 2011 20:38:04 +0000 (20:38 +0000)]
From Roland Knall via bug 6538:
Remove stringToBytes and use hex_str_to_bytes instead.

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

7 years agoAdd (most) primitive header items to the tree before calling UMTS RLC dissector.
martinm [Thu, 3 Nov 2011 16:52:37 +0000 (16:52 +0000)]
Add (most) primitive header items to the tree before calling UMTS RLC dissector.

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

7 years agoRemove apparent debug code that causes these console messages on launch:
sfisher [Thu, 3 Nov 2011 15:38:29 +0000 (15:38 +0000)]
Remove apparent debug code that causes these console messages on launch:

looking for dissectors in /usr/local/src/wireshark/epan/wspython/wspy_dissectors
looking for dissectors in /home/sfisher/.wireshark/plugins
registered protocols []

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

7 years agoUpdate the list of new features.
gerald [Wed, 2 Nov 2011 20:44:05 +0000 (20:44 +0000)]
Update the list of new features.

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

7 years agoFix spelling.
gerald [Wed, 2 Nov 2011 20:43:10 +0000 (20:43 +0000)]
Fix spelling.

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

7 years agoWe have to remove svnversion.h with "make distclean".
guy [Wed, 2 Nov 2011 20:21:11 +0000 (20:21 +0000)]
We have to remove svnversion.h with "make distclean".

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

7 years agoRevert revision 39665 (for bug 6472) which introduced bug 6537.
stig [Wed, 2 Nov 2011 20:06:40 +0000 (20:06 +0000)]
Revert revision 39665 (for bug 6472) which introduced bug 6537.

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

7 years agoFrom Roland Knall:
etxrab [Wed, 2 Nov 2011 19:36:33 +0000 (19:36 +0000)]
From Roland Knall:
Avoiding the fuzz-test crash, but still allowing for large parts of CIP to be dissected.

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

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

7 years agoFrom Roland Knall:
etxrab [Wed, 2 Nov 2011 19:28:38 +0000 (19:28 +0000)]
From Roland Knall:
Remove the warnings for the Clang-Code-Analysis.


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

7 years agoThe answer to
guy [Wed, 2 Nov 2011 18:16:26 +0000 (18:16 +0000)]
The answer to

XXX - "svnversion.h" is distributed in the release tarball; should
we be deleting it with "make clean", or should we only do that with
"make maintainer-clean"?

is probably "we should only do that with "make maintainer-clean""; see


and followups.

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

7 years agoHandle differences in Camel V2
etxrab [Wed, 2 Nov 2011 18:10:34 +0000 (18:10 +0000)]
Handle differences in Camel V2


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

7 years agoRequiescat in pace, osx-build.sh.
guy [Wed, 2 Nov 2011 18:01:27 +0000 (18:01 +0000)]
Requiescat in pace, osx-build.sh.

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

7 years agoRemove osx-build.sh. It was never fully ported to the Wireshark build
gerald [Wed, 2 Nov 2011 17:36:20 +0000 (17:36 +0000)]
Remove osx-build.sh. It was never fully ported to the Wireshark build
environment and has been unused for 3 years.

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

7 years agoFrom Andrew Kampjes via bug 6536:
stig [Wed, 2 Nov 2011 11:01:57 +0000 (11:01 +0000)]
From Andrew Kampjes via bug 6536:
Improved the Ethernet checksum field, modelled on the TCP checksum field.

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

7 years agoExport NAEA-CIC to be used by Camel.
etxrab [Wed, 2 Nov 2011 06:38:46 +0000 (06:38 +0000)]
Export NAEA-CIC to be used by Camel.

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

7 years agoFrom Yaniv Kaul:
etxrab [Wed, 2 Nov 2011 06:30:25 +0000 (06:30 +0000)]
From Yaniv Kaul:
Many enhancements, and some fixes, to the Spice dissector:
- SASL authentication support
- indention, tab fixes
- LZ image dissection (fixing at least one TODO item)
- dissect Spice client agent data
- fix some proto_tree_add_item() offsets
- probably some more that I forgot.


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

7 years agoUse "%g" for float as well as double.
guy [Wed, 2 Nov 2011 03:45:18 +0000 (03:45 +0000)]
Use "%g" for float as well as double.

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

7 years agoAmazingly, there *are* apparently protocols with IPv4 addresses in
guy [Wed, 2 Nov 2011 01:53:37 +0000 (01:53 +0000)]
Amazingly, there *are* apparently protocols with IPv4 addresses in
byte-swapped form - i.e., not network byte order, but the reverse of
network byte order - as, a long time ago, somebody asked to have the
"little_endian" flag affect the way proto_tree_add_item() fetched IPv4
addresses from the packet.

Use ENC_BIG_ENDIAN for IPv4 addresses (ENC_NA and ENC_BIG_ENDIAN have
the same value, but this makes it clearer that we, sadly, need to care).

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

7 years agoFrom Roland Knall:
etxrab [Tue, 1 Nov 2011 06:12:33 +0000 (06:12 +0000)]
From Roland Knall:
- Renaming opensafety.msg.type to opensafety.msg.direction
- Introducing real opensafety.msg.type as opensafety.msg.category and generated
- Adding openSAFETY Sender and Receiver field, for all types of messages
- Adding openSAFETY Domain number and Node number as generated fields, which
allows filtering for them
- Added functions, so that the new sender and receiver fields as well as
network information are added as sub-trees
- Removed DISSECTOR_ASSERT in opensafety_get_scm_udid as it is not needed here
- Added the connection valid bit to the dissection tree ( has been there as
message type, but was never validated )
- Added calculations for Domain Network Addr, depending if a valid UDID for the
SCM is present in SSDO and SPDO
- Corrected error, where sub-tree for spdo dissection used global ssdo_tree
instead of spdo_tree
- Added "Message Type unknown" which leads to PI_MALFORMED marked entry in
- Added check for ( length - frameOffset ) is below or equal zero, to avoid
using dissector asserts
- Added check for freak frame start detection, where both frame starts would be
equal (could happen during fuzztest)
- Removed DISSECTOR_ASSERT for both frame starts being different
- Added check, that if the frame address is above 1024, the package get's
marked as PI_MALFORMED (fuzztest)
- Fixed CID 1215, CID 1224 and CID 1246/1247
- Corrected naming issue with openSAFETY/SercosIII dissection using UDP


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

7 years agoRemove comma at the end of several enumerator lists.
morriss [Tue, 1 Nov 2011 01:23:10 +0000 (01:23 +0000)]
Remove comma at the end of several enumerator lists.

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

7 years agoWhen checking for GTK+2, indicate that we will *not* accept GTK 3 and later.
morriss [Tue, 1 Nov 2011 01:08:59 +0000 (01:08 +0000)]
When checking for GTK+2, indicate that we will *not* accept GTK 3 and later.

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

7 years agoDisable the CIP dissector until we can solve the fuzz failures.
morriss [Tue, 1 Nov 2011 00:58:21 +0000 (00:58 +0000)]
Disable the CIP dissector until we can solve the fuzz failures.

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

7 years agoFix compilation error:
sfisher [Mon, 31 Oct 2011 21:14:12 +0000 (21:14 +0000)]
Fix compilation error:

    In file included from packet-uaudp.c:39:
    packet-ua.h:32:38: error: no newline at end of file

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

7 years agoOne "packet-" suffices.
guy [Mon, 31 Oct 2011 20:44:31 +0000 (20:44 +0000)]
One "packet-" suffices.

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

7 years agoGive Iain Arnell specific credit for various ajp13 enhancements.
guy [Mon, 31 Oct 2011 20:43:31 +0000 (20:43 +0000)]
Give Iain Arnell specific credit for various ajp13 enhancements.

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

7 years agoFrom Martin Renold via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5730
alagoutte [Mon, 31 Oct 2011 18:37:58 +0000 (18:37 +0000)]
From Martin Renold via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5730
Dissector for HSR and PRP-1

Here is a patch that adds a dissector for HSR and for PRP-1. Both protocols are defined in IEC62439 Part 3. (High-availability Seamless Redundancy / Parallel Redundancy Protocol)

The existing PRP dissector has been refactored to support both the old PRP (now called PRP-0) and the new PRP-1.

There are three distinct dissectors:
- HSR (ethertype 892F)
- HSR/PRP supervision (ethertype 88FB)
- PRP-0 and PRP-1 (trailer dissector; disabled by default)

From me :
* Fix Clang Warning
* Add modification for CMakeLists.txt

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

7 years agoFrom Marek Tews via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6060
alagoutte [Mon, 31 Oct 2011 17:26:02 +0000 (17:26 +0000)]
From Marek Tews via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6060
Enhance Universal Alcatel Protocol

Several fixes and heuristic version. You can also specify the ports (as in the previous version), if the heuristic version is not working properly.

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

7 years agoTry to fix warnings.
etxrab [Mon, 31 Oct 2011 17:04:58 +0000 (17:04 +0000)]
Try to fix warnings.

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

7 years agoFrom me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6462 & 6505
alagoutte [Mon, 31 Oct 2011 13:45:21 +0000 (13:45 +0000)]
From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6462 & 6505
Wireshark unable to parse ERSPAN from HP Comware platforms
Huawei GRE ERSPAN is not decoded properly

Add a pref to FORCE to decode directly Ethernet frame in GRE (with no ERSPAN Header)

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

7 years agoFrom Thomas Dreibholz via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6524
alagoutte [Mon, 31 Oct 2011 13:30:29 +0000 (13:30 +0000)]
From Thomas Dreibholz via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6524
Enhancement for the Component Status Protocol dissector

The attached patch adds a dissection of the message flags field to the Component Status Protocol dissector.

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

7 years agoAdd BT-DHT to the Author Xiao Xiangquan
alagoutte [Mon, 31 Oct 2011 12:51:25 +0000 (12:51 +0000)]
Add BT-DHT to the Author Xiao Xiangquan

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

7 years agoNo need to ep_strdup a string to lua_pushstring.
stig [Mon, 31 Oct 2011 08:38:49 +0000 (08:38 +0000)]
No need to ep_strdup a string to lua_pushstring.

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

7 years agoSet the ENC_ on the remaining proto_add_item().
etxrab [Mon, 31 Oct 2011 07:05:52 +0000 (07:05 +0000)]
Set the ENC_ on the remaining proto_add_item().

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

7 years agoCompare current ABI to last (git) tagged version's ABI
rbalint [Sun, 30 Oct 2011 22:46:52 +0000 (22:46 +0000)]
Compare current ABI to last (git) tagged version's ABI

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

7 years agoDon't ep_strdup the protocol name when register a dissector, because
stig [Sun, 30 Oct 2011 21:32:27 +0000 (21:32 +0000)]
Don't ep_strdup the protocol name when register a dissector, because
this name will be collected when loading a capture file and the name
will be gone.

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

7 years agoFixed some coding errors:
stig [Sun, 30 Oct 2011 17:03:24 +0000 (17:03 +0000)]
Fixed some coding errors:
packet-bacapp.c:6154: error: stray '\250' in program
packet-bacapp.c:7137: warning: cast to pointer from integer of different size

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

7 years agoFix unused variable warnings.
etxrab [Sun, 30 Oct 2011 16:44:02 +0000 (16:44 +0000)]
Fix unused variable warnings.

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

7 years agoFrom Thomas Dreibholz:
etxrab [Sun, 30 Oct 2011 16:23:36 +0000 (16:23 +0000)]
From Thomas Dreibholz:
Update the NetPerfMeter protocol dissector to the latest
version of NetPerfMeter (http://www.iem.uni-due.de/~dreibh/netperfmeter/).


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

7 years agoFrom Kevin Hildebrand:
etxrab [Sun, 30 Oct 2011 16:19:05 +0000 (16:19 +0000)]
From Kevin Hildebrand:
Typo in acinclude.m4 breaks Heimdal kerberos builds


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

7 years agoFrom Lori Tribble:
etxrab [Sun, 30 Oct 2011 16:06:14 +0000 (16:06 +0000)]
From Lori Tribble:

I found many new properties in BACnet that were not decoded correctly in
Wireshark.  I have attached a patch that adds decoding to the following

Fixed the following properties to decode:

In the Accumulator Object:
scale (187)
prescale (185)
logging-record (184)

In Access Door Object:
door-members (228)
masked-alarm-values (234)

In the Pulse Converter Object:
input-reference (181)

In the Group Object:
list-of-group-members (53)

In the Event Enrollment Object:
object-property-reference (78)

In the Command Object:
action (2)

In the Trend Log Multiple object:
log-buffer (131)

In the Event Log Object:
log-buffer (131)

In the Structured View object:
subordinate-list (211)

Added decoding for the following enumeration type properties:
  Logging-type (197)
  event-state (36)
  reliability (103)
  notify-type (208)
  door-status (231)
  lock-status (233)
  secured-status (235)
  maintenance-required (158)
  program-state (92)
  program-change (90)
  reason-for-halt (100)
  mode (160)
  silenced (163)
  operation-expected (161)
  tracking-value (164)
  file-access-method (41)

The above fixes also fixed the log-buffer decoding of the old trend log
recorded as Wireshark bug: #6458

I believe this patch also fixes bug: #6235.  But the original bug did not
contain a capture file so I am not positive my capture represents the
originators issue.


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

7 years agoFrom Martin Kaiser:
etxrab [Sun, 30 Oct 2011 16:02:20 +0000 (16:02 +0000)]
From Martin Kaiser:
DVB-CI / CI+ Operator Profile Resource


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

7 years agoFrom Pascal Quantin:
etxrab [Sun, 30 Oct 2011 15:57:30 +0000 (15:57 +0000)]
From Pascal Quantin:
Fix dissection of PLMN List IE.

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

7 years agoIncrease the size of a unknown INTEGER to FT_INT64 to be able to show
stig [Sun, 30 Oct 2011 15:55:18 +0000 (15:55 +0000)]
Increase the size of a unknown INTEGER to FT_INT64 to be able to show
negative integers and integers up to MAXINT64.  We still don't support
integers between MAXINT64 and MAXUINT64, which would be 9 bytes long.

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

7 years agopass file to wireshark in wireshark.desktop
rbalint [Sun, 30 Oct 2011 14:24:29 +0000 (14:24 +0000)]
pass file to wireshark in wireshark.desktop

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

7 years ago[Automatic manuf, services and enterprise-numbers update for 2011-10-30]
gerald [Sun, 30 Oct 2011 14:03:25 +0000 (14:03 +0000)]
[Automatic manuf, services and enterprise-numbers update for 2011-10-30]

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

7 years agoClang Cat is watching you fail to check for a null pointer.
guy [Sun, 30 Oct 2011 06:47:27 +0000 (06:47 +0000)]
Clang Cat is watching you fail to check for a null pointer.

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

7 years agoDon't set mr_mult_req_info->num_services *unless we're sure
guy [Sat, 29 Oct 2011 20:41:30 +0000 (20:41 +0000)]
Don't set mr_mult_req_info->num_services *unless we're sure
mr_mult_req_info is non-null*!  This should fix bug 6514, and possibly a
bunch of other buildbot crashes.

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

7 years agoAdded support for big integer64 values.
stig [Sat, 29 Oct 2011 18:26:57 +0000 (18:26 +0000)]
Added support for big integer64 values.

This fixes bug 6295.

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

7 years agoBased on a patch provided by Prashanth in bug 6472:
stig [Sat, 29 Oct 2011 10:28:58 +0000 (10:28 +0000)]
Based on a patch provided by Prashanth in bug 6472:
Only have one Filter Expression window.

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

7 years agoFixed max and min in sint24_from_unparsed() again.
stig [Sat, 29 Oct 2011 09:00:18 +0000 (09:00 +0000)]
Fixed max and min in sint24_from_unparsed() again.
Note to self: don't think hex while doing something else...

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

7 years agoIt appears that the "packet" records are actually "stuff from the ISDN
guy [Fri, 28 Oct 2011 22:57:33 +0000 (22:57 +0000)]
It appears that the "packet" records are actually "stuff from the ISDN
link" records, including stuff that's from a G.704 PRI frame but not
from a D or H channel in that frame.  Handle them (currently, we ignore

The low-order bit of the flags field for "packet" records" is "network
to user" (NT->TE), not "user to network" (TE->NT).

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

7 years agoFixed max and min in sint24_from_unparsed().
stig [Fri, 28 Oct 2011 20:57:46 +0000 (20:57 +0000)]
Fixed max and min in sint24_from_unparsed().

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

7 years agoFixed a typo: strtoull() -> strtoul()
stig [Fri, 28 Oct 2011 20:32:42 +0000 (20:32 +0000)]
Fixed a typo: strtoull() -> strtoul()

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

7 years agoSimplified code for checking integer ranges.
stig [Fri, 28 Oct 2011 20:30:41 +0000 (20:30 +0000)]
Simplified code for checking integer ranges.

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

7 years agoAdded range checking for integers and give an appropriate error
stig [Fri, 28 Oct 2011 20:14:13 +0000 (20:14 +0000)]
Added range checking for integers and give an appropriate error
message if value is outside of range (given by field type).

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

7 years agoPrefer previous error message if not having hfinfo->strings,
stig [Fri, 28 Oct 2011 20:13:56 +0000 (20:13 +0000)]
Prefer previous error message if not having hfinfo->strings,
because this may give more interesting information.

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

7 years agoFix the width of a type (and hopefully please the buildbots).
martinm [Fri, 28 Oct 2011 18:59:30 +0000 (18:59 +0000)]
Fix the width of a type (and hopefully please the buildbots).

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

7 years agoFirst go at calling UMTS RLC dissector from IxCatapult logs.
martinm [Fri, 28 Oct 2011 18:36:20 +0000 (18:36 +0000)]
First go at calling UMTS RLC dissector from IxCatapult logs.

Had to change some #defines in the header file (for UDP-framed/heuristic
dissector) - will need to update example sending program later on tonight.

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

7 years agoFix Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Fri, 28 Oct 2011 17:44:01 +0000 (17:44 +0000)]
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFix Dead Store (Dead assignement/Dead increment) Warning found by Clang
alagoutte [Fri, 28 Oct 2011 17:39:31 +0000 (17:39 +0000)]
Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang

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

7 years agoFrom Xiao Xiangquan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5767
alagoutte [Fri, 28 Oct 2011 14:50:13 +0000 (14:50 +0000)]
From Xiao Xiangquan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5767
BitTorrent DHT dissector for wireshark

From me :
* Fix encoding attribut for proto_tree_add_item (with fix-encodings-args script)

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

7 years agoFrom Xiao Xiangquan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5767
alagoutte [Fri, 28 Oct 2011 14:49:31 +0000 (14:49 +0000)]
From Xiao Xiangquan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5767
Make bt-utp as heuristic dissectors

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