Commit graph

623 commits

Author SHA1 Message Date
Anders Broman
3821038f94 From Michael Mann:
I made the following improvements to the Modbus/TCP dissector:

1. Implemented protocol to the latest specification (v1.1b).  See
http://www.modbus.org/specs.php.
2. Upgraded to "tcp_dissect_pdus" instead of having the dissector do it
manually.  This also provides TCP packet reassembly support.
3. Removed support for UDP port 502 because it's not supported by the protocol
specification.  I believe "Decode As..." could be used in its place.
4. Added dissector support for the following function codes:
  a) 8 - Diagnostics
  b) 11 - Event Counter
  c) 12 - Event Log
  d) 43 - Encapsulation Transport (mostly for 43/14)
5. Removed support for function codes not in the protocol specification. None
of them were really being parsed, they just offered a "name" for the function
code.
6. Moved protocol #defines to header file for access from other dissectors.  I
plan to have other dissectors use this, but one patch at a time.
7. Created "modbus" dissector that is accessible to other dissectors.
8. Renamed base "display filter name" to reflect PROTOABBREV.

I removed defines for value_strings, I think it's better to export the vaöue strings if needed.

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

svn path=/trunk/; revision=37539
2011-06-04 15:45:50 +00:00
Guy Harris
c681f0434e From Roland Knall: openSAFETY dissector.
svn path=/trunk/; revision=37487
2011-05-31 19:31:45 +00:00
Stig Bjørlykke
0b154761fa One more still dirty.
svn path=/trunk/; revision=37436
2011-05-27 12:46:35 +00:00
Stig Bjørlykke
8a8ff7f03d Moved nbap and pcap back as dirty dissectors.
svn path=/trunk/; revision=37434
2011-05-27 11:58:47 +00:00
Stig Bjørlykke
21432aa5b0 Try building some ASN.1 dissectors as clean.
svn path=/trunk/; revision=37432
2011-05-27 10:52:25 +00:00
Jeff Morriss
28bae657ae From Florian Fainelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5943 :
The two patches attached allow the dissection of the Homeplug AV Ethernet MAC
management frames between a controlling device and a Homeplug AV Ethernet to
PLC adapter. This protocol is pretty similar to the previous generation
Homeplug protocol (dissected by packet-homeplug.c) but a couple of noticeable
differences make it require its own dissector handler.

