Commit graph

12765 commits

Author SHA1 Message Date
Bill Meier
17c47d3078 Fix several cases wherein proto_tree_add_uint() was intended iso proto_tree_add_item();
One case would have caused display of a FT_UINT16 field with the wrong endianness.

svn path=/trunk/; revision=39358
2011-10-11 14:49:09 +00:00
Bill Meier
0a94d852e4 Revert SVN #39347; There's a better way.
svn path=/trunk/; revision=39357
2011-10-11 14:31:01 +00:00
Bill Meier
f74d57767c Fix a number of benign bugs wherein proto_tree_add_uint was intended (rather than proto_tree_add_item).
Tip o' the hat to Guy ...

svn path=/trunk/; revision=39356
2011-10-11 14:10:52 +00:00
Bill Meier
366f6e28ed Revert SVN #39345; (There's a better way ...)
svn path=/trunk/; revision=39355
2011-10-11 14:02:26 +00:00
Bill Meier
af3ae8ceea Fix "unused variable" compile error.
svn path=/trunk/; revision=39352
2011-10-10 23:45:33 +00:00
Bill Meier
ee395460d0 Fix benign bugs in some proto_tree_add_item() 'encoding' args;
svn path=/trunk/; revision=39351
2011-10-10 23:36:07 +00:00
Bill Meier
232629191b Fix bugs which caused certain fields to display with the wrong endianness;
Specifically: some proto_tree_add_item() 'encoding' args were incorrect.

svn path=/trunk/; revision=39350
2011-10-10 23:34:24 +00:00
Bill Meier
29e823dfba Fix benign bugs in some proto_tree_add_item() 'encoding' args;
svn path=/trunk/; revision=39348
2011-10-10 21:53:15 +00:00
Bill Meier
f96f3faf27 Fix additiuonal bugs in some proto_tree_add_item() 'encoding' args;
Two of the bugs would appear to have caused display of a FT_UINT16 field with
 the wrong endianness.

svn path=/trunk/; revision=39347
2011-10-10 21:46:19 +00:00
Bill Meier
f2ee4a9303 Fix benign bug in some proto_tree_add_item() 'encoding' args;
Use consistent indentation.

svn path=/trunk/; revision=39346
2011-10-10 21:29:10 +00:00
Bill Meier
8960630a3c Fix some benign bugs in proto_tree_add_item() 'encoding' arg.
svn path=/trunk/; revision=39345
2011-10-10 21:12:05 +00:00
Bill Meier
e81572eaa9 Comment out some unused hf[] entries;
Add notes about missing hf[] entries.

svn path=/trunk/; revision=39344
2011-10-10 20:57:56 +00:00
Bill Meier
a78fdcfddc Convert proto_tree_add_item() 'encoding' parameter as appropriate.
svn path=/trunk/; revision=39343
2011-10-10 20:12:57 +00:00
Anders Broman
bf76975958 Use guint64
svn path=/trunk/; revision=39342
2011-10-10 19:16:58 +00:00
Bill Meier
b37eaa9920 Fix a benign bug in proto_tree_add_item() 'encoding' arg.
svn path=/trunk/; revision=39341
2011-10-10 19:10:13 +00:00
Anders Broman
29d57edb56 From Donnie Savage:
Re-write of the EIGRP dissector to support Multi-Protocol (TLV 2.0) and
Multi-Topology (TLV 3.0).  This version also support Service Advertisement
Framework(SAF) extensions to EIGRP

Dissector includes:
- Dissection of all EIGRP Opcodes and TLVs
- Decode of EIGRP Flags and bitfields
- Decode of EIGRP Communities
- Decode of latest EIGRP "wide metric" formats
- Decode of EIGRP Extended Metrics
- Decode of SAF packets with XML client data handed off to XML dissector

From me:
Fix checkapi errors/warnings use G_GINT64_CONSTANT and G_GINT64_MODIFIER

svn path=/trunk/; revision=39339
2011-10-10 18:11:18 +00:00
Anders Broman
b79dfbe405 Fix unused function warnings
svn path=/trunk/; revision=39338
2011-10-10 17:42:43 +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
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
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
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
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
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
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
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
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
b9a03ec9ae Create expert item for invalid packet type instead of using DISSECTOR_ASSERT_NOT_REACHED();
Reformat some long lines;
Refactor code slightly.

