Commit Graph

113 Commits

Author SHA1 Message Date
Chris Maynard 647c5c0b27 packet_info's in_error_pkt is now a bitfield like in_gre_pkt.
svn path=/trunk/; revision=39764
2011-11-08 18:39:11 +00:00
Chris Maynard d55d8781b8 Improve ICMP conversation tracking, especially when capturing on multiple interfaces and one of them is a GRE tunnel. Resolves bug 5770, which was reopened.
svn path=/trunk/; revision=39757
2011-11-08 17:25:22 +00:00
Bill Meier 794757ae8f For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.
Also: remove trailing whitespace for a number of files.

svn path=/trunk/; revision=39503
2011-10-21 02:10:19 +00:00
Bill Meier d65261d344 Use ENC_NA as proto_tree_add_item() encoding arg for FT_ETHER hf[] field type.
(Some minor whitespace cleanup).

svn path=/trunk/; revision=39488
2011-10-20 14:07:54 +00:00
Bill Meier 33f6f89401 Specify ENC_TIME_TIMESPEC for a proto_tree_add_item() encoding arg for a field with type FT_ABSOLUTE_TIME.
svn path=/trunk/; revision=39482
2011-10-19 23:24:52 +00:00
Bill Meier 293049dfba Do some conversions of proto_tree_add_item() 'encoding' arg.
(previously missed).

    57   FT_BOOLEAN:       FALSE-->ENC_BIG_ENDIAN
    31   FT_BOOLEAN:       TRUE-->ENC_LITTLE_ENDIAN

    10   FT_BYTES:         ENC_BIG_ENDIAN-->ENC_NA
     1   FT_BYTES:         ENC_LITTLE_ENDIAN-->ENC_NA
    21   FT_BYTES:         FALSE-->ENC_NA
     2   FT_BYTES:         TRUE-->ENC_NA

     2   FT_IPXNET:        ENC_BIG_ENDIAN-->ENC_NA

     6   FT_IPv6:          ENC_BIG_ENDIAN-->ENC_NA
     1   FT_IPv6:          FALSE-->ENC_NA

     6   FT_NONE:          ENC_BIG_ENDIAN-->ENC_NA
    19   FT_NONE:          FALSE-->ENC_NA
     3   FT_NONE:          TRUE-->ENC_NA

     1   FT_STRING:        ENC_BIG_ENDIAN-->ENC_ASCII|ENC_NA
     1   FT_STRING:        ENC_LITTLE_ENDIAN-->ENC_ASCII|ENC_NA
     5   FT_STRING:        FALSE-->ENC_ASCII|ENC_NA
     1   FT_STRING:        TRUE-->ENC_ASCII|ENC_NA

     4   FT_STRINGZ:       ENC_NA-->ENC_ASCII|ENC_NA
     8   FT_STRINGZ:       FALSE-->ENC_ASCII|ENC_NA

     1   FT_INT32:         FALSE-->ENC_BIG_ENDIAN
     1   FT_INT32:         TRUE-->ENC_LITTLE_ENDIAN

    11   FT_UINT8:         0-->ENC_BIG_ENDIAN
   111   FT_UINT8:         FALSE-->ENC_BIG_ENDIAN
    17   FT_UINT8:         TRUE-->ENC_LITTLE_ENDIAN
     1   FT_UINT16:        0-->ENC_BIG_ENDIAN
    68   FT_UINT16:        FALSE-->ENC_BIG_ENDIAN
    18   FT_UINT16:        TRUE-->ENC_LITTLE_ENDIAN
     4   FT_UINT24:        FALSE-->ENC_BIG_ENDIAN
    70   FT_UINT32:        FALSE-->ENC_BIG_ENDIAN
     1   FT_UINT32:        TRUE-->ENC_LITTLE_ENDIAN
     4   FT_UINT64:        FALSE-->ENC_BIG_ENDIAN
     1   FT_UINT64:        TRUE-->ENC_LITTLE_ENDIAN

     1   FT_UINT_STRING:   FALSE-->ENC_ASCII|ENC_BIG_ENDIAN


