gd/wireshark/.git
9 years agoUse forward slashes in paths to runlex.sh
Роман Донченко [Sat, 12 Jul 2014 14:59:56 +0000 (18:59 +0400)]
Use forward slashes in paths to runlex.sh

This gets rid of "MS-DOS style path detected" warnings from Cygwin.

Change-Id: Id10429669704aa371dbf56a9398947c8002260ad
Reviewed-on: https://code.wireshark.org/review/3024
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Wireshark Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
9 years agova_list can't be NULL on ARM.
Steev Klimaszewski [Thu, 19 Jun 2014 21:54:57 +0000 (16:54 -0500)]
va_list can't be NULL on ARM.

Bug: 10209
Change-Id: Ibd63a530450b7d2d4ec244e91c77caa731ba63aa
Signed-off-by: Steev Klimaszewski <threeway@gmail.com>
Signed-off-by: Balint Reczey <balint@balintreczey.hu>
Reviewed-on: https://code.wireshark.org/review/2464
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agouse proto_tree_add_item()
Martin Kaiser [Wed, 16 Jul 2014 17:55:35 +0000 (19:55 +0200)]
use proto_tree_add_item()

Change-Id: I7642295721e886eef4682c602ad96b61bc85b3b6
Reviewed-on: https://code.wireshark.org/review/3128
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agosimplify APPEND_OUI_NAME
Martin Kaiser [Wed, 16 Jul 2014 13:04:09 +0000 (15:04 +0200)]
simplify APPEND_OUI_NAME

Change-Id: I83aef5ebc92a7218f59bd77338058d98ffa2ed6b
Reviewed-on: https://code.wireshark.org/review/3127
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agoremove the NULL check in APPEND_BOOLEAN_FLAG
Martin Kaiser [Wed, 16 Jul 2014 13:05:57 +0000 (15:05 +0200)]
remove the NULL check in APPEND_BOOLEAN_FLAG

Change-Id: I15742ce73d3445ec47369d35dd0da6715b7079cf
Reviewed-on: https://code.wireshark.org/review/3126
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agoadd editor modelines
Martin Kaiser [Wed, 16 Jul 2014 12:36:22 +0000 (14:36 +0200)]
add editor modelines
reformat

Change-Id: Idce9d34c41ce2bcbc4d5efa4699decd7f3068199
Reviewed-on: https://code.wireshark.org/review/3125
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agosimplify the tree handling a bit
Martin Kaiser [Wed, 16 Jul 2014 12:26:26 +0000 (14:26 +0200)]
simplify the tree handling a bit

Change-Id: Ie6a9c033d2de3231f810a33b032ab06fee3f68a0
Reviewed-on: https://code.wireshark.org/review/3124
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agofix bug 9100
Martin Kaiser [Thu, 17 Jul 2014 21:26:37 +0000 (23:26 +0200)]
fix bug 9100

object and package containers may have multiple entries

Change-Id: I032e78057aadbbe67925d07881da9f1182a24058
Reviewed-on: https://code.wireshark.org/review/3121
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agoremove some more unnecessary initializations
Martin Kaiser [Wed, 16 Jul 2014 09:37:11 +0000 (11:37 +0200)]
remove some more unnecessary initializations

Change-Id: I74b082b7644f36efc3dc220ff92f1bfff524c408
Reviewed-on: https://code.wireshark.org/review/3119
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agono need to initialize these pointers
Martin Kaiser [Wed, 16 Jul 2014 09:20:10 +0000 (11:20 +0200)]
no need to initialize these pointers

Change-Id: I0791ca2fc9a7a87dafbdf15f51d9f1a9d12aa89e
Reviewed-on: https://code.wireshark.org/review/3118
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agouse gboolean for detected_drop
Martin Kaiser [Mon, 14 Jul 2014 22:57:08 +0000 (00:57 +0200)]
use gboolean for detected_drop

Change-Id: Ice0c68541604c5566cc807c17faf534cd6628262
Reviewed-on: https://code.wireshark.org/review/3117
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agoadd H.265 stream type
Martin Kaiser [Fri, 18 Jul 2014 14:02:56 +0000 (16:02 +0200)]
add H.265 stream type

Change-Id: Ic8e17f949f245ad6fe26fb8078e0545fe5b35daa
Reviewed-on: https://code.wireshark.org/review/3116
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agoOnly ABI-check strncasecmp.h if strncasecmp() is part of the API/ABI.
Guy Harris [Sat, 19 Jul 2014 07:23:37 +0000 (00:23 -0700)]
Only ABI-check strncasecmp.h if strncasecmp() is part of the API/ABI.

Some routines Wireshark uses are present in some, but not all,
platforms; for routines that would be used on all platforms, libwsutil
provides its own implementations on platforms that lack them.

On platforms that provide a routine, that routine will not be part of
the API and ABI, and, if we do an API or ABI check using the header
libwsutil provides to declare the function on platforms that lack it, we
may have a collision between the declaration in our header and the
declaration in a system header.

There's no guarantee that we can make them match, as the declaration
might differ from platform to platform and from platform version to
platform version, so we simply leave the header file out of the check if
we have the function on the platform on which we're checking the API or
ABI.

Change-Id: I8a23e63d9e17e5c1f5a83304dbe14d1e7df22e7e
Reviewed-on: https://code.wireshark.org/review/3115
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAdd casts to squelch compiler warnings.
Guy Harris [Sat, 19 Jul 2014 06:37:39 +0000 (23:37 -0700)]
Add casts to squelch compiler warnings.

Change-Id: I100ec30e1e9ac204e3c9225278adc8a26992542a
Reviewed-on: https://code.wireshark.org/review/3114
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoRevert part of 5cc2ab74af486611def7bcc14105c1a0257b41de
Evan Huus [Sat, 19 Jul 2014 01:16:03 +0000 (21:16 -0400)]
Revert part of 5cc2ab74af486611def7bcc14105c1a0257b41de

