Commit Graph

50902 Commits

Author SHA1 Message Date
Michael Tüxen ec9642f9c9 May this silences a warning of code that will go out next week.
svn path=/trunk/; revision=54042
2013-12-13 13:31:34 +00:00
Michael Tüxen 9a5d23c83c Try to silence warnings and add a comment for Irene to
fix these appropriately next week.

svn path=/trunk/; revision=54041
2013-12-13 13:00:29 +00:00
Michael Tüxen 0c5eccc277 Try to silence a warning due to a temporary workaround.
svn path=/trunk/; revision=54040
2013-12-13 11:34:37 +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
Alexis La Goutte 4f32d662fa Add Copyright and modelines (Fix also indent to use 4 spaces)
svn path=/trunk/; revision=54038
2013-12-13 11:29:11 +00:00
Irene Rüngeler 894bc27bd7 Fix typo
svn path=/trunk/; revision=54037
2013-12-13 11:20:21 +00:00
Irene Rüngeler a2a48090da Fix typo.
svn path=/trunk/; revision=54036
2013-12-13 11:03:13 +00:00
Irene Rüngeler 92ed24dcf7 Fix gboolean bool conflict.
svn path=/trunk/; revision=54035
2013-12-13 10:56:31 +00:00
Alexis La Goutte 3ad28a943f 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
2013-12-13 10:56:14 +00:00
Irene Rüngeler a1da50b91e Add sctp files to Makefile.am
svn path=/trunk/; revision=54033
2013-12-13 10:39:13 +00:00
Irene Rüngeler dafe3d02ce Address more Windows errors.
svn path=/trunk/; revision=54032
2013-12-13 09:52:41 +00:00
Irene Rüngeler 7cfa3d05a3 Address Windows warning
svn path=/trunk/; revision=54031
2013-12-13 09:14:20 +00:00
Jörg Mayer 9792fe5d79 "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
2013-12-13 09:10:35 +00:00
Jörg Mayer ecbca40104 "Fix" 'set but not used' warning turning error.
svn path=/trunk/; revision=54029
2013-12-13 09:09:06 +00:00
Irene Rüngeler 66d0882e85 Address Windows warning.
svn path=/trunk/; revision=54028
2013-12-13 08:41:26 +00:00
Irene Rüngeler 2c6d94bec3 Take sctp_stat.c off the list because it has been removed.
svn path=/trunk/; revision=54027
2013-12-13 08:01: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
Anders Broman 4e3e8d2d1f Try to fix building of captype
svn path=/trunk/; revision=54024
2013-12-13 06:52:02 +00:00
Anders Broman 62f5450324 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
2013-12-13 06:36:00 +00:00
Evan Huus 86149a1184 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
2013-12-13 04:11:49 +00:00
Evan Huus e954ce02ed Add what appears to be a missing #include for windows.
svn path=/trunk/; revision=54020
2013-12-13 04:04:10 +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
Guy Harris afa9f611d7 And another one.
svn path=/trunk/; revision=54018
2013-12-13 03:13:40 +00:00
Guy Harris 70e8da2d8c Add some more file types misidentified as VWR files.
svn path=/trunk/; revision=54017
2013-12-13 03:12:42 +00:00
Guy Harris 644e804074 Fix command name.
svn path=/trunk/; revision=54016
2013-12-13 03:02:09 +00:00
Guy Harris e21fd7c0ce 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
2013-12-13 02:59:16 +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
Guy Harris c34050d629 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
2013-12-13 02:38:11 +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
Chris Maynard 18398c9749 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
2013-12-13 02:35:26 +00:00
Chris Maynard e45b95fa02 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
2013-12-13 02:04:39 +00:00
Chris Maynard bd9b32ae3e Fix Visual Studio Code Analysis warning C6001: Using uninitialized memory 'obj_type'
svn path=/trunk/; revision=54008
2013-12-13 01:56:40 +00:00
Gerald Combs 10d8530102 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
2013-12-13 01:40:36 +00:00
Jakub Zawadzki d708f93406 netlink: update
- add netlink socket diag,
- dissect socket diag meminfo structures,
- add prototypes.

svn path=/trunk/; revision=54006
2013-12-13 00:51:30 +00:00
Bill Meier 721b5d266a 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
2013-12-13 00:44:32 +00:00
Chris Maynard 2fd6bb79ea Trivial: Spaces -> tabs
svn path=/trunk/; revision=54004
2013-12-13 00:08:16 +00:00
Gerald Combs a43efdb873 Fix redirection.
svn path=/trunk/; revision=54003
2013-12-13 00:05:32 +00:00
Chris Maynard 3a35dd595c Trivial: Spaces -> tabs
svn path=/trunk/; revision=54002
2013-12-13 00:05:14 +00:00
Gerald Combs 07b56cf62f Don't cherry-pick if we have changes.
svn path=/trunk/; revision=54001
2013-12-13 00:03:19 +00:00
Gerald Combs db59fd82a4 Add .gitreview
svn path=/trunk/; revision=54000
2013-12-13 00:02:46 +00:00
Gerald Combs 9b0b75703f Add a "backport-change" script which cherry-picks a proposed backport
and pushes it to Gerrit.

svn path=/trunk/; revision=53999
2013-12-12 23:38:54 +00:00
Bill Meier 37f60fa2d6 In one or more of the files:
- Create/use some extended value-strings;
 - Remove some unneeded initializers;
 - 'offset++' --> 'offset += 1' for consistency;
 - Set editor modelines 'tab-width' to 8 (not 4);
 - tabs --> spaces (to match editor modelines);
 - Rework/add whitespace.

svn path=/trunk/; revision=53998
2013-12-12 23:11:04 +00:00
Pascal Quantin 5db2d622e4 From Michael Lum via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9554 :
GSM SMS: remove some globals and expose some UDH fields through dis_field_udh()

svn path=/trunk/; revision=53997
2013-12-12 22:35:45 +00:00
Guy Harris 8d67e7b20c The dissector table has never been used, and the name of the dissector
table doesn't correspond to any obvious field, so I'm not sure why it
needs to exist.  Remove it.

svn path=/trunk/; revision=53996
2013-12-12 22:22:09 +00:00
Chris Maynard 76eebd5561 Appease Visual Studio Code Analysis by ensuring that the string in csec[] is NULL-terminated.
svn path=/trunk/; revision=53995
2013-12-12 22:02:46 +00:00
Guy Harris 3e8ea51499 Get rid of a dissector table that has never been used.
Get rid of a field that was hidden, always set to 0, and not obviously
used anywhere.

svn path=/trunk/; revision=53994
2013-12-12 21:45:35 +00:00
Bill Meier b3922f9f72 Create/use two extended value-strings;
Reformat some hf[] entries;
Reformat a long line;
tabs --> spaces 9to match editor-modelines);
Rework/Add whitespace.

svn path=/trunk/; revision=53993
2013-12-12 21:42:10 +00:00
Jakub Zawadzki f049bec3ca DHCPv6: update list of message types and options (from IANA)
svn path=/trunk/; revision=53992
2013-12-12 21:29:51 +00:00