Commit Graph

18373 Commits

Author SHA1 Message Date
Bill Meier 2197f291e5 Revert SVN #52665.
Compilation fails on (only the ?) OSX-10.6-x64 buildbot with error:

netscaler.c: In function 'nstrace_read_v30':
netscaler.c:1295: warning: implicit conversion shortens 64-bit value into a 32-bit value

(Life is too short for me to dig multiple levels deep into a set of macros to try to see which
 actual line of code is causing the problem.  Maybe the patch submitter can identify the problem).


svn path=/trunk/; revision=52666
2013-10-18 04:31:08 +00:00
Bill Meier c50b988807 From Shekhar Chandra: support for version 3.0 of netscaler packet wire format.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9280

From me: fix indentation(tabs->spaces) and trailing whitespace.


svn path=/trunk/; revision=52665
2013-10-18 03:36:04 +00:00
Michael Mann 42c52d8612 Add more filterable fields around EDNS(0)
svn path=/trunk/; revision=52664
2013-10-18 01:53:32 +00:00
Michael Mann e746a62459 Bugfix an apparent typo in edns0 "Higher bits in extended RCODE". Bug 9199 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9199).
#BACKPORT(1.10)

svn path=/trunk/; revision=52662
2013-10-17 20:54:42 +00:00
Tomas Kukosa 744f47107e H.225.0: fix handling of compound parameters in Generic Extensible Framework (H.460.22 did not work well)
svn path=/trunk/; revision=52659
2013-10-17 11:24:43 +00:00
Michael Mann 747f1409a1 Properly decode CAPWAP Data Keep-Alive's. Bug 9165 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9165)
From Andreas Schultz

From me: Use expert API instead of throwing exception for a bad length.

svn path=/trunk/; revision=52657
2013-10-17 02:13:23 +00:00
Michael Mann 9e494dbe18 Be able to search through HTTP request and HTTP response lines. Bug 9134 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9134)
From Edwin Groothuis

svn path=/trunk/; revision=52656
2013-10-17 01:23:12 +00:00
Bill Meier 80b5c92af0 Remove trailing blanks; Fix some indentation;
Add editor modelines.

svn path=/trunk/; revision=52653
2013-10-16 20:35:08 +00:00
Bill Meier 94ba4e9875 Fix inconsistent indentation & formatting, trailing blanks.
Add some parens.
Add editor modelines.

svn path=/trunk/; revision=52652
2013-10-16 20:32:57 +00:00
Evan Huus 09066e4eba In packet-wsp.c, don't use the get_long_integer macro where we only need the
very smallest part of its logic. Just call tvb_get_guint8 directly and check
that the return is between 1 and 4. Properly fixes the set-but-unused and
associated warnings that were showing up.

svn path=/trunk/; revision=52648
2013-10-16 18:08:24 +00:00
Gerald Combs 1701f42969 Fix warnings found by Clang 5.0 (-Wself-assign and -Wparentheses-equality).
Move code from ipv6-utils.h to packet-ipv6.c since that was the only
place it was used. Comment out unused code.

svn path=/trunk/; revision=52645
2013-10-16 17:19:59 +00:00
Gerald Combs 4515b2b3aa Fix a comment.
svn path=/trunk/; revision=52644
2013-10-16 17:05:29 +00:00
Gerald Combs 2aa86c5af7 Back out the previous commit. We'll have to find a different fix.
svn path=/trunk/; revision=52643
2013-10-16 16:44:56 +00:00
Gerald Combs cdebec19c8 Work around a self-assingment error picked up by Clang 5.0.
svn path=/trunk/; revision=52642
2013-10-16 16:41:28 +00:00
Bill Meier 9b40d29017 Fix (what appears to be) a minor bug when dissecting RTMP.
svn path=/trunk/; revision=52641
2013-10-16 14:17:05 +00:00
Pascal Quantin 938206442c Upgrade RRLP dissector to V11.0.0
svn path=/trunk/; revision=52640
2013-10-16 03:06:46 +00:00
Bill Meier f6e09faa2d From Ed Beroset: add modelines and fix irregular indenting;
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9273

This patch adds modelines and cleans up the irregular indentation of
this dissector's code.  The only other change was in
asn1/c1222/packet-c1222-template.c to consolidate an #ifdef that had a
redundant #endif (line 812) and subsequent reopening #ifdef (line
824).  The only thing between them was comments, so the span of the
original #ifdef (line 644) was simply extended by eliminating those
two lines.

