aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ip.c
AgeCommit message (Collapse)AuthorFilesLines
2019-06-11decode_as: remove the "title" member from decode_as_tMartin Kaiser1-1/+1
The title of a decode_as_t was used by the GTK UI. It's no longer required for Qt. Change-Id: Ibd9d4acbe9cad2c1af520340d04e550326a97ebe Reviewed-on: https://code.wireshark.org/review/33557 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-30IP: Make dissection of ip.frag_offset RFC 791 compliantSake Blok1-2/+3
The v2.5.0rc0-478-g558fe23226, the dissection of ip.frag_offset changed to be listed under "Flags", this is not correct. The Fragmentation Offset is a separate field according to the RFC. This change corrects that behavior. Also, the raw value from the header was shown instead of the real byte offset, this is also corrected. Change-Id: I1d6dfc4314091eb6f3eef418c5a17ed37f7a1200 Fixes: v2.5.0rc0-478-g558fe23226 ("[IP] Simplify paring of flags field by using proto_tree_add_bitmask_with_flags().") Reviewed-on: https://code.wireshark.org/review/33422 Petri-Dish: Sake Blok <sake.blok@SYN-bit.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Sake Blok <sake.blok@SYN-bit.nl>
2019-04-04epan: Convert our PROTO_ITEM_ macros to inline functions.Gerald Combs1-39/+39
Convert our various PROTO_ITEM_ macros to inline functions and document them. Change-Id: I070b15d4f70d2189217a177ee8ba2740be36327c Reviewed-on: https://code.wireshark.org/review/32706 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-03-21packet-ip: Add codepoint LE as per draft-ietf-tsvwg-le-phb.Loganaden Velvindron1-0/+3
From the I-D: This document defines a Differentiated Services per-hop behavior [RFC2474] called "Lower Effort" (LE), which is intended for traffic of sufficiently low urgency that all other traffic takes precedence over the LE traffic in consumption of network link bandwidth [snip] Example uses for the LE PHB: o For traffic caused by world-wide web search engines while they gather information from web servers. o For software updates or dissemination of new releases of operating systems. o For reporting errors or telemetry data from operating systems or applications. o For backup traffic or non-time critical synchronization or mirroring traffic. o For content distribution transfers between caches. o For preloading or prefetching objects from web sites. o For network news and other "bulk mail" of the Internet. o For "downgraded" traffic from some other PHB when this does not violate the operational objectives of the other PHB. o For multicast traffic from untrusted (e.g., non-local) sources. Change-Id: I90b2a08332943daf8349826eaa0862f0c12d6a05 Reviewed-on: https://code.wireshark.org/review/32427 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-02-11Change maxmind_db_lookup_ipv4 to look more like maxmind_db_lookup_ipv6Peter Wu1-2/+2
Both functions accept an address in network byte order, but maxmind_db_lookup_ipv4 does not accept a pointer. Add an indirection and remove unnecessary memcpy calls. This removes some confusion for me. Change-Id: I291c54c8c55bc8048ca011b84918c8a5d3ed1398 Reviewed-on: https://code.wireshark.org/review/31951 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-01-01Add a "failed" return for tap packet routines.Guy Harris1-4/+4
This allows taps that can fail to report an error and fail; a failed tap's packet routine won't be called again, so they don't have to keep track of whether they've failed themselves. We make the return value from the packet routine an enum. Don't have a separate type for the per-packet routine for "follow" taps; they're expected to act like tap packet routines, so just use the type for tap packet routines. One tap packet routine returned -1; that's not a valid return value, and wasn't one before this change (the return value was a boolean), so presume the intent was "don't redraw". Another tap routine's early return, without doing any work, returned TRUE; this is presumably an error (no work done, no need to redraw), so presumably it should be "don't redraw". Clean up some white space while we're at it. Change-Id: Ia7d2b717b2cace4b13c2b886e699aa4d79cc82c8 Reviewed-on: https://code.wireshark.org/review/31283 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-12-21ip, tcp: add expert info for invalid header lengthNardi Ivan1-3/+6
Change-Id: I58c1b20304aabcff144667cfbbcc774010fc2a16 Reviewed-on: https://code.wireshark.org/review/31148 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-11-20Fix expert info message for wrong option length.Guy Harris1-1/+1
Bug: 15290 Change-Id: Id5b4f6a899fea542f5d50e8be991d7cca623fd46 Reviewed-on: https://code.wireshark.org/review/30744 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-09-30MPLS: add dissector for Management Communication ChannelChristoph Portner1-0/+1
Management communication channel described in RFC 5718 Change-Id: I5ed95d0d6f25754c50a97457679d08b99db6f527 Reviewed-on: https://code.wireshark.org/review/29920 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-08-22Revert "IP: Use pinfo for session IP addresses"João Valverde1-5/+7
This reverts commit bb25d64a2a240dcfd6469d5e389a996f7a4637d7. Change-Id: I8b790ee8371a7257696a21fe99ed483c892b8baf Reviewed-on: https://code.wireshark.org/review/29251 Reviewed-by: João Valverde <j@v6e.pt>
2018-08-22IP: Use pinfo for session IP addressesJoão Valverde1-7/+5
The pinfo structure is sufficent for providing the src/dst address. The pinfo address data is strictly the same as the tap data, even for IP over IP. Besides the trivial code simplification we prioritize the use of pinfo over a tap, for increased type-safety and on the presumption of having a more stable implementation (in the mutability sense). Change-Id: Idcfc8c762f9af934e4612522b7472b35a01042ca Reviewed-on: https://code.wireshark.org/review/29238 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-07-14The maximum offset in an IP option dissector is the length of the option.Guy Harris1-1/+1
It's *not* the sum of the length of the option and the length of the option header. Change-Id: I0b5ab0e35ca33dc02a0bc2501e0f0f531ec3f376 Reviewed-on: https://code.wireshark.org/review/28701 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-03-15Epan+Qt: Invalidate cached column strings.Gerald Combs1-1/+1
Add col_data_changed, which checks to see if we have updated column info. Add col_append_frame_number, which adds a frame number and sets col_data_changed. Call col_append_frame_number instead of col_append_fstr from some dissectors. Add PacketListRecord::invalidateAllRecords, which invalidates any cached record data. Add PacketListModel::invalidateAllColumnStrings which calls invalidateAllRecords and signals that our data has changed. Call invalidateAllColumnStrings when we have new name resolution or column information. Bug: 11414 Bug: 11468 Change-Id: I2671594a722f4f9436fe1df84d43489a148e0cee Reviewed-on: https://code.wireshark.org/review/26373 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-03-10MaxMindDB: Add country ISO codes.Gerald Combs1-1/+24
Add and dissect country ISO codes. Prefer them when printing summary information. Change-Id: I3ce2bde88fa5ca2604c8bb745c42f239660252ff Reviewed-on: https://code.wireshark.org/review/26415 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-03-06Transition from GeoIP Legacy to MaxMindDB.Gerald Combs1-155/+116
MaxMind is discontinuing its legacy databases in April in favor of GeoIP2, which use a newer database format (MaxMind DB). The reference C library (libmaxminddb) is available under the Apache 2.0 license which isn't quite compatible with ours. Add mmdbresolve, a utility that reads IPv4 and IPv6 addresses on stdin and prints resolved information on stdout. Place it under a liberal license (MIT) so that we can keep libmaxminddb at arm's length. Add epan/maxmind_db.[ch], which spawns mmdbresolve and communicates with it via stdio. Migrate the preferences and documentation to MaxMindDB. Change the IPv4 and IPv6 asnum fields to FT_UINT32s. Change the geographic coordinate fields to FT_DOUBLEs. Bug: 10658 Change-Id: I24aeed637bea1b41d173270bda413af230f4425f Reviewed-on: https://code.wireshark.org/review/26214 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-12dissectors: use SPDX identifiers.Dario Lombardo1-13/+1
Change-Id: I92c94448e6641716d03158a5f332c8b53709423a Reviewed-on: https://code.wireshark.org/review/25756 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-01-07ZigBee: Enable heuristic dissection of Tunneling cluster payloadKenneth Soerensen1-0/+1
The Smart Energy Tunneling cluster can carry various payloads. The type of payload is determined when the tunnel is established. However, we cannot be sure to capture the tunnel establishment and therefore heuristics are used to determine the payload type. The IP protocol is added as a heuristic dissector because the specification allows IP in the tunnel payload. However, the only real life payload type I am aware of is GBCS messages in UK Smart Metering (https://smartenergycodecompany.co.uk). Finally, if a heuristic dissector cannot be found, the Data dissector is used. Change-Id: I4942bf00d0d0efe7047db6494cd4f8a9d19c96b6 Reviewed-on: https://code.wireshark.org/review/25181 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Boye Petersen <martinboyepetersen@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-30Add wsutil/inet_ipv4.h.Guy Harris1-10/+2
It defines a ws_in4_addr type, which is intended to hold IPv4 addresses in network byte order, and some macros to test for IPv4 addresses in the local network control block and multicast IPv4 addresses. Use those macros in places where dissectors had their own code for that purpose. Change-Id: I4252b410e37207157be85119a332e2a6913b332f Reviewed-on: https://code.wireshark.org/review/24178 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-10-29Use endpoint_type in conversation tables and hostlistsMichael Mann1-3/+3
Follow up to having conversions use endpoint_type instead of port_type. Change-Id: Ifd59a33bd8b9a013c242bce5fcceb09533f02c17 Reviewed-on: https://code.wireshark.org/review/24172 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-09-02Have a single IPv6 tapJoão Valverde1-14/+14
Optimize code and open possibility for enriching IPv6 tap data. Change-Id: I5a204d7464cde32123d5bfe664cc9b6bcf08dbe1 Reviewed-on: https://code.wireshark.org/review/23340 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2017-09-01Avoid use of global protocol variablesJoão Valverde1-1/+2
Change-Id: I006d872a83649e72a6c83abac68cbae064457162 Reviewed-on: https://code.wireshark.org/review/23346 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-07-30Verify IP checksum even if in ICMP error packetMichael Mann1-6/+3
Bug: 10579 Change-Id: I18cac02f81465598451e0cf8f6729a26faf8c176 Reviewed-on: https://code.wireshark.org/review/22849 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-30Fix IP Security option dissectionMichael Mann1-5/+4
"offset" no longer needed (since using dissector table for options), and since it should always be 0, just remove it. Change-Id: Icc2802b76bc99a17d60d1deff75e1dc65761e8ed Reviewed-on: https://code.wireshark.org/review/22848 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-29Add initial RFC2780 IP Version lookup supportArjen Zonneveld1-0/+11
Add support for https://www.iana.org/assignments/version-numbers/version-numbers.xhtml IP Version lookups. Change-Id: I58a330ab9acba17356344df3ffeb94cc1b2b1443 Reviewed-on: https://code.wireshark.org/review/22821 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-07-20[IP] Simplify paring of flags field by usingAndersBroman1-35/+33
proto_tree_add_bitmask_with_flags(). Change-Id: If8e9f9956543f253f4f59d8204c9536f444dbcd5 Reviewed-on: https://code.wireshark.org/review/22728 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-06-22TCP: Make the header length display consistent with IPv4.Gerald Combs1-0/+1
Format tcp.hdr_len in the tree similar to ip.hdr_len. Add comments noting that they should be consistent. Change-Id: Ic64282d8386c8ed339811bc9c22b5962c707d292 Reviewed-on: https://code.wireshark.org/review/22314 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-06-20IP: ensure that fragment contains payload before adding it for reassemblyPascal Quantin1-0/+1
Solves a UBSan runtime error null pointer passed as argument 1, which is declared to never be null. It can be reproduced with the pcap from bug 13603 Change-Id: I0d6fdddcccc892b3141855d59be372887afcaca5 Reviewed-on: https://code.wireshark.org/review/22272 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-04-17packet-nsh.c: Create dissector table for next protocolMichael Mann1-0/+2
Change-Id: Id8be2a37f99f4ac9d531a694273c7d5d3f843cc1 Reviewed-on: https://code.wireshark.org/review/21163 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2017-02-23Make IP options into a dissector table.Michael Mann1-414/+336
This provides external access for dissectors and plugins to provide their own implementation of IP options. Change-Id: I40ce17ce408217769e3b86e364f372a5181888e1 Reviewed-on: https://code.wireshark.org/review/20163 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-01-29Register reassembly tablesMichael Mann1-15/+2
Register all reassembly tables with a central unit, allowing the central unit to have the callback that initializes and destroys the reassembly tables, rather than have dissectors do it individually. Change-Id: Ic92619c06fb5ba6f1c3012f613cae14982e101d4 Reviewed-on: https://code.wireshark.org/review/19834 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-12-31Dissectors don't need a journey of self discovery.Michael Mann1-3/+2
They already know who they are when they register themselves. Saving the handle then to avoid finding it later. Not sure if this will increase unnecessary register_dissector functions (instead of using create_dissector_handle in proto_reg_handoff function) when other dissectors copy/paste, but it should make startup time a few microseconds better. Change-Id: I3839be791b32b84887ac51a6a65fb5733e9f1f43 Reviewed-on: https://code.wireshark.org/review/19481 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-12-13Adjust proto_tree_add_uint_format_value calls to use unit stringMichael Mann1-3/+2
Several calls to proto_tree_add_uint_format_value could be better served using BASE_UNIT_STRING with a "unit string" in hf_ field. There also a few cases where proto_tree_add_uint_format_value could just be proto_tree_add_uint. Added a few more "common" unit string values to unit_strings.[ch] Change-Id: Iaedff82c515269c9c31ab9100dff19f5563c932d Reviewed-on: https://code.wireshark.org/review/19242 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-12fix no previous prototype for ‘capture_*’ [-Wmissing-prototypes]Alexis La Goutte1-1/+1
Change-Id: Ie5bfe4d366a679ebcb561716f23d174e7b9bf487 Reviewed-on: https://code.wireshark.org/review/18754 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-31PW_ACH: Use proper symbolic namesJaap Keuter1-1/+2
Collect all used PW Associated Channel Types and use them in the subdissector table registrations. Change-Id: I5d196bceefdb4560b1f4388ff86898e316e5e2ae Reviewed-on: https://code.wireshark.org/review/18590 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-28Implement registration of capture dissectors by nameJoão Valverde1-5/+20
Mirror it after protocol dissector API. Change-Id: I7985bcfa9e07654c7cf005efec94efc205d7a304 Reviewed-on: https://code.wireshark.org/review/18496 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-19IP: Fix evil flag expert item textJaap Keuter1-1/+1
When creating the expert info item definition the copied line wasn't updated with the correct message text. This change sets the right text. Change-Id: I9a98126c0b8a650e5ab195f97c53bb32e3053e89 Reviewed-on: https://code.wireshark.org/review/18301 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-10-13Convert most UDP dissectors to use "auto" preferences.Michael Mann1-1/+1
Similar to the "tcp.port" changes in I99604f95d426ad345f4b494598d94178b886eb67, convert dissectors that use "udp.port". More cleanup done on dissectors that use both TCP and UDP dissector tables, so that less preference callbacks exist. Change-Id: If07be9b9e850c244336a7069599cd554ce312dd3 Reviewed-on: https://code.wireshark.org/review/18120 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-08-31Don't do any Decode As stuff for dissector tables not used with Decode As.Guy Harris1-1/+1
Have all dissector tables have a "supports Decode As" flag, which defaults to FALSE, and which is set to TRUE if a register_decode_as() refers to it. When adding a dissector to a dissector table with a given key, only add it for Decode As if the dissector table supports it. For non-FT_STRING dissector tables, always check for multiple entries for the same protocol with different dissectors, and report an error if we found them. This means there's no need for the creator of a dissector table to specify whether duplicates of that sort should be allowed - we always do the check when registering something for "Decode As" (in a non-FT_STRING dissector table), and just don't bother registering anything for "Decode As" if the dissector table doesn't support "Decode As", so there's no check done for those dissector tables. Change-Id: I4a1fdea3bddc2af27a65cfbca23edc99b26c0eed Reviewed-on: https://code.wireshark.org/review/17402 Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-24Pass the next protocol value to ip_try_dissect() as an argument.Guy Harris1-3/+4
That way, we don't rely on the ws_ip pointer being non-null. Based on changes from Ib73410fd8575ad6c836311bbda87a0580e5640ac. Change-Id: If8c437572c725481ac4148c8095a1a479b4fb0f8 Reviewed-on: https://code.wireshark.org/review/16617 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-23Update struct ws_ip with flow label and commentsJoão Valverde1-5/+5
Change field ip_v_hl to version. Change-Id: Ic7ce8d6d083f6413284a7b9ba91a2387b11b29fb Reviewed-on: https://code.wireshark.org/review/16555 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-07-23Use wmem_new0() to allocate struct ws_ipJoão Valverde1-1/+2
Change-Id: I0e76ffc2dc0c3e3d7bd081ff433c95741b9aa906 Reviewed-on: https://code.wireshark.org/review/16598 Reviewed-by: João Valverde <j@v6e.pt>
2016-07-21Add proto_tree_add_checksum.Michael Mann1-67/+23
This is an attempt to standardize display/handling of checksum fields for all dissectors. The main target is for dissectors that do validation, but dissectors that just report the checksum were also included just to make them easier to find in the future. Bug: 10620 Bug: 12058 Ping-Bug: 8859 Change-Id: Ia8abd86e42eaf8ed50de6b173409e914b17993bf Reviewed-on: https://code.wireshark.org/review/16380 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-19VXLAN: use the newly created vxlan.next_proto dissector table everywherePascal Quantin1-0/+2
Change-Id: Ib6f44e0f1d3d8c76d2b6e6c778af8c243af4389c Reviewed-on: https://code.wireshark.org/review/16543 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-18Rename iph->ip_p to iph->ip_nxtJoão Valverde1-8/+8
struct ws_ip is IP version agnostic. "ip_p" is too terse and less appropriate. Change-Id: I06b8740ab420e20781bf7b9efcf5dce19ad22ab2 Reviewed-on: https://code.wireshark.org/review/16519 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-06-15Display "IP DSCP" column as short textJoão Valverde1-2/+2
Ping-Bug: 12429 Change-Id: I618b2017e161d89f0efa25ce2fb82a1808e8d315 Reviewed-on: https://code.wireshark.org/review/10701 Reviewed-by: João Valverde <j@v6e.pt>
2016-04-30IPv4: use calculated value for Header Length display filterPascal Quantin1-4/+4
Bug: 12387 Change-Id: I63370ea884b6fb75a0743fecc06af2e213700645 Reviewed-on: https://code.wireshark.org/review/15163 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-03-20Create call_data_dissector() to call data dissector.Michael Mann1-4/+2
This saves many dissectors the need to find the data dissector and store a handle to it. There were also some that were finding it, but not using it. For others this was the only reason for their handoff function, so it could be eliminated. Change-Id: I5d3f951ee1daa3d30c060d21bd12bbc881a8027b Reviewed-on: https://code.wireshark.org/review/14530 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-17Associate dissector tables and heuristic subdissector lists with a protocol.Michael Mann1-2/+2
This will make it easier to determine protocol dependencies. Some LLC OUI dissector tables didn't have an associated protocol, so they were left without one (-1 used) Change-Id: I6339f16476510ef3f393d6fb5d8946419bfb4b7d Reviewed-on: https://code.wireshark.org/review/14446 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-03-03[IPv4] In case of a bougus IPv4 version continnue dissection as IPv6 ifAndersBroman1-0/+5
the version indicates IPv6. This handles a case of Linux cooked capture with ethertype set as IPv4 for IPv6 packets. Change-Id: Ie79f1a631980a224a7b51963f9174e75ffb69a47 Reviewed-on: https://code.wireshark.org/review/14321 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-02-01IP: Don't check length if in a ICMP error packetStig Bjørlykke1-4/+6
Change-Id: I5fd81aec13655b9c53df9f0002441c3afc51c6e9 Reviewed-on: https://code.wireshark.org/review/13597 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Jaap Keuter <jaap.keuter@xs4all.nl>