aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-ipv6.c
AgeCommit message (Collapse)AuthorFilesLines
2013-10-27Remove iplen and iphdrlen from struct _packet_info.Michael Mann1-2/+0
Dissectors should just use (reported) tvb length and taps have other ways to get the data. svn path=/trunk/; revision=52899
2013-10-16Fix warnings found by Clang 5.0 (-Wself-assign and -Wparentheses-equality).Gerald Combs1-3/+33
Move code from ipv6-utils.h to packet-ipv6.c since that was the only place it was used. Comment out unused code. svn path=/trunk/; revision=52645
2013-09-16Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if ↵Michael Mann1-2/+2
hf_ field name is the first part of the formatted string. This was all manual inspection and most cases were either: 1. Case sensitivity differences between hf_ field name and formatted string. 2. Unnecessary whitespace between hf_ field name and colon in formatted string There are cases where the hf_ field name doesn't quite match the proto_tree_add_uint_format, but it's close enough that one of them should be "right", I'm just not sure which is, I just know the string in proto_tree_add_uint_format is the one displayed. svn path=/trunk/; revision=52098
2013-09-15More wmem conversion (leaving uat related functions aside)Pascal Quantin1-4/+5
svn path=/trunk/; revision=52055
2013-09-15Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if ↵Michael Mann1-21/+17
hf_ field name is the first part of the formatted string. This was done with a perl script on the dissectors directory (packet-*.c), followed by manual inspection of the output. The manual inspection yielded a few cases that really should have been proto_tree_add_uint or proto_tree_add_item, so I updated them accordingly. The script didn't catch as many as I would have liked, but it's a start. The most common (ab)use of proto_tree_add_uint_format was for appending strings to CRC/checksum values to note good or bad CRC/checksum. svn path=/trunk/; revision=52045
2013-09-11Rename frame relay NLPID dissector table from "fr.ietf" to "fr.nlpid".Chris Maynard1-1/+1
svn path=/trunk/; revision=51960
2013-09-11Change the name of the Cisco HDLC dissector table from chdlctype to ↵Chris Maynard1-1/+1
chdlc.protocol and change the UI name to match. It is by far much more common to name the tables after the field than to pick another name. svn path=/trunk/; revision=51958
2013-09-11Move a lot of includes from follow_stream_dialog.h toGerald Combs1-0/+24
follow_stream_dialog.cpp. Remove the ones that we don't use. Use QMessageBox in place of simple_dialog. Move IP6OPT_HOME_ADDRESS and related definitions to packet-ipv6.c. It looks like we only use it there and it conflicts with WinPcap. Mark some items unused. svn path=/trunk/; revision=51951
2013-09-09expert_add_info_format_text -> expert_add_info_formatMichael Mann1-7/+7
svn path=/trunk/; revision=51852
2013-07-17Remove fragment_data, add fragment_head, fragment_item - for now alias it to ↵Jakub Zawadzki1-1/+1
the same structure. This is begin of work to split fragment head and fragments items. svn path=/trunk/; revision=50708
2013-07-03expert_add_info_format_text + proto_tree_add_text = ↵Michael Mann1-3/+1
proto_tree_add_expert_format, where applicable. svn path=/trunk/; revision=50377
2013-06-30ip_proto.h now requires expert.h.Jeff Morriss1-1/+2
svn path=/trunk/; revision=50249
2013-06-14Remove check_col() and the occasional tree.Michael Mann1-6/+2
svn path=/trunk/; revision=49920
2013-06-08Batch of filterable expert infos.Michael Mann1-19/+53
svn path=/trunk/; revision=49845
2013-03-22Don't wire into the reassembly code the notion that reassemblies shouldGuy Harris1-7/+5
be done on flows from one address to another; reassembly for protocols running atop TCP should be done on flows from one TCP endpoint to another. We do this by: adding "reassembly table" as a data structure; associating hash tables for both in-progress reassemblies and completed reassemblies with that data structure (currently, not all reassemblies use the latter; they might keep completed reassemblies in the first table); having functions to create and destroy keys in that table; offering standard routines for doing address-based and address-and-port-based flow processing, so that dissectors not needing their own specialized flow processing can just use them. This fixes some mis-reassemblies of NIS YPSERV YPALL responses (where the second YPALL response is processed as if it were a continuation of a previous response between different endpoints, even though said response is already reassembled), and also allows the DCE RPC-specific stuff to be moved out of epan/reassembly.c into the DCE RPC dissector. svn path=/trunk/; revision=48491
2013-03-19From beroset:Anders Broman1-2/+2
remove C++ incompatibilities https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 svn path=/trunk/; revision=48426
2013-02-21I'm pretty sure that reassembled IPv6 data does not fit in a uint32.Jaap Keuter1-1/+1
svn path=/trunk/; revision=47791
2012-12-26Fix a bunch of warnings.Guy Harris1-42/+42
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of sizeof. Cast away some implicit 64-bit-to-32-bit conversion errors due to use of strtol() and strtoul(). Change some data types to avoid those implicit conversion warnings. When assigning a constant to a float, make sure the constant isn't a double, by appending "f" to the constant. Constify a bunch of variables, parameters, and return values to eliminate warnings due to strings being given const qualifiers. Cast away those warnings in some cases where an API we don't control forces us to do so. Enable a bunch of additional warnings by default. Note why at least some of the other warnings aren't enabled. randpkt.c and text2pcap.c are used to build programs, so they don't need to be in EXTRA_DIST. If the user specifies --enable-warnings-as-errors, add -Werror *even if the user specified --enable-extra-gcc-flags; assume they know what they're doing and are willing to have the compile fail due to the extra GCC warnings being treated as errors. svn path=/trunk/; revision=46748
2012-12-02Introduce, and start using, TVB_SET_ADDRESS() and TVB_SET_ADDRESS_HF(). TheyJeff Morriss1-9/+8
are like the non-TVB versions except that they take a TVB and an offset instead of (frequently) a pointer into the TVB. Calling tvb_get_ptr() before modifying the rest of the fields should help fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7960 (though I can't reproduce that problem). Replace a bunch of calls like: SET_ADDRESS(..., AT_XXX, length, tvb_get_ptr(tvb, offset, length)); with: TVB_SET_ADDRESS(..., AT_XXX, tvb, offset, length); svn path=/trunk/; revision=46324
2012-11-21From Stephen Tarr: Fix 'misspelling (typo) in display filter field name'.Bill Meier1-1/+1
ipv6.framgent --> ipv6.fragment #BACKPORT svn path=/trunk/; revision=46098
2012-10-31From report of VinsWorldcom via ↵Alexis La Goutte1-2/+2
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7938 IPv6 Option Pad1 Incorrect dissection Wireshark 1.8.3 does not decode the IPv6 Option Pad1 (RFC 2460 Section 4.2) RFC say : NOTE! the format of the Pad1 option is a special case -- it does not have length and value fields. #BACKPORT(1.8) svn path=/trunk/; revision=45843
2012-10-08Continuation of r43335Jakub Zawadzki1-1/+1
- ipv6.traffic_class.dscp use ext string so and need BASE_EXT_STRING flag (fix SIGSEGV) - dscp_vals was removed from .h file, so make it static - export dscp_vals_ext svn path=/trunk/; revision=45380
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-07From Robert Bullen via ↵Jeff Morriss1-0/+6
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7683 : The reassembled fragments tree in the Packet Details view is awesome, but it lacks one thing: a field that exposes the reassembled data. tcp.data already exists for exposing a single TCP segment's payload as a byte array. It would be handy to have something similar for a single application layer PDU when TCP segment reassembly is involved. I propose tcp.reassembled.data, named and placed after the already existing field tcp.reassembled.length. My primary use case for this feature is outputting tcp.reassembled.data with tshark for further processing with a script. The attached patch implements this very feature. Because the reassembled fragment tree code is general purpose, i.e. not specific to just TCP, any dissector that relies upon it can add a similar field very cheaply. In that vein I've also implemented ip.reassembled.data and ipv6.reassembled.data, which expose reassembled fragment data as a single byte stream for IPv4 and IPv6, respectively. All other protocols that use the reassembly code have been left alone, other than inserting NULL into their initializer lists for the newly introduced struct field reassemble.h:fragment_items.hf_reassembled_data. svn path=/trunk/; revision=44802
2012-08-10Use val_to_str_const() where appropriate;Bill Meier1-4/+4
Also (for a few files): - create/use some extended value strings; - remove unneeded #include files; - remove unneeded variable initialization; - re-order fcns slightly so prefs_reg_handoff...() at end, etc svn path=/trunk/; revision=44438
2012-07-18Fix some system header files that were #included with "" instead of <>.Evan Huus1-1/+1
They made cppcheck unhappy. svn path=/trunk/; revision=43779
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-06-19Correct the IPv6 fragment offset shown in COL_INFO.Jeff Morriss1-11/+23
Make some Fragment header fields filterable (add_text() -> add_item()). Display (and make filterable) the reserved octet and bits. svn path=/trunk/; revision=43389
2012-06-19Add proto_tree_add_unicode_string() to add UTF-8 string to tree. Jakub Zawadzki1-4/+4
Convert some proto_tree_add_string_format_value(..., val, "%s", val); to use new function. svn path=/trunk/; revision=43363
2012-06-18Integrate r43221 and 43222 with 43211. (Revert back to having onlyGerald Combs1-1/+1
dscp_vals_ext.) svn path=/trunk/; revision=43335
2012-06-12Revert r41952Jörg Mayer1-1/+18
BACKPORT to 1.8 svn path=/trunk/; revision=43222
2012-06-12Manually revert r41953Jörg Mayer1-3/+7
BACKPORT to 1.8 svn path=/trunk/; revision=43221
2012-06-11Don't define value_string arrays in a .h file (included in multiple places).Bill Meier1-6/+4
Also: - don't use val_to_str_const() with a "format" default string; - rename 'opt_len_type' enumeration identifiers to be less generic. svn path=/trunk/; revision=43210
2012-05-31From Sheetal Kshirsagar and Andrew Williams:Anders Broman1-5/+98
Updating the RPL SRH dissector and implementing RPL Options header dissection. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6986 svn path=/trunk/; revision=42937
2012-05-30Fix bug #5077 in IPv6.Jakub Zawadzki1-15/+26
svn path=/trunk/; revision=42909
2012-05-30Cleanup geoip support in ipv6.Jakub Zawadzki1-90/+37
svn path=/trunk/; revision=42908
2012-05-15Fix a few scan-build warnings along with some whitespace.Gerald Combs1-71/+67
svn path=/trunk/; revision=42630
2012-05-08Enhance Unknown IPv6 Extension HeaderAlexis La Goutte1-10/+7
svn path=/trunk/; revision=42511
2012-04-05Use common code to have the same hf field for DSCP in IPv4 and IPv6.Anders Broman1-7/+2
svn path=/trunk/; revision=41953
2012-04-05Use common code to add ip version to the tree.Anders Broman1-18/+1
svn path=/trunk/; revision=41952
2012-04-05Use common value string for DSCP.Anders Broman1-23/+1
svn path=/trunk/; revision=41951
2012-03-27Add IPv6 Option : RPL Option RFC-ietf-6man-rpl-option-06Alexis La Goutte1-1/+60
svn path=/trunk/; revision=41797
2012-03-27Add IPv6 Option :Alexis La Goutte1-5/+81
* Tunnel Encapsulation Limit (RFC 2473) * CALIPSO (RFC 5570) * Experimental Option (RFC 4727) svn path=/trunk/; revision=41796
2012-03-20Add Quick Start IPv6 Option ( And shared Quick Start option between ↵Alexis La Goutte1-1/+83
IPv4/IPv6/TCP ) svn path=/trunk/; revision=41681
2012-03-18Fix typo (wrong proto_item is used... when there is PAD1 Option)Alexis La Goutte1-1/+1
svn path=/trunk/; revision=41636
2012-03-16Remove dissect_ipv6_options function (unused from Revision 16302...)Alexis La Goutte1-97/+0
svn path=/trunk/; revision=41624
2012-03-12Enhance and update IPv6 Option of Extension HeaderAlexis La Goutte1-107/+133
* Make field filterable... * Display unknown option payload svn path=/trunk/; revision=41513
2012-02-01Fix some typos.Chris Maynard1-3/+3
svn path=/trunk/; revision=40787
2011-12-21Fix indent and add modelines informationAlexis La Goutte1-980/+1014
svn path=/trunk/; revision=40258
2011-12-05Explicitly display "Source or Destination Address/Host" like IPv4.Chris Maynard1-4/+4
svn path=/trunk/; revision=40095