nghttp2ver.h is a local header, so use "" not <>

Change-Id: I62d1aebdc7c4b66035fccbba71ec9ca2edf1f07f
Reviewed-on: https://code.wireshark.org/review/3112
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoAdd extern "C", to let this be used from C++.
Guy Harris [Sat, 19 Jul 2014 00:55:07 +0000 (17:55 -0700)]
Add extern "C", to let this be used from C++.

Change-Id: I3c7d89b7aef301b49f3358ffb9b637acb00f720b
Reviewed-on: https://code.wireshark.org/review/3111
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoHTTP2: Update to nghttp2 lib 0.5.0
Alexis La Goutte [Fri, 18 Jul 2014 19:30:59 +0000 (21:30 +0200)]
HTTP2: Update to nghttp2 lib 0.5.0

Change-Id: Ia63c066e482f633ef5096f2341d74de749422102
Reviewed-on: https://code.wireshark.org/review/3104
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoFix install_desktop_files non-portability and add out-of-tree support.
Fabian Raetz [Fri, 18 Jul 2014 20:50:05 +0000 (13:50 -0700)]
Fix install_desktop_files non-portability and add out-of-tree support.

Prepend $(srcdir)/ to the sources in install commands, and get rid of
the -T flag, as it's GNU coreutils install-specific; some versions of
install don't support -T at all, and FreeBSD's install has a -T flag
that takes an argument and has a completely different meaning.

Fixes bug 10292; fix came from

    http://marc.info/?l=openbsd-ports&m=140571104528980&w=2

Change-Id: I8e80d475a728a17848736be043f97d2b90a0be82
Reviewed-on: https://code.wireshark.org/review/3107
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAdd some expert info to the MAC Control dissector
Michael Mann [Mon, 14 Jul 2014 11:04:33 +0000 (07:04 -0400)]
Add some expert info to the MAC Control dissector

Partial-bug: 6121
Change-Id: If7a367671cf55793799e0d72f8846bd6fe2a2222
Reviewed-on: https://code.wireshark.org/review/3038
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoWebSocket: increase max unmask payload size to 256K and indicate that packet is trunc...
Pascal Quantin [Thu, 17 Jul 2014 22:02:27 +0000 (00:02 +0200)]
WebSocket: increase max unmask payload size to 256K and indicate that packet is truncated is going above the new limit

Bug: 10283
Change-Id: Iea5401d02bcf50a3427dce5f2b817c3b73a7dc11
Reviewed-on: https://code.wireshark.org/review/3098
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoDNS: Add new opcode EDNS EXPIRE (9) for EDNS options (RFC7314)
Alexis La Goutte [Fri, 18 Jul 2014 12:28:01 +0000 (14:28 +0200)]
DNS: Add new opcode EDNS EXPIRE (9) for EDNS options (RFC7314)

Change-Id: I2db7bf6a80a34540aa90a3362566ac399b1c3644
Reviewed-on: https://code.wireshark.org/review/3101
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoAdd better assertions for comparing integers.
Kevin Cox [Fri, 18 Jul 2014 15:25:53 +0000 (11:25 -0400)]
Add better assertions for comparing integers.

Adds DISSECTOR_ASSERT_CMPINT() family of assertions which show the value
of each side of the comparison upon failure.

Change-Id: Ie6f2ba46d62fc864c08eb432c403fab8f1932d91
Reviewed-on: https://code.wireshark.org/review/3103
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoAdd casts to make the buildbot happy.
AndersBroman [Fri, 18 Jul 2014 08:51:04 +0000 (10:51 +0200)]
Add casts to make the buildbot happy.

Change-Id: Ia77b86c83a6458210f913a691b707b7aa1b911d7
Reviewed-on: https://code.wireshark.org/review/3100
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoSplit LBMR tap into 5 separate taps. Make the associated tap data use fixed-length...
David Ameiss [Thu, 10 Jul 2014 15:11:23 +0000 (10:11 -0500)]
Split LBMR tap into 5 separate taps. Make the associated tap data use fixed-length fields. The idea is to allow user-written tap
listeners easier access to the tap data. Also correct the conditions (in packet-lbmc.c) under which a subdissector would be
called, if present.

Change-Id: I5244cfbd17314058f7d3b9f42d647e0e6c375e14
Reviewed-on: https://code.wireshark.org/review/3007
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoSupport of draft-ietf-idr-flow-spec-v6 and some cosmetic improvments
Matthieu Texier [Thu, 10 Jul 2014 21:14:42 +0000 (23:14 +0200)]
Support of draft-ietf-idr-flow-spec-v6 and some cosmetic improvments

Change-Id: Ieaf23c84d67ccdfdcb167afb382c86797bc1cd2b
Reviewed-on: https://code.wireshark.org/review/3006
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agossl-utils: change some references from ietf drafts to rfcs
Hauke Mehrtens [Sat, 12 Jul 2014 11:45:32 +0000 (13:45 +0200)]
ssl-utils: change some references from ietf drafts to rfcs

Change-Id: I41a93a2818228ff6e5f005df5135996e687498af
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-on: https://code.wireshark.org/review/3097
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoEscape some characters like \n when appending text
Michael Tüxen [Thu, 17 Jul 2014 18:50:59 +0000 (20:50 +0200)]
Escape some characters like \n when appending text

This patch escapes some characters like \n when showing text
contained in a packet by appending it to a protocol item.

