Commit Graph

42 Commits

Author SHA1 Message Date
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
Stig Bjørlykke 2445e38d88 Indicate hexadecimal preferences.
svn path=/trunk/; revision=27650
2009-03-08 11:55:44 +00:00
Bill Meier e8a1e7d84c Fix some indentation
svn path=/trunk/; revision=27219
2009-01-13 18:08:20 +00:00
Stig Bjørlykke 9a0020f2f9 From Peter (bug 2942):
Allow optimalization with -ftracer.

svn path=/trunk/; revision=26822
2008-11-22 15:55:01 +00:00
Anders Broman 95451b54f8 From Max Filippov:
patch to support IEE802.15.4 non-ASK PHY.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2906

svn path=/trunk/; revision=26792
2008-11-16 17:15:49 +00:00
Jaap Keuter 62e4dd4459 From Colin O'Flynn:
The idea is that there is now some hardware that can put 802.15.4 frames over
Ethernet. To do so, the 802.15.4 frames are wrapped in an Ethernet frame, with
the Ethertype set to a value indicating the payload is 802.15.4.

Since there is no official ETHTYPE designated by the IEEE, the number 0x809A
is used in this code. However a preference is added to the "IEEE 802.15.4" type
in the preference dialog allowing you to change this ethtype to something else.

The hardware for those interested is the Atmel Raven USB Stick.

svn path=/trunk/; revision=26352
2008-10-05 08:11:35 +00:00
Jaap Keuter 7116bc941b Made FCS calculation and checking code work on GCC 4.3.1.
Made FCS check actually mean something.

svn path=/trunk/; revision=26125
2008-09-03 05:56:30 +00:00
Bill Meier 77b81b391b #include <prefs.h> not req'd
svn path=/trunk/; revision=26089
2008-08-25 22:06:20 +00:00
Gerald Combs fef4a3b22d Remove a linefeed from a field description.
svn path=/trunk/; revision=24756
2008-03-29 20:47:12 +00:00
Stig Bjørlykke b6bf233599 Removed some unnamed unions, reported by Andrew Hood.
svn path=/trunk/; revision=24720
2008-03-23 18:40:22 +00:00
Stephen Fisher 9ba003e8b6 Mark a couple of variables volatile
Remove two unused dissector handles
Comment out a function declaration labeled as "TODO" 


svn path=/trunk/; revision=24571
2008-03-05 22:28:29 +00:00
Anders Broman a4798caa7b Fix typos.
svn path=/trunk/; revision=24570
2008-03-05 21:04:42 +00:00
Anders Broman f9ad87dd7c From Owen Kirby :
IEEE 802.15.4 dissector and DLT_ type.

svn path=/trunk/; revision=24564
2008-03-05 20:30:03 +00:00