Commit Graph

37837 Commits

Author SHA1 Message Date
Gerald Combs 7d442f4c22 Change the use of threads from "mostly always, depending on your
configure options and Gtk+ and GLib versions" to "always".

svn path=/trunk/; revision=39751
2011-11-07 23:42:53 +00:00
Alexis La Goutte 60247a582b 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

svn path=/trunk/; revision=39750
2011-11-07 16:56:16 +00:00
Stig Bjørlykke 42376edbac 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.

svn path=/trunk/; revision=39749
2011-11-07 16:09:41 +00:00
Stig Bjørlykke 43c34aaf8e 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.

svn path=/trunk/; revision=39748
2011-11-07 07:41:03 +00:00
Guy Harris 3f6175ac2f 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
svn:executable.

svn path=/trunk/; revision=39747
2011-11-06 20:20:14 +00:00
Alexis La Goutte b7e21381ae 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

svn path=/trunk/; revision=39746
2011-11-06 19:19:07 +00:00
Alexis La Goutte 0ec187967e From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6545
DVB-CI / CI+ fix clang warning about unused variable

svn path=/trunk/; revision=39745
2011-11-06 19:02:36 +00:00
Stig Bjørlykke 0352ac8e8f 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.

svn path=/trunk/; revision=39744
2011-11-06 17:39:13 +00:00
Gerald Combs 54c1e0e2a6 [Automatic manuf, services and enterprise-numbers update for 2011-11-06]
svn path=/trunk/; revision=39741
2011-11-06 15:03:27 +00:00
Anders Broman 28f7d63c58 Dissect RIM related IEs
svn path=/trunk/; revision=39740
2011-11-06 08:18:26 +00:00
Guy Harris d0fa4d6df7 Add a preference to select whether to use LAPD or DPNSS as the protocol
on the D channel.

svn path=/trunk/; revision=39739
2011-11-05 20:47:11 +00:00
Guy Harris 74ad858e3a 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.

svn path=/trunk/; revision=39738
2011-11-05 20:45:39 +00:00
Guy Harris 8abad18913 Fix what I assume is a typo in the introductory comment.
svn path=/trunk/; revision=39737
2011-11-05 20:43:56 +00:00
Guy Harris bc3796b7ac Updates based on stuff seen in a new capture.
I'm leaving debug messages in, but #if 0'ed out, for now.

svn path=/trunk/; revision=39736
2011-11-04 23:59:07 +00:00
Guy Harris 30811d83fd Get rid of non-ASCII characters in comments.
Convert "4-space tabs" to spaces.

svn path=/trunk/; revision=39735
2011-11-04 18:43:23 +00:00
Anders Broman f960294c68 Dissect RIM Routing Address Discriminator and RAN Transparent Container.
svn path=/trunk/; revision=39734
2011-11-04 17:39:54 +00:00
Anders Broman 42a3c77a9f Dissect RIMInformation.
svn path=/trunk/; revision=39733
2011-11-04 17:37:38 +00:00
Stig Bjørlykke edc2689422 Only have the option to turn off syntax check capture filter
if not using threads.

svn path=/trunk/; revision=39732
2011-11-04 17:02:33 +00:00
Jeff Morriss 7e24821c3d Terminate a value_string.
svn path=/trunk/; revision=39731
2011-11-04 13:41:12 +00:00
Stig Bjørlykke d4e7b76316 From Roland Knall via bug 6538:
Use CRC routines from wsutil + some Code-Clang Analysis fixes.

svn path=/trunk/; revision=39730
2011-11-04 08:15:29 +00:00
Anders Broman ed8927d316 Fix GRE Key entry
svn path=/trunk/; revision=39729
2011-11-03 22:01:05 +00:00
Stig Bjørlykke db6f524164 From Roland Knall via bug 6539:
Implementing generic CRC8 and CRC16 functions for openSAFETY in wsutil.

svn path=/trunk/; revision=39726
2011-11-03 20:58:29 +00:00
Stig Bjørlykke 91eab9d737 From Roland Knall via bug 6538:
Remove stringToBytes and use hex_str_to_bytes instead.

svn path=/trunk/; revision=39725
2011-11-03 20:38:04 +00:00
Martin Mathieson fd521521f4 Add (most) primitive header items to the tree before calling UMTS RLC dissector.
svn path=/trunk/; revision=39724
2011-11-03 16:52:37 +00:00
Stephen Fisher 3a2674599f 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 []


