Commit graph

155 commits

Author SHA1 Message Date
Anders Broman
007a0b28ae From Matthias St. Pierre:
Add full rfc4868 support to both dissectors.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7873

svn path=/trunk/; revision=45708
2012-10-22 12:34:01 +00:00
Anders Broman
5b80615885 From Matthias St. Pierre:
Add authentication methods HMAC-SHA2-256-96 and HMAC-SHA2-256-128 to isakmp dissector

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7873

svn path=/trunk/; revision=45630
2012-10-18 14:43:42 +00:00
Pascal Quantin
c5e0d7ce32 Do not use private_data from caller dissector as IKEv2 decryption parameters
svn path=/trunk/; revision=45510
2012-10-12 21:06:27 +00:00
Jeff Morriss
2552c750e5 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45017
2012-09-20 02:03:38 +00:00
Jeff Morriss
aa5d9d78dd From Robert Bullen via 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-09-07 02:09:59 +00:00
Bill Meier
638d74d43f Use val_to_str_const() where appropriate;
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-08-10 22:55:02 +00:00
Guy Harris
659cf0527a UATs could be put into "categories". The categories were defined only
implicitly by the #define name and string they were defined to; not all
UATs neatly fit into any of the categories, so some of them were put
into categories that weren't obviously correct for them, and one - the
display filter macro UAT - wasn't put into any category at all (which
caused crashes when editing them, as the GUI code that handled UAT
changes from a dialog assumed the category field was non-null).

The category was, in practice, used only to decide, in the
aforementioned GUI code, whether the packet summary pane needed to be
updated or not.  It also offered no option of "don't update the packet
summary pane *and* don't redissect anything", which is what would be
appropriate for the display filter macro UAT.

Replace the category with a set of fields indicating what the UAT
affects; we currently offer "dissection", which applies to most UATs
(any UAT in libwireshark presumably affects dissection at a minimum) and
"the set of named fields that exist".  Changing any UAT that affects
dissection requires a redissection; changing any UAT that affects the
set of named fields that exist requires a redissection *and* rebuilding
the packet summary pane.

Perhaps we also need "filtering", so that if you change a display filter
macro, we re-filter, in case the display is currently filtered with a
display filter that uses a macro that changed.

svn path=/trunk/; revision=43603
2012-07-08 01:00:46 +00:00
Jakub Zawadzki
bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
pascal
acc2a3706b Fix RVALS() macro usage
svn path=/trunk/; revision=42720
2012-05-19 19:05:36 +00:00
Anders Broman
fc41d4ad51 From Evan Huus:
Duplicate and misplaced 'break' statements.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7106

svn path=/trunk/; revision=42091
2012-04-16 08:39:34 +00:00
Alexis La Goutte
914a9df522 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=41720
2012-03-21 11:27:10 +00:00
Alexis La Goutte
f5822cdd9e From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6972
ISAKMP : VendorID CheckPoint : Malformed Packet

Wrong minimum length when there is not CheckPoint "Data" after VendorID

svn path=/trunk/; revision=41718
2012-03-21 09:49:35 +00:00
Alexis La Goutte
98cd9c9ebb From me via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6206
IKE: Life-Duration wrong displayed in LTV format

The Fix commit in Revision 38387 is wrong 
Get the following error message : ISAKMP dissector bug: failed assertion proto.c:2957

use a HF by type (uint32, uint64, bytes...) for life duration

svn path=/trunk/; revision=41717
2012-03-21 09:28:31 +00:00
Chris Maynard
07ef77a875 Fix Coverity CID 1366: MISSING BREAK
svn path=/trunk/; revision=40610
2012-01-20 18:53:06 +00:00
Chris Maynard
436b44b99e Fix some duplicate display filter names.
svn path=/trunk/; revision=40592
2012-01-19 21:57:24 +00:00
Alexis La Goutte
2fb9360c96 Update ISAKMP to last IANA Parameters (2011-11-07)
Add new ISAKMP Attribut of RFC6407 and new IKE type (GAP ID 22)

svn path=/trunk/; revision=40476
2012-01-13 16:59:22 +00:00
Alexis La Goutte
333bbe5079 Update IKEv2 to last IANA Parameters (2011-12-19)
RFC-kivinen-ipsecme-secure-password-framework-03 => RFC6467

svn path=/trunk/; revision=40293
2011-12-26 14:00:22 +00:00
Alexis La Goutte
99f11112f9 Update IKEv2 to last IANA Parameters (2011-11-09)
Add RFC-kivinen-ipsecme-secure-password-framework-03

svn path=/trunk/; revision=40233
2011-12-17 09:57:35 +00:00
Bill Meier
ececcf6811 Fix a memory leak.
svn path=/trunk/; revision=40189
2011-12-13 23:03:16 +00:00
Bill Meier
4a976f1be7 Use tvb_new_child_real_data() instead of tvb_new_real_data() + tvb_set_child_real_data_tvbuff().
svn path=/trunk/; revision=40173
2011-12-13 04:01:33 +00:00
Michael Tüxen
0f1ddc857b Fix compilation if HAVE_LIBGCRYPT is not defined.
svn path=/trunk/; revision=39812
2011-11-12 22:03:55 +00:00
Anders Broman
fa7ea2ea34 fix [-Wunused-but-set-variable]
svn path=/trunk/; revision=39803
2011-11-12 12:37:38 +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
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
Michael Tüxen
055f20b798 Use "%" G_GINT64_MODIFIER "u" instead of G_GINT64_MODIFIER "%u".
svn path=/trunk/; revision=38388
2011-08-07 15:01:10 +00:00
Chris Maynard
f59ddbef68 Life duration is a variable length TLV, and not always a 2 byte value. Hopefully fixes bug 6206 (no relevant capture file available to test).
Reference: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6206

svn path=/trunk/; revision=38387
2011-08-07 14:49:49 +00:00
Stig Bjørlykke
10c3eaa321 Avoid a possible infinite loop in dissect_delete().
This may fix the "Malformed IKE Packet DoS" bug.

svn path=/trunk/; revision=38247
2011-07-28 22:19:46 +00:00
Alexis La Goutte
541be89168 Update last IANA Parameters
RFC-ietf-ipsecme-failure-detection-08.txt => RFC6290
RFC-ietf-ipsecme-ipsecha-protocol-06.txt => RFC6311

svn path=/trunk/; revision=38174
2011-07-23 15:53:19 +00:00
Gerald Combs
49b92440de More GLIB_CHECK_VERSION cleanups. Update the minimum GLib/GTK+ versions
in README.devloper. Remove g_gnuc.h since it's no longer needed. Remove
tvbuff_init(), tvbuff_cleanup(), reassemble_init(), and
reassemble_cleanup() since they were only used for older GLib versions
which didn't support GSlices. Assume we always support the "matches"
operator.

svn path=/trunk/; revision=37978
2011-07-11 20:32:19 +00:00
Bill Meier
d2269ce7d5 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
svn path=/trunk/; revision=37716
2011-06-19 18:47:35 +00:00
Alexis La Goutte
a432c736e8 Update IKEv2 to last IANA Parameters (2011-05-09)
Add Notify Message Types of : 
* A Quick Crash Detection Method for IKE (RFC-ietf-ipsecme-failure-detection-08.txt)
* Protocol Support for High Availability of IKEv2/IPsec (RFC-ietf-ipsecme-ipsecha-protocol-06.txt)

svn path=/trunk/; revision=37690
2011-06-17 11:54:51 +00:00
Anders Broman
b471c4a807 From Michael Mann:
UATification of isakmp dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5989

svn path=/trunk/; revision=37536
2011-06-04 13:47:19 +00:00
Bill Meier
a2b58f051d Add #include <stdlib.h> to files which reference fcns declared in stdlib.h;
(In many cases I previously incorrectly removed the #include <stdlib.h>).

svn path=/trunk/; revision=37334
2011-05-20 19:00:09 +00:00
Alexis La Goutte
416ed742d5 From discussion in dev mailing ( http://www.wireshark.org/lists/wireshark-dev/201105/msg00235.html )
* Fix a duplicate value_string in cp_version table
* Fix a typo error (Cersion => Version)
Also fix some whitespaces/4tab-spaces (Need more work...)



svn path=/trunk/; revision=37240
2011-05-18 15:34:34 +00:00
Anders Broman
2ad1c8df66 VALS(& -> VALS(
svn path=/trunk/; revision=37009
2011-05-06 12:28:11 +00:00
Jaap Keuter
3884e987b6 From Alexis La Goutte :
A patch to add Vendor ID of VIA Client & Remote AP (from Aruba Networks)
Also add ett_ value for rohc, ike & ike2.

svn path=/trunk/; revision=35974
2011-02-17 08:03:48 +00:00
Gerald Combs
7b254f46fb Fix some Visual C++ static analyzer complaints.
svn path=/trunk/; revision=35971
2011-02-17 01:11:05 +00:00
Jeff Morriss
50e1634f4c Modify proto_tree_add_bytes_format() and proto_tree_add_bytes_format_value()
so that if the start_ptr is NULL the bytes are extracted from the given TVB
using the given offset and length.

Replace a bunch of:

proto_tree_add_bytes_format*(tree, hf, tvb, offset, length, tvb_get_ptr(tvb, offset, length), [...])

with:

proto_tree_add_bytes_format*(tree, hf, tvb, offset, length, NULL, [...])

svn path=/trunk/; revision=35896
2011-02-10 16:31:00 +00:00
Anders Broman
95e14efafd From Alexis La Goutte:
Patch to fix a typo error....

svn path=/trunk/; revision=35816
2011-02-04 11:52:50 +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
Jeff Morriss
6cfdeed280 Replace ip_to_str((tvb_get_ptr(...)) with tvb_ip_to_str().
Replace ip6_to_str((tvb_get_ptr(...)) with tvb_ip6_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.

Replace some memcpy()+tvb_get_ptr() with tvb_memcpy().

svn path=/trunk/; revision=35529
2011-01-14 03:44:58 +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
250373865e from Alexis La Goutte:
Cleanup and update ISAKMP Dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5360

svn path=/trunk/; revision=34754
2010-11-02 16:58:43 +00:00
Bill Meier
0b9a803e45 #include <string.h> apparently req'd on OSX ...
svn path=/trunk/; revision=34465
2010-10-10 23:48:16 +00:00
Bill Meier
93b94a23ca Define some fcns & vars as static; Some #includes not req'd; packet-mikey.h not req'd.
svn path=/trunk/; revision=34464
2010-10-10 23:28:40 +00:00
Bill Meier
3b48b69866 Use extended ipproto value_string (ipproto_val_ext).
svn path=/trunk/; revision=34214
2010-09-23 17:55:11 +00:00