Commit Graph

37522 Commits

Author SHA1 Message Date
Anders Broman b79dfbe405 Fix unused function warnings
svn path=/trunk/; revision=39338
2011-10-10 17:42:43 +00:00
Jeff Morriss 56a684a625 Fix ASN.1 dissector generation on Windows.
svn path=/trunk/; revision=39337
2011-10-10 14:54:12 +00:00
Jeff Morriss b9c974071c Fix a typo
svn path=/trunk/; revision=39336
2011-10-10 12:54:27 +00:00
Jeff Morriss 454555d42b Don't remove the ASN.1 dissectors when cleaning: we don't (re)build them during the make process yet.
svn path=/trunk/; revision=39335
2011-10-10 12:52:53 +00:00
Stig Bjørlykke 76493cf5a2 From Anders:
Move packet-t38.c to ASN1_DISSECTOR_SRC.

svn path=/trunk/; revision=39334
2011-10-10 08:50:55 +00:00
Jeff Morriss cf012d27b1 Build the ASN.1 dissectors directly into epan/dissectors (rather than building
them and then copying them over).  The "all" target to builds these dissectors
now (instead of "generate_files" and/or "copy_files").

asn2wrs's "-O" option now means "the dissector goes in this directory" (rather
than "all output goes in this directory"); it also means that the "-s" (single
output file) option is now required.

Fix things up so that it's possible to build all of the ASN.1 dissectors in
one shot.

Fix building of conformance files when doing out-of-source-tree builds.


Unfortunately "make all" in the asn1 directory always builds something--I think
because of circular depedencies.