Change-Id: Ice0040040ec7ab573dd9a412f8c0c197a566a031
Reviewed-on: https://code.wireshark.org/review/3095
Petri-Dish: Michael Tüxen <tuexen@wireshark.org>
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
9 years agoTry to make tap operations in the Qt UI more responsive.
Gerald Combs [Thu, 17 Jul 2014 22:10:53 +0000 (15:10 -0700)]
Try to make tap operations in the Qt UI more responsive.

Add single-shot timers to ramp up the tap update interval and update
taps when we finish reading the capture file.

Change-Id: Ia1694b47ffd2705b6a06aa50c21e675a64aefeac
Reviewed-on: https://code.wireshark.org/review/3099
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoAdd an Application Id.
AndersBroman [Thu, 17 Jul 2014 16:05:11 +0000 (18:05 +0200)]
Add an Application Id.

Change-Id: I239560637fb61a22cd4ef4700aeb28c82659a805
Reviewed-on: https://code.wireshark.org/review/3093
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoWhen DNP3 heuristics are disabled, relax the conditions on
Graham Bloice [Thu, 17 Jul 2014 15:42:14 +0000 (16:42 +0100)]
When DNP3 heuristics are disabled, relax the conditions on
accepting a packet as DNP3.

Bug: 10287
Change-Id: I222ec885186447c8a72eaf11cebacff8b9b79fad
Reviewed-on: https://code.wireshark.org/review/3092
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
9 years agoFix assertion error when no header field was decompressed
Tatsuhiro Tsujikawa [Wed, 16 Jul 2014 13:41:27 +0000 (22:41 +0900)]
Fix assertion error when no header field was decompressed

bug: 10279
Change-Id: Ibf88b1622318692ccf3904aede5d964e6028bdc7
Reviewed-on: https://code.wireshark.org/review/3087
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoFix regression related to OSPF related enum order definitions
Jim Young [Thu, 10 Jul 2014 08:32:06 +0000 (04:32 -0400)]
Fix regression related to OSPF related enum order definitions

bug: 10271
Change-Id: Id2de856104d7506583e94893501cff23de3ec212
Reviewed-on: https://code.wireshark.org/review/2976
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoTLS: Update to the final RFC (7301) for ALPN
Alexis La Goutte [Tue, 15 Jul 2014 07:03:59 +0000 (09:03 +0200)]
TLS: Update to the final RFC (7301) for ALPN

Change-Id: I16b3f6ec7cc4d356a6cb6090866691ddd2e708b6
Reviewed-on: https://code.wireshark.org/review/3056
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoReflect the move of the buffer_ routines to libwsutil.
Guy Harris [Wed, 16 Jul 2014 03:41:00 +0000 (20:41 -0700)]
Reflect the move of the buffer_ routines to libwsutil.

We went with the whole WS_DLL_EXPORT thing so that we don't *have* to
maintain lists of exported symbols; is there truly no way to automate
the generation of *these* files?

Change-Id: I77f240c77782ed634e4620833f951c4a02fb4390
Reviewed-on: https://code.wireshark.org/review/3083
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAllow the interface monitor routines to be called from C++.
Guy Harris [Wed, 16 Jul 2014 02:28:12 +0000 (19:28 -0700)]
Allow the interface monitor routines to be called from C++.

Change-Id: I2ae60c1b015a432f5df36bd623f1a4c69b02bef1
Reviewed-on: https://code.wireshark.org/review/3081
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoMark unused parameter as such
Evan Huus [Wed, 16 Jul 2014 02:00:27 +0000 (22:00 -0400)]
Mark unused parameter as such

Change-Id: I6a7fa5943957712fbd9e4801702a57dbb2d21b81
Reviewed-on: https://code.wireshark.org/review/3079
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoCheck for __func__ in checkAPIs.pl
Evan Huus [Wed, 16 Jul 2014 01:56:55 +0000 (21:56 -0400)]
Check for __func__ in checkAPIs.pl

Change-Id: I649c69cbf545a8de32d9142c1156db6adb076b63
Reviewed-on: https://code.wireshark.org/review/3078
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoAllow expert info to show only items in the display filter.
Michael Mann [Fri, 20 Jun 2014 06:47:03 +0000 (02:47 -0400)]
Allow expert info to show only items in the display filter.

This was started by Chris Maynard before Qt was announced and I just polished it off for inclusion in GTK version of Wireshark.

This also can be used as input into the Qt version of the Expert Info "dialog" since it hasn't been written yet.  Personally I like the "template" the Qt statistics dialog has with the display filter built it.  I think that would work well for the Expert Info dialog as well.

bug:1860
Change-Id: Icaada6e7900f22b0a3d97c2a5656edfd8d8c8b7f
Reviewed-on: https://code.wireshark.org/review/3035
Reviewed-by: Christopher Maynard <Christopher.Maynard@gtech.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoMove the monitor-for-interface-list-changes stuff to the caputils library.
Guy Harris [Wed, 16 Jul 2014 01:26:46 +0000 (18:26 -0700)]
Move the monitor-for-interface-list-changes stuff to the caputils library.

Change-Id: Ie0d4504688602c2aa8e9788643b079930ca7d305
Reviewed-on: https://code.wireshark.org/review/3076
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoThe plural is "PDUs", not "PDU:s".
Guy Harris [Wed, 16 Jul 2014 01:10:22 +0000 (18:10 -0700)]
The plural is "PDUs", not "PDU:s".

Change-Id: I4bef734ef17b02e254b742744e2debd3038e98a0
Reviewed-on: https://code.wireshark.org/review/3074
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years ago"Export PDUs to File" pops up a dialog, so put "..." after it.
Guy Harris [Wed, 16 Jul 2014 00:56:24 +0000 (17:56 -0700)]
"Export PDUs to File" pops up a dialog, so put "..." after it.

Also, capitalize "File" in the GTK+ version (it's already capitalized in
the Qt version).

