metze/wireshark/wip.git
10 years agoUse "(void) <variable/>" to avoid unused variable warnings similar to
Gerald Combs [Sat, 14 Dec 2013 23:44:25 +0000 (23:44 -0000)]
Use "(void) <variable/>" to avoid unused variable warnings similar to
Qt's Q_UNUSED macro.

svn path=/trunk/; revision=54110

10 years agoFix some warnings
Jakub Zawadzki [Sat, 14 Dec 2013 22:07:26 +0000 (22:07 -0000)]
Fix some warnings

svn path=/trunk/; revision=54109

10 years agosock diag netlink: dissect requests, stub for 'padding dissection'.
Jakub Zawadzki [Sat, 14 Dec 2013 21:04:49 +0000 (21:04 -0000)]
sock diag netlink: dissect requests, stub for 'padding dissection'.

svn path=/trunk/; revision=54108

10 years agoRework code slightly to prevent VS Code Analysis warning:
Bill Meier [Sat, 14 Dec 2013 19:26:06 +0000 (19:26 -0000)]
Rework code slightly to prevent VS Code Analysis warning:
  C6326: Potential comparison of a constant with another constant

svn path=/trunk/; revision=54107

10 years agoMore shorten-64-to-32 warnings.
Gerald Combs [Sat, 14 Dec 2013 19:23:34 +0000 (19:23 -0000)]
More shorten-64-to-32 warnings.

svn path=/trunk/; revision=54106

10 years agoUse proto_tree_add_item() rather than fetching a string an adding it, if
Guy Harris [Sat, 14 Dec 2013 19:11:21 +0000 (19:11 -0000)]
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

10 years agoFix (I think) VS Code Analyzer warnings:
Bill Meier [Sat, 14 Dec 2013 18:50:23 +0000 (18:50 -0000)]
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

10 years agoCreate/use several extended value-strings;
Bill Meier [Sat, 14 Dec 2013 18:33:55 +0000 (18:33 -0000)]
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

10 years agoFix VS Code Analysis warning:
Bill Meier [Sat, 14 Dec 2013 18:25:42 +0000 (18:25 -0000)]
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

10 years agoCast away shorten-64-to-32 warnings.
Gerald Combs [Sat, 14 Dec 2013 18:12:32 +0000 (18:12 -0000)]
Cast away shorten-64-to-32 warnings.

svn path=/trunk/; revision=54101

10 years agoSquelch a bunch of shorten-64-to-32 warnings by parsing all of our
Gerald Combs [Sat, 14 Dec 2013 18:07:01 +0000 (18:07 -0000)]
Squelch a bunch of shorten-64-to-32 warnings by parsing all of our
numeric values using strtoul and casting it the result to a guint32.
Hopefully no user or session IDs are negative or greater than 32 bits.

svn path=/trunk/; revision=54100

10 years agoFix bug found by VS Code Analysis:
Bill Meier [Sat, 14 Dec 2013 17:00:56 +0000 (17:00 -0000)]
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

10 years agoTake a preemptive strike at some likely future VS Code Analyzer warnings about string...
Chris Maynard [Sat, 14 Dec 2013 17:00:36 +0000 (17:00 -0000)]
Take a preemptive strike at some likely future VS Code Analyzer warnings about strings possibly not being zero-terminated.

svn path=/trunk/; revision=54098

10 years agoxmpp_attr_info, xmpp_attr_info_ext: Pass pointer to hf
Jakub Zawadzki [Sat, 14 Dec 2013 16:47:52 +0000 (16:47 -0000)]
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

10 years agoPrevent VS Code Analyzer warning; (AFAICT: not an actual bug).
Bill Meier [Sat, 14 Dec 2013 16:36:07 +0000 (16:36 -0000)]
Prevent VS Code Analyzer warning; (AFAICT: not an actual bug).

svn path=/trunk/; revision=54096

10 years agoFix [-Wmissing-prototypes]
Jakub Zawadzki [Sat, 14 Dec 2013 16:09:57 +0000 (16:09 -0000)]
Fix [-Wmissing-prototypes]

svn path=/trunk/; revision=54095

10 years agoSet Proto col & Clear Info col before fetching data from the tvb;
Bill Meier [Sat, 14 Dec 2013 16:01:00 +0000 (16:01 -0000)]
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

10 years agoAdd a cast to silence an unnecessary warning.
Evan Huus [Sat, 14 Dec 2013 14:44:52 +0000 (14:44 -0000)]
Add a cast to silence an unnecessary warning.