svn path=/trunk/; revision=39286
2011-10-06 00:53:06 +00:00
Gerald Combs
2841728510 Fix GeoIP-sans-IPv6 compilation.
svn path=/trunk/; revision=39281
2011-10-05 22:37:00 +00:00
Gerald Combs
b9b05239f1 Add GeoIP IPv6 database support. Tested with GeoIP 1.4.7, but older
versions *should* be supported.

svn path=/trunk/; revision=39280
2011-10-05 22:27:51 +00:00
Bill Meier
c9f7505375 packet-ipdc.h no longer exists ...
svn path=/trunk/; revision=39279
2011-10-05 21:00:53 +00:00
Bill Meier
6e0682b828 Fix proto_tree_add_item() encoding parameter:
- Use ENC_BIG_ENDIAN instead of a (non-sensical) variable value;
- Use ENC_NA for hf field type FT_BYTES;

Also:
- Remove unneeded #includes;
- Use consistent indentation;
- val_to_str_...()  ==> val_to_str_..._const()

svn path=/trunk/; revision=39278
2011-10-05 20:57:56 +00:00
Bill Meier
a70163fa5c All: Fix proto_tree_add_item() encoding parameter:
- Use 'ENC_(LITTLE|BIG)_ENDIAN' instead of locally defined 'bo_(little|big)_endian';
- Use ENC_NA for hf fields with type FT_NONE or FT_BYTES.

packet-wsp.c:
- #if 0 unused hf fields;
-Fix two minor bugs in "sir" dissection.

svn path=/trunk/; revision=39276
2011-10-05 19:21:48 +00:00
Anders Broman
121b7d772e Add a couple of OID strings.
svn path=/trunk/; revision=39274
2011-10-05 18:27:48 +00:00
Bill Meier
e79d91f328 Add a short description ofthe dissector (from the Bug submission)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6428

svn path=/trunk/; revision=39272
2011-10-05 16:12:29 +00:00
Bill Meier
a5c09a54e3 Various cleanup:
- Add Gerald Combs copyright;
- Use correct address for FSF;
- Move proto_reg_handoff...() to the end of the file per convention;
- Remove unneeded check_col() and col_clear();
- Localize brp_handle;
- Whitespace cleanup ("4 space tabs" ==> spaces; remove trailing spaces).

svn path=/trunk/; revision=39271
2011-10-05 16:06:01 +00:00
Bill Meier
4c7f166dbb Use ENC_NA as the proto_tree_add_item() encoding parameter for a field of type FT_BYTES;
Fixes what appears to be a minor bug.

svn path=/trunk/; revision=39270
2011-10-05 14:51:06 +00:00
Stig Bjørlykke
3be3568bce Cleanup the unregister loop to avoid freeing wrong data.
svn path=/trunk/; revision=39269
2011-10-05 11:44:38 +00:00
Stig Bjørlykke
7714898212 Cleanup the unregister loop to avoid freeing wrong data.
svn path=/trunk/; revision=39268
2011-10-05 11:44:29 +00:00
Bill Meier
e18e2694c6 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|1|0|ENC_LITTLE_ENDIAN|ENC_BIG_ENDIAN
 

svn path=/trunk/; revision=39263
2011-10-05 02:39:04 +00:00
Bill Meier
799578fb29 Use ENC_NA as encoding for proto_tree_add_item() calls which directly reference an hf item with types in hf[] of:
FT_NONE
    FT_BYTES
    FT_IPV6
    FT_IPXNET
    FT_OID

svn path=/trunk/; revision=39261
2011-10-05 00:25:09 +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
Stig Bjørlykke
039fc59cb1 Free duplicated strings in hf entries.
svn path=/trunk/; revision=39259
2011-10-04 21:06:40 +00:00
Stig Bjørlykke
19e87afd9d Free duplicated strings in hf entries.
svn path=/trunk/; revision=39258
2011-10-04 21:06:20 +00:00
Anders Broman
463fcff9f4 Remove unused variables.
svn path=/trunk/; revision=39256
2011-10-04 19:19:43 +00:00
Anders Broman
77a3810066 Added Id
svn path=/trunk/; revision=39255
2011-10-04 19:04:56 +00:00
Anders Broman
575bf125aa From Rob Kruciak:
This is a dissector for the BRP (Bandwidth Reservation Protocol). This protocol
is used by various telecommunications vendors to establish VoD (Video
On-Demand) sessions between a STB (Set Top Box) at the customer's home and the
VoD server at the video head-end. 

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6428
- Changed hf blurbs to NULL
- Used dissector_add_handle() as the proposed port is registered to a different protocol.

