aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-eth.c
AgeCommit message (Collapse)AuthorFilesLines
2011-02-04Fix for bug 5645 : Ethernet packets with both VLAN tag and LLC header no ↵Sake Blok1-2/+23
longer displayed correctly svn path=/trunk/; revision=35830
2010-12-20Rename the routines that handle dissector tables with unsigned integerGuy Harris1-5/+5
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-11-20Fix for bug 5422:Jaap Keuter1-0/+3
Add support for dissecting SLL type 0x03 frames. svn path=/trunk/; revision=34987
2010-11-10Resolve bug #2254: Migrate the 802.1q VLAN dissector into the Ethernet II.Stephen Fisher1-5/+96
svn path=/trunk/; revision=34838
2010-10-17Add expert info if the eth src mac has the I/G bit setJörg Mayer1-0/+5
svn path=/trunk/; revision=34548
2010-08-27Allow Dissect As... to select the Ethernet-without-FCS dissector for aGuy Harris1-0/+7
given UDP port; this is to handle the output for the Cisco CMTS "cable intercept" command - it encapsulates Ethernet frames in UDP packets, but the UDP port is user-defined. svn path=/trunk/; revision=33964
2010-06-19Use top level tree when using dissectors from "eth.trailer" heuristics.Stig Bjørlykke1-2/+2
svn path=/trunk/; revision=33255
2010-04-25Slightly reword the preference text about CCSDS packets.Bill Meier1-3/+4
svn path=/trunk/; revision=32558
2009-08-07From Matt P via bug 3774:Gerald Combs1-14/+30
Patch utilizes techniques incorporated in the packet-ieee8023.c dissect_802_3() routine to dynamically calculate the remaining payload length. This is then compared to the length included in the CCSDS header. svn path=/trunk/; revision=29329
2009-07-22Get rid of check_col() in some of the more frequently used dissectors.Anders Broman1-7/+3
svn path=/trunk/; revision=29170
2009-06-18From Kovarththanan Rajaratnam via bug 3548:Stig Bjørlykke1-2/+2
(1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770
2009-05-20Add a preference to force the dissector to assume that packets have anGuy Harris1-2/+14
FCS; this handles protocols where there's no length field, so that the "is there a trailer and/or an FCS?" heuristic can't work. svn path=/trunk/; revision=28432
2009-01-18From Matt P:Jaap Keuter1-8/+75
CCSDS packets may reside within an 802.3 packet. This patch provides a way for the CCSDS dissector to be called from the 802.3 dissector. svn path=/trunk/; revision=27257
2008-09-30Minor proto_reg_handoff cleanup: use find_dissector when appropriate.Bill Meier1-2/+1
svn path=/trunk/; revision=26308
2008-07-12Clean up indentation.Guy Harris1-1/+1
svn path=/trunk/; revision=25723
2007-12-16Big 2104 - From Benn Bollay:Sake Blok1-2/+10
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-11-29Didier Gautheron:Anders Broman1-3/+7
Only call ether_to_str(), get_ether_name() if the tree is visible, they are slow. svn path=/trunk/; revision=23666
2007-11-10Apply yet another set of the optimization patches:Anders Broman1-21/+36
move TRY block in its own function. __attribute__((noinline)) does not compile with MS VC 6 nor does __declspec(noinline) Applied the patch without it. svn path=/trunk/; revision=23424
2007-09-28queue the ip/eth headers for tapping before calling any subdissectors Ronnie Sahlberg1-7/+5
so that they can be tapped even if the subdissectors cause an exception this fixes bug 1527 svn path=/trunk/; revision=23004
2007-09-25Highlight whole ethernet trailer in Packet Details View.Stig Bjørlykke1-1/+2
svn path=/trunk/; revision=22960
2007-09-17Added functionality to highlight the FCS bytes in Ethernet and IEEE 802.11Stig Bjørlykke1-0/+1
packets in the Packet Details View. This "appendix" bytes are not copied with the Copy functions or in the Export Selected Packet Bytes. svn path=/trunk/; revision=22887
2007-07-22register dissect_eth_maybefcs as "eth" users might find it useful.Luis Ontanon1-0/+1
svn path=/trunk/; revision=22381
2007-04-13Fix various warningsStephen Fisher1-1/+1
Move packet-cops.c out of clean dissectors due to a #define conflict in the headers of net-snmp with our config.h svn path=/trunk/; revision=21398
2007-01-20From Graeme Hewson:Jaap Keuter1-4/+4
The attached patch adds Homeplug to the table of ethernet types. svn path=/trunk/; revision=20509
2006-10-18Squelch compiler warningsJaap Keuter1-2/+2
svn path=/trunk/; revision=19597
2006-08-25remove the code that conditionally dissects LG only if IG is setRonnie Sahlberg1-16/+4
svn path=/trunk/; revision=19034
2006-08-25from Stephen FRonnie Sahlberg1-24/+36
ethernet IG/LG bit changes with minor modifications (only dissect LG if it is a unicast address put a hint what locally administered means in the dissect tree ) svn path=/trunk/; revision=19033
2006-05-21change a whole bunch of ethereal into wiresharkRonnie Sahlberg1-2/+2
svn path=/trunk/; revision=18196
2006-02-23add an expansion to ethernet source and destination addressesRonnie Sahlberg1-11/+55
inside this expansion show 1, eth.addr so people can see that this field exists (i think it is futile to use "hidden" fields and expect people to search through the infinitely long list of fields, better show everything and they will see themself what fuields they can filter on) 2, bit 0x01 of the first byte to show if it is Multi or Uni-cast 3, bit 0x02 of the first byte to show if it is a locally administrated address or not. I do use the (to laymen) more descriptive names "factory default" instead of LocallyAdminAddr in the true_false string though. svn path=/trunk/; revision=17378
2005-09-17Move a pile of protocol-related headers from the top-level sourceGuy Harris1-1/+1
directory to the epan directory. Some of them should perhaps ultimately be moved to epan/dissectors, if they pertain only to stuff exported by a particular dissector. Fix Gerald's e-mail address in files we're moving. svn path=/trunk/; revision=15844
2005-07-09Squelch various signed vs. unsigned warnings by:Guy Harris1-1/+1
making pointers to byte data be "guint8 *" rather than "char *", and making buffers holding byte data arrays of "guint8" rather than arrays of "char"; making pointers to text strings "char *" rather than "guchar *"; appropriately casting pointers (cast to "guint8 *" when passing to routines expecting "guint8 *" or when assigning to "guint8 *"); making port-number preferences "guint"; making enum preferences "gint"; making hf_ variables "int". Clean up white space. svn path=/trunk/; revision=14884
2005-07-08checksum messages: use "[correct]" instead of "(correct)" and other "alike" ↵Ulf Lamping1-2/+2
messages svn path=/trunk/; revision=14880
2005-06-02add the resolved Ethernet addresses to the "Ethernet II" summary lineUlf Lamping1-2/+2
svn path=/trunk/; revision=14520
2005-05-05Squelch a compiler warning.Guy Harris1-1/+1
svn path=/trunk/; revision=14313
2005-04-17Add a tvb_ensure_bytes_exist(). Fixes bug 62.Gerald Combs1-0/+1
svn path=/trunk/; revision=14112
2005-04-11Major speed improvement for filtering and dissection.Ronnie Sahlberg1-8/+19
It should not dump core as far as all my tests are concerned and Menu_Statistics/ProtocolHierStats work It needs more testing and there might still be cases where it will crash that will need to be fixed but I feel it will be worth it since it will decrease the time to filter very large capture files dramatically. Real significant performance boost for very large captures. (If we cant fix all the problems we can just revert this patch) svn path=/trunk/; revision=14051
2005-01-01Get rid of some warnings about variables whose values might be lost in aGuy Harris1-1/+1
longjmp, by properly qualifying those variables as volatile. svn path=/trunk/; revision=12914
2004-11-24Export two versions of the Ethereal dissector, for use with encapsulatedGuy Harris1-13/+19
Ethernet frames, one for encapsulated frames that include an FCS and one for encapsulated frames that don't include an FCS. Use the appropriate versions. In the ISL dissector, do the same sort of processing we do in the Ethernet dissector to figure out whether the frame has a trailer or not and whether it has an FCS or not. svn path=/trunk/; revision=12593
2004-11-24Only interpret a frame as an FW1 header if it looks like one, as per aGuy Harris1-5/+8
patch from Yaniv Kaul. svn path=/trunk/; revision=12590
2004-11-03Check for ISL frames before checking for ETHERTYPE_UNK, as ISL fieldsGuy Harris1-23/+29
might have 0 in what would be the Ethernet type field. Also, handle the first 5 octets of the destination address of an ISL frame being 0C-00-0C-00-00. svn path=/trunk/; revision=12484
2004-09-29Move the tap infrastructure to the epan directory.Guy Harris1-1/+1
svn path=/trunk/; revision=12128
2004-09-28Move various checksum routines and headers to epan.Guy Harris1-1/+1
svn path=/trunk/; revision=12117
2004-09-27Move prefs.c and prefs.h into the epan subdirectory.Guy Harris1-1/+1
svn path=/trunk/; revision=12115
2004-08-06From Albert Chin: rename resolv.{ch} to addr_resolv.{ch}, so that anGuy Harris1-1/+1
include of <resolv.h> in any system header file gets the system <resolv.h> (needed for builds on Tru64 with GTK+ 1.2[.x]). svn path=/trunk/; revision=11615
2004-07-18Move dissectors to epan/dissectors directory.Gilbert Ramirez1-0/+471
Also move ncp222.py, x11-fields, process-x11-fields.pl, make-reg-dotc, and make-reg-dotc.py. Adjust #include lines in files that include packet-*.h files. svn path=/trunk/; revision=11410