Commit graph

62 commits

Author SHA1 Message Date
Bill Meier
7ff8d2e622 Add missing '*/' to the end of a comment: Fixes gcc compile error.
svn path=/trunk/; revision=40005
2011-11-25 22:08:25 +00:00
Bill Meier
78af0d3f86 From Ivan Lawrow: Added IEEE 802.15.4-2003 AES-CCM security modes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4912

svn path=/trunk/; revision=40004
2011-11-25 22:02:25 +00:00
Jeff Morriss
f5e838b602 Remove comma at the end of several enumerator lists.
svn path=/trunk/; revision=39700
2011-11-01 01:23:10 +00:00
Stig Bjørlykke
5359494b1f Second try to move crc routines to libwsutil.
This time keep the tvb routines in epan.

Now we can use common crc routines outside epan.

svn path=/trunk/; revision=38810
2011-08-31 09:00:54 +00:00
Stig Bjørlykke
71f903b956 Revert r38800, as the crc routines contains some tvb functions.
svn path=/trunk/; revision=38803
2011-08-30 14:17:40 +00:00
Stig Bjørlykke
4132d40e50 Move all crc routines to libwsutil.
This way we can use the crc routines in wiretap.

svn path=/trunk/; revision=38800
2011-08-30 13:46:42 +00:00
Bill Meier
b708c2892b Dissectors don't need to #include <gmodule.h>
Also: #include <stdlib.h> not req'd in some cases.

svn path=/trunk/; revision=38409
2011-08-08 15:41:09 +00:00
Stig Bjørlykke
2e74f2f582 Added a cast from ieee802154_long_addr.addr (guint64) to guint.
svn path=/trunk/; revision=37691
2011-06-17 11:56: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
Guy Harris
602b0747ce Stuff that comes back from ep_alloc() is properly aligned for all uses;
that's why it returns "void *", not "guint8 *".  Don't pointer-convert
that information away; otherwise, compilers might whine at you about
unsafe casts.

svn path=/trunk/; revision=36793
2011-04-22 03:34:39 +00:00
Gerald Combs
46865581e5 Fix Visual C++ code analysis warnings.
svn path=/trunk/; revision=36007
2011-02-19 00:05:12 +00:00
Jaap Keuter
133cbe7581 From Ivan Lawrow:
The Final CAP Slot field "wpan.cap" in the Superframe Specification for a
beacon is always displayed as zero.

svn path=/trunk/; revision=35999
2011-02-18 08:02:53 +00:00
Guy Harris
fd941f3906 Don't look at any of the fields that come from the Auxiliary Security
Header unless there *is* an Auxiliary Security Header.

svn path=/trunk/; revision=35878
2011-02-08 06:55:53 +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
Jeff Morriss
313785c513 From Fred Fierling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5395 :
The ZigBee security dissector was not recording the short to long address
mappings in Security Headers, preventing the decryption of some payloads. This
patch eliminates the Undecoded warnings in packets 1 and 19 in this test
capture: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=5457

The keys to decrypt these packets are listed in the bug.

svn path=/trunk/; revision=34886
2010-11-15 20:52:41 +00:00
Jaap Keuter
605db4842d From Colin O'Flynn:
Add a missing NULL pointer check.

svn path=/trunk/; revision=34761
2010-11-03 17:52:11 +00:00
Guy Harris
0f96301a3e You may not use g_int64_hash() or g_int64_equal(), as they are not
present in the minimum version of GLib that we support.  Create a
ieee802154_long_addr structure for long addresses, create hash
routines for those addresses, and use them.

svn path=/trunk/; revision=34651
2010-10-26 08:31:16 +00:00
Anders Broman
30d27cfb05 g_int64_hash is first available in Glib 2.22
(This needs a proper fixr)
This is just to get the build going again.

svn path=/trunk/; revision=34649
2010-10-26 06:48:09 +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
bfcc79bd23 error: ‘ieee802154_short_addr_invalidate’ declared ‘static’ but never defined
error: ‘ieee802154_long_addr_invalidate’ declared ‘static’ but never defined

svn path=/trunk/; revision=34629
2010-10-24 14:02:31 +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
Jeff Morriss
cca3ba3ce2 (Refining the regexp...) Replace blurbs that match the name (case insensitive) with NULL.
svn path=/trunk/; revision=34230
2010-09-24 02:51:40 +00:00
Guy Harris
11b9ed0426 Define WTAP_ENCAP_IEEE802_15_4_NOFCS, for use in file formats that don't
include the FCS, and use it for the Daintree SNA file format.  While
we're at it, explicitly check to make sure the purported packet length
gives it at least one byte of packet data, and fix some print formats to
use %u for unsigned values.

svn path=/trunk/; revision=33678
2010-07-30 02:30:50 +00:00
Guy Harris
45afe26346 Squelch some compiler complaints.
svn path=/trunk/; revision=32572
2010-04-27 07:41:28 +00:00
Anders Broman
d8ea0a5fb4 Remove C++ style comments in packet-ieee802154.c
svn path=/trunk/; revision=32167
2010-03-11 09:19:29 +00:00
Jaap Keuter
e0cef3d9f9 From Owen Kirby:
This patch adds a hash table that stores any short-to-extended address mappings
that the dissector finds for later use during packet decryption. I've also
added a UAT so the user can manually add address pairs if needed.

