Commit Graph

80 Commits

Author SHA1 Message Date
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
Anders Broman d150a694cb Remove code commited by misstake.
svn path=/trunk/; revision=39101
2011-09-23 11:22:48 +00:00
Anders Broman 7c0741ad15 Revert Revision 34838 "Resolve bug #2254: Migrate the 802.1q VLAN dissector into the Ethernet II."
as this causes a lot of problems.
See 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5680
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6305
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6366

Original bug:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2254

svn path=/trunk/; revision=39100
2011-09-23 11:01:13 +00:00
Anders Broman 0beb8db2a3 Add ethertype #8903
svn path=/trunk/; revision=38912
2011-09-07 08:26:36 +00:00
Jaap Keuter f1bb0e1735 From Dejan Bucar:
Added support new multicore header in the LINX Ethernet protocol.
Added linx/tcp.

svn path=/trunk/; revision=37777
2011-06-23 21:52:58 +00:00
Anders Broman 570ffe5f7d From Florian Fainelli:
Patch adding the Homeplug AV ethertype.
Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5943

svn path=/trunk/; revision=37388
2011-05-25 05:33:00 +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
Anders Broman cd8af5a050 Add RoHC to the ethertypes.
svn path=/trunk/; revision=36499
2011-04-06 18:48:07 +00:00
Guy Harris a8bc4a0d13 Rename the routines that handle dissector tables with unsigned integer
keys to have _uint in their names, to match the routines that handle
dissector tables with string keys.  (Using _port can confuse people into
thinking they're intended solely for use with TCP/UDP/etc. ports when,
in fact, they work better for things such as Ethernet types, where the
binding of particular values to particular protocols are a lot
stronger.)

svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
Anders Broman 96659d0252 From Jouni Malinen:
Add support for dissecting TDLS (IEEE 802.11z) frames.
These are mostly used as Action frames that are encapsulated in Data frames (to go through any AP).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5493

svn path=/trunk/; revision=35208
2010-12-16 21:49:55 +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
Jaap Keuter 9a1a03eca9 From Daniel Ginsburg:
draft-ietf-isis-ext-eth specifies an extension to current Ethernet Frame
specifications for hardware and frame format to support payloads greater than
1500 Bytes for Type interpretation and Length interpretation frames.

The extension introduced by draft-ietf-isis-ext-eth is currently used by Cisco
Systems' IS-IS routing protocol implementation when running IS-IS over Ethernet
links with large MTU.

svn path=/trunk/; revision=34748
2010-11-02 07:54:24 +00:00
Jeff Morriss 33f116a46d Restore pinfo->private_data after an exception was thrown by a subdissector.
This is necessary in case a subdissector had changed it but was unable to
restore it (due to the exception).

Remove check_col().

svn path=/trunk/; revision=34436
2010-10-08 17:48:22 +00:00
Stig Bjørlykke df7f6aa8ff From Lukasz Kotasa via bug 5248:
Added ETHERTYPE_WAI.

svn path=/trunk/; revision=34180
2010-09-22 13:14:46 +00:00
Anders Broman dff27826ec From Slava:
Infiniband RoCE dissection.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5060

svn path=/trunk/; revision=33702
2010-08-03 16:57:02 +00:00
Bill Meier d7b4bbc98a From Haakon Nessjoen: New dissector for Digiums TDMoE protocol
From me: A few minor changes:
- col-clear() not req'd;
- Use 'gint32 length' rather than 'guint8 length';
- Use ENC_NA instead of FALSE/TRUE in two cases;
- Move global tdmoe_handle to be local to proto_reg_handoff...

svn path=/trunk/; revision=33307
2010-06-23 20:08:11 +00:00
Stig Bjørlykke 286aaddb05 Use top level tree when using dissectors from "eth.trailer" heuristics.
svn path=/trunk/; revision=33255
2010-06-19 01:16:29 +00:00
Anders Broman cd4cfa05ac Add the Gigamon ethertype.
svn path=/trunk/; revision=33250
2010-06-18 04:18:08 +00:00
Anders Broman a11836dc8b Move VLAN and ARP closer to the top.
svn path=/trunk/; revision=32927
2010-05-24 04:09:03 +00:00
Bill Meier 1f1a38f961 From Torrey Atcitty: IEEE 1722(AVB Transport Protocol) Dissector
See Bug #4764 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4764)

