Commit Graph

39 Commits

Author SHA1 Message Date
Bill Meier ffde0a10bb Restore saved 'pinfo->fragmented' as appropriate;
Fixes gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.

svn path=/trunk/; revision=38297
2011-07-31 23:41:20 +00:00
Alexis La Goutte 12592dab19 From Owen Kirby via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6147
6LoWPAN: Support for IP-in-IP tunnelingy

svn path=/trunk/; revision=38258
2011-07-29 14:26:41 +00:00
Jaap Keuter 8e30d1990e From Colin O'Flynn:
Avoid processing tvb when fragment dissection didn't create one.

svn path=/trunk/; revision=37426
2011-05-27 07:02:26 +00:00
Bill Meier bf271ce2d0 From beth.tridium [At] gmail.com: 6LoWPAN dissector selects wrong byte for HC_UDP Encoding subtree
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5926

svn path=/trunk/; revision=37194
2011-05-16 23:15:08 +00:00
Bill Meier 1b9144beb8 From Yaniv Kaul: some 'set but not used' compilation fixes.
svn path=/trunk/; revision=36888
2011-04-27 04:27:38 +00:00
Bill Meier aec98c121a Don't assign to a proto_item * if the value won't be used: Coverity 820/821;
Also: #include <stdio.h> & <string.h> not required;


svn path=/trunk/; revision=36447
2011-04-04 15:38:19 +00:00
Gerald Combs 3de62b03c6 Forward port r36036 from trunk-1.4: Make sure we ep_allocate enough
memory.

svn path=/trunk/; revision=36037
2011-02-23 22:49:59 +00:00
Anders Broman ed66081a4d From Alexis La Goutte:
Cleanup packet-ipv6.h and dependency.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5713

svn path=/trunk/; revision=36031
2011-02-23 13:51:49 +00:00
Stig Bjørlykke 84bc28bd6a Introduce "Fragment count" filter element for all protocols doing reassembly.
svn path=/trunk/; revision=35705
2011-01-30 21:01:07 +00:00
Anders Broman 26f0f7bc7a From Fred Fierling:
Multi-key Support and Extended Address Mapping for ZigBee Dissectors
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331

svn path=/trunk/; revision=34647
2010-10-26 05:42:24 +00:00
Anders Broman b1e852cf70 Back out 34627 and friends again.
svn path=/trunk/; revision=34633
2010-10-24 15:22:44 +00:00
Anders Broman 43cb273d08 From Fred Fierling:
Multi-key Support and Extended Address Mapping for ZigBee Dissectors
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5331

svn path=/trunk/; revision=34627
2010-10-24 10:04:29 +00:00
Stig Bjørlykke 8d3bde0f49 Initialize length.
svn path=/trunk/; revision=34293
2010-09-30 19:41:44 +00:00
Jaap Keuter 733183a170 From Colin O'Flynn / Owen Kirby:
The 6LoWPAN dissector had as a TODO the 'stateful address compression' mode.
This patch fixes that TODO, up to HC-13.
This patch also updates to HC-08, where the PANID is no longer used in forming
the short address.

svn path=/trunk/; revision=34290
2010-09-30 19:23:31 +00:00
Anders Broman 1315fe5d29 From John Sucaet:
The committed changes in 33624 did not include all fixes of the previous patch
file - Please add the fix for the field description of the 8-bit Deep Hops Left
field
Attached file contains this fix (+as well as small correction to the field
descriptions of V and F flags, according to the terminology of RFC 4944)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5047

svn path=/trunk/; revision=33630
2010-07-26 13:04:10 +00:00
Jaap Keuter 7ca6e3a655 From John Sucaet:
packet-6lowpan.c dissects the non-compressed ipv6 fields in an order different
from the one specified in RFC 4944 §10.3.1. 
The patch fixes the wrong order and an additional problem with the dissection 
of the mesh header: support for the Deep Hops Left field (RFC 4944 §5.2)

svn path=/trunk/; revision=33624
2010-07-23 20:19:05 +00:00
Jaap Keuter afc25e015c From Jan van den Boom:
Correct the V and F flag interpretation in the Mesh Addressing Type and Header
for correct address interpretation.

svn path=/trunk/; revision=33623
2010-07-23 19:40:32 +00:00
Guy Harris 5c394ee15f Squelch some compiler warnings (including warnings about the last member
of a structure being an empty array; that is *not* supported by all the
compilers that can be used to build Wireshark).

svn path=/trunk/; revision=32412
2010-04-07 00:34:20 +00:00
Bill Meier 09764dd969 Remove unneeded #include <stdio.h>
svn path=/trunk/; revision=32367
2010-04-03 21:55:23 +00:00
Jaap Keuter e347a5f155 From Colin O'Flynn:
This is a minor change between the version in SVN which is hc-05, 
and the latest which is hc-06.

svn path=/trunk/; revision=32163
2010-03-10 19:21:17 +00:00
Guy Harris 2341d987a7 Add a sanity check in dissect_6lowpan_hc1() for the datagram length.
Fail, and add an expert item, for invalid lengths.