This dissector is based on the work done by Nicolas Thill, Xavier Carcelle and
myself in the Faifa project (https://dev.open-plc.org).

The dissector handles the standard Homeplug AV Ethernet MAC management frames
(called public) as well as the Intellon specific management frames (vendor).

From me:
Remove unnecessary global variables.
Add to COL_INFO even when !tree.
Remove gotos.
Remove unnecessary includes.

svn path=/trunk/; revision=37403
2011-05-26 01:55:04 +00:00
Jeff Morriss
cf485a2ea1 From Johannes Jochen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5900 :
I have created a dissector for the Multiple MAC Registration Protocol based on
the exiting dissector of the Multiple Stream Reservation Protocol (bugzilla id:
4757 ) You can found the documentation of the Protocol here:
http://standards.ieee.org/getieee802/download/802.1ak-2007.pdf It's also
includes the corrections of the protocol you will found here:
http://standards.ieee.org/getieee802/download/802.1Q-2005_Cor1-2008.pdf

svn path=/trunk/; revision=37104
2011-05-12 21:37:55 +00:00
Chris Maynard
df79077cdd Add USB/AT dissector, submitted by Tyson Key via bug 5868 with some
modifications by me as described/documented in the bug report.

svn path=/trunk/; revision=37045
2011-05-10 17:04:05 +00:00
Bill Meier
1d00bb4da1 packet-xtp.h used only in packet-xtp.c; Move packet-xtp.h contents to packet-xtp.c
svn path=/trunk/; revision=36994
2011-05-05 01:08:17 +00:00
Anders Broman
a663d91ca6 From Hans-Christoph Schemmel:
A variant of 3GPP TS 27.010 multiplexing protocol dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5829

svn path=/trunk/; revision=36927
2011-04-28 05:36:26 +00:00
Jeff Morriss
d687ba04fd From Loránd Jakab via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5854 :
The Locator/ID Separation Protocol [1] is being standardized within the IETF,
and it is nearing RFC status (pending security review). I have been maintaining
a dissector patch for about a year, see [2]. Feedback received indicates that,
among others, it is widely used by the developers of a large router vendor,
without issues.

In January I submitted the dissector for data plane packets as bug #5602, which
was committed as r35615. The patch attached to this bug adds support for
dissection of control plane packets.

[1] http://tools.ietf.org/html/draft-ietf-lisp
[2] http://lisp.ccaba.upc.edu/wireshark/

svn path=/trunk/; revision=36845
2011-04-25 02:06:17 +00:00
Alexis La Goutte
d059b43226 From Xiao Xiangquan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5846
A new dissector for uTorrent Transport Protocol

From me :
* Add link to spec BEP-0029
* Add note about type/version 
* Rework extensions loop
* Use 2-space indenting


svn path=/trunk/; revision=36715
2011-04-19 15:23:06 +00:00
Anders Broman
ffae0f912d From Neil Piercy:
Adds BMC protocol, including adding support for MAC and RLC CTCH channels to carry it.
From me:
Removed hf blurbs = def and removed check_col added tp CMakeList.

svn path=/trunk/; revision=36662
2011-04-16 12:22:16 +00:00
Anders Broman
0a1437bfac Add a basic ROCH dissector.
Limitations:
- Small CID
- RTP profile
- IPv4

svn path=/trunk/; revision=36659
2011-04-16 11:44:05 +00:00
Gerald Combs
d7d45f8072 1.5.1 → 1.5.2. Reenable Babel.
svn path=/trunk/; revision=36540
2011-04-10 17:03:43 +00:00
Gerald Combs
8b8082442d Build 1.5.1. Temporarily disable the Babel dissector.
svn path=/trunk/; revision=36537
2011-04-10 16:42:10 +00:00
Stephen Fisher
374558c830 From Juliusz Chroboczek via bug #5812: Dissector for the Babel Routing
Protocol (RFC 6126)


svn path=/trunk/; revision=36518
2011-04-08 16:53:02 +00:00
Chris Maynard
595e5e1c1d Add ICMP tap support, and add a tshark tap to measure such things as:
* Number of ICMP echo requests, replies, lost replies and percent loss.
  * Min, Max, Average SRT (Service Response Time), and standard deviation.
(This is my first tap, so hopefully I didn't miss something, but we'll see ...)
TODO: Add a Wireshark tap.


svn path=/trunk/; revision=36480
2011-04-05 20:21:59 +00:00
Jeff Morriss
a148a936b1 From Felix Kraemer: fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5694 :
This patch adds the capability to create BACnet statistics trees. 
Find the respective menu items under 'Statistics->BACnet'.
Packets can be sorted by different criteria:
- Src/Dst IP adresses
- Instance ID
- Object Type
- Service

From me:
- Don't use C++/C99-style comments.
- Name variables for tick_stat_node() don't need to be static.
- Change updateBacnetInfoValue() to require 'data' to be ep_ allocated.  Change
  the couple of calls that did not send in ep_ allocated data to do so.
- Change one or two functions to be static.
- Do not use (memory-unsafe) g_sprintf().
- Use ep_strconcat() instead of leaking memory with g_strconcat().
- Put back one if(tree) that doesn't appear to do any harm.
- Remove variable declarations and #includes from the header file.

svn path=/trunk/; revision=36468
2011-04-05 02:18:28 +00:00
Jaap Keuter
391b328a6b From Alexis La Goutte:
A patch to add ATM over TCP Dissector.
The dissector dissect only the ATMTCP header (VCI, VPI, Payload Length) 
The data are not yet dissect, it is necessary to add a "UAT" (As with the K12
dissector) to indicate the type (ILMI, AAL, ATM...) of data (based on VCI/VPI)

svn path=/trunk/; revision=36354
2011-03-26 16:07:30 +00:00
Anders Broman
9486d7dcc2 From Roland Knall:
Patch, which removes both EPL and EPLv1 .h files, as well as adding a heuristic dissector hook to EPL (v1 is nearly nowhere in use anymore, therefore not needed)

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

svn path=/trunk/; revision=36198
2011-03-16 06:21:56 +00:00
Stig Bjørlykke
d3cff4643b Use TRUE/FALSE for encoding_info to make it build.
Added packet-mndp.c to Makefile build.

svn path=/trunk/; revision=36179
2011-03-12 12:09:52 +00:00
Bill Meier
16b528aaf1 From Martin Kaiser: dissector for DVB-CI (Common Interface)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5654

From me:
- Entry for DVBCI added to wtap.c encap_table_base[];
- Some code simplification with respect to the use of col_...() for COL_INFO;
- Certain tests for "enough bytes available" not really needed;
- (Other minor tweaks);
- #include<stdio.h> not req'd;
- Minor reformatting and whitespace cleanup;


svn path=/trunk/; revision=36149
2011-03-07 02:22:48 +00:00
Anders Broman
eec32e9cbc svn path=/trunk/; revision=36087 2011-02-28 09:43:22 +00:00
Anders Broman
ff2bbd35b2 Revert file commited by misstake.
svn path=/trunk/; revision=36070
2011-02-25 15:14:12 +00:00
Anders Broman
1b02abc1eb Verify tools fails if wireshark-win32-libs does not exist.
svn path=/trunk/; revision=36068
2011-02-25 15:09:05 +00:00
Jeff Morriss
d8a2cf3c4d From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5713 :
Enhance RIPng
* Replace tvb_memcpy/proto_tree_add_text by proto_tree_add_item
* Remove dependency to packet-ipv6.h
* Remove packet-ripng.h (not needed)

Also update AUTHORS file

From me:
Put a check_col() back and reword (shorten) a couple of the new blurbs.

svn path=/trunk/; revision=36033
2011-02-23 17:31:03 +00:00
Stig Bjørlykke
5868c7d026 Renamed x411 to p1, x420 to p22 and s4406 to p772 to be consistent
on the naming policy for X.400 protocols.

svn path=/trunk/; revision=36013
2011-02-20 17:03:29 +00:00
Tomas Kukosa
e3808393e1 Erlang Port Mapper Daemon protocol updated and Erlang Distribution Protocol implemented
svn path=/trunk/; revision=35819
2011-02-04 14:10:37 +00:00
Jeff Morriss
2832bf5aa1 Include packet-tetra.h in the source distribution.
svn path=/trunk/; revision=35787
2011-02-03 19:01:19 +00:00
Anders Broman
2395973d17 Integrate and build the tetra dissector.
svn path=/trunk/; revision=35766
2011-02-02 20:11:02 +00:00
Anders Broman
a740413286 Move gprscdr to dissectors with warnings.
svn path=/trunk/; revision=35762
2011-02-02 17:50:12 +00:00
Anders Broman
5bb082fde0 Build gsmcdr.
svn path=/trunk/; revision=35761
2011-02-02 17:16:29 +00:00
Stig Bjørlykke
7a16aeaf05 Moved packet-t38.c to the ASN.1 section.
svn path=/trunk/; revision=35704
2011-01-30 20:59:39 +00:00
Jaap Keuter
a4f66cd9f6 From Brian Ginsbach:
Patch to add a new dissector for Realm Specific IP (RSIP) as defined by
RFC 3102, RFC 3103, and RFC 3104.
This is a very basic dissector.  It could be extended to do addtional RSIP
protocol violation testing.  The dissector is written such that it should be
easy to add later.

svn path=/trunk/; revision=35653
2011-01-26 07:24:06 +00:00
Jaap Keuter
2f74388448 From Loránd Jakab:
The patch I am attaching here is for dissecting LISP data packets.

From me: 
Minor cleanups.
Showing the reserved field.
Adding to all makefiles and release notes.

svn path=/trunk/; revision=35615
2011-01-22 00:18:03 +00:00
Jaap Keuter
1ea96b1e30 From Slava K:
FCoIB – Fibre Channel over InfiniBand. The protocol enables transmission of
Fibre Channel frames over InfiniBand networks. It is based on encapsulation of
Fibre Channel frames over InfiniBand UD transport. The discovery protocol is
based on the FIP protocol (not supported by this patch).

This patch adds an FCoIB dissector to Wireshark. It is based in large part on
the existing FCoE dissection code.

This code is submitted on behalf of Mellanox Technologies Ltd.

svn path=/trunk/; revision=35475
2011-01-11 08:22:16 +00:00
Bill Meier
e0424dde5d Move some DISSECTOR_SRC & DISSECTOR_INCLUDES entries so they are (more or less) in alpha order.
svn path=/trunk/; revision=35454
2011-01-10 15:19:18 +00:00
Anders Broman
a2bbf3d7cc Put sgsap in the right place.
svn path=/trunk/; revision=35433
2011-01-09 13:50:41 +00:00
Kovarththanan Rajaratnam
46dd093b94 From Allan M. Madsen via. bug 5445:
Bluetooth profiles and protocols above RFCOMM and L2CAP can not be dissected correctly because the required information (server channel and dynamic PSM value mappings to services/profiles) about the type of data carried in the payload is not available. RFCOMM is currently hardcoded to handoff all payload data to the obex dissector though it may carry e.g. handsfree, dial-up networking or serial port profile related data.

The patch consists of modifcations to the following dissectors:

btsdp: Extraction of RFCOMM server channel and L2CAP dynamic PSM with service mapping is provided to RFCOMM and L2CAP through a tap interface. In addition, the packet list info is beautyfied and extended with more details for better
overview.

btl2cap: Adds a new dissector table with services and dynamic PSM mapping which is filled by a tap listner catching the info from btsdp. More info added to packet list.

btrfcomm: Adds a new dissector table with services and server channel mapping which is filled by a tap listner catching the info from btsdp. Dissectors for handsfree, dial-up netorking and serial port profiles (all based on RFCOMM) are also added.

btobex: Registers several obex based profiles (e.g. obex push, file transfer, basic printing etc.) in both RFCOMM and L2CAP. Some cleanup.


svn path=/trunk/; revision=35323
2011-01-02 08:13:40 +00:00
Chris Maynard
2cd8459ddb From Jakub Zawadzki via bug 4753: New dissector: JSON, w/minor changes by me:
1) Add links to RFC 4627 and the json.org web site.
2) Comment out hf_json_member_key to keep tools/checkhf.pl happy.
3) Avoid duplicate (application/json) from being displayed in Info column.