svn path=/trunk/; revision=32841
2010-05-17 04:08:08 +00:00
Bill Meier 7a0a969036 From Torrey Atcitty: IEEE 802.1Qat (Multiple Stream Reservation Protocol) dissector
See: Bug #4757: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4757

svn path=/trunk/; revision=32816
2010-05-14 22:55:55 +00:00
Anders Broman 57229a36fa From David Aggeler:
Added 0x88DE to etypes.h
Added ETHERTYPE_VMLAB 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4186

svn path=/trunk/; revision=32378
2010-04-05 09:21:48 +00:00
Stephen Fisher af48a878d4 Reformat value_string, its comments and whitespace.
svn path=/trunk/; revision=31415
2010-01-03 10:05:50 +00:00
Jaap Keuter 585e448083 From Juha Siltanen :
This is a patch for a new dissector that decodes Nokia Siemens Networks'
proprietary Flow Layer Internal Protocol (Ethertype 0x8901).

svn path=/trunk/; revision=31069
2009-11-24 23:11:11 +00:00
Anders Broman 57ec611fa1 From dragonlinux:
Add QNX OS VER 6's qnet ethernet protocol number.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3934

svn path=/trunk/; revision=29558
2009-08-26 05:10:12 +00:00
Kovarththanan Rajaratnam 8b515e9340 Switch a bunch of dissectors over to using tvb_new_subset_remaining()
svn path=/trunk/; revision=29446
2009-08-16 12:36:22 +00:00
Anders Broman 298feb719f From Joakim Wiberg:
Device Level Ring protocol addition.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3685

With some minor changes (blurb NULL whem text equal).

svn path=/trunk/; revision=29044
2009-07-09 20:44:28 +00:00
Guy Harris 9ed2e2b4fb The only callers of ethertype() should be dissectors for protocols with
Ethernet-type trailers; no callers are left that don't at least purport
to care about them.

svn path=/trunk/; revision=28284
2009-05-05 21:05:06 +00:00
Anders Broman a02bbff000 Add XiMeta Technology's ethertype.
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3392)

svn path=/trunk/; revision=28040
2009-04-13 18:32:24 +00:00
Jaap Keuter 66d54fa2ce From Benjamin Roch:
This contains the source for dissecting TTEthernet packets (including Protocol Control Frames) conforming to our TTEthernet specification as dissector for Wireshark.

svn path=/trunk/; revision=26955
2008-12-10 07:00:26 +00:00
Stig Bjørlykke 9a0020f2f9 From Peter (bug 2942):
Allow optimalization with -ftracer.

svn path=/trunk/; revision=26822
2008-11-22 15:55:01 +00:00
Anders Broman f7e0b6490a Add Ethertype for WAVE Short Message dissection (WSMP).
svn path=/trunk/; revision=26018
2008-08-14 17:03:30 +00:00
Jaap Keuter 01c640d3e7 From Joe Eykholt:
FIP is the FCoE Initialization Protocol.  FCoE is Fibre-Channel over Ethernet.
FIP is being finalized in t11.org, and further changes are not expected.

svn path=/trunk/; revision=25748
2008-07-15 20:56:22 +00:00
Guy Harris a985d71ec1 If we know that an Ethernet packet includes the FCS, remove the FCS from
the payload we hand to the next dissector.

Check whether the length field in an 802.3 header doesn't go past the
(presumed) end of the payload.

svn path=/trunk/; revision=25731
2008-07-13 18:56:54 +00:00
Jeff Morriss 31d705e32f From Sven Meier (on -dev in 6/2007):
This is a dissector for the Parallel Redundancy Protocol (PRP) defined in chapter
6 of the IEC 62439.

PRP uses two independent networks in parallel and allows redundancy without
switchovers.

The protocol is sending Mac multicast messages with Ethertype 0x88fb. In
addition to that it adds to every Ethernet frame a 4 byte trailer before
the FCS. The trailer is detected by checking a size field and an identifier
which are part of the trailer. Therefore, if the last 4 bytes of a frame
match a correct trailer they get interpreted as a trailer, although it was
probably not a real one.

Note:

This is a post-dissector which means it gets called for every frame.  So as
to not cause a performance hit for every Wireshark user (who may not even be
looking at Ethernet frames) it currently disables itself every time Wireshark
starts up.  (There should be a better way to do this--maybe different Profiles
(as discussed on -dev recently) is the way to go.)