svn path=/trunk/; revision=54093

10 years agoFix const warnings.
Jakub Zawadzki [Sat, 14 Dec 2013 14:33:46 +0000 (14:33 -0000)]
Fix const warnings.

svn path=/trunk/; revision=54092

10 years agoFrom Peter Paluch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9158
Evan Huus [Sat, 14 Dec 2013 14:11:30 +0000 (14:11 -0000)]
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

10 years agordp_field_info_t struct: Pass pointer to hf
Jakub Zawadzki [Sat, 14 Dec 2013 13:36:54 +0000 (13:36 -0000)]
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

10 years agoFix warnings
Jakub Zawadzki [Sat, 14 Dec 2013 12:45:57 +0000 (12:45 -0000)]
Fix warnings

svn path=/trunk/; revision=54089

10 years agoRemove not needed ';'
Jakub Zawadzki [Sat, 14 Dec 2013 11:12:20 +0000 (11:12 -0000)]
Remove not needed ';'

svn path=/trunk/; revision=54088

10 years agoFix constiness of GET_VALSP() macro.
Jakub Zawadzki [Sat, 14 Dec 2013 11:03:16 +0000 (11:03 -0000)]
Fix constiness of GET_VALSP() macro.

svn path=/trunk/; revision=54087

10 years agoAllow -Wmissing-prototypes only for C
Jakub Zawadzki [Sat, 14 Dec 2013 10:43:29 +0000 (10:43 -0000)]
Allow -Wmissing-prototypes only for C