svn path=/trunk/; revision=35317
2010-12-31 18:03:23 +00:00
Anders Broman
356aced5bf Start of a SGSAP (TS 29.118) dissector for LTE.
svn path=/trunk/; revision=35266
2010-12-26 21:06:08 +00:00
Jeff Morriss
c755b2fd54 Oh yeah, there's a reason we don't put targets in Makefile.common: the first target in a makefile is what you get when you just run make (without a target). Revert 35073 and 35069.
svn path=/trunk/; revision=35075
2010-11-30 02:04:55 +00:00
Jeff Morriss
f1c066bbee Move some checkapi targets into Makefile.common
svn path=/trunk/; revision=35073
2010-11-29 22:34:04 +00:00
Jeff Morriss
1f4cdf5a9d From Stephane Bryant via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5358 :
This is a dissector for reload framed message:
ReLOAD packets can be inserted in frame message, as described in
draft-ietf-p2psip-base-10

From me: remove some unnecessary includes.

svn path=/trunk/; revision=35005
2010-11-22 16:19:39 +00:00
Stephen Fisher
dbf10b1dc8 From Jon Ellch via bug #5175: Add PPI-GPS protocol dissector patch
Minor changes by me as detailed in the bug's comment #8.


svn path=/trunk/; revision=34956
2010-11-18 20:54:14 +00:00
Jeff Morriss
805d04fd15 From Toralf Foerster via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5376 :
A dissector for the SAMETIME protocol.