From me:

Put ETHERTYPE_PRP (not IANA registered) in etypes.h and packet-ethertype.c

svn path=/trunk/; revision=24493
2008-02-27 21:52:17 +00:00
Sake Blok 4f05930abe Big 2104 - From Benn Bollay:
This patch adds a heuristic dissector to the ethernet trailer under the
keystring "eth.trailer".  This allows for other protocol plugins which coopt
the ethernet trailer for their own devices to register for trailer traffic
without requiring any further changes to the executable.


svn path=/trunk/; revision=23880
2007-12-16 00:35:34 +00:00
Anders Broman eeab60b75f Apply yet another of the optimization patches:
- Remove a spurious volatile.

svn path=/trunk/; revision=23627
2007-11-27 21:23:45 +00:00
Stephen Fisher 6785ffd796 Wake on LAN (WOL): New dissector from Chris Maynard via -dev list and
enhancement bug #1968

Me: Added entries in epan/etypes.h and epan/dissectors/packet-ethertype.c
for WOL.


svn path=/trunk/; revision=23371
2007-11-06 05:30:04 +00:00
Anders Broman 1950ffc214 Apply the small performance enhancment patches for:
- if offset is 0, tvb_length is the same as tvb_length_remaining, just faster.
Replace 
- col_append_fstr() with faster  col_append_str() 
- col_add_str() with col_set_str()
when it's safe

svn path=/trunk/; revision=23252
2007-10-23 05:50:00 +00:00
Anders Broman c644b82279 Ethercat plugin
Author :
Richard Kuemmel <r.kuemmel[AT]beckhoff.de>

Updates and bugfixes:
Peter Johansson <peterjohansson73[AT]gmail.com>

svn path=/trunk/; revision=23174
2007-10-14 15:45:24 +00:00
Anders Broman dd12268277 Add ethertype for IEEE 802.1ag Connectivity Fault Management (CFM) protocol
svn path=/trunk/; revision=23081
2007-10-07 15:14:27 +00:00
Ashok Narayanan a692269fc9 Added support for 802.1ad and 802.1ah ethernet frames
svn path=/trunk/; revision=22541
2007-08-17 21:21:18 +00:00
Jaap Keuter 6ab0bbb73c Clean up the WiMax Mac-to-Mac dissector code.
svn path=/trunk/; revision=22435
2007-08-01 17:42:43 +00:00
Anders Broman 361006501b From Seehofer, Markus:
ETHERTYPE for IEEE1588/PTP

svn path=/trunk/; revision=22257
2007-07-06 10:03:19 +00:00
Anders Broman 430a1de0c0 From Joe Eykholt:
Attached is a patch file and a new dissector for FCoE.   This protocol
is described at http://fcoe.com and has been submitted to T11. It is an encapsulation protocol that can be used to transport FC frames over raw Ethernet when the link is loss-free due to pause.  The Ethertype 0x8906 has been reserved through IEEE for this protocol.

svn path=/trunk/; revision=21967
2007-05-28 06:38:30 +00:00
Jaap Keuter 1eed0eae40 From Bingyao Du:
Attachment is a patch for adding a new Juniper NSRP dissector. In this patch, OICQ author email address 
<dubingyao@gmail.com> has also been updated to <secfire@gmail.com>. 

svn path=/trunk/; revision=21599
2007-04-27 06:34:31 +00:00
Jaap Keuter 1f5f997b3c Add ether type for Link Layer Topology Discovery (LLTD)
svn path=/trunk/; revision=21091
2007-03-21 16:14:23 +00:00
Jaap Keuter fce186d76a From Graeme Hewson:
The attached patch adds Homeplug to the table of ethernet types.

svn path=/trunk/; revision=20509
2007-01-20 16:46:42 +00:00
Ulf Lamping e3330fd922 instead of simply doing an assert when running out of memory in emem, throw a new OutOfMemoryError Exception, so file.c can show at least a better explanation to the user before Wireshark terminates
XXX - to prevent a busy wait, I need a portable way to wait for a short time period, like Sleep() for Windows

svn path=/trunk/; revision=20437
2007-01-15 05:16:13 +00:00
Anders Broman 643dc7099d From Eliot Blennerhassett :
Add Cirrus cobranet ethertype

svn path=/trunk/; revision=19980
2006-11-25 12:04:21 +00:00