Having done that, add some casts to squelch compiler warnings.

svn path=/trunk/; revision=32160
2010-03-10 10:23:19 +00:00
Jaap Keuter 4732c51d52 From Owen Kirby:
I've come across a bug in the 6LoWPAN header decompression code that
incorrectly computes the length of IPv6 extension headers by adding the
protocol and length fields twice.

svn path=/trunk/; revision=32157
2010-03-10 07:15:07 +00:00
Jaap Keuter 103d684a3f From Owen Kirby:
This patch fixes 6LoWPAN fragmentation to comply with RFC4944.
I also happened across a problem with the derivations of 
interface identifiers from 16-bit IEEE 802.15.4 addresses, which 
should also be fixed in my patch.

svn path=/trunk/; revision=32155
2010-03-09 23:22:03 +00:00
Anders Broman 50f7fa97dc from Colin O'Flynn:
6lowpan dissector: copy/paste error results in 64-bit source & 16-bit dest failing
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4545

svn path=/trunk/; revision=32065
2010-03-01 11:13:54 +00:00
Jaap Keuter 3126f22a14 From Owen Kirby:
This patch fixes a bug in the 6LoWPAN dissectors that corrupts addresses when
multicast address compression is used. Testing this fix also uncovered a bug in
the computation of the length of the extension headers. And some typos.

svn path=/trunk/; revision=31870
2010-02-12 22:10:53 +00:00
Jaap Keuter 3c702d064b From Owen Kirby:
This patch fixes a bug in the 6LoWPAN dissector where link-local addresses
created from an EUI-64 address do not correctly invert the universal/local bit
as recommended by section 4 of RFC2464.

svn path=/trunk/; revision=31843
2010-02-09 08:40:40 +00:00
Stig Bjørlykke 539b558f8c Renamed some reassembled data texts.
Removed some check_col().

svn path=/trunk/; revision=31809
2010-02-06 18:20:21 +00:00
Stig Bjørlykke 88b72356ad Introduce "Reassembled length" filter element for all protocols doing
reassembly.

svn path=/trunk/; revision=31767
2010-02-02 16:01:52 +00:00
Anders Broman 0a5a3c1158 From Didier Gautheron:
Fix a memory leak.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3917

svn path=/trunk/; revision=31511
2010-01-13 07:42:42 +00:00
Jaap Keuter e1afd4d4f7 From Beth Tridium:
When a 6lowpan message has a compressed UDP length (i.e. the length must be
calculated, not read from the headers), the 6lowpan dissector correctly reports
that the UDP length is compressed, but it may try to read the length from the
headers anyway.

svn path=/trunk/; revision=31075
2009-11-25 19:46:08 +00:00
Stig Bjørlykke 68939c0d8d Removed an unused assignment.
svn path=/trunk/; revision=30895
2009-11-09 14:36:35 +00:00
Jaap Keuter a1d82636c1 Add parentheses to satisfy the compiler.
svn path=/trunk/; revision=30842
2009-11-06 07:08:40 +00:00
Jaap Keuter e2246d08cd From Owen Kirby:
We've discovered a number of bugs in the 6LoWPAN dissector, 
and have fixed them in the following patch. The fixed bugs include:
  - Incorrect UDP Checksum calculation.
  - Incorrect link-local prefix when decompressing IPHC headers.
  - Incorrect parsing of the UDP port numbers when not 8-byte aligned.
  - Overflow of the datagram offset field when reassembling fragmented packets.

svn path=/trunk/; revision=30840
2009-11-05 22:39:00 +00:00
Bill Meier 6645d6e47d Fix code so it actually pads a length to an 8 byte boundary.
svn path=/trunk/; revision=30406
2009-10-08 16:13:53 +00:00
Bill Meier bb8fc20cd3 1. There doesn't seem to be a need for a separate .h file;
2. Move prototype declarations to after the struct declarations
   used by the prototypes.
3. Fix some typos.

svn path=/trunk/; revision=30310
2009-10-04 17:50:39 +00:00
Kovarththanan Rajaratnam c7b5a98682 We don't use preferences so if (!init) not required
svn path=/trunk/; revision=30278
2009-10-04 06:53:05 +00:00
Jeff Morriss 50cec93579 Fix a couple (false) uninitialized variable warnings.
svn path=/trunk/; revision=30271
2009-10-03 22:47:41 +00:00
Michael Tüxen 923fbf0b98 Make gcc happy.
svn path=/trunk/; revision=30269
2009-10-03 10:52:15 +00:00
Jaap Keuter 07a1f3875e From Owen Kirby:
The attached patch adds a dissector for IPv6 over IEEE 802.15.4 (aka 6LoWPAN).
The protocol is specified in RFC 4944. This dissector also processes the
6LoWPAN draft header compression scheme in draft-ietf-6lowpan-hc-05.

svn path=/trunk/; revision=30268
2009-10-03 10:06:19 +00:00