From me: no need to include gmodule.h, use only ASCII in the author's name.

svn path=/trunk/; revision=34930
2010-11-17 16:47:03 +00:00
Jeff Morriss
37d4ccff56 From Slava via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5335 :
This patch adds to Wireshark the ability to dissect Infiniband SDP (Socket
Direct Protocol) and CM MADs traffic.

It also contains various other bug-fixes and enhancements. SDP traffic can be
identified automatically (analyzing SDP CM MADs) or manually.

SDP, or Sockets Direct Protocol, is a protocol developed by the Infiniband
Trade Association which enables existing socket-based applications to
transparently utilize the Infiniband capabilities. 

This patch is submitted on behalf of Mellanox Technologies Ltd.

svn path=/trunk/; revision=34918
2010-11-17 02:57:22 +00:00
Stephen Fisher
b18e8fd1ca Resolve bug #2254: Migrate the 802.1q VLAN dissector into the Ethernet II.
svn path=/trunk/; revision=34838
2010-11-10 22:37:30 +00:00
Jeff Morriss
e257f75449 From Alexis La Goutte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5290 :
A patch to add support of Mongo Wire Protocol (Used by MongoDB)

From me: use ENC_xxx in proto_tree_add_item() calls.

svn path=/trunk/; revision=34680
2010-10-28 17:33:18 +00:00