Change-Id: I27eb27022930b1c0e0321cd1a1446c3b9dc1bd17
Reviewed-on: https://code.wireshark.org/review/3072
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoDon't use __func__, use G_STRFUNC.
Guy Harris [Wed, 16 Jul 2014 00:23:26 +0000 (17:23 -0700)]
Don't use __func__, use G_STRFUNC.

Not all compilers we use support __func__.

Change-Id: I61194e1073c87e67f821e14698ea21b73d63983c
Reviewed-on: https://code.wireshark.org/review/3071
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoSquelch a warning.
Guy Harris [Wed, 16 Jul 2014 00:14:11 +0000 (17:14 -0700)]
Squelch a warning.

In at least some versions of GLib, g_array_free() warns if passed a null
pointer, rather than just silently returning.

Change-Id: I1bfc0a81faa1eeebe288f6e0cc58ebfb64784958
Reviewed-on: https://code.wireshark.org/review/3068
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoOnly one buffer.c, please.
Guy Harris [Tue, 15 Jul 2014 23:40:46 +0000 (16:40 -0700)]
Only one buffer.c, please.

Otherwise, if you link with both libwiretap and libfiletap, it's
anybody's guess which one you get.  That means you're wasting memory
with two copies of its routines if they're identical, and means
surprising behavior if they're not (which showed up when I was debugging
a double-free crash - fixing libwiretap's buffer_free() didn't fix the
problem, because Wireshark happened to be calling libfiletap' unfixed
buffer_free()).

There's nothing *tap-specific about Buffers, anyway, so it really
belongs in wsutil.

Change-Id: I91537e46917e91277981f8f3365a2c0873152870
Reviewed-on: https://code.wireshark.org/review/3066
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoNo more README.irix.
Guy Harris [Tue, 15 Jul 2014 23:28:11 +0000 (16:28 -0700)]
No more README.irix.

Change-Id: I3c906451549d28040f1068356bf7e62bff9cd92a
Reviewed-on: https://code.wireshark.org/review/3065
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoHave buffer_free() null out the buffer data pointer.
Guy Harris [Tue, 15 Jul 2014 23:22:34 +0000 (16:22 -0700)]
Have buffer_free() null out the buffer data pointer.

That prevents some double-free issues (I got one when doing non-"Update
list of packets in real time" captures, if I do one such capture and
then another one).

Change-Id: Ia08034d9d1640bad21b74960efade8926dbfc5de
Reviewed-on: https://code.wireshark.org/review/3063
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agossl: move decoder init from ClientKeyExchange to ChangeCipherSpec
Peter Wu [Fri, 11 Jul 2014 22:30:12 +0000 (00:30 +0200)]
ssl: move decoder init from ClientKeyExchange to ChangeCipherSpec

My previous change removed master-key retrieval in the Server Hello.
This broke decryption when ClientKeyExchange is missing. That was done
because decryption is only needed after ChangeCipherSpec.

This patch moves the remaining initialization in ClientKeyExchange to
ChangeCipherSpec. In theory this could fix decryption of DTLS traffic
when an abbreviated handshake is used (and thus keyring material is
never generated in ClientKeyExchange since it is not called).

It also avoids saving a session ticket with an empty key which can
happen when no RSA key is present, but the NewSessionTicket message
is received. This could lead to garbage decryption.

Change-Id: If0f475232c270b1d7b006c1f9af0e8d8098c6b65
Reviewed-on: https://code.wireshark.org/review/3019
Reviewed-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agossl: unify common Hello dissection to ssl-utils
Peter Wu [Sun, 13 Jul 2014 11:21:41 +0000 (13:21 +0200)]
ssl: unify common Hello dissection to ssl-utils

Based on DTLS code with changes merged from SSL. Changes:

 - Ignore large Session IDs, this was not harmful though since the
   backing storage was 256 bytes in size.
 - {ssl,dtls}.handshake.random: fixed description, it is not used like
   a SSLv2 random challenge.
 - dtls: also debug print client/server for random
 - SSL: the common dissector now returns an offset rather than dissected
   length.
 - dtls: display actual Session ID bytes in the UI rather than the text
   "Session ID (32 bytes)". The length field is already visible in the
   preceding field.

Also changed is the handling of key material generation. The SSL
dissector previously generated key material based on the Session ID,
Session Ticket or a key logfile. (DTLS did not have this functionality.)
As decryption is needed only after ChangeCipherSpec, I have removed it
from the ServerHello handling. This will break decryption when a
ClientKeyExchange message is missing, but it will be restored proper in
a next patch.

(By the way, there was an inverted if-condition bug in DTLS that could
break decryption by not restoring the master key matching a SID. This
is gone in the refactoring because the faulty code is removed.)

Change-Id: Ida3de88adefe3f7691f85936c496977426c4d96e
Reviewed-on: https://code.wireshark.org/review/3018
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoLooks like this file is completely outdated - at least the problems
Joerg Mayer [Sat, 12 Jul 2014 20:06:25 +0000 (22:06 +0200)]
Looks like this file is completely outdated - at least the problems
it mentions are.

Change-Id: Idc8fd36bc605c9b79019285e1a259fa545cf72b5
Reviewed-on: https://code.wireshark.org/review/3026
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoFix Argument with 'nonnull' attribute passed null found by Clang
Alexis La Goutte [Tue, 15 Jul 2014 06:52:31 +0000 (08:52 +0200)]
Fix Argument with 'nonnull' attribute passed null found by Clang

Change-Id: I48f488a75f53d077a213f7b9379960985ce3bf08
Reviewed-on: https://code.wireshark.org/review/3055
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoHTTP2: Fix double free
Alexis La Goutte [Tue, 15 Jul 2014 14:50:32 +0000 (16:50 +0200)]
HTTP2: Fix double free

Found by Clang Analyzer

