aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-eth.c
AgeCommit message (Collapse)AuthorFilesLines
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-3/+1
svn path=/trunk/; revision=45017
2012-09-11Add data parameter to dissector_try_heuristicJakub Zawadzki1-2/+2
svn path=/trunk/; revision=44871
2012-05-07Get rid of remaining Booleans-as-encoding-arguments inGuy Harris1-2/+2
proto_tree_add_item() calls. svn path=/trunk/; revision=42483
2011-12-10If we know there is a FCS present, don't hand it to the ethernet trailer ↵Sake Blok1-21/+36
dissectors, but dissect it on return svn path=/trunk/; revision=40146
2011-12-10Clarify some stuff in a comment.Guy Harris1-12/+16
Don't call any of the heuristic trailer dissectors if there's no trailer to dissect. svn path=/trunk/; revision=40143
2011-12-06- Make a distinction between ethernet padding and an ethernet trailerSake Blok1-11/+52
- ... and make that distinction configurable for capture files that do not have padding in small frames, but do have trailers - Add VSS-Monitoring dissector to show by the TAP inserted time- and portstamps svn path=/trunk/; revision=40108
2011-11-02From Andrew Kampjes via bug 6536:Stig Bjørlykke1-9/+66
Improved the Ethernet checksum field, modelled on the TCP checksum field. svn path=/trunk/; revision=39712
2011-10-21For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.Bill Meier1-1/+1
Also: remove trailing whitespace for a number of files. svn path=/trunk/; revision=39503
2011-10-10 Convert 'encoding' parameter of certain proto_tree_add_item() calls in ↵Bill Meier1-12/+12
non-autogenerated epan/dissectors: Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as the encoding parameter for proto_tree_add_item() calls which directly reference an item in hf[] which has a type of: FT_BOOLEAN FT_IPv4 FT_EUI64 FT_GUID FT_UINT_STRING Also: For type FT_ITv6 use ENC_NA. (This was missed in SVN #39260) svn path=/trunk/; revision=39328
2011-10-06Convert 'encoding' parameter of certain proto_tree_add_item() calls in ↵Bill Meier1-1/+1
non-autogenerated epan/dissectors: Specifically: Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as the encoding parameter for proto_tree_add_item() calls which directly reference an item in hf[] which has a type of: FT_UINT8 FT_UINT16 FT_UINT24 FT_UINT32 FT_UINT64 FT_INT8 FT_INT16 FT_INT24 FT_INT32 FT_INT64 FT_FLOAT FT_DOUBLE svn path=/trunk/; revision=39288
2011-09-25Do some cleanup related to the reversion of SVN #34848 donr in SVN #39100.Bill Meier1-28/+3
1. Revert SVN #35830 (See Bug #5645); This patch is no longer needed given the reversion. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5645 http://anonsvn.wireshark.org/viewvc?revision=39100&view=revision 2. Restore 'col_set_str(pinfo->cinfo, COL_INFO, "Ethernet II");' just to be safe (altho it's possible that this line is not needed). 3. Remove several lines of no longer needed code. svn path=/trunk/; revision=39134
2011-09-23Uh, "Fix the fix (in SVN #39105)" so it compiles. Bill Meier1-1/+1
svn path=/trunk/; revision=39106
2011-09-23Correction for SVN #39100:"Revert Revision 34838";Bill Meier1-2/+2
Fixes buildbot compile error. svn path=/trunk/; revision=39105
2011-09-23Revert Revision 34838 "Resolve bug #2254: Migrate the 802.1q VLAN dissector ↵Anders Broman1-88/+2
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-13Always pass the FCS length to dissect_802_3() and ethertype(), so itGuy Harris1-2/+2
will process the FCS if it's known to be present and will attempt to guess whether it's present if it's not known not to be present. svn path=/trunk/; revision=38990
2011-08-31Second try to move crc routines to libwsutil.Stig Bjørlykke1-1/+1
This time keep the tvb routines in epan. Now we can use common crc routines outside epan. svn path=/trunk/; revision=38810
2011-08-30Revert r38800, as the crc routines contains some tvb functions.Stig Bjørlykke1-1/+1
svn path=/trunk/; revision=38803
2011-08-30Move all crc routines to libwsutil.Stig Bjørlykke1-1/+1
This way we can use the crc routines in wiretap. svn path=/trunk/; revision=38800
2011-06-29Although technically not needed, for clarity, explicity catch invalid ↵Chris Maynard1-2/+1
Ethernet frames, increment the "other" count and return. Previously, code execution would have fallen through to the ETHERNET_II case and capture_ethertype() would have incremented the "other" count. svn path=/trunk/; revision=37835
2011-06-29Based on Guy's suggestion from the user mailing list, dissect Ethernet ↵Chris Maynard1-295/+348
frames with a type/len field in the range of 1501-1535 as invalid, and add an expert info to make it that much easier to find such invalid frames. Also did some whitespace cleanup, converting tabs to spaces since most of the file was spaced, not tabbed, and swapped the order that the lg and ig bits get added to the tree because I think it looks better reading bits left-to-right. TODO: I'm not entirely sure what to do in capture_eth() if that invalid range is encountered, so for now I just added some #if 0'd code as a placeholder. Ref: http://www.wireshark.org/lists/wireshark-users/201106/msg00127.html svn path=/trunk/; revision=37832
2011-05-10Add support for USB CDC Ethernet. Resolves bug 4819.Chris Maynard1-0/+2
svn path=/trunk/; revision=37049
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-06 09:20:25 +0000