The purpose for this patch is to make the file easier to edit and
understand in advance of more substantive patches later.  This patch
is intended to be easy to review by having only non-substantive
changes.


svn path=/trunk/; revision=52636
2013-10-16 00:57:28 +00:00
Anders Broman 6731cba63a Don't try heuristic dissectors on second pass if no match was found in the first one.
svn path=/trunk/; revision=52631
2013-10-15 21:28:04 +00:00
Anders Broman 9c3be9d5ae Try to optimize heuristics slightly.
svn path=/trunk/; revision=52624
2013-10-15 18:19:57 +00:00
Cal Turney 4ae53bc208 Reorder all of the bitmask trees according to its endianess from highest to lowest order bit.
These consist of the following bitmask fields: 
[packet-smb.c] 'Create Flags', 'Access Mask', 'File Attributes', 'Share Access', 'Create Options',
               'Security Flags', 'Optional Support'(in TreeConnect AndX responses), and "Quota Flags"
[packet-smb2.c] 'Flags', 'Session Flags', 'Security mode', and 'Interface Capabilities'.

[packet-smb.c] Made the tfs_file_attribute_xxx true_false_string values less verbose and more compact.

[packet-smb2.c] Changed all references to "RMDA" to RDMA".

[packet_smb.c] In dissect_qfi_SMB_FILE_NETWORK_OPEN_INFO() (GetInfo response) changed "Unknown Field"
               to "Reserved" (See capture 'DMtrace2.cap' frame 20023).

svn path=/trunk/; revision=52623
2013-10-15 16:41:29 +00:00
Evan Huus 586dea0e04 Check the length *before* accessing the array, and cap the
length-retrieved-from-packet at the size of the array we have.

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

svn path=/trunk/; revision=52616
2013-10-15 13:05:31 +00:00
Chris Maynard 66de013399 Fix Coverity CID 1106801: Missing break in switch.
svn path=/trunk/; revision=52613
2013-10-15 03:38:09 +00:00
Michael Mann 856668d739 Fix the bitcoin dissector to be able to dissect recent version of the protocol. Bug 8844 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8844)
Changes:
  - All messages now have a checksum (and not only version and verack).
  - In the version message: user agent added as a string preceded by a varint length.
  - Port in an address is in little endian and not big endian.
  - In the version message the receiving and emitting address where inverted.

From Eric Masson

svn path=/trunk/; revision=52609
2013-10-15 00:05:45 +00:00
Anders Broman 21e17b82d2 Reverting as requested by Jakub, eventhoug I don't think this prticular entry is useful as it's duplicated in the tree and almost certanly never vissible.
svn path=/trunk/; revision=52608
2013-10-14 21:50:37 +00:00
Anders Broman ecb5860b78 Adding to col info is probably useless as next dissector will overwrite it.
svn path=/trunk/; revision=52604
2013-10-14 18:18:16 +00:00
Anders Broman 7541b47020 Try to pptimize heuristics slightly.
svn path=/trunk/; revision=52603
2013-10-14 18:16:11 +00:00
Pascal Quantin c94403e9ba Add dissection of NCM/MBIM data traffic based on data interface class protocol code
svn path=/trunk/; revision=52602
2013-10-14 17:55:43 +00:00
Pascal Quantin debe9b6591 As reported by Didier Gautheron on -dev (http://www.wireshark.org/lists/wireshark-dev/201310/msg00159.html) :
Since r49923, TCP flags are no more displayed in info column when tree is NULL

svn path=/trunk/; revision=52597
2013-10-14 08:36:38 +00:00
Michael Mann 7be4187b39 TLS server key exchange misses sig and hash algorithm for TLS 1.2. Bug 9208 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9208).
1. Fix ECDH server key exchange for TLS 1.2
2. Fix RSA server key exchange for TLS 1.2

From Hauke Mehrtens

svn path=/trunk/; revision=52596
2013-10-14 03:07:32 +00:00
Michael Mann 20c163d070 DTLS server key exchange misses sig and hash algorithm for TLS 1.2. Bug 9208 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9208)
1. Fix ECDH server key exchange for DTLS 1.2
2. Fix RSA server key exchange for DTLS 1.2

From Hauke Mehrtens