svn path=/trunk/; revision=39723
2011-11-03 15:38:29 +00:00
Gerald Combs 13c64c2524 Update the list of new features.
svn path=/trunk/; revision=39722
2011-11-02 20:44:05 +00:00
Gerald Combs 18cbe2f0e0 Fix spelling.
svn path=/trunk/; revision=39721
2011-11-02 20:43:10 +00:00
Guy Harris 21688e4e46 We have to remove svnversion.h with "make distclean".
svn path=/trunk/; revision=39720
2011-11-02 20:21:11 +00:00
Stig Bjørlykke 66b220330a Revert revision 39665 (for bug 6472) which introduced bug 6537.
svn path=/trunk/; revision=39719
2011-11-02 20:06:40 +00:00
Anders Broman b0ceb1cc77 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

svn path=/trunk/; revision=39718
2011-11-02 19:36:33 +00:00
Anders Broman 083dbff6f9 From Roland Knall:
Remove the warnings for the Clang-Code-Analysis.

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

svn path=/trunk/; revision=39717
2011-11-02 19:28:38 +00:00
Guy Harris 68e4d887d2 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

	http://www.wireshark.org/lists/wireshark-dev/201111/msg00027.html

and followups.

svn path=/trunk/; revision=39716
2011-11-02 18:16:26 +00:00
Anders Broman d1c256002f Handle differences in Camel V2
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3911
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6474

svn path=/trunk/; revision=39715
2011-11-02 18:10:34 +00:00
Guy Harris 475b93f975 Requiescat in pace, osx-build.sh.
svn path=/trunk/; revision=39714
2011-11-02 18:01:27 +00:00
Gerald Combs 376c998cff Remove osx-build.sh. It was never fully ported to the Wireshark build
environment and has been unused for 3 years.

svn path=/trunk/; revision=39713
2011-11-02 17:36:20 +00:00
Stig Bjørlykke 293695e82c From Andrew Kampjes via bug 6536:
Improved the Ethernet checksum field, modelled on the TCP checksum field.

svn path=/trunk/; revision=39712
2011-11-02 11:01:57 +00:00
Anders Broman 7669c6affd Export NAEA-CIC to be used by Camel.
svn path=/trunk/; revision=39711
2011-11-02 06:38:46 +00:00
Anders Broman e1bdf00529 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.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6535#attach_7355

svn path=/trunk/; revision=39710
2011-11-02 06:30:25 +00:00
Guy Harris 4e2c6d9986 Use "%g" for float as well as double.
svn path=/trunk/; revision=39709
2011-11-02 03:45:18 +00:00
Guy Harris d332082386 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).

svn path=/trunk/; revision=39708
2011-11-02 01:53:37 +00:00
Anders Broman 228b478691 From Roland Knall:
- Renaming opensafety.msg.type to opensafety.msg.direction
- Introducing real opensafety.msg.type as opensafety.msg.category and generated
field
- 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
- Rework PACKET_RECEIVED_BY and PACKET_SEND_FROM_TO_ALL to PACKET_RECEIVER and
PACKET_SENDER
- Replaced PACKET_SEND_FROM_TO with calls to PACKET_RECEIVER and PACKET_SENDER
- 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
anymore
- 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
dissect_opensafety_message
- 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
transport

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

svn path=/trunk/; revision=39701
2011-11-01 06:12:33 +00:00
Jeff Morriss f5e838b602 Remove comma at the end of several enumerator lists.
svn path=/trunk/; revision=39700
2011-11-01 01:23:10 +00:00
Jeff Morriss e3f8def24f When checking for GTK+2, indicate that we will *not* accept GTK 3 and later.
svn path=/trunk/; revision=39699
2011-11-01 01:08:59 +00:00
Jeff Morriss cea1d2c231 Disable the CIP dissector until we can solve the fuzz failures.
svn path=/trunk/; revision=39698
2011-11-01 00:58:21 +00:00
Stephen Fisher 677331f529 Fix compilation error:
In file included from packet-uaudp.c:39:
    packet-ua.h:32:38: error: no newline at end of file


svn path=/trunk/; revision=39697
2011-10-31 21:14:12 +00:00
Guy Harris 2c63dc2272 One "packet-" suffices.
svn path=/trunk/; revision=39696
2011-10-31 20:44:31 +00:00
Guy Harris 69649d4014 Give Iain Arnell specific credit for various ajp13 enhancements.
svn path=/trunk/; revision=39695
2011-10-31 20:43:31 +00:00
Alexis La Goutte b17be73489 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

svn path=/trunk/; revision=39692
2011-10-31 18:37:58 +00:00
Alexis La Goutte 4ea690d66e 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.

svn path=/trunk/; revision=39691
2011-10-31 17:26:02 +00:00
Anders Broman 201d4f3cab Try to fix warnings.
svn path=/trunk/; revision=39690
2011-10-31 17:04:58 +00:00