It should fix:
cc1plus: warning: command line option `-Wmissing-prototypes' is valid for Ada/C/ObjC but not for C++ [enabled by default]

(only g++ complains, clang is OK with -Wmissing-prototypes)

svn path=/trunk/; revision=54086

10 years agoFix some trivial warnings.
Jakub Zawadzki [Sat, 14 Dec 2013 10:29:26 +0000 (10:29 -0000)]
Fix some trivial warnings.

svn path=/trunk/; revision=54085

10 years agoUse proto_tree_add_item() for UTF-16 strings when dissecting string
Guy Harris [Sat, 14 Dec 2013 03:44:12 +0000 (03:44 -0000)]
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

10 years agoFix string length typo causing unitialized-value warnings caught by valgrind
Evan Huus [Sat, 14 Dec 2013 01:40:39 +0000 (01:40 -0000)]
Fix string length typo causing unitialized-value warnings caught by valgrind
fuzzing.

svn path=/trunk/; revision=54083

10 years agoIt seems sscanf requires the input string to be null-terminated, even if it is
Evan Huus [Sat, 14 Dec 2013 01:34:02 +0000 (01:34 -0000)]
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

10 years agoAdd a bunch of tooltips.
Gerald Combs [Sat, 14 Dec 2013 00:07:27 +0000 (00:07 -0000)]
Add a bunch of tooltips.

svn path=/trunk/; revision=54081

10 years agoPass the information from ATP to the conversation dissector.
Guy Harris [Fri, 13 Dec 2013 23:32:00 +0000 (23:32 -0000)]
Pass the information from ATP to the conversation dissector.

svn path=/trunk/; revision=54080

10 years agoIt should halve warnings count in tn5250 dissector.
Jakub Zawadzki [Fri, 13 Dec 2013 23:22:28 +0000 (23:22 -0000)]
It should halve warnings count in tn5250 dissector.

svn path=/trunk/; revision=54079

10 years agoFix warnings + remove some v. old comment from strutil.h
Jakub Zawadzki [Fri, 13 Dec 2013 23:11:14 +0000 (23:11 -0000)]
Fix warnings + remove some v. old comment from strutil.h

svn path=/trunk/; revision=54078

10 years agoMake sure all unused bits are 0 in bacapp, fixes uninitialized memory found by
Evan Huus [Fri, 13 Dec 2013 23:08:32 +0000 (23:08 -0000)]
Make sure all unused bits are 0 in bacapp, fixes uninitialized memory found by
valgrind.

svn path=/trunk/; revision=54077

10 years agoRename spotlight_get_utf16_string_encoding() to
Guy Harris [Fri, 13 Dec 2013 22:44:58 +0000 (22:44 -0000)]
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

10 years agoIn tvb_get_unicode_string(), if the byte count is odd, ignore the last
Guy Harris [Fri, 13 Dec 2013 22:35:50 +0000 (22:35 -0000)]
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

10 years agonetlink: update
Jakub Zawadzki [Fri, 13 Dec 2013 22:34:10 +0000 (22:34 -0000)]
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

10 years agoChange the exit status of a fuzz failure to 255 so that if you use it with xargs
Evan Huus [Fri, 13 Dec 2013 22:15:29 +0000 (22:15 -0000)]
Change the exit status of a fuzz failure to 255 so that if you use it with xargs
the failures don't get suppressed.

svn path=/trunk/; revision=54071

10 years agoNote that apparently some BACnet implementations misuse the "ANSI X3.4"
Guy Harris [Fri, 13 Dec 2013 21:36:50 +0000 (21:36 -0000)]
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

10 years agoSimplify column sizing.
Gerald Combs [Fri, 13 Dec 2013 21:31:01 +0000 (21:31 -0000)]
Simplify column sizing.

svn path=/trunk/; revision=54068

10 years agoFix various issues:
Bill Meier [Fri, 13 Dec 2013 21:30:25 +0000 (21:30 -0000)]
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

10 years agoReplace wmem_alloc with wmem_new in a few places, and wmem_new with wmem_new0 in
Evan Huus [Fri, 13 Dec 2013 21:26:59 +0000 (21:26 -0000)]
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

10 years agoReturn FALSE from dissect_iwarp_mpa() if data is NULL. Note that this is the conserv...
Chris Maynard [Fri, 13 Dec 2013 21:25:48 +0000 (21:25 -0000)]
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

10 years agoReturn FALSE from dissect_zbee_nwk_heur() if data is NULL.
Chris Maynard [Fri, 13 Dec 2013 21:15:49 +0000 (21:15 -0000)]
Return FALSE from dissect_zbee_nwk_heur() if data is NULL.

svn path=/trunk/; revision=54064

10 years agoAdd data arg to dissect_wassp_heur() in case it's ever used.
Chris Maynard [Fri, 13 Dec 2013 21:08:21 +0000 (21:08 -0000)]
Add data arg to dissect_wassp_heur() in case it's ever used.

svn path=/trunk/; revision=54063

10 years agoReturn FALSE from dissect_tapa_heur() if data is NULL.
Chris Maynard [Fri, 13 Dec 2013 20:59:45 +0000 (20:59 -0000)]
Return FALSE from dissect_tapa_heur() if data is NULL.

svn path=/trunk/; revision=54062

10 years agoAdd data arg to dissect_skype_heur() so it compiles cleanly if/when SKYPE_HEUR is...
Chris Maynard [Fri, 13 Dec 2013 20:50:19 +0000 (20:50 -0000)]
Add data arg to dissect_skype_heur() so it compiles cleanly if/when SKYPE_HEUR is ever defined.

svn path=/trunk/; revision=54061

10 years agoHandle NFS4_OP_ILLEGAL (and other potential array bounds errors).
Guy Harris [Fri, 13 Dec 2013 20:31:02 +0000 (20:31 -0000)]
Handle NFS4_OP_ILLEGAL (and other potential array bounds errors).

svn path=/trunk/; revision=54058

10 years agoRemove _U_
Chris Maynard [Fri, 13 Dec 2013 20:16:53 +0000 (20:16 -0000)]
Remove _U_

svn path=/trunk/; revision=54057

10 years agoAdd another check to radiotap-iter initialization to catch another out-of-bounds
Evan Huus [Fri, 13 Dec 2013 20:09:17 +0000 (20:09 -0000)]
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

10 years agoIf data is NULL, return FALSE.
Chris Maynard [Fri, 13 Dec 2013 20:07:44 +0000 (20:07 -0000)]
If data is NULL, return FALSE.

svn path=/trunk/; revision=54055

10 years agoRemove _U_
Chris Maynard [Fri, 13 Dec 2013 19:01:02 +0000 (19:01 -0000)]
Remove _U_

svn path=/trunk/; revision=54054

10 years agoAdd recent Qt additions.
Gerald Combs [Fri, 13 Dec 2013 19:00:51 +0000 (19:00 -0000)]
Add recent Qt additions.

svn path=/trunk/; revision=54053

10 years agoCapture Interfaces dialog cleanup.
Gerald Combs [Fri, 13 Dec 2013 18:36:59 +0000 (18:36 -0000)]
Capture Interfaces dialog cleanup.

Apply layouts as needed to allow resizing. Select the interface list by
row. We might want to switch the interface list to a QTreeWidget. Today
I learned that you can make QGroupBox titles checkable. Do that where we
enable and disable groups of items. Flatten all of the group boxes.
Change the output format combo to radio buttons. There are only two
choices and we have lots of real estate available. Use a
QDialogButtonBox so Qt can size and order the buttons appropriately.

svn path=/trunk/; revision=54052

10 years agoFix Visual Studio Code Analysis warning C6011: Dereferencing NULL pointer 'returnedDe...
Chris Maynard [Fri, 13 Dec 2013 18:25:06 +0000 (18:25 -0000)]
Fix Visual Studio Code Analysis warning C6011: Dereferencing NULL pointer 'returnedDevmode'

svn path=/trunk/; revision=54051

10 years agoFix Visual Studio Code Analysis warning C6001: Using uninitialized memory 'keylist'
Chris Maynard [Fri, 13 Dec 2013 18:13:58 +0000 (18:13 -0000)]
Fix Visual Studio Code Analysis warning C6001: Using uninitialized memory 'keylist'

svn path=/trunk/; revision=54050

10 years agoFix Visual Studio Code Analysis warning C6054: String 'szStr' might not be zero-termi...
Chris Maynard [Fri, 13 Dec 2013 17:13:33 +0000 (17:13 -0000)]
Fix Visual Studio Code Analysis warning C6054: String 'szStr' might not be zero-terminated

svn path=/trunk/; revision=54049

10 years agoFix (presumably) a VS Code analysis warning:
Bill Meier [Fri, 13 Dec 2013 14:56:39 +0000 (14:56 -0000)]
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

10 years agoValue_string.h: Minor changes to comment text
Bill Meier [Fri, 13 Dec 2013 14:39:19 +0000 (14:39 -0000)]
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

10 years ago(Trivial) remove some trailing whitespace.
Bill Meier [Fri, 13 Dec 2013 14:19:52 +0000 (14:19 -0000)]
(Trivial) remove some trailing whitespace.

svn path=/trunk/; revision=54046

10 years agoFrom Peter Lemenkov via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9556
Alexis La Goutte [Fri, 13 Dec 2013 14:16:54 +0000 (14:16 -0000)]
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

10 years agoFix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Fri, 13 Dec 2013 14:16:46 +0000 (14:16 -0000)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

svn path=/trunk/; revision=54044

10 years agoFrom Hauke Mehrtens via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9499
Alexis La Goutte [Fri, 13 Dec 2013 14:06:18 +0000 (14:06 -0000)]
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

10 years agoMay this silences a warning of code that will go out next week.
Michael Tüxen [Fri, 13 Dec 2013 13:31:34 +0000 (13:31 -0000)]
May this silences a warning of code that will go out next week.

svn path=/trunk/; revision=54042

10 years agoTry to silence warnings and add a comment for Irene to
Michael Tüxen [Fri, 13 Dec 2013 13:00:29 +0000 (13:00 -0000)]
Try to silence warnings and add a comment for Irene to
fix these appropriately next week.

svn path=/trunk/; revision=54041

10 years agoTry to silence a warning due to a temporary workaround.
Michael Tüxen [Fri, 13 Dec 2013 11:34:37 +0000 (11:34 -0000)]
Try to silence a warning due to a temporary workaround.

svn path=/trunk/; revision=54040

10 years agoFrom Peter Wu
Alexis La Goutte [Fri, 13 Dec 2013 11:30:24 +0000 (11:30 -0000)]
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

10 years agoAdd Copyright and modelines (Fix also indent to use 4 spaces)
Alexis La Goutte [Fri, 13 Dec 2013 11:29:11 +0000 (11:29 -0000)]
Add Copyright and modelines (Fix also indent to use 4 spaces)

svn path=/trunk/; revision=54038

10 years agoFix typo
Irene Rüngeler [Fri, 13 Dec 2013 11:20:21 +0000 (11:20 -0000)]
Fix typo

svn path=/trunk/; revision=54037

10 years agoFix typo.
Irene Rüngeler [Fri, 13 Dec 2013 11:03:13 +0000 (11:03 -0000)]
Fix typo.

svn path=/trunk/; revision=54036

10 years agoFix gboolean bool conflict.
Irene Rüngeler [Fri, 13 Dec 2013 10:56:31 +0000 (10:56 -0000)]
Fix gboolean bool conflict.

svn path=/trunk/; revision=54035

10 years agoFix build when use Qt4
Alexis La Goutte [Fri, 13 Dec 2013 10:56:14 +0000 (10:56 -0000)]
Fix build when use Qt4

ui/qt/sctp_chunk_statistics_dialog.cpp:16:40: error: ‘class QHeaderView’ has no member named ‘setSectionsClickable’
ui/qt/sctp_chunk_statistics_dialog.cpp:17:40: error: ‘class QHeaderView’ has no member named ‘setSectionsMovable’

svn path=/trunk/; revision=54034

10 years agoAdd sctp files to Makefile.am
Irene Rüngeler [Fri, 13 Dec 2013 10:39:13 +0000 (10:39 -0000)]
Add sctp files to Makefile.am

svn path=/trunk/; revision=54033

10 years agoAddress more Windows errors.
Irene Rüngeler [Fri, 13 Dec 2013 09:52:41 +0000 (09:52 -0000)]
Address more Windows errors.

svn path=/trunk/; revision=54032

10 years agoAddress Windows warning
Irene Rüngeler [Fri, 13 Dec 2013 09:14:20 +0000 (09:14 -0000)]
Address Windows warning

svn path=/trunk/; revision=54031

10 years ago"Fix"
Jörg Mayer [Fri, 13 Dec 2013 09:10:35 +0000 (09:10 -0000)]
"Fix"
/home/jmayer/work/wireshark/svn/trunk/ui/qt/sctp_graph_byte_dialog.cpp:36:13: error: variable ‘minBytes’ set but not used [-Werror=unused-but-set-variable]
     guint32 minBytes, maxBytes;
             ^
cc1plus: all warnings being treated as errors

svn path=/trunk/; revision=54030

10 years ago"Fix" 'set but not used' warning turning error.
Jörg Mayer [Fri, 13 Dec 2013 09:09:06 +0000 (09:09 -0000)]
"Fix"  'set but not used' warning turning error.

svn path=/trunk/; revision=54029

10 years agoAddress Windows warning.
Irene Rüngeler [Fri, 13 Dec 2013 08:41:26 +0000 (08:41 -0000)]
Address Windows warning.

svn path=/trunk/; revision=54028

10 years agoTake sctp_stat.c off the list because it has been removed.
Irene Rüngeler [Fri, 13 Dec 2013 08:01:24 +0000 (08:01 -0000)]
Take sctp_stat.c off the list because it has been removed.

svn path=/trunk/; revision=54027

10 years agoAdd dialogs and graphs to analyse SCTP behavior similar to the GTK version.
Irene Rüngeler [Fri, 13 Dec 2013 07:25:30 +0000 (07:25 -0000)]
Add dialogs and graphs to analyse SCTP behavior similar to the GTK version.

svn path=/trunk/; revision=54026

10 years agoFix [-Wmissing-prototypes]
Anders Broman [Fri, 13 Dec 2013 06:55:20 +0000 (06:55 -0000)]
Fix [-Wmissing-prototypes]

svn path=/trunk/; revision=54025

10 years agoTry to fix building of captype
Anders Broman [Fri, 13 Dec 2013 06:52:02 +0000 (06:52 -0000)]
Try to fix building of captype

svn path=/trunk/; revision=54024

10 years agoAdd a file that probably should have been a part of
Anders Broman [Fri, 13 Dec 2013 06:36:00 +0000 (06:36 -0000)]
Add a file that probably should have been a part of
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=54015

svn path=/trunk/; revision=54023

10 years agoDon't use optind, we don't actually call getopt or friends and we don't include
Evan Huus [Fri, 13 Dec 2013 04:11:49 +0000 (04:11 -0000)]
Don't use optind, we don't actually call getopt or friends and we don't include
the necessary headers on all platforms to have optind defined. Just check that
we got arguments in addition to the executable name.

svn path=/trunk/; revision=54022

10 years agoAdd what appears to be a missing #include for windows.
Evan Huus [Fri, 13 Dec 2013 04:04:10 +0000 (04:04 -0000)]
Add what appears to be a missing #include for windows.

svn path=/trunk/; revision=54020

10 years ago(Try to) fix VS Clang Analysis warning:
Bill Meier [Fri, 13 Dec 2013 03:24:08 +0000 (03:24 -0000)]
(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

10 years agoAnd another one.
Guy Harris [Fri, 13 Dec 2013 03:13:40 +0000 (03:13 -0000)]
And another one.

svn path=/trunk/; revision=54018

10 years agoAdd some more file types misidentified as VWR files.
Guy Harris [Fri, 13 Dec 2013 03:12:42 +0000 (03:12 -0000)]
Add some more file types misidentified as VWR files.

svn path=/trunk/; revision=54017

10 years agoFix command name.
Guy Harris [Fri, 13 Dec 2013 03:02:09 +0000 (03:02 -0000)]
Fix command name.

svn path=/trunk/; revision=54016

10 years agoAdd a "captype" file that just reports the type of a capture file, based
Guy Harris [Fri, 13 Dec 2013 02:59:16 +0000 (02:59 -0000)]
Add a "captype" file that just reports the type of a capture file, based
on what libwiretap thinks it is.

Update some comments to reflect the death of the hack used to include
(libwiretap) plugin support in programs not built with libwireshark.

svn path=/trunk/; revision=54015

10 years agoFix packet-lapd.c:186: warning: comparison between signed and unsigned.
Chris Maynard [Fri, 13 Dec 2013 02:58:34 +0000 (02:58 -0000)]
Fix packet-lapd.c:186: warning: comparison between signed and unsigned.

svn path=/trunk/; revision=54014

10 years agoFix 4 instances of Visual Studio Code Analysis warnings C6001: Using uninitialized...
Chris Maynard [Fri, 13 Dec 2013 02:55:05 +0000 (02:55 -0000)]
Fix 4 instances of Visual Studio Code Analysis warnings C6001: Using uninitialized memory 'pduType2', 'numberCapabilities' (2x), and 'pduType'

svn path=/trunk/; revision=54013

10 years agoThe IxVeriWave heuristic now gets more false positives (after, I
Guy Harris [Fri, 13 Dec 2013 02:38:11 +0000 (02:38 -0000)]
The IxVeriWave heuristic now gets more false positives (after, I
suspect, the change to handle VWR files with no packets); shuffle it
after all the types we've seen misidentified as VWR files.

svn path=/trunk/; revision=54012

10 years agoLet's see if this fixes VS Code Analysis warnings:
Bill Meier [Fri, 13 Dec 2013 02:36:27 +0000 (02:36 -0000)]
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

10 years agoFix Visual Studio Code Analysis warning C6204: Possible buffer overrun in call to...
Chris Maynard [Fri, 13 Dec 2013 02:35:26 +0000 (02:35 -0000)]
Fix Visual Studio Code Analysis warning C6204: Possible buffer overrun in call to 'memcpy': use of unchecked parameter 'data_len'

svn path=/trunk/; revision=54010

10 years agoTry to appease Visual Studio Code Analysis to avoid a false warning (as far as I...
Chris Maynard [Fri, 13 Dec 2013 02:04:39 +0000 (02:04 -0000)]
Try to appease Visual Studio Code Analysis to avoid a false warning (as far as I can tell), namely: warning C6054: String 'forbidden' might not be zero-terminated

svn path=/trunk/; revision=54009

10 years agoFix Visual Studio Code Analysis warning C6001: Using uninitialized memory 'obj_type'
Chris Maynard [Fri, 13 Dec 2013 01:56:40 +0000 (01:56 -0000)]
Fix Visual Studio Code Analysis warning C6001: Using uninitialized memory 'obj_type'

svn path=/trunk/; revision=54008

10 years agoSwitch the cherry-pick merge strategy to "recursive + theirs", which
Gerald Combs [Fri, 13 Dec 2013 01:40:36 +0000 (01:40 -0000)]
Switch the cherry-pick merge strategy to "recursive + theirs", which
seems to pull in fewer changes and be less prone to conflitcs. This was
the case for r53086, at least.  Add "-x" which adds a "cherry picked
from..." line to the commit message.

Show a diff before pushing.

svn path=/trunk/; revision=54007

10 years agonetlink: update
Jakub Zawadzki [Fri, 13 Dec 2013 00:51:30 +0000 (00:51 -0000)]
netlink: update

- add netlink socket diag,
- dissect socket diag meminfo structures,
- add prototypes.

svn path=/trunk/; revision=54006

10 years agoDo one or more of the following:
Bill Meier [Fri, 13 Dec 2013 00:44:32 +0000 (00:44 -0000)]
Do one or more of the following:
- Convert "4 space tabs" to spaces;
- Remove some unneeded initializers;
- 'offset++' --> 'offset += 1' for consistency;
- Reformat hf[] entries;
- Rework/add whitespace;
- Adjust editor modelines (set tab-width to 8).

svn path=/trunk/; revision=54005