Commit Graph

24111 Commits

Author SHA1 Message Date
Guy Harris 478f83dd2a Use proto_tree_add_item() rather than fetching a string an adding it, if
possible.  If (possibly) not possible, use tvb_get_string_enc() rather
than tvb_get_unicode_string().

svn path=/trunk/; revision=54105
2013-12-14 19:11:21 +00:00
Bill Meier 81a67cec58 Fix (I think) VS Code Analyzer warnings:
C6297: Arithmetic overflow: 32-bit value is shifted, then cast to 64-bit value.
   Results might not be an expected value


svn path=/trunk/; revision=54104
2013-12-14 18:50:23 +00:00
Bill Meier 3ddb2011f9 Create/use several extended value-strings;
(Sort & remove dups from underlying value_string arrays);
Reformat a few long lines;
Add editor modelines;


svn path=/trunk/; revision=54103
2013-12-14 18:33:55 +00:00
Bill Meier 1190f52ecb Fix VS Code Analysis warning:
C6297: Arithmetic overflow: 32-bit value is shifted, then cast to 64-bit value. \
  Results might not be an expected value

'offset++' --> 'offset += 1' for consistency;
Add/adjust whitespace;
Add editor modelines


svn path=/trunk/; revision=54102
2013-12-14 18:25:42 +00:00
Bill Meier c729725ab6 Fix bug found by VS Code Analysis:
warning C6385: Invalid data: accessing 'tag_to_type', \
 the readable size is '136' bytes, but '140' might be read

svn path=/trunk/; revision=54099
2013-12-14 17:00:56 +00:00
Jakub Zawadzki 07a8d1b55a xmpp_attr_info, xmpp_attr_info_ext: Pass pointer to hf
This should fix most of warnings: 
	initializer element is not computable at load time

svn path=/trunk/; revision=54097
2013-12-14 16:47:52 +00:00
Jakub Zawadzki 715e2d6699 Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54095
2013-12-14 16:09:57 +00:00
Bill Meier 5a4720b28d Set Proto col & Clear Info col before fetching data from the tvb;
Almost all of the dissection code can be under 'if (tree)';
Do some whitespace changes.

svn path=/trunk/; revision=54094
2013-12-14 16:01:00 +00:00
Evan Huus aa1649416b Add a cast to silence an unnecessary warning.
svn path=/trunk/; revision=54093
2013-12-14 14:44:52 +00:00
Jakub Zawadzki e0e86bab5a Fix const warnings.
svn path=/trunk/; revision=54092
2013-12-14 14:33:46 +00:00
Evan Huus 2754c08d93 From Peter Paluch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9158
Currently, the LLC dissector in packet-llc.c displays the values of DSAP IG bit
and SSAP CR bit as separate items in the proto tree. This gives an impression
that these entries are separate fields in the LLC header while in reality, they
are only the least significant bits in DSAP/SSAP octets. In addition, the
importance of these bits is relatively low in today's LLC-based protocols (they
are mostly set to 0), so having them always displayed in the proto tree is
somewhat of a luxury.

Modify the LLC dissector by having added a subtree to both DSAP and SSAP items
that displays the IG and CR bits as bits in a bitfield, and moved the display
of IG and CR bits into these subtrees.