svn path=/trunk/; revision=32166
2010-03-11 07:50:45 +00:00
Jaap Keuter
de0f1f1391 From Owen Kirby:
Fix for malformed IEEE 802.15.4 decryption.

svn path=/trunk/; revision=32154
2010-03-09 22:26:29 +00:00
Guy Harris
9a5521a819 Fix tpyo.
svn path=/trunk/; revision=31924
2010-02-19 17:51:36 +00:00
Guy Harris
1b59a2446f Clean up decryption; have it return various indications for whether it
was able to decrypt and, if it wasn't, why it wasn't, and put that
information into an expert information indication.

svn path=/trunk/; revision=31922
2010-02-19 10:24:13 +00:00
Ronnie Sahlberg
9b5ed8bf3b Flag the arguments as _U_ so that we dont fail the build with "unusued
parameter" warnings if we build without libgcrypt



svn path=/trunk/; revision=31825
2010-02-08 00:14:40 +00:00
Guy Harris
7a4031e31d More uninitialized-variable warning squelching.
svn path=/trunk/; revision=31823
2010-02-07 20:45:49 +00:00
Stig Bjørlykke
f092ff045d Initialize a subtree.
svn path=/trunk/; revision=31822
2010-02-07 20:12:48 +00:00
Anders Broman
6d64ae6425 Try to pacify the buildbot.
svn path=/trunk/; revision=31821
2010-02-07 20:08:00 +00:00
Anders Broman
95e212e6c7 From Owen Kirby:
Packet decryption for IEEE 802.15.4.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4457

svn path=/trunk/; revision=31820
2010-02-07 19:39:31 +00:00
Bill Meier
de4c6ff515 Fix a number of gcc _Wshadow warnings
svn path=/trunk/; revision=31557
2010-01-18 21:49:47 +00:00
Stig Bjørlykke
d577ca0fa7 Guard #include <sys/types.h> with HAVE_SYS_TYPES_H.
svn path=/trunk/; revision=31053
2009-11-23 18:47:52 +00:00
Jaap Keuter
0100407124 Fix for bug 4076:
Have the option to continue dissection of data even with failed FCS check.

svn path=/trunk/; revision=30786
2009-10-31 20:55:33 +00:00
Anders Broman
88bb44a51e From Jakub Zawadzki:
Cleanup dissector code - use proper memory functions.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4164

svn path=/trunk/; revision=30691
2009-10-25 11:43:30 +00:00
Kovarththanan Rajaratnam
00810ff199 * Prefer col_append_str instead of col_append_fstr for constant strings
* Remove check_col guards

svn path=/trunk/; revision=30127
2009-09-24 20:21:23 +00:00
Jaap Keuter
d764400291 From Jean-François Wauthy:
Dissect the Auxiliary Security Header for IEEE 802.15.4-2006 only.
Also Auxiliary Security Header dissection endianness bugfix.

svn path=/trunk/; revision=29864
2009-09-11 16:58:21 +00:00
Jaap Keuter
85cfb2d98c From Jean-François Wauthy:
Implementation of the IEEE 802.15.4 dissector ignores the Auxiliary Security
Header of the MHR (see IEEE 802.15.4-2006 specs p.138). 
The attached patch, add two things :
 1) Support for dissecting the Auxiliary Security Header
 2) Add a preference option to force the dissection of 
    the FCS field as being in the TI CC24xx format

svn path=/trunk/; revision=29849
2009-09-10 20:42:17 +00:00
Jaap Keuter
c4ab58dd42 From Jean-François Wauthy:
This patch fixes a bug in the dissection of the TI CC24xx FCS where the
endianness of the bitmasks used was wrong.

svn path=/trunk/; revision=29847
2009-09-10 18:54:12 +00:00
Kovarththanan Rajaratnam
8c48c6835f Rename address_to_str() to ep_address_to_str() because:
1) This indicates that the string has ephemeral lifetime
2) More consistent with its existing seasonal counterpart, se_address_to_str().

svn path=/trunk/; revision=29747
2009-09-06 14:25:47 +00:00
Kovarththanan Rajaratnam
6fe1060cd1 Don't pass ep_alloc()'ed strings to col_set_str().
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3984

svn path=/trunk/; revision=29726
2009-09-06 04:26:50 +00:00
Kovarththanan Rajaratnam
6110a96f68 Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29345
2009-08-09 07:59:51 +00:00
Stig Bjørlykke
b228488bc0 From Kovarththanan Rajaratnam via bug 3548:
(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-06-18 21:30:42 +00:00
Stig Bjørlykke
fc3f1b5283 From Artem Tamazov (bug 3472):
Save/Restore pinfo->private_data when used.

svn path=/trunk/; revision=28412
2009-05-19 17:16:14 +00:00
Bill Meier
f3d59ba1fe More ethereal --> wireshark
svn path=/trunk/; revision=27994
2009-04-08 13:07:21 +00:00
Anders Broman
caf80bbb74 More size_t casts.
svn path=/trunk/; revision=27888
2009-03-29 21:20:15 +00:00