svn path=/trunk/; revision=39442
2011-10-16 23:38:49 +00:00
Bill Meier 126aa85393 Convert proto_tree_add_item() 'encoding' arg for field types FT_STRING, FT_STRINGZ, FT_UINT_STRING as follows:
1. If there's no character encoding (ENC_ASCII, ...) specified
    then use ENC_ASCII.
 2. For all but FT_UINT_STRING, always use ENC_NA
    (replacing any existing True/1/FALSE/0
    /ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN).



svn path=/trunk/; revision=39426
2011-10-15 18:46:26 +00:00
Bill Meier 67ee5049d4 Convert 'encoding' parameter of certain proto_tree_add_item() calls in 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-10 00:39:31 +00:00
Bill Meier 4e57694d4a Convert 'encoding' parameter of certain proto_tree_add_item() calls in 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-10-06 03:35:44 +00:00
Bill Meier 94f36ca4ff Use ENC_NA as encoding for proto_tree_add_item() calls which directly reference an hf item (in hf[] with types:
FT_NONE
   FT_BYTES
   FT_IPV6
   FT_IPXNET
   FT_OID

Note: Encoding field set to ENC_NA only if the field was previously TRUE|FALSE|ENC_LITTLE_ENDIAN|ENC_BIG_ENDIAN

svn path=/trunk/; revision=39260
2011-10-04 22:44:31 +00:00
Bill Meier 4c46725c2c Fix vi "modeline" so it works;
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5748

svn path=/trunk/; revision=39074
2011-09-21 16:28:53 +00:00
Chris Maynard afb6549467 Add dissection of router address(R) flag. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6350.
svn path=/trunk/; revision=39029
2011-09-16 19:23:26 +00:00
Alexis La Goutte cc2b9a77d8 * Replace FALSE by ENC_BIG_ENDIAN for encoding parameter
* Remove some whitespace...

svn path=/trunk/; revision=38272
2011-07-30 14:11:08 +00:00
Alexis La Goutte b7fad24596 From Eric Zhu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5846
Wireshark cannot display Reachable time & Retrans timer in IPv6 RA messages

svn path=/trunk/; revision=38227
2011-07-27 15:19:17 +00:00
Alexis La Goutte 79754d8f50 Make checkAPIs Happy
Error: the blurb for field "Status" ("icmpv6.6lowpannd.da.status") has leading space in epan/dissectors/packet-icmpv6.c

svn path=/trunk/; revision=37667
2011-06-15 08:55:01 +00:00
Alexis La Goutte 97fcab0f33 From Colin O'Flynn via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5363
Add latest 6lowpan-nd Support

From me :
* Add Description in Header Field
* Use FT_EUI64 for EUI64 Field


svn path=/trunk/; revision=37666
2011-06-15 08:52:38 +00:00
Alexis La Goutte 17bb20ea8f From Colin O'Flynn via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5363
Fix some error in ICMPv6 dissector...

svn path=/trunk/; revision=37665
2011-06-15 08:32:10 +00:00
Alexis La Goutte d4a80250c0 Add EUI64 display type for Source/Target Link-layer Address (RFC4861)
svn path=/trunk/; revision=37165
2011-05-15 18:48:39 +00:00
Alexis La Goutte d05788974e From Colin O'Flynn via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5921
Fix for RPL DAO-ACK Processing when DODAG ID present

Reported and fixed by Jakob Ruhe

svn path=/trunk/; revision=37162
2011-05-15 17:47:56 +00:00
Alexis La Goutte 7d317e553b Add FT_EUI64 Field Type
* Remove proto_tree_add_eui64 function from 802.15.4 Dissector 
* Replace print_eui64/print_eui64 by eui64_to_str/get_eui64_name
* Update Documentation (README.dev)
* Add new function in libwireshark.def
* Support of encoding for tvb_eui64_to_str
* Use FT_EUI64 for ICMPv6, CAPWAP, Zbee ... dissector

svn path=/trunk/; revision=37015
2011-05-08 10:23:53 +00:00
Alexis La Goutte 9b5f811b4e Convert ICMPv6 dissector to "new-style" dissector
Fix Dead Store Warning ( warning: Value stored to '*offset*' is never read )


svn path=/trunk/; revision=36668
2011-04-16 17:14:39 +00:00
Alexis La Goutte 12dae38bb7 Update to last IANA parameters (2011-04-08)
Update to last RPL Draft (19)
Add new ICMPv6 Option: Proxy Signature (PS) draft-ietf-csi-proxy-send-05
Fix 2 Clang Warning (unused variable):
packet-icmpv6.c:2755:9: warning: Value stored to 'oplength' is never read
        oplength = tvb_get_guint8(tvb, rr_offset);
packet-icmpv6.c:2916:5: warning: Value stored to 'nb_mcast_records' is never read
    nb_mcast_records = tvb_get_ntohs(tvb, mldr_offset);

svn path=/trunk/; revision=36641
2011-04-14 09:40:07 +00:00
Chris Maynard 26e4e13c06 Neither checksum_item nor length are used uninitialized, but for some reason,
the OSX buildbots think they can be.  Initialize them to avoid a build failure.

svn path=/trunk/; revision=36562
2011-04-11 18:40:36 +00:00
Chris Maynard 5abfa49525 Add conversation tracking and tshark tap support to ICMPv6. Fixes bug 5810.
TODO: Add a Wireshark tap or look into possibly using the stats tree instead.
Also, like ICMP, the ICMPv6 payload appears to carry the sender's timestamp, so
it might be possible to make use of this information to estimate the total SRT.
(See bug 5770 for more details.)

svn path=/trunk/; revision=36561
2011-04-11 17:42:01 +00:00
Jeff Morriss 559c1e0d53 Use tvb_ether_to_str().
svn path=/trunk/; revision=36126
2011-03-03 02:41:22 +00:00
Bill Meier 121c65c613 Remove unneeded #includes (stdio.h,stdlib.h);
Whitespace cleanup: trailing, indentation, "4-space tabs"

svn path=/trunk/; revision=35850
2011-02-07 18:49:29 +00:00
Jaap Keuter 5c7ec8729a From Alexis La Goutte:
A patch to enhance the ICMPv6 dissector
- Make ICMP Type (sub)field filterable
- Add Inverse Neighbor Discovery (RFC 3122)
- Remove dependency to packet-ipv6.h
- Cleanup packet-ipv6.h
- Update RFC Draft to draft-ietf-roll-rpl-17 (with make a sub dissector
  for RPL Control and add Secure RPL...)
- Replace tvb_get_ipv6/ip6_to_str by new function tvb_ip6_to_str
- and other enchancements.....

svn path=/trunk/; revision=35586
2011-01-19 20:57:39 +00:00
Jeff Morriss d553df218e Use tvb_memeql().
Use tvb_ip_to_str().

There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_*(): just use proto_tree_add_item().

Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s to ensure the
return string is NULL terminated.

svn path=/trunk/; revision=35547
2011-01-16 03:46:16 +00:00
Anders Broman bdc3fa5463 From Alexis La Goutte:
- Update RFC Draft (draft-vida-mld-v2-08.txt) to Final RFC
(RFC 3810)
- Make MLD field filterable 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5552

svn path=/trunk/; revision=35413
2011-01-07 00:19:28 +00:00
Anders Broman 52264efdfe Fix build.
svn path=/trunk/; revision=35358
2011-01-04 08:45:03 +00:00
Jaap Keuter b9f7ef1bb2 From Alexis La Goutte:
A Patch to enchance the ICMPv6 Router Renumbering for IPv6 (RFC 2894) Dissector
- Make RR field filterable 
- Add RR Result Message
- ...

svn path=/trunk/; revision=35355
2011-01-04 07:44:39 +00:00
Jaap Keuter bf301e6d86 Fix the HAI value display filter string.
svn path=/trunk/; revision=35294
2010-12-29 07:39:52 +00:00
Chris Maynard 40106e2f5b From Alexis La Goutte via bug 5528:
Fix wrong Field Type for HAI-Value and MN-Value (RFC 5271)

svn path=/trunk/; revision=35289
2010-12-28 18:26:16 +00:00
Jaap Keuter 64d02a0ae1 From Alexis La Goutte:
A patch to enchance the ICMPv6 dissector
- Update RFC Draft (draft-ietf-ipngwg-icmp-name-lookups-07/08) to Final RFC (RFC 4620)
- Make NI field filterable 
- ....

svn path=/trunk/; revision=35283
2010-12-28 10:34:19 +00:00
Anders Broman 2f80045a5c From Alexis La Goutte:
ICMPv6 Enhancements : make ICMP option filterable (Part 2)

*Merge (and update) FMIPv6 Option with ND Option
*Make ICMP option filterable (use proto_tree_add_item..)
*Reorder ND Option
*Add dissector for RA Flags Extension (RFC5075)
*Add dissector for Handover Key Request/Reply (RFC5269)
*Add dissector for Handover Assist Info / Mobile Node ID (RFC5271)
*Add dissector for DNS Search List (RFC6106

From me removed a c++ style comment and changed 
to tvb_memcpy(tvb, (guint8 *)&prefix.bytes in a couple of places.

svn path=/trunk/; revision=35272
2010-12-27 10:57:42 +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 879821bc35 Try to fix Buildbot crash output: fuzz-2010-11-28-11164.pcap
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5448

svn path=/trunk/; revision=35060
2010-11-29 13:02:31 +00:00
Stig Bjørlykke 3bfd25c34e Removed unused route_preference.
svn path=/trunk/; revision=34990
2010-11-21 11:28:42 +00:00
Anders Broman ebac83d6a3 From Alexis La Goutte:
ICMPv6 Enhancements : make ICMP option filterable.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5424

svn path=/trunk/; revision=34988
2010-11-21 10:30:35 +00:00
Anders Broman 5d6d0f6fea Update from IANA records.
svn path=/trunk/; revision=34846
2010-11-11 21:18:46 +00:00
Jeff Morriss df0692a8e6 Use while loops instead of goto's.
svn path=/trunk/; revision=34580
2010-10-20 01:37:03 +00:00
Jeff Morriss 8a7125f063 From Colin O'Flynn and Owen Kirby via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5266 :
The attached patch begins to add support for RPL to the ICMPv6 file. All
locations that RPL code have been added are marked with a comment allowing this
patch to be reverted at a future time if it is decided to e.g. move all the RPL
code to it's own dissector.

A few values await IANA assignment and are also clearly marked (in
packet-ipv6.h). 

Only the 'metric' option is left unsupported, as it is primarily defined in
another I-D.

svn path=/trunk/; revision=34579
2010-10-20 01:23:32 +00:00
Gerald Combs fff19c8383 Improve the ND flag display.
svn path=/trunk/; revision=34388
2010-10-05 22:16:29 +00:00
Gerald Combs a0b284c5db Add more information to the Info column for some ICMPv6 messages. Add a
small comment to addr_resolv.c.

svn path=/trunk/; revision=34384
2010-10-05 17:57:23 +00:00
Jaap Keuter add282a338 From Colin O'Flynn
Add 6lowpan-nd-13 Support.
This brings the 6lowpan dissector up to the latest revision, nd-13.

svn path=/trunk/; revision=34294
2010-09-30 19:43:33 +00:00
Stig Bjørlykke 35073fe5a7 Added some values from IANA's icmpv6-parameters.
Note: option 29 and 30 still not dissected according to RFC 5271.

svn path=/trunk/; revision=33563
2010-07-18 12:09:14 +00:00
Stig Bjørlykke becb46a421 Added some updates from RFC 4443.
svn path=/trunk/; revision=33562
2010-07-18 11:47:43 +00:00
Stig Bjørlykke 039c0ccac0 Show the reserved values in type 135, 137 and 143 in the packet tree.
This fixes the issues in bug 5018.

svn path=/trunk/; revision=33561
2010-07-18 11:07:04 +00:00
Anders Broman 970dbcb464 Clean up a bit, fix indent.
svn path=/trunk/; revision=33045
2010-06-02 10:50:39 +00:00
Jörg Mayer af443c79c8 Add three more ICMPv6 type that only have a code of 0
svn path=/trunk/; revision=32120
2010-03-04 23:51:30 +00:00