svn path=/trunk/; revision=39254
2011-10-04 19:03:55 +00:00
Stig Bjørlykke
3316585afb Make custom IMF headers a part of profiles.
svn path=/trunk/; revision=39253
2011-10-04 18:53:35 +00:00
Stig Bjørlykke
b3f8f54079 Delete allocated header fields when updating the UAT.
Don't call header_fields_initialize_cb for prefs, as it will be called
when done in the UAT.

svn path=/trunk/; revision=39252
2011-10-04 18:41:07 +00:00
Stig Bjørlykke
8c8cd4024c Unregister and delete allocated header fields when updating the UAT.
Avoid double loading the UAT.
Use the post update callback in uat_new for regenerating header_fields_hash.

svn path=/trunk/; revision=39251
2011-10-04 18:40:56 +00:00
Jeff Morriss
d9d46c3014 Make value_strings const to fix checkapi warning. Do some minor reformatting.
svn path=/trunk/; revision=39250
2011-10-04 13:30:50 +00:00
Stig Bjørlykke
92001a0d3d Added support for configuring custom IMF headers.
svn path=/trunk/; revision=39249
2011-10-04 10:13:05 +00:00
Anders Broman
a17fcee039 From Pascal Quantin:
Add dissection of GERAN related messages.

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

svn path=/trunk/; revision=39246
2011-10-03 21:15:04 +00:00
Anders Broman
838c1b337b Fix a typo
svn path=/trunk/; revision=39245
2011-10-03 17:22:47 +00:00
Anders Broman
797c140887 Set ENC
svn path=/trunk/; revision=39244
2011-10-03 16:47:54 +00:00
Alexis La Goutte
4ce630cead Fix checkhf error in packet-smb2.c file.
Unused entry: epan/dissectors/packet-smb2.c, hf_smb2_data_length => Add in Revision #16546 and never used
Unused entry: epan/dissectors/packet-smb2.c, hf_smb2_file_name_info => Add in Revision #25371 and never used
Unused entry: epan/dissectors/packet-smb2.c, hf_smb2_security_blob_len => Remove in Revision #16557
Unused entry: epan/dissectors/packet-smb2.c, hf_smb2_response_buffer_offset => Remove in Revision #21793
Unused entry: epan/dissectors/packet-smb2.c, hf_smb2_security_blob_offset => Remove in Revision #16557
Unused entry: epan/dissectors/packet-smb2.c, hf_smb2_response_size => Remove in Revision #16605