svn path=/trunk/; revision=52595
2013-10-14 02:34:06 +00:00
Martin Mathieson 5320a5eddd DRX: start to show state prior to and after current PDU.
svn path=/trunk/; revision=52594
2013-10-13 22:00:09 +00:00
Anders Broman a361571bce As requested by Zoltán Lajos Kis, split the openflow dissector int one file per protocol version.
svn path=/trunk/; revision=52593
2013-10-13 21:25:19 +00:00
Bill Meier 2ac134b3c5 whitespace fixes; mostly: remove trailing blanks
svn path=/trunk/; revision=52591
2013-10-13 19:56:52 +00:00
Bill Meier 59277781ff Minor whitespace changes
svn path=/trunk/; revision=52590
2013-10-13 19:14:33 +00:00
Bill Meier 76d4b43a29 Minor whitespace, formatting & etc changes.
svn path=/trunk/; revision=52588
2013-10-13 18:14:59 +00:00
Michael Mann 14d9d10373 openSAFETY: Dissection for second crc as well as plausability check. Bug 9261 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9261).
From Roland Knall

svn path=/trunk/; revision=52582
2013-10-13 12:25:01 +00:00
Pascal Quantin f5decf57f1 Fix dissection of Home Provider CID and fix a typo error
svn path=/trunk/; revision=52579
2013-10-13 08:47:05 +00:00
Chris Maynard 65accd3c18 Don't assume that tvb_length_remaining() or tvb_reported_length_remaining() always return a value >= 0. Part of fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9263
#BACKPORT(1.10,1.8)

svn path=/trunk/; revision=52570
2013-10-12 18:03:34 +00:00
Pascal Quantin 214a2d7f55 From Todd Newton via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9262 :
Fix dissection of PTP Management messages

svn path=/trunk/; revision=52566
2013-10-12 14:05:32 +00:00
Evan Huus 137be14b3d We can't use proto_tree_add_uint_* for FT_TIME fields, use proto_tree_add_time_*
instead. Fixes another one of the issues that shows up in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9263

svn path=/trunk/; revision=52565
2013-10-12 13:14:30 +00:00
Evan Huus b581aff2c3 Based on help and suggestions from Johannes Berg, fix Radiotap Header decode the
right way.

Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9256 without
reintroducing https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9212

svn path=/trunk/; revision=52564
2013-10-12 12:53:35 +00:00
Pascal Quantin a37a217653 Fix another fuzz failure
svn path=/trunk/; revision=52537
2013-10-11 10:32:05 +00:00
Jeff Morriss 545455db1c Fix compilation when we don't HAVE_LIBGCRYPT
svn path=/trunk/; revision=52527
2013-10-11 00:42:02 +00:00
Evan Huus 2ed259ccbc When TCP options are truncated, we only add the truncated length to the tree,
not the whole length. Fixes an invalid access with the capture from
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9263

svn path=/trunk/; revision=52523
2013-10-10 23:59:57 +00:00
Pascal Quantin dea61da3f6 Fix an infinite loop detected during fuzz testing
svn path=/trunk/; revision=52510
2013-10-10 20:19:27 +00:00
Evan Huus f29544f9df Add a call to tvb_ensure_bytes_exist before we allocate memory based on our
offset+size, prevents attempts to allocate outrageous memory, fixing
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9260

svn path=/trunk/; revision=52503
2013-10-10 17:44:55 +00:00
Evan Huus a50dee3286 From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9246
Fix memory leaks and bad memory accesses in c1222 dissector.

From me: use realloc in a handoff function since it may get called multiple
times, and we only need the latest.

svn path=/trunk/; revision=52497
2013-10-10 16:18:49 +00:00
Evan Huus 1370003bee From Marko Hrastovec via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9239

Add dissection of Asterix category 008.

svn path=/trunk/; revision=52496
2013-10-10 16:07:20 +00:00
Chris Maynard 59c91b3c52 Safer to compare return value of tvb_reported_length_remaining() > 0 than != 0.
Convert tabs to spaces.

svn path=/trunk/; revision=52495
2013-10-10 16:04:41 +00:00
Cal Turney 943356c9f4 "Expert Info (Error/Malformed) trying to fetch an unsigned integer with length 0" errors when an attempt is made to display the File Attributes within the FID subtree of SMB requests and responses. In addition, not all the options and masks were marked with PROTO_ITEM_SET_GENERATED(item) when appropriate to do so;
Fix1: The proto_tree_add_item() was changed to proto_tree_add_uint.
Fix2: "If (len==0) PROTO_ITEM_SET_GENERATED(item);" was added to dissect_nt_create_options_bits(), dissect_nt_share_access_bits(), dissect_smb_access_mask_bits(), dissect_nt_create_bits(), and dissect_file_ext_attr_bits().

svn path=/trunk/; revision=52494
2013-10-10 15:53:45 +00:00