svn path=/trunk/; revision=39333
2011-10-10 02:31:11 +00:00
Bill Meier 6142dd287b Convert 'encoding' parameter of certain proto_tree_add_item() calls in asn1/*:
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_IPv6 use ENC_NA. (This was missed in SVN #39260)

svn path=/trunk/; revision=39332
2011-10-10 01:38:20 +00:00
Bill Meier 93c7550b4a After regenerating asn1 files, packet-gsm_map.h changed, (presumably due to asn2wrs.py change in SVN #39320).
svn path=/trunk/; revision=39331
2011-10-10 01:34:44 +00:00
Bill Meier 39c11c3c69 After re-generating ASN1 files, 2 .h files changed (presumably due to asn2wrs.py change in SVN #39320).
svn path=/trunk/; revision=39330
2011-10-10 01:32:07 +00:00
Bill Meier 9eb54292d3 Convert 'encoding' parameter of certain proto_tree_add_item() calls in plugins/*:
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 an earlier SVN)

svn path=/trunk/; revision=39329
2011-10-10 00:53:55 +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
Guy Harris e0820c62d4 Add a comment with links to I-Ds for protocols that look as if they're
at least somewhat related.

svn path=/trunk/; revision=39327
2011-10-09 17:42:49 +00:00
Anders Broman c9134488f9 Fix a typo.
svn path=/trunk/; revision=39326
2011-10-09 15:46:10 +00:00
Gerald Combs d2076e06cd [Automatic manuf, services and enterprise-numbers update for 2011-10-09]
svn path=/trunk/; revision=39323
2011-10-09 14:03:25 +00:00
Alexis La Goutte 74c9396555 From Jouni Malinen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6422
Clean up IEEE 802.11 dissector - fixed fields

Many of the fixed fields use similar bitfield construction in the proto_tree. Use proto_tree_add_bitmask() to avoid having to implement the same subtree and item addition separately for each field.

svn path=/trunk/; revision=39322
2011-10-09 13:09:46 +00:00
Alexis La Goutte 10056d45c1 Enhance BGP Open message
* Make field filterable 
* Remove bgp_open struct
* Fix a bug of offset in Optionnel Parameter TLV (Bug include by me in Revision #39098)

svn path=/trunk/; revision=39321
2011-10-09 13:06:32 +00:00
Stig Bjørlykke 46ae76bf6c Always generate packet-*-exp.h.
This fixes a bug when only exporting _PDU objects, and we can have
'#include "packet-*-exp.h"' in packet-*-template.h even when having
no #.EXPORTS in the conformation file.

svn path=/trunk/; revision=39320
2011-10-09 10:42:54 +00:00
Stig Bjørlykke 4938502ee0 Added a button to refresh a UAT from the system defaults (if existing).
Added a button to clear the list.
Added tooltip to some buttons.
Removed unused clist code.

svn path=/trunk/; revision=39319
2011-10-09 09:55:14 +00:00
Stig Bjørlykke e0c689dc03 Check for NULL pointer in file_exists().
svn path=/trunk/; revision=39318
2011-10-09 09:54:48 +00:00
Guy Harris 03194fa270 Move the GeoIP entry where it belongs.
Expand a couple of comments.

svn path=/trunk/; revision=39317
2011-10-08 19:44:36 +00:00
Alexis La Goutte fc823d7b6a Enhance BGP Header
* Remove a not needed subtree
* Make field filtereable
* Use expert info to display a wrong length

svn path=/trunk/; revision=39316
2011-10-08 18:12:59 +00:00
Alexis La Goutte 63088ace0a From Jouni Malinen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6422
Clean up IEEE 802.11 dissector - fixed fields

The fixed field identifiers were defined to have specific values. However, this is used only within the parser and does not correspond to any specific packet field. As such, there is no need for the specific values to be maintained and an enum makes it simpler to add and remove these fields as needed.

svn path=/trunk/; revision=39315
2011-10-08 17:51:03 +00:00
Alexis La Goutte d0d00c22cf From Jouni Malinen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6422
Clean up IEEE 802.11 dissector - fixed fields

The app_fixed_field() function has grown to overly complex and long function. Split it into separate helper functions for each fixed field and a table of dissector functions. This makes it easier to extend and maintain the implementation.

svn path=/trunk/; revision=39314
2011-10-08 17:50:06 +00:00
Alexis La Goutte 770c55ec37 From Jouni Malinen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6421
IEEE 802.11u ANQP enhancements

Dissect vendor-specific ANQP Capabilities

svn path=/trunk/; revision=39313
2011-10-08 17:22:45 +00:00
Alexis La Goutte bde9017379 From Jouni Malinen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6421
IEEE 802.11u ANQP enhancements

Dissect NAI Realm List

svn path=/trunk/; revision=39312
2011-10-08 17:21:44 +00:00
Alexis La Goutte 8f1ba7305c From Jouni Malinen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6420
WPA IE pairwise cipher suite dissector uses incorrect value_string list

From me :
* Use correct value_string for WPA Key MGMT...

svn path=/trunk/; revision=39311
2011-10-08 16:55:54 +00:00
Jörg Mayer 432ca372bd Remove a duplicate entry
svn path=/trunk/; revision=39310
2011-10-08 15:17:56 +00:00
Bill Meier 56776c54c8 From Stéphane Bryant: fixes in reload fragmentation handling
-Fixes in reload fragmentation
  -also updated the code to reflect draft-zong-p2psip-drr-01

From me:
  Remove one line of the patch which appears to be incorrect:
  At about line 4118 (in dissect_reload_message())
-      pinfo->fragmented = save_fragmented;
+      pinfo->fragmented = pinfo->fragmented;


svn path=/trunk/; revision=39309
2011-10-08 14:42:11 +00:00
Bill Meier 8b3c428699 From Stéphane Bryant: remove the variables that the previous patch left unused
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317

From me: Add hf[] entry for 'hf_reload_dmflag_underlay_hop'

svn path=/trunk/; revision=39308
2011-10-08 14:14:32 +00:00
Jörg Mayer 03fe88b31f Mimic test for IPv6 support in GeoIP from autofoo
svn path=/trunk/; revision=39307
2011-10-08 06:09:38 +00:00
Anders Broman 59cd698822 From Martin Kaiser:
DVB-CI / CI+ CC resource version 2

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

svn path=/trunk/; revision=39306
2011-10-07 16:46:37 +00:00
Anders Broman eeff694c87 - Put a TRY/CATCH block around dissect_h264_nal_unit() in case
a bogus nal unit was sent.
- Delete an unused hf entry.

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

svn path=/trunk/; revision=39305
2011-10-07 16:42:52 +00:00
Jeff Morriss cf96c7793f As suggested/requested in
http://ask.wireshark.org/questions/6756/linking-error-with-str_to_str :

Add str_to_str to the list of exported functions.

svn path=/trunk/; revision=39304
2011-10-07 13:53:43 +00:00
Gerald Combs 691a5244d7 From Dirk Jagdmann:
Below is a small enhancement to the EPM dissector. It adds the "type" of
EPM Map request/response to the INFO column. This way I don't have to
dig into the proto tree if I want to see what service is requested.

From me:

Add a modeline blurb.

svn path=/trunk/; revision=39303
2011-10-06 22:05:11 +00:00
Bill Meier cf1c4c12d3 Use '"%" G_GINT64_MODIFIER "d"' instead of "%ld" to format a guint64.
Fixes a compile warning

svn path=/trunk/; revision=39302
2011-10-06 21:12:21 +00:00
Bill Meier e022b330df From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
  draft-ietf-p2psip-sip-06,
  draft-ietf-p2psip-service-discovery-03,
  draft-ietf-p2psip-self-tuning-04,
  draft-ietf-p2psip-diagnostics-06,
  draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
  configuration data
- export the message content dissection function
  in the new packet-reload.h file for use in
  related protocols (draft-hautakorpi-p2psip-with-hip-01)

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

From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data

Note: Additional fix yet req'd since checkhf.pl gives:
  ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
  Unused entry: packet-reload.c, hf_reload_storeddata_signature
  Unused entry: packet-reload.c, hf_reload_storeddataspecifiers

(Compile is OK).

svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +00:00
Gerald Combs da0f8cf7c0 Don't stuff "(null)" into the protocol tree.
svn path=/trunk/; revision=39300
2011-10-06 20:28:40 +00:00
Gerald Combs 210262ad24 Assume all strings coming from GeoIP are ISO-8859-1. Fix IPv6
destination GeoIP lookups.

svn path=/trunk/; revision=39299
2011-10-06 19:33:15 +00:00
Stig Bjørlykke 27d50a084a Added media type multipart/report from RFC3462.
svn path=/trunk/; revision=39298
2011-10-06 19:26:21 +00:00
Anders Broman 8b18a26764 Typo FT_IPv4 isf FT_IPv6.
Fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6435

svn path=/trunk/; revision=39297
2011-10-06 19:07:26 +00:00
Anders Broman 83b98f5e2c Add exports
svn path=/trunk/; revision=39296
2011-10-06 18:46:47 +00:00
Jaap Keuter ac9c74a8f4 Fix for bug 6356:
Wireshark encounters error while parsing ieee80211 QoS Null data.
The error is because of invalid read when trying to read mesh_flags 
(after the header), which doesn't exist.

svn path=/trunk/; revision=39295
2011-10-06 17:53:44 +00:00
Bill Meier e2996ceabe Convert 'encoding' parameter of certain proto_tree_add_item() calls in asn1 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=39294
2011-10-06 16:50:13 +00:00
Bill Meier 594f1efcdd Add missing (presumably) entries for credssp,idmp,t124 & x721.
However: t124 & x721 fail to build on Windows so comment them out.

svn path=/trunk/; revision=39293
2011-10-06 16:43:24 +00:00
Bill Meier 02065b0981 Convert 'encoding' parameter of certain proto_tree_add_item() calls in plugin 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=39292
2011-10-06 14:46:34 +00:00
Stig Bjørlykke 3c551a7bce It seems like GEOIP_NETSPEED_EDITION_REV1_V6 was added to GeoIP 1.4.8.
svn path=/trunk/; revision=39291
2011-10-06 06:53:07 +00:00
Anders Broman 7bba3ab20a Fix unused parameter warnings.
svn path=/trunk/; revision=39290
2011-10-06 06:15:32 +00:00
Anders Broman 063f24973c Removed unconditional g_warnings and a bit of code clean up.
svn path=/trunk/; revision=39289
2011-10-06 05:48:48 +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
Gerald Combs aae5eb7de0 Don't break strict aliasing rules.
svn path=/trunk/; revision=39287
2011-10-06 02:43:51 +00:00