It may seem that adding a text item instead of a FT_UINT8 value is not a
sensible approach because such item is not filterable. However, if filtering by
the entire DSAP/SSAP value (which is the typical way of filtering on SAPs), this
value is always added to the tree in its entirety and indexed by "llc.dsap" and
"llc.ssap" filter strings. If the GI or CR bit are to be matched, "llc.dsap.ig"
and "llc.ssap.cr" filter strings are available. Searching for the value of the
DSAP/SSAP & 0xFE which would be the value currently added by the
proto_tree_add_text() is not done and should not be done, as IEEE stipulates:
"An individual actual address value does not necessarily have any relationship
with a group address of the same actual address value."
(http://standards.ieee.org/develop/regauth/tut/llc.pdf) Following this
consideration, the choice of displaying the SAP "actual address" using
proto_tree_add_text() is acceptable.

svn path=/trunk/; revision=54091
2013-12-14 14:11:30 +00:00
Jakub Zawadzki a990dfa454 rdp_field_info_t struct: Pass pointer to hf
This should fix most of errors:
  warning: initializer element is not computable at load time [enabled by default]

svn path=/trunk/; revision=54090
2013-12-14 13:36:54 +00:00
Jakub Zawadzki 1053e722ed Fix warnings
svn path=/trunk/; revision=54089
2013-12-14 12:45:57 +00:00
Jakub Zawadzki 4d92f6079b Remove not needed ';'
svn path=/trunk/; revision=54088
2013-12-14 11:12:20 +00:00
Jakub Zawadzki fde0410bb5 Fix constiness of GET_VALSP() macro.
svn path=/trunk/; revision=54087
2013-12-14 11:03:16 +00:00
Jakub Zawadzki 5c79cbf152 Fix some trivial warnings.
svn path=/trunk/; revision=54085
2013-12-14 10:29:26 +00:00
Guy Harris 5dd7b7388b Use proto_tree_add_item() for UTF-16 strings when dissecting string
descriptors.

Make sure the length in string descriptors is at least 2, so that we
have a valid string or string-list length.

svn path=/trunk/; revision=54084
2013-12-14 03:44:12 +00:00
Evan Huus e57d150ec9 Fix string length typo causing unitialized-value warnings caught by valgrind
fuzzing.

svn path=/trunk/; revision=54083
2013-12-14 01:40:39 +00:00
Evan Huus cb73c3710b It seems sscanf requires the input string to be null-terminated, even if it is
longer than the maximum possible amount to read based on the format string. For
this reason, don't use sscanf on tvb_get_ptr directly, copy and null-terminate
the bytes we want.

Fixes an uninitialized value caught by valgrind fuzzing.

svn path=/trunk/; revision=54082
2013-12-14 01:34:02 +00:00
Guy Harris 0510eeb0cb Pass the information from ATP to the conversation dissector.
svn path=/trunk/; revision=54080
2013-12-13 23:32:00 +00:00
Jakub Zawadzki 8a3191f8e0 It should halve warnings count in tn5250 dissector.
svn path=/trunk/; revision=54079
2013-12-13 23:22:28 +00:00
Jakub Zawadzki d6da7a01b1 Fix warnings + remove some v. old comment from strutil.h
svn path=/trunk/; revision=54078
2013-12-13 23:11:14 +00:00
Evan Huus 24360c9951 Make sure all unused bits are 0 in bacapp, fixes uninitialized memory found by
valgrind.

svn path=/trunk/; revision=54077
2013-12-13 23:08:32 +00:00
Guy Harris 4043db5865 Rename spotlight_get_utf16_string_encoding() to
spotlight_get_utf16_string_byte_order(), and have it return
ENC_BIG_ENDIAN or ENC_LITTLE_ENDIAN if it finds a BOM and 0xFFFFFFFF if
it doesn't, to make it a bit clearer what it's doing.

Use tvb_get_string_enc() rather than tvb_get_unicode_string().

svn path=/trunk/; revision=54075
2013-12-13 22:44:58 +00:00
Guy Harris 30ab019f2b In tvb_get_unicode_string(), if the byte count is odd, ignore the last
byte.  (We should perhaps add an expert info indication in those cases.)

svn path=/trunk/; revision=54074
2013-12-13 22:35:50 +00:00
Jakub Zawadzki bbc3e14642 netlink: update
- set pinfo->p2p_dir based on portid
- check for nlmsg type in dissect_netlink_sock_diag()
- sock diag support LINUX_AF_INET6, LINUX_AF_PACKET
- naming cleanup 

svn path=/trunk/; revision=54073
2013-12-13 22:34:10 +00:00
Guy Harris 2d5c1c8689 Note that apparently some BACnet implementations misuse the "ANSI X3.4"
encoding for ISO 8859-1; this means that those strings won't be
correctly interpreted if they're interpreted as UTF-8.

svn path=/trunk/; revision=54069
2013-12-13 21:36:50 +00:00
Bill Meier 9d21f521fe Fix various issues:
- Display of header bit fields was incorrect;
- Computation of the data length was incorrect;
- Display of trailer 'indicator enable' & 'indicator' bit fields was incorrect;
- 'Display' field of certain hf[] entries was incorrect.
- Pedantic: Use ENC_BIG_ENDIAN instead of ENC_NA in certain places.

See Bug #9539

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


svn path=/trunk/; revision=54067
2013-12-13 21:30:25 +00:00
Evan Huus 34b93ed41e Replace wmem_alloc with wmem_new in a few places, and wmem_new with wmem_new0 in
a few places to avoid uninitialized memory found while fuzz-testing with
valgrind.

svn path=/trunk/; revision=54066
2013-12-13 21:26:59 +00:00
Chris Maynard 0905bffaa5 Return FALSE from dissect_iwarp_mpa() if data is NULL. Note that this is the conservative/safest approach since there do appear to be some code paths that don't rely on the data.
svn path=/trunk/; revision=54065
2013-12-13 21:25:48 +00:00
Chris Maynard 7aaa0b2a27 Return FALSE from dissect_zbee_nwk_heur() if data is NULL.
svn path=/trunk/; revision=54064
2013-12-13 21:15:49 +00:00
Chris Maynard 629c13c51d Add data arg to dissect_wassp_heur() in case it's ever used.
svn path=/trunk/; revision=54063
2013-12-13 21:08:21 +00:00
Chris Maynard 7ba2ee5d6e Return FALSE from dissect_tapa_heur() if data is NULL.
svn path=/trunk/; revision=54062
2013-12-13 20:59:45 +00:00
Chris Maynard 305055b829 Add data arg to dissect_skype_heur() so it compiles cleanly if/when SKYPE_HEUR is ever defined.
svn path=/trunk/; revision=54061
2013-12-13 20:50:19 +00:00
Guy Harris cbeaa89644 Handle NFS4_OP_ILLEGAL (and other potential array bounds errors).
svn path=/trunk/; revision=54058
2013-12-13 20:31:02 +00:00
Chris Maynard c88431cbb0 Remove _U_
svn path=/trunk/; revision=54057
2013-12-13 20:16:53 +00:00
Evan Huus 4b6ef3fac2 Add another check to radiotap-iter initialization to catch another out-of-bounds
read found while fuzzing with valgrind. Hopefully doesn't break valid captures.

svn path=/trunk/; revision=54056
2013-12-13 20:09:17 +00:00
Chris Maynard 7d016fc24f If data is NULL, return FALSE.
svn path=/trunk/; revision=54055
2013-12-13 20:07:44 +00:00
Chris Maynard 2147ff90ce Remove _U_
svn path=/trunk/; revision=54054
2013-12-13 19:01:02 +00:00
Bill Meier fae2172c83 Fix (presumably) a VS Code analysis warning:
C6385: Invalid data: accessing 'dgt->out', the readable size is '15' bytes, but '18' bytes might be read

Also: Do some trivial whitespace and formatting changes.

svn path=/trunk/; revision=54048
2013-12-13 14:56:39 +00:00
Bill Meier 099efcf5eb Value_string.h: Minor changes to comment text
value_string.c:  value_string_ext_validate() always fails on Windows
                   when called from a different DLL (i.e. a plugin).
                   So: Add #ifndef _WIN32 around the offending code.

svn path=/trunk/; revision=54047
2013-12-13 14:39:19 +00:00
Alexis La Goutte 18fe640e9b From Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9556
Cosmetic change in a LF field representation in the RTPproxy dissector

Don't display any value for LF field

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>

svn path=/trunk/; revision=54045
2013-12-13 14:16:54 +00:00
Alexis La Goutte 719cc1ea30 From Hauke Mehrtens via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9499
DLTS: add cipher version for OpenSSL pre 0.9.8f

OpenSSL pre 0.9.8f uses the TLS version 0x0100 and is not completely
compatible with DTLS 1.0 or 1.2. One difference is that the encrypted
pre master from TLS 1.0 does not have an own length, which is needed by
TLS and DTLS 1.0, this makes decrypting impossible. This patch makes it
possible for the code to distinguish between this OpenSSL version and
real DTLS 1.0, because they are not using the same code any more. This
is needed to fix the snakeoil-dtls test.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

svn path=/trunk/; revision=54043
2013-12-13 14:06:18 +00:00
Alexis La Goutte ec32b614f6 From Peter Wu
ssl-utils: remove SIG, rename mode and formatting

The changes seem huge, but actually involve a few structural changes
that do not change functionality, but aim to make maintenance easier and
lines shorter. The following changes were made:

 1. Remove the "sig" field and `SIG_*` constants as they are not used
    anywhere.
 2. Convert `SSL_CIPHER_MODE_*` macros to an enum, change the type in
    SslCipherSuite, change the field terminator in cipher_suites and
    drop the `SSL_CIPHER_` prefix to make it shorter.
 3. Add whitespace to align the cipher suites and convert the numbers to
    hex to match common usage (e.g. IANA docs). Done with the awk script
    below.

AWK script that takes the lines with `,KEX_` and applies changes (3):

    #!/usr/bin/gawk -f
    BEGIN { FS="[, {]+" }
    {
        split($0, c, "}, *");
        comment="";if(c[2])comment="   "c[2];
        sub("}", "", $10); # comment }
        printf("    {0x%04X,%-12s%-16s%2d,%3d,%3d,%-11s %-22s},%s\n",
               strtonum($2),
               $3 ",", # Key exchange
               # $4 is SIG_ - remove
               $5 ",", # Cipher
               $6, # blocksize
               $7, # keysize
               $8, # export keysize
               $9 ",", # Digest
               $10, # mode
               comment);
    }

Signed-off-by: Peter Wu <lekensteyn@gmail.com>

svn path=/trunk/; revision=54039
2013-12-13 11:30:24 +00:00
Irene Rüngeler 796bf409b0 Add dialogs and graphs to analyse SCTP behavior similar to the GTK version.
svn path=/trunk/; revision=54026
2013-12-13 07:25:30 +00:00
Anders Broman 28e6aa4e8a Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54025
2013-12-13 06:55:20 +00:00
Bill Meier 746e796e83 (Try to) fix VS Clang Analysis warning:
C6297: Arithmetic overflow: 32-bit value is shifted, then cast to 64-bit value. Results might not be an expected value

svn path=/trunk/; revision=54019
2013-12-13 03:24:08 +00:00
Chris Maynard ed9865a779 Fix packet-lapd.c:186: warning: comparison between signed and unsigned.
svn path=/trunk/; revision=54014
2013-12-13 02:58:34 +00:00
Chris Maynard e2d46b8023 Fix 4 instances of Visual Studio Code Analysis warnings C6001: Using uninitialized memory 'pduType2', 'numberCapabilities' (2x), and 'pduType'
svn path=/trunk/; revision=54013
2013-12-13 02:55:05 +00:00
Bill Meier 6544ea2078 Let's see if this fixes VS Code Analysis warnings:
C6297: Arithmetic overflow: 32-bit value is shifted, then cast to 64-bit value. \
                              Results might not be an expected value

svn path=/trunk/; revision=54011
2013-12-13 02:36:27 +00:00