Backport from https://github.com/tatsuhiro-t/nghttp2/commit/62423f5949001c375c8e325296c74c92d1be0965
Signed-off-by: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Change-Id: Ic70f74b55ab80ca0b8d5042f07a29c9d14af4fe2
Reviewed-on: https://code.wireshark.org/review/3058
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoMAUSB dissection of control transfer responses
Sean O. Stalley [Mon, 7 Jul 2014 18:38:45 +0000 (11:38 -0700)]
MAUSB dissection of control transfer responses

The MAUSB dissector can now dissect transfer responses for control
endpoints.

Change-Id: Ic488ccb308365d072bbbf0eaf128b198caf74eca
Reviewed-on: https://code.wireshark.org/review/2960
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoMoved USB Setup Response Dissection into own function
Sean O. Stalley [Mon, 7 Jul 2014 17:28:24 +0000 (10:28 -0700)]
Moved USB Setup Response Dissection into own function

USB Setup Responses are now dissected in their own function.
Before they were dissected inline in the usb_dissect_common()
function.
(just copied code).

Also replaced proto_tree_add_text() with proto_tree_add_item()
for generic setup response data.

Change-Id: Ia3943334cccc0a1813e0c906196307f99561ad21
Reviewed-on: https://code.wireshark.org/review/2959
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoFix Dereference of null pointer found by Clang analyzer
Alexis La Goutte [Tue, 15 Jul 2014 06:47:40 +0000 (08:47 +0200)]
Fix Dereference of null pointer found by Clang analyzer

Change-Id: I3e84e987ad26019d7536baf4d90d6b0c684f6ec1
Reviewed-on: https://code.wireshark.org/review/3054
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoFix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Tue, 15 Jul 2014 06:44:36 +0000 (08:44 +0200)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Change-Id: I908e08e491bae6c7532e02269d8ed004ad0cee91
Reviewed-on: https://code.wireshark.org/review/3053
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoFix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Tue, 15 Jul 2014 06:41:57 +0000 (08:41 +0200)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Change-Id: I17dc2259e039586b9a06944bd1c2b552dd23855d
Reviewed-on: https://code.wireshark.org/review/3052
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoGet rid of cf_reset_state() - it's only called from one place.
Guy Harris [Tue, 15 Jul 2014 22:48:29 +0000 (15:48 -0700)]
Get rid of cf_reset_state() - it's only called from one place.

Change-Id: I48521bbaa898c99286e6bb5e40281aba7701ed4d
Reviewed-on: https://code.wireshark.org/review/3062
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoMake the state variable an enum, and add a case for the IN_SKIP value.
Guy Harris [Tue, 15 Jul 2014 20:54:54 +0000 (13:54 -0700)]
Make the state variable an enum, and add a case for the IN_SKIP value.

Also indicate what the states mean.

Change-Id: Ie1701bb2fb33334bcd66d325d1368c2a15cbb7e8
Reviewed-on: https://code.wireshark.org/review/3061
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoFix up library names when using CMake on Windows
Graham Bloice [Wed, 9 Jul 2014 13:39:41 +0000 (14:39 +0100)]
Fix up library names when using CMake on Windows

Change-Id: I3573e69eb54044bb915161756dbb8f18cc769061
Reviewed-on: https://code.wireshark.org/review/2957
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
9 years agoCleanup the "export PDU" common code.
Guy Harris [Tue, 15 Jul 2014 20:15:27 +0000 (13:15 -0700)]
Cleanup the "export PDU" common code.

exp_pdu_file_open() isn't used outside ui/tap_export_pdu.c; make it
static.

do_export_pdu() isn't a tap routine, it's called *from* tap routines, so
its last argument doesn't need to be a generic pointer; its last
argument must be a pointer to an exp_pdu_t, so declare it as such.

Clean up comments while we're at it.

Change-Id: Iab51b54a0c272052d7876110a095f2fff66fa2c1
Reviewed-on: https://code.wireshark.org/review/3060
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAdd application/atom+xml as an XML document type.
Guy Harris [Mon, 14 Jul 2014 23:48:10 +0000 (16:48 -0700)]
Add application/atom+xml as an XML document type.

Change-Id: I9fcf438f3cafcb3ab3a5b6dc0f72ed2561e5a94f
Reviewed-on: https://code.wireshark.org/review/3049
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoTreat CR-LF at the end of a line like LF.
Guy Harris [Mon, 14 Jul 2014 19:14:46 +0000 (12:14 -0700)]
Treat CR-LF at the end of a line like LF.

That way, if we're reading a Windows-format file on UN*X, we handle it
the same way we'd handle a UN*X-format file.

This handles bug 10272 for the cfilter and dfilter file; there are other
configuration files that may need code changes as well.

While we're at it, don't hand non-ASCII characters to isspace().

Change-Id: I4f5efeaa938bcb2d85737ab136c3ca19ea1ddb5b
Reviewed-on: https://code.wireshark.org/review/3045
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoTreat CR-LF at the end of a line like LF.
Guy Harris [Mon, 14 Jul 2014 18:26:24 +0000 (11:26 -0700)]
Treat CR-LF at the end of a line like LF.

That way, if we're reading a Windows-format file on UN*X, we handle it
the same way we'd handle a UN*X-format file.

This handles bug 10272 for the preference file and the "recent" files;
there are other configuration files that may need code changes as well.

Change-Id: Iec15a8fac276929ce8b53ae16070e9f2855f574c
Reviewed-on: https://code.wireshark.org/review/3042
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoRename parameter if_index to stop clang warning:
Graham Bloice [Mon, 14 Jul 2014 14:22:53 +0000 (15:22 +0100)]
Rename parameter if_index to stop clang warning:

capture_opts.c:1017:61: error: declaration of 'index' shadows a global declaration [-Werror=shadow]