svn path=/trunk/; revision=39243
2011-10-03 11:49:17 +00:00
Guy Harris
66a8e6aa5d Thou shalt not use g_sprintf() lest thou overflow a buffer. (Yes, even
if you know it's safe.  Sorry.)

svn path=/trunk/; revision=39242
2011-10-03 07:28:45 +00:00
Guy Harris
574f05eb2c %hhu = %u in printf-like functions, as "char", "signed char", and
"unsigned char" get upsized to "int" and "unsigned int" when passed to
varargs functions.

svn path=/trunk/; revision=39241
2011-10-03 07:19:05 +00:00
Guy Harris
7bf74b645c Cast away a warning - if that buffer has more than 2^31-1 characters in
it, we have a real problem.

svn path=/trunk/; revision=39239
2011-10-03 06:39:59 +00:00
Anders Broman
49f715f169 Remove unused hf field.
svn path=/trunk/; revision=39238
2011-10-03 06:24:28 +00:00
Anders Broman
71dfc675ca Set encoding.
svn path=/trunk/; revision=39236
2011-10-03 05:44:17 +00:00
Anders Broman
cd9d1c6cdf From Jakob Hirsch:
Parse T.30 PPR (partial page request) and show requested frames.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6326

svn path=/trunk/; revision=39235
2011-10-03 05:34:56 +00:00
Anders Broman
76da7fb4e5 From David Mueller:
Incorrect identification of UDP-encapsulated NAT-keepalive packets.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6414

svn path=/trunk/; revision=39234
2011-10-03 05:13:53 +00:00
Anders Broman
f08f09ecd4 From Michael Mann:
Condense all SCTP CRC routines to wsutil/crc32.[ch]. Also made
crc32_ccitt_table not explicitly accessible (must use crc32_ccitt_table_lookup).

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

svn path=/trunk/; revision=39233
2011-10-03 04:53:17 +00:00
Guy Harris
b7bdb4a985 OK, those seem to depend on at least some of the CIP changes, so back
the ENIP changes out as well.

svn path=/trunk/; revision=39232
2011-10-02 19:05:20 +00:00
Guy Harris
65ea44dd27 Back out the changes to packet-cip.h, too, so that a fixed version of
the patch that updates both can be cleanly applied.

svn path=/trunk/; revision=39231
2011-10-02 18:58:21 +00:00
Guy Harris
1a267e4d0e Back out improvements - it's still getting a lot of "used uninitialized"
errors, so I'll reopen the bug and log all the warnings that have been
produced, and mark the patch as "rejected".

svn path=/trunk/; revision=39230
2011-10-02 18:47:00 +00:00
Guy Harris
a1b6a2e95f "seg_size" isn't set here, and the items don't appear to have a variable
segment size, they just appear to be 2 bytes long.

svn path=/trunk/; revision=39229
2011-10-02 18:31:33 +00:00
Michael Tüxen
dab27a2d3d Fix warnings.
svn path=/trunk/; revision=39228
2011-10-02 17:59:00 +00:00
Anders Broman
362d86a22f Add comments.
svn path=/trunk/; revision=39227
2011-10-02 17:27:05 +00:00
Michael Tüxen
eb4f10eedb Fix warnings.
svn path=/trunk/; revision=39226
2011-10-02 17:18:23 +00:00
Anders Broman
2f9778be01 From Martin Kaiser:
Low Speed Communication Resource

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

svn path=/trunk/; revision=39224
2011-10-02 16:42:41 +00:00
Anders Broman
17528136d4 From Martin Kaiser:
DVB-CI / CI+ Host Control Version 2

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

svn path=/trunk/; revision=39223
2011-10-02 16:39:04 +00:00
Anders Broman
8bb88d9efc From Michael Mann :
General improvements to CIP and ENIP dissectors. 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6416

svn path=/trunk/; revision=39222
2011-10-02 16:35:10 +00:00
Anders Broman
44f914a0f1 From Pascal Quantin:
I identified a new regression. When selecting a bit string, the highlighted bytes in the packet view are not the correct ones.

svn path=/trunk/; revision=39220
2011-10-02 15:12:47 +00:00
Anders Broman
8a324e5737 From Pascal Quantin:
[LTE RRC] Enhance dissection of NeighCellConfig IE.

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

svn path=/trunk/; revision=39219
2011-10-02 15:08:27 +00:00
Guy Harris
6c3f1f0df7 Squelch some more warnings.
svn path=/trunk/; revision=39212
2011-10-02 08:58:35 +00:00
Guy Harris
b061017eca Squelch warnings (at that point, toc_offset has been determined to fit
into an int, as has offset + toc_offset + 8).

svn path=/trunk/; revision=39211
2011-10-02 08:40:03 +00:00
Guy Harris
3bad9fcc4d SQ_TYPE_NULL appears to do run-length encoding of nulls; do run-length
encoding of the list of nulls in the protocol tree, so if we have a
ridiculously large number of nulls, we don't have a ridiculously large
number of protocol tree entries, one for each null.  This should
(finally) fix bug 6378.

Add some additional sanity checks to avoid integer overflows and
underflows due to subtracting N from a value not guaranteed to be >= N.

In the big switch statements for AFP command codes, put the break
statement on a separate line, so it's a bit more obvious that the code
isn't falling through.

svn path=/trunk/; revision=39210
2011-10-02 08:12:08 +00:00
Anders Broman
5d342b64ae Set encoding.
Should 
hf_smb_server_guid
hf_smb_dfs_referral_server_guid
be FT_GUIDS?

svn path=/trunk/; revision=39209
2011-10-01 08:11:06 +00:00
Bill Meier
b9e8adf0f8 Fix checkAPI error:
Error: the blurb for field "Flags" ("smb2.ses_req_flags") matches the field name in packet-smb2.c

svn path=/trunk/; revision=39208
2011-10-01 02:51:28 +00:00
Bill Meier
c90ab1ede1 Fix "unused_but_set_variable" GCC warning: Remove apparently unneeded code.
svn path=/trunk/; revision=39207
2011-10-01 02:13:15 +00:00
Bill Meier
c4b4394936 From Stefan Metzmacher: Support for SMB 2.22 features;
"Patches to add most things for SMB 2.22"

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

svn path=/trunk/; revision=39205
2011-10-01 01:57:38 +00:00
Chris Maynard
345d384f29 Fix Coverity CID 1204: CONSTANT EXPRESSION RESULT according to feedback from Roland Knall. See http://www.wireshark.org/lists/wireshark-dev/201109/msg00160.html. Also, convert the relatively few tabs to 4-spaces to match the rest of this dissector's white space choice and add modelines.
svn path=/trunk/; revision=39204
2011-09-30 21:36:13 +00:00
Chris Maynard
1f3f39c242 Add a few more raw link types to be up to date with the current ERF format spec. Patch provided by Andrew Kampjes via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6410.
svn path=/trunk/; revision=39203
2011-09-30 20:51:10 +00:00
Graeme Lunt
511fff0e7b Add packet-credssp.h
svn path=/trunk/; revision=39198
2011-09-30 16:37:28 +00:00
Graeme Lunt
779206012c Microsoft Credential Security Support Provider (CredSSP) support.
Used by direct approach RDP for NTLMSSP authentication under SSL. 



svn path=/trunk/; revision=39196
2011-09-30 15:21:16 +00:00
Alexis La Goutte
89b307973a Fix checkhf
* Remove hf_bgp_cluster_identifier never use ! (Add in Revision #7546)

svn path=/trunk/; revision=39195
2011-09-30 15:14:33 +00:00
Alexis La Goutte
50c6e8bb0f Enhance extended communities when RD Type 2
svn path=/trunk/; revision=39194
2011-09-30 15:08:52 +00:00
Alexis La Goutte
0b7914b55e From Clemix via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6408
Dissector for ieee802.11e QoS Info field of QoS Capability Element(46) is missed

From me :
* Fix checkAPIs error (Found non-ASCII characters)

svn path=/trunk/; revision=39193
2011-09-30 14:49:23 +00:00
Bill Meier
8cc93538e2 Whitespace cleanup.
svn path=/trunk/; revision=39189
2011-09-29 22:15:43 +00:00
Bill Meier
38a43987ab From András Veres-Szentkirályi: Added cursor type decoding to MySQL dissector
"The current MySQL dissector treats the exec_flags field as unused, however
since MySQL 5.0, this field is used to indicate the type of the cursor as it
can be read at
http://forge.mysql.com/wiki/MySQL_Internals_ClientServer_Protocol#Execute_Packet_.28Tentative_Description.29


svn path=/trunk/; revision=39188
2011-09-29 21:47:01 +00:00
Guy Harris
dcd97bd0c1 Clean up white space.
The appropriate encoding for a string is ENC_BIG_ENDIAN or
ENC_LITTLE_ENDIAN, combined with a character encoding value; it is not
ENC_NA, as the character encoding is definitely applicable, and the byte
order is also applicable if it's a counted string or a UTF-16 or UCS-2
string.  Assume ASCII for now.

svn path=/trunk/; revision=39187
2011-09-29 20:03:51 +00:00
Bill Meier
b805c27a40 When building w/o LIBZ: (Somewhat clunky) attempt to fix "unused variable" and "unused parameter" compile errors.
svn path=/trunk/; revision=39186
2011-09-29 19:57:52 +00:00
Bill Meier
c7d76f767b Comment out two cases of code which caused GCC 4.6 "unused-but-set-variable" warning.
svn path=/trunk/; revision=39185
2011-09-29 18:26:57 +00:00
Bill Meier
5af9d3c5f8 From Yaniv Kaul: SPICE dissector
"It's not perfect, but has been in use for quite a while and dissects nicely most
of the messages."

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

svn path=/trunk/; revision=39184
2011-09-29 18:10:14 +00:00
Anders Broman
0007775464 Make it possible to dissect proprietarry Opcodes.
svn path=/trunk/; revision=39183
2011-09-29 15:23:23 +00:00
Anders Broman
d406b805a1 From Roland Knall:
Address Coverty issues CID 1204, CID 1215, CID 1224, CID 1246, CID 1247

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

svn path=/trunk/; revision=39182
2011-09-29 06:13:13 +00:00
Chris Maynard
d6063791f8 Add heuristics in dissect_xmcp_message() to try to avoid dissecting TCP packets on port 4788 that aren't actually xmcp packets. Also, removed the check for a NULL tree as there's more work to do whether tree is NULL or not.
svn path=/trunk/; revision=39181
2011-09-29 01:53:38 +00:00
Jeff Morriss
1c4af9ad9c The SRT/SRA test pattern is 16 bits in Japan, don't try to retrieve 32 bits of it.
svn path=/trunk/; revision=39179
2011-09-28 19:46:24 +00:00
Chris Maynard
2d50d73dcb Add modeline. For now, add it at the bottom with tabstop=8, as that's where and what most others are using.
svn path=/trunk/; revision=39177
2011-09-28 19:38:03 +00:00
Guy Harris
e4532f21af Quit if we have a zero-length query, so we don't loop indefinitely.
Should fix bug 6378.

svn path=/trunk/; revision=39176
2011-09-28 19:08:20 +00:00
Guy Harris
e851859a0e Link to the RTmac spec.
svn path=/trunk/; revision=39174
2011-09-28 00:15:48 +00:00
Guy Harris
2593e1fc89 Update URL.
svn path=/trunk/; revision=39173
2011-09-27 23:48:34 +00:00
Bill Meier
59ebed36cb - check_col() no longer needed;
- Calls to col_str_str() and to subdissectors must not be under 'if(tree)';
- Remove unneeded #includes;
- Use tvb_reported_length();
- Use tvb_new_subset_remaining();
- Use val_to_str_const();

svn path=/trunk/; revision=39172
2011-09-27 20:41:45 +00:00
Alexis La Goutte
ea6e328149 From Jouni Malinen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6359
IEEE 802.11 dissector shows duplicated proto item for Action category

Action frame dissecting is first adding hf_ieee80211_action (wlan_mgt.fixed.action) field before the category-based processing. Immediately after that, the per-category implementations are adding FIELD_CATEGORY_CODE (hf_ieee80211_ff_category_code, i.e., wlan_mgt.fixed.category_code) to the proto tree for the exact same octet. Remove hf_ieee80211_action to avoid the duplicated item in the tree. In addition, remove the now unused action_item and action_tree variables.

svn path=/trunk/; revision=39169
2011-09-27 19:43:31 +00:00
Alexis La Goutte
da7e08a4d9 From mtwire via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6060
New dissectors: (UA) Universal Alcatel Protocol and transport UAUDP

From me :
* Prefer proto_tree_add_item (when is possible)
* Use 4-space indenting
* Add Modeline information
* Fix Clang Warning

svn path=/trunk/; revision=39167
2011-09-27 18:21:57 +00:00
Anders Broman
0f2e6c6cc5 Get rid of check_col, while at it set ENC.
svn path=/trunk/; revision=39164
2011-09-27 12:05:32 +00:00
Chris Maynard
e3779631d6 Some whitespace cleanup. FALSE -> ENC_BIG_ENDIAN. Remove most check_col()'s.
svn path=/trunk/; revision=39159
2011-09-26 20:34:33 +00:00
Chris Maynard
744a6639fa Fix modeline.
svn path=/trunk/; revision=39157
2011-09-26 20:31:52 +00:00
Stephen Fisher
5ee76e40d4 From Thomas Morin via bug #6395: Improve display for IGMP
svn path=/trunk/; revision=39156
2011-09-26 19:24:47 +00:00
Chris Maynard
94f51b09cc Make buildbots happy by adding back closing brace.
svn path=/trunk/; revision=39154
2011-09-26 18:24:17 +00:00
Anders Broman
14fbabcb26 Get rid of check_col() and use ENC.
svn path=/trunk/; revision=39153
2011-09-26 17:50:54 +00:00
Anders Broman
03a6c7fe7d Get rid of check_col() and use ENC.
svn path=/trunk/; revision=39151
2011-09-26 17:18:10 +00:00
Anders Broman
5f76488f0a Move tvb_new_octet_aligned() to tvbuff.c and use it.
svn path=/trunk/; revision=39150
2011-09-26 15:11:14 +00:00
Anders Broman
b87f9143e4 Get rid of check_col, while at it set ENC.
svn path=/trunk/; revision=39149
2011-09-26 14:50:59 +00:00
Anders Broman
ab901be153 Get rid of check_col, while at it set ENC.
svn path=/trunk/; revision=39148
2011-09-26 11:33:10 +00:00
Anders Broman
fc447d3377 Get rid of check_col, while at it set ENC.
svn path=/trunk/; revision=39147
2011-09-26 09:01:17 +00:00
Anders Broman
4b952c1324 Get rid of check_col, while at it set ENC.
svn path=/trunk/; revision=39146
2011-09-26 08:25:18 +00:00
Anders Broman
d06af0f771 Make it build again.
svn path=/trunk/; revision=39145
2011-09-26 06:13:27 +00:00
Anders Broman
fc63c35843 Get rid of check_col() and use ENC_BIG_ENDIAN.
svn path=/trunk/; revision=39144
2011-09-26 05:52:58 +00:00
Anders Broman
69bfd68ac4 From Martin Kaiser:
Implement the content control resource from the CI+
specification 1.2.

From me:
Change ENC_NA to ENC_BIG_ENDIAN as i suppose this is a big endian protocol and ENC_NA was erroneously used for irems bigger than i byte in some cases.

svn path=/trunk/; revision=39143
2011-09-26 05:17:57 +00:00
Bill Meier
0a1ab095ac From Sylvain Munaut: Fix Bug #6351 (Buildbot fuzztest crash);
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6351


svn path=/trunk/; revision=39140
2011-09-25 22:01:50 +00:00
Bill Meier
f5ff1c5001 Do some cleanup related to the reversion of SVN #34848 donr in SVN #39100.
1. Revert SVN #35830 (See Bug #5645);
   This patch is no longer needed given the reversion.

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

   http://anonsvn.wireshark.org/viewvc?revision=39100&view=revision

2. Restore 'col_set_str(pinfo->cinfo, COL_INFO, "Ethernet II");' just to
       be safe (altho it's possible that this line is not needed).

3. Remove several lines of no longer needed code.

svn path=/trunk/; revision=39134
2011-09-25 19:28:07 +00:00
Stig Bjørlykke
81d78db6e5 Try fixing the signed/unsigned mismatch issues.
svn path=/trunk/; revision=39132
2011-09-25 17:30:29 +00:00
Stig Bjørlykke
5be0ca9150 From Glenn Matthews via bug 6319:
Add dissector for XMCP protocol.

From me:
- Fixed an obvious bug setting transaction_id_key[2].key = NULL,
  where transaction_id_key is defined with only 2 elements.
- Only register heur_dissector once.
- Only find media_type_dissector_table once.
- Added packet-xmcp.c to CMakeLists.txt

svn path=/trunk/; revision=39131
2011-09-25 16:31:14 +00:00
Bill Meier
1d113b0dc8 Fix a compile error.
svn path=/trunk/; revision=39130
2011-09-25 15:25:33 +00:00
Bill Meier
f740787546 Minor cleanup:
- Fix two cases of "set but unused" as reported by GCC 4.6;
- remove _U_ from parameters which are actually used;
- printf --> REPORT_DISSECTOR_BUG;
- define a function as static;

svn path=/trunk/; revision=39129
2011-09-25 15:09:44 +00:00
Graeme Lunt
0cdfb11c2f Bug 6369:
Unprotected array write. 


svn path=/trunk/; revision=39125
2011-09-25 07:02:57 +00:00
Alexis La Goutte
88b162f565 Make buildbot happy
svn path=/trunk/; revision=39121
2011-09-24 13:42:53 +00:00
Alexis La Goutte
c22e483238 Fix a typo in RD offset
svn path=/trunk/; revision=39120
2011-09-24 13:36:51 +00:00
Alexis La Goutte
b5d6b2c1d8 From Abhik Sarkar via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2384
SMPP+ which is customized by Huawei company can't be decoded

From me :
Convert "space tabs" to spaces

svn path=/trunk/; revision=39119
2011-09-24 13:27:58 +00:00
Gerald Combs
44332d7279 Change the case of "sNMPv2-Trap" to match RFC 3416. Reported by Qiyao.
svn path=/trunk/; revision=39114
2011-09-23 22:44:28 +00:00