Commit Graph

37 Commits

Author SHA1 Message Date
Anders Broman ae747e4c4b From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48430
2013-03-19 22:03:00 +00:00
Alexis La Goutte 87c1df5ead From report of Elavarasan via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8099 Named field for each item in Selected Registrar Config methods is not available
The structure of both the Config Methods and Selected Registrar Config Methods are  the same.

Display filters such as "wps.config_methods.pushbutton", "wps.config_methods.display", etc are available for the different methods in the Config methods whereas the display filters for the elements in the Selected Registrar Config methods are found to be the same as the Config method Display filters.

From me :
add new filter for selected_registrar config method bitmask (and also permitted config method)

svn path=/trunk/; revision=46725
2012-12-23 19:17:54 +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
Evan Huus 15dca08b65 Fix uninitialized value warnings from GCC.
svn path=/trunk/; revision=44966
2012-09-18 02:17:24 +00:00
Bill Meier 7d31b63dbc Do some reformatting.
svn path=/trunk/; revision=44965
2012-09-18 01:34:08 +00:00
Bill Meier 07a1067f26 From Michael Lum: Fix typo.
svn path=/trunk/; revision=44964
2012-09-18 00:47:37 +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
Jakub Zawadzki 9c48f9ca96 Add missing const attribute to some char *
Fix some "assignment discards qualifiers from pointer target type", etc

svn path=/trunk/; revision=41993
2012-04-09 17:53:04 +00:00
Bill Meier 30cee99009 Fix a number of proto_tree_add_item() encoding args.
svn path=/trunk/; revision=39774
2011-11-09 17:33:18 +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 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 781129806f Fix ex "modeline" so it works;
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5748

svn path=/trunk/; revision=39081
2011-09-21 17:49:11 +00:00
Guy Harris 9d6671bbab The checkAPI script doesn't understand arrays of value_string tables,
and that flavor of two-dimensional array requires you to declare a
maximum size for the value_string tables in the array.  Don't use an
array of value_string tables.

svn path=/trunk/; revision=35871
2011-02-08 00:57:21 +00:00
Jaap Keuter d265580072 From Masashi Honma:
Currently the Wireshark does not support Primary Device Type dissection. 
I made a patch for the dissection based on "Wi-Fi Simple Configuration 
Specification DRAFT Version 2.0.0.51".

svn path=/trunk/; revision=35867
2011-02-07 22:47:43 +00:00
Jaap Keuter b964ee34dd From Masashi Honma:
EAP WPS RF band may be '2.4 GHz and 5 GHz'.

svn path=/trunk/; revision=35282
2010-12-28 09:30:24 +00:00
Bill Meier af4db6059a (Minor) Some whitespace cleanup.
svn path=/trunk/; revision=34634
2010-10-24 15:39:36 +00:00
Bill Meier 2ccfd848fe From Jouni Malinen: Add support for new WSC 2.0 attributes and values
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5196

svn path=/trunk/; revision=34632
2010-10-24 15:18:43 +00:00
Stig Bjørlykke ccba8cc3df Removed an unused assignment.
svn path=/trunk/; revision=30881
2009-11-09 14:09:19 +00:00
Jaap Keuter f55ec2aeff From Jouni Malinen:
WPS encodes Bool attributes as single-octet values. Selected Registrar
attribute is parsed correctly (packet-wps.c), but many of the other Bool
attributes are marked incorrectly to use two-octet fields. This results in
showing incorrect octets for some of the attributes and incorrectly marking
frames invalid if a Bool attribute is included as the last attribute in a WPS
IE.

svn path=/trunk/; revision=30622
2009-10-19 18:36:34 +00:00
Stig Bjørlykke 0437f102c3 From Kovarththanan Rajaratnam:
More FT_XXX cleanup.

svn path=/trunk/; revision=28971
2009-07-07 09:02:59 +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 9b6fc0d050 From Jens Braeuer via bug 3522:
Change "wps.serial_number" from bytes to string.

svn path=/trunk/; revision=28697
2009-06-11 11:35:45 +00:00
Bill Meier 9af5304276 FT_BOOLEAN fields with bitmask: Display is 'parent bitfield width' not BASE...
Replace blurbs identical with title in hf[] with NULL;
Use consistent indentation.

svn path=/trunk/; revision=28306
2009-05-08 17:25:23 +00:00
Bill Meier 7172127412 #include reassemble.h not req'd
svn path=/trunk/; revision=27911
2009-03-31 12:08:44 +00:00
Jaap Keuter 38fc4d7e69 From Gursel Mutlu:
WPS defines usage of UUID values for both enrollee and registrar. They are both
16-byte values as defined in RFC 4122 for UUID. Current code on SVN repository
dissectors these values as they are 8 bytes long.

svn path=/trunk/; revision=27095
2008-12-23 17:39:19 +00:00
Bill Meier 33c99f44fd Fix typos and spelling (mostly in text strings)
svn path=/trunk/; revision=27028
2008-12-17 00:08:38 +00:00
Jaap Keuter cb477a2a4a From Vladimir Koutny:
The size of selected_registrar fiels in WPS IE should be 1b, not 2b 
(it is defined as BOOL in WPS specs).

svn path=/trunk/; revision=26214
2008-09-16 05:43:36 +00:00
Bill Meier 67559b7dfe Add NULL termination element to value_string arrays
svn path=/trunk/; revision=25793
2008-07-22 18:27:13 +00:00
Stig Bjørlykke c068f9acf2 From Jens Braeuer (bug 1999):
This patchs adds the 
- requested check of tlv_len at top of the disection-loop
- length check for fields w/ variable length (expert_add_info_format)

svn path=/trunk/; revision=23673
2007-11-29 17:25:36 +00:00
Stig Bjørlykke 82041ad3b6 Set an initial value to make gcc 4.1.3 20070929 (prerelease) on Ubuntu happy.
svn path=/trunk/; revision=23580
2007-11-25 02:20:41 +00:00
Guy Harris 38ab1b8e7a Set the usual properties on packet-wps.[ch].
svn path=/trunk/; revision=23553
2007-11-23 18:48:49 +00:00
Stig Bjørlykke 2ad24805fe No $Id:$ in new files?
svn path=/trunk/; revision=23551
2007-11-23 18:29:00 +00:00
Stig Bjørlykke d6f0b0c2af From Jens Braeuer:
Added support for Wifi Simple Config aka Wifi Protected Setup

From me:
Added standard copyright header to packet-wps

svn path=/trunk/; revision=23549
2007-11-23 17:48:28 +00:00