Change-Id: Ie409b4fa7abeb85e460bea398735cdc98d9034b1
Reviewed-on: https://code.wireshark.org/review/3041
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
9 years agoFix buildbot issues with commit f8f3239bb03487de1844ab0f6df0ba693322ce4b
Graham Bloice [Mon, 14 Jul 2014 14:00:02 +0000 (15:00 +0100)]
Fix buildbot issues with commit f8f3239bb03487de1844ab0f6df0ba693322ce4b
from change 3016.

Change-Id: I67363462f1c4e1ca69695573892692c458c620c6
Reviewed-on: https://code.wireshark.org/review/3040
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
9 years agoAdd default ciphering and integrity algorithms to use for when control messages are...
Martin Mathieson [Fri, 11 Jul 2014 22:49:40 +0000 (23:49 +0100)]
Add default ciphering and integrity algorithms to use for when control messages are not available, e.g. when handing in to a target cell.

Change-Id: I35830fe04df5e5778c15cdb782982b2fbcda67ea
Reviewed-on: https://code.wireshark.org/review/3016
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
9 years ago[Automatic manuf, services and enterprise-numbers update for 2014-07-13]
Gerald Combs [Sun, 13 Jul 2014 15:05:27 +0000 (08:05 -0700)]
[Automatic manuf, services and enterprise-numbers update for 2014-07-13]

Change-Id: I2aa66d261040f9f3e86103c820c914c371a70d1f
Reviewed-on: https://code.wireshark.org/review/3031
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoproto_register_zbee_zcl_appl_evtalt: correct formatting
Роман Донченко [Sat, 12 Jul 2014 18:19:57 +0000 (22:19 +0400)]
proto_register_zbee_zcl_appl_evtalt: correct formatting

The original formatting, besides looking silly, also prevents the function
from being picked up by make-dissector-reg.

Change-Id: I06e37b0e862064275b07976295eca8f0288a0974
Reviewed-on: https://code.wireshark.org/review/3025
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoRemove some $Id$ lines
Joerg Mayer [Sat, 12 Jul 2014 14:31:13 +0000 (16:31 +0200)]
Remove some $Id$ lines

Change-Id: Idec3769750f5a433b184e6e9fb44cbad23a29c60
Reviewed-on: https://code.wireshark.org/review/3023
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
9 years agofix scan_local_interfaces()
Martin Kaiser [Fri, 4 Jul 2014 22:18:07 +0000 (18:18 -0400)]
fix scan_local_interfaces()

when we delete an interface from all_ifaces, delete it from ifaces as well
remove its selected status if it was selected

at the moment, an interface that was used for capturing before will
never be removed from the list of interfaces even if it becomes
unavailable as it remains in ifaces and will be re-added to all_ifaces
in scan_local_interfaces()

new helper function capture_opts_del_iface() to delete an entry from ifaces and
free all its components

Change-Id: Ie3271a7ed086367e511d3a971f3b68cfc014115d
Reviewed-on: https://code.wireshark.org/review/2965
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agomake unit-test suite work out-of-tree
Evan Huus [Sun, 6 Jul 2014 16:22:03 +0000 (12:22 -0400)]
make unit-test suite work out-of-tree

Change-Id: I638015a9b55712bb6843d6756c9c55915e142372
Reviewed-on: https://code.wireshark.org/review/2893
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agodtls: fix faulty offsets and tvbuff references
Peter Wu [Fri, 11 Jul 2014 08:40:47 +0000 (10:40 +0200)]
dtls: fix faulty offsets and tvbuff references

This could lead to problems for fragmented DTLS packets.

Change-Id: I602c7e181ea3799a4a2e7bcfed05bfbb129f7df4
Reviewed-on: https://code.wireshark.org/review/3017
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agodissectors/llrp: Add support for Impinj's Hub extension
Petr Štetiar [Thu, 10 Jul 2014 11:08:34 +0000 (13:08 +0200)]
dissectors/llrp: Add support for Impinj's Hub extension

Based on Impinj extension schema v1.4.

Change-Id: Ica9493a4527ae800d6e5daaf2d86b8cfdf479ed1
Signed-off-by: Petr Štetiar <petr.stetiar@gaben.cz>
Reviewed-on: https://code.wireshark.org/review/2981
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoAdd back -Qunused-arguments for Clang++.
Gerald Combs [Fri, 11 Jul 2014 22:21:04 +0000 (15:21 -0700)]
Add back -Qunused-arguments for Clang++.

When used with ccache it can result in warnings as described at
http://petereisentraut.blogspot.com/2011/05/ccache-and-clang.html.

Change-Id: Ibca4fd262ec8d1f16a450b1698ead10f57d52b06
Reviewed-on: https://code.wireshark.org/review/3015
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoFix the x64 builds after the commit:b3b1f7c3aa2233a147294bad833b748d38fba84d
Graham Bloice [Fri, 11 Jul 2014 21:30:25 +0000 (22:30 +0100)]
Fix the x64 builds after the commit:b3b1f7c3aa2233a147294bad833b748d38fba84d
From Change: 2803

Change-Id: Ic57fb0e3c1e0450561aebe48a873a3fdb2e8e105
Reviewed-on: https://code.wireshark.org/review/3014
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
9 years agoAdd strlen casts.
Gerald Combs [Fri, 11 Jul 2014 21:01:26 +0000 (14:01 -0700)]
Add strlen casts.

Change-Id: Icaf80f060c476dd7259c04c4cce4123025ef1dab
Reviewed-on: https://code.wireshark.org/review/3012
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoAdd plumbing for stat commands ("-z ...").
Gerald Combs [Wed, 9 Jul 2014 17:50:51 +0000 (10:50 -0700)]
Add plumbing for stat commands ("-z ...").

Trigger dialog creation by passing a method name to
QMetaObject::invokeMethod. I'm not entirely sure this is sane but it
seems to work OK. Move getopt processing further down in the main initialization sequence
to more closely match GTK+ and allow for stat command registration.

Change-Id: I5cd5375fa71dbadac69d528b2ba3bb13598dc3f6
Reviewed-on: https://code.wireshark.org/review/2964
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoRemove $Id$
Bill Meier [Fri, 11 Jul 2014 19:53:22 +0000 (15:53 -0400)]
Remove $Id$
Change-Id: Iae71c6e65000471f251717a172c5f4b812ac1bd3
Reviewed-on: https://code.wireshark.org/review/3011
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agoGTP: allow empty Data Record Packet IE
Pascal Quantin [Fri, 11 Jul 2014 17:49:46 +0000 (19:49 +0200)]
GTP: allow empty Data Record Packet IE

Bug: 10277
Change-Id: I4edf330fa1c44a52d985d70555c7756954fb9364
Reviewed-on: https://code.wireshark.org/review/3008
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agologcat: improve (crash) robustness, improve names
Peter Wu [Thu, 3 Jul 2014 09:23:19 +0000 (11:23 +0200)]
logcat: improve (crash) robustness, improve names

The logcat version detector would crash with ASAN enabled because it did
not validate the payload length and hence a payload length of 0 would
trigger out-of-bounds access. (This happened on non-logcat data.)

This patch tries to get rid of all magic numbers by using a structure,
improves the version detector to validate the payload length and
prevents crashes due to missing nul-terminators in the input. Older
Android kernels would create entries with __pad with random contents, so
that cannot be used to determine version for v1. Instead, use heuristics
on the priority, tag and maybe the msg field.

Furthermore, Android is mostly (if not, always?) Little-Endian, so add
conversions where necessary (just in case WS supports BE arches).

"microseconds" has been renamed to "milliseconds" because that is what
they are, actually. A duplicate logcat_log loop has been refactored
such that one loop is sufficient, instead of separate buffers for each
log part, a single one is now used. get_priority does not really need
a pointer, just make it accept a character.

The output has been validated against v1 and v2 logcat binary formats
with __pad (hdr_size) equal to 0, and on attachment 9906.

Change-Id: I46c8813e76fe705b293ffdee85b4c1bfff7d8362
Reviewed-on: https://code.wireshark.org/review/2803
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
9 years agoRestore some assignments of ti2 that were removed in the proto_tree_add_subtree[_form...
Michael Mann [Fri, 11 Jul 2014 07:19:08 +0000 (03:19 -0400)]
Restore some assignments of ti2 that were removed in the proto_tree_add_subtree[_format] conversion

bug:10270
Change-Id: I40062065add1c6a08bdabc9dcbbe53afaafca035
Reviewed-on: https://code.wireshark.org/review/2997
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoTry to fix the build.
AndersBroman [Fri, 11 Jul 2014 07:34:38 +0000 (09:34 +0200)]
Try to fix the build.

Change-Id: I06e813db6af41d9fa4effcf2b23cf91d72c8c0ec
Reviewed-on: https://code.wireshark.org/review/2998
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoUpdate to fix for Bug 6302.
Anish Bhatt [Fri, 11 Jul 2014 03:41:15 +0000 (20:41 -0700)]
Update to fix for Bug 6302.
There is no need to check block constraints as min length already guarantees this, this also fixes false positives for missing TOS metric blocks

Change-Id: Icbe3067d2506fad1c7dbcb175d932a5f242fa5cd
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/2995
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agossl: move CertificateRequest to ssl-utils
Peter Wu [Thu, 10 Jul 2014 22:58:35 +0000 (00:58 +0200)]
ssl: move CertificateRequest to ssl-utils

Except for field/expert_info names, a redundant subtree assignment,
a different !tree check, a type confusion in DTLS (proto_tree *ti),
a check against a different DTLS/TLS version and a (void) retval cast,
the functions are exactly the same. Extract them to ssl-utils.

Change-Id: I2ca7089fe2cd23212ef78656506cb53768f55927
Reviewed-on: https://code.wireshark.org/review/2986
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agossl: move Certificate handshake dissection to ssl-utils
Peter Wu [Thu, 10 Jul 2014 22:35:04 +0000 (00:35 +0200)]
ssl: move Certificate handshake dissection to ssl-utils

There are no dissection differences between DTLS and SSL, so move to
ssl-utils. While at it, skip dissection when the tree is NULL, remove
the plural from certificates length (the length is always larger than
ome), fix type of "ti" for dtls, get rid of "failsafe" subtree
assignment in ssl, get rid of tvb_ensure_bytes_exist in ssl.

Unrelated changes: fix param (tvb vs sub_tvb) for DTLS KeyExchange
handshake messages.

Change-Id: Iecaa45a7a601e55a52aa16180cf219a122fbe95a
Reviewed-on: https://code.wireshark.org/review/2985
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agossl: add missing valid handshake types
Peter Wu [Thu, 10 Jul 2014 09:50:23 +0000 (11:50 +0200)]
ssl: add missing valid handshake types

The DTLS dissector duplicated a handshake types check, this has been
eliminated. Convert HandshakeType and ContentType to enums to get the
benefit of compiler-checked switch cases. Move these checks to
ssl-utils.

Two default cases could never be reached since the dissector returns
immediately on an invalid ContentType.

Also fixed misleading debugging messages.

Change-Id: I07a2062564e073004dcc0401cd82538e5659fa0c
Reviewed-on: https://code.wireshark.org/review/2978
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoGTK Remote Capturing
Irene Ruengeler [Wed, 9 Jul 2014 11:50:11 +0000 (13:50 +0200)]
GTK Remote Capturing

Move the GTK files necessary for managing the recnet remote host from capture_dlg.c to recent.c in order to use them in QT, too.

Change-Id: I3f3fd31ce928162de08c6db7309ef2a9b1e97760
Reviewed-on: https://code.wireshark.org/review/2955
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoStrip some trailing whitespace; Fix some indentation; Add editor-modelines as needed.
Bill Meier [Fri, 11 Jul 2014 03:11:25 +0000 (23:11 -0400)]
Strip some trailing whitespace; Fix some indentation; Add editor-modelines as needed.

Change-Id: I943153e28f468070d86535abad7be032e1386118
Reviewed-on: https://code.wireshark.org/review/2994
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agoAs opposed to *loudly* silently?
Guy Harris [Fri, 11 Jul 2014 00:44:10 +0000 (17:44 -0700)]
As opposed to *loudly* silently?

Change-Id: I5c6843ac2c665a4c8c8822084377fee661405d34
Reviewed-on: https://code.wireshark.org/review/2992
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoChange comments to reflect current reality.
Guy Harris [Fri, 11 Jul 2014 00:42:37 +0000 (17:42 -0700)]
Change comments to reflect current reality.

Change-Id: If4e220457d2040eaa35dd5e55a0f43fc9da5e347
Reviewed-on: https://code.wireshark.org/review/2991
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAvoid sign-extending bytes before handing them to <ctype.h> macros.
Guy Harris [Fri, 11 Jul 2014 00:27:49 +0000 (17:27 -0700)]
Avoid sign-extending bytes before handing them to <ctype.h> macros.

Pointed out by the Visual Studio code analyzer.

Change-Id: Idd429b4d0fb3db11ce171c3a5b38bdc55cc53c15
Reviewed-on: https://code.wireshark.org/review/2988
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoQuick fix to handle IEPS token.
AndersBroman [Thu, 10 Jul 2014 14:44:53 +0000 (16:44 +0200)]
Quick fix to handle IEPS token.
Fix deorecated APIs

Change-Id: Iad1f970b553f1655109b36364a1d37676582f608
Reviewed-on: https://code.wireshark.org/review/2984
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoFix Uninitialized argument value found by Clang Analyzer
Alexis La Goutte [Thu, 10 Jul 2014 12:33:45 +0000 (14:33 +0200)]
Fix Uninitialized argument value found by Clang Analyzer

Change-Id: I3cdb7734302b3e879def71dfa48c4654999ae9d2
Reviewed-on: https://code.wireshark.org/review/2983
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoI don't see the point of inserting p_proto_data sorted use
AndersBroman [Thu, 10 Jul 2014 11:21:54 +0000 (13:21 +0200)]
I don't see the point of inserting p_proto_data sorted use
g_slist_prepend().
While there fix deprecated API.

Change-Id: Id5241348927d904d859530fac3f43f2b301a1acb
Reviewed-on: https://code.wireshark.org/review/2982
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoFix a small typo in the FindChocolatey.cmake module
Graham Bloice [Thu, 10 Jul 2014 11:42:52 +0000 (12:42 +0100)]
Fix a small typo in the FindChocolatey.cmake module

Change-Id: Idefea86a9f65f59432db4bf32b9f702298409cdb
Reviewed-on: https://code.wireshark.org/review/2980
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
9 years agossl,dtls: convert from tvb_length
Peter Wu [Tue, 8 Jul 2014 16:34:04 +0000 (18:34 +0200)]
ssl,dtls: convert from tvb_length

Every occurrence of tvb_length* has been converted to
tvb_reported_length* except some dtls lines.

Change-Id: I0faac315cdf5d17c0af18be177aacd076ff86cff
Reviewed-on: https://code.wireshark.org/review/2977
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
9 years agoRemove a useless line now that nghttp2 library has moved to /epan
Pascal Quantin [Thu, 10 Jul 2014 07:29:22 +0000 (09:29 +0200)]
Remove a useless line now that nghttp2 library has moved to /epan

Change-Id: I41c876620e691f2e217fc9249d6abae01ea81b7f
Reviewed-on: https://code.wireshark.org/review/2975
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoconvert to proto_tree_add_subtree[_format] for plugin dissectors
Michael Mann [Thu, 10 Jul 2014 01:21:32 +0000 (21:21 -0400)]
convert to proto_tree_add_subtree[_format] for plugin dissectors

Change-Id: I13924c5a2f056688a42cdee25654d82c056b5f97
Reviewed-on: https://code.wireshark.org/review/2974
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoRevert "See if we can get rid of the "lib" in front of "wsutil" on Windows."
Guy Harris [Thu, 10 Jul 2014 00:59:23 +0000 (00:59 +0000)]
Revert "See if we can get rid of the "lib" in front of "wsutil" on Windows."

This reverts commit c5a50df51f38e10e3a3618d9394364f60a1ca8af.

Most of the change to remove "lib" seems to work, but the list of libraries to sign appears not to be in the source repository, so I can't make that step work.

Change-Id: I6ead152fc308480d02266b0f3f0caaa873caf6d2
Reviewed-on: https://code.wireshark.org/review/2973
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoRevert "More needed to get rid of "lib" in "libwsutil" on Windows."
Guy Harris [Thu, 10 Jul 2014 00:59:01 +0000 (00:59 +0000)]
Revert "More needed to get rid of "lib" in "libwsutil" on Windows."

This reverts commit 28719a4e4e01b478889dab9611fed517e506360e.

Most of the change to remove "lib" seems to work, but the list of libraries to sign appears not to be in the source repository, so I can't make that step work.

Change-Id: I32e400593e8a39f582cc702df34eea7f6e9e722a
Reviewed-on: https://code.wireshark.org/review/2972
Reviewed-by: Guy Harris <guy@alum.mit.edu>