metze/wireshark/wip.git
9 years agoDump additional debugging information.
Guy Harris [Sat, 2 Aug 2014 21:01:07 +0000 (14:01 -0700)]
Dump additional debugging information.

For autotools, dump CC, CFLAGS, CXX, and CXXFLAGS.

For CMake, dump CMAKE_C_COMPILER_ID and CMAKE_CXX_COMPILER_ID.

Hopefully this will help figure out why CMake builds catch different
warnings from autotools builds.

Change-Id: I26955ad955f60e8bad248562fa87963a3a1bb42f
Reviewed-on: https://code.wireshark.org/review/3365
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoWait until the C and C++ compiler flags are fully set before showing them.
Guy Harris [Sat, 2 Aug 2014 20:53:44 +0000 (13:53 -0700)]
Wait until the C and C++ compiler flags are fully set before showing them.

That way, we report the *full* contents of those flags.

Change-Id: Idab78049247c04b7d35a3ce804c8ea9daaf84312
Reviewed-on: https://code.wireshark.org/review/3364
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAdd tvb_ensure_bytes_exist64 to the API list.
Guy Harris [Sat, 2 Aug 2014 18:54:54 +0000 (11:54 -0700)]
Add tvb_ensure_bytes_exist64 to the API list.

I thought ws_symbol_export.h was supposed to eliminate API list files.
Apparently it didn't, so we have to update this file every time we add a
new API.

Change-Id: I93dda6ccc992c79d52d2b460e818995e6332f1be
Reviewed-on: https://code.wireshark.org/review/3363
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAdd a routine to check whether all bytes implied by a 64-bit length exist.
Guy Harris [Sat, 2 Aug 2014 18:32:42 +0000 (11:32 -0700)]
Add a routine to check whether all bytes implied by a 64-bit length exist.

This lets us blow up with oversized 64-bit length values, before casting
them to the 31-bit lengths we can actually handle in Wireshark, rather
than blindly casting them with weird results.

Use that in the MySQL dissector, and, if we get past the test, cast the
lengths to int to squelch warnings.

Change-Id: I3a5e9bd0027fa4ddcb9622f77952dba8f6b23c27
Reviewed-on: https://code.wireshark.org/review/3362
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoMySQL: Support authplugin and connattrs
Daniël van Eeden [Sun, 20 Jul 2014 19:37:22 +0000 (21:37 +0200)]
MySQL: Support authplugin and connattrs

Bug:10294

Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Change-Id: I65ec69821fd562da8f873ae85b1846c79ab400d9
Reviewed-on: https://code.wireshark.org/review/3138
Reviewed-by: Daniël van Eeden <wireshark@myname.nl>
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agofix multi-byte entries in Operator Profile capability loops
Martin Kaiser [Fri, 1 Aug 2014 10:32:21 +0000 (12:32 +0200)]
fix multi-byte entries in Operator Profile capability loops
(this problem showed up in an APDU with two 16bit application ids)

Change-Id: Ie4842181b19db984a693534144fac5e91b217b34
Reviewed-on: https://code.wireshark.org/review/3358
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agofix warning: 'cipher_hd' may be used uninitialized in this function
Evan Huus [Sat, 2 Aug 2014 14:45:28 +0000 (10:45 -0400)]
fix warning: 'cipher_hd' may be used uninitialized in this function

I don't think it's an actual issue, but the new compiler on the mac buildbots
isn't smart enough to tell that.

Change-Id: I759e1afe9c4011d5612be0d15282076be6f5a331
Reviewed-on: https://code.wireshark.org/review/3355
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoAdd a cast to squelch a warning.
Guy Harris [Sat, 2 Aug 2014 11:27:05 +0000 (04:27 -0700)]
Add a cast to squelch a warning.

Change-Id: Id8eba103b9edd54bdfdea9144c807c3fbe0cb4e4
Reviewed-on: https://code.wireshark.org/review/3353
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoRename buffer_ routines to ws_buffer_ to avoid name collisions.
Guy Harris [Sat, 2 Aug 2014 11:00:48 +0000 (04:00 -0700)]
Rename buffer_ routines to ws_buffer_ to avoid name collisions.

In particular, epan/wslua/lrexlib.c has its own buffer_ routines,
causing some linker warnings on some platforms, as reported in bug
10332.

(Not to be backported to 1.12, as that would change the API and ABI of
libwsutil and libwiretap.  We should also make the buffer_ routines in
epan/wslua/lrexlib.c static, which should also address this problem, but
the name change avoids other potential namespace collisions.)

Change-Id: I1d42c7d1778c7e4c019deb2608d476c52001ce28
Reviewed-on: https://code.wireshark.org/review/3351
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoRevert "Make Lua taps work in out-of-source-tree builds."
Evan Huus [Sat, 2 Aug 2014 02:11:29 +0000 (02:11 +0000)]
Revert "Make Lua taps work in out-of-source-tree builds."

Breaks on windows...

This reverts commit 6b11cd97f2153bb015ade6efd05929999de85457.

Change-Id: I1caf5500da993d7988e09fc0758950469f8252cf
Reviewed-on: https://code.wireshark.org/review/3346
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoFix another (valid) complaint from the mac buildbot
Evan Huus [Sat, 2 Aug 2014 02:13:24 +0000 (22:13 -0400)]
Fix another (valid) complaint from the mac buildbot

What mystical new compiler upgrade is this?

Change-Id: I89b3bfb53b9a19bbfb1cc8339d38cdc4a4652c62
Reviewed-on: https://code.wireshark.org/review/3347
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoRename variable to avoid -Wshadow on mac buildbots
Evan Huus [Sat, 2 Aug 2014 01:12:19 +0000 (21:12 -0400)]
Rename variable to avoid -Wshadow on mac buildbots

Change-Id: I13d591248718fcc36cd300bf28f779e2d9e0265a
Reviewed-on: https://code.wireshark.org/review/3339
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoMake the nameres test suite work out of tree by looking for the global hosts
Jeff Morriss [Fri, 1 Aug 2014 19:26:18 +0000 (15:26 -0400)]
Make the nameres test suite work out of tree by looking for the global hosts
file in the build directory (rather than the source directory).

Change-Id: I365e573ee84e9a41aa76f4aa9a4a6efaf42fb60e
Reviewed-on: https://code.wireshark.org/review/3334
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoMake Lua taps work in out-of-source-tree builds.
Jeff Morriss [Fri, 1 Aug 2014 20:14:23 +0000 (16:14 -0400)]
Make Lua taps work in out-of-source-tree builds.

make-taps.pl needs to know where to find the source files otherwise none of
the tap data gets built correctly.

This makes the wslua test suite run in out-of-source-tree builds too.

Change-Id: I059474d90d59e87bd57dba18530a66a927a014cf
Reviewed-on: https://code.wireshark.org/review/3337
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoCompiledFilterOutput dialog fixes and updates.
Gerald Combs [Fri, 1 Aug 2014 23:32:02 +0000 (16:32 -0700)]
CompiledFilterOutput dialog fixes and updates.

Apply a layout to the "Compiled Filter Output" dialog. Render the filter
as monospaced text.

Don't add an "expert OK" icon to the list. It doesn't seem to indicate
any sort of status.

Use a "Close" button instead of "OK". According to

http://uxmovement.com/buttons/why-the-ok-button-is-no-longer-okay/

"OK" implies we're going to perform some sort of action.

Add a "Copy" button while we're here.

Change-Id: Ia63f3032916e322fa9f4f2d465140b128b4f8078
Reviewed-on: https://code.wireshark.org/review/3338
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoFixing indentation with tabs in isis dissector
Matthieu Texier [Fri, 1 Aug 2014 18:59:19 +0000 (20:59 +0200)]
Fixing indentation with tabs in isis dissector

Change-Id: I4f6296f1cb988dca8c94ca5089ff6aa03439da32
Reviewed-on: https://code.wireshark.org/review/3333
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoFix variable-length managment packet dissection
Sean O. Stalley [Thu, 31 Jul 2014 19:23:51 +0000 (12:23 -0700)]
Fix variable-length managment packet dissection

Before, several managment packets were dissected incorrectly as
EPHandleDeleteReq's. Now they are dissected with the generic managment
packet dissector.

Change-Id: Id2f0951b91b99ba2340ff77c6285f382436788ef
Reviewed-on: https://code.wireshark.org/review/3328
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoFix comparison.
Gerald Combs [Fri, 1 Aug 2014 19:29:12 +0000 (12:29 -0700)]
Fix comparison.

Change-Id: If2af35c8a49f405bee70eb144e26e539a7dc61f2
Reviewed-on: https://code.wireshark.org/review/3335
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoRemove the old wireshark binary during RPM upgrades.
Jeff Morriss [Fri, 1 Aug 2014 18:51:53 +0000 (14:51 -0400)]
Remove the old wireshark binary during RPM upgrades.

If we have a pre-alternatives wireshark binary out there (e.g., because
we're upgrading from wireshark-1.10 to wireshark-1.12), get rid of it
in the %pre script.  Otherwise the binary gets left there (because it's
listed as a %ghost in the new spec file).

Change-Id: I5828fcff486af3d269bad8dfe544c7659179bf5e
Reviewed-on: https://code.wireshark.org/review/3332
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
9 years agoFix the CMake WinPcap library path check.
Gerald Combs [Fri, 1 Aug 2014 18:25:08 +0000 (11:25 -0700)]
Fix the CMake WinPcap library path check.

Look for wpcap.lib in WpdPack/Lib/x64 when our target platform is Win64.

Change-Id: I9a1bac22106bcb6a1f155ce83c02e344e6ec0d55
Reviewed-on: https://code.wireshark.org/review/3331
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoFix Dead Store (Dead assignement/Dead increment) warning found by Clang
Alexis La Goutte [Fri, 1 Aug 2014 15:09:07 +0000 (17:09 +0200)]
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang

Change-Id: I847c7217b520a5f7ec581e6170fe3dc77c628e96
Reviewed-on: https://code.wireshark.org/review/3322
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoUpdate to match the current Windows Buildbot environment.
Gerald Combs [Fri, 1 Aug 2014 17:23:49 +0000 (10:23 -0700)]
Update to match the current Windows Buildbot environment.

Update some OS X information as well.

Change-Id: I9a252ec83712848696dbb531e6da15b3c7644591
Reviewed-on: https://code.wireshark.org/review/3327
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoAdd the easy_codec plugin to the source distribution.
Jeff Morriss [Fri, 1 Aug 2014 16:15:47 +0000 (12:15 -0400)]
Add the easy_codec plugin to the source distribution.

It doesn't build on Linux but cmake looks for it (won't build without it) and
Windows users might want it.

Change-Id: I978f0de0a2895a82f4f3b8c1e9e0ecec6a93e6f4
Reviewed-on: https://code.wireshark.org/review/3325
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
9 years agocmake: forget about plugins/asn1: it's not used any more.
Jeff Morriss [Fri, 1 Aug 2014 15:26:12 +0000 (11:26 -0400)]
cmake: forget about plugins/asn1: it's not used any more.

(Don't load plugins/asn1/plugin.rc.in)

Change-Id: I621552a7e915396f61c5bb450a99d4e575ac30df
Reviewed-on: https://code.wireshark.org/review/3324
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
9 years agoAdd doxygen_global.cfg to the source distribution.
Jeff Morriss [Fri, 1 Aug 2014 15:13:13 +0000 (11:13 -0400)]
Add doxygen_global.cfg to the source distribution.

Change-Id: Ifc552ac74b84bce2a695189794440c905bf140a5
Reviewed-on: https://code.wireshark.org/review/3323
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
9 years agotcp: detect invalid window scale shift value
Peter Wu [Fri, 1 Aug 2014 12:32:33 +0000 (14:32 +0200)]
tcp: detect invalid window scale shift value

According to RFC 1323, the window scale shift value must not exceed 14.
Detect this and cap at 14 to prevent undefined behavior (shifting by a
too large value).

Caught by `clang -fsanitize=undefined`.

Change-Id: I1acad252b86c7f23e497575b48d9496346327e00
Reviewed-on: https://code.wireshark.org/review/3312
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoAdd wireshark.pc.in to the source distribution (needed for cmake).
Jeff Morriss [Fri, 1 Aug 2014 14:08:38 +0000 (10:08 -0400)]
Add wireshark.pc.in to the source distribution (needed for cmake).

Bug: 10331
Change-Id: I81e0d224917cd4b38215e28ec146cd80efdb99d2
Reviewed-on: https://code.wireshark.org/review/3316
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
9 years agoUse packet_scope instead of a stack local
Evan Huus [Thu, 31 Jul 2014 17:18:21 +0000 (13:18 -0400)]
Use packet_scope instead of a stack local

As clang pointed out we end up storing a reference to it in a global and (more
relevantly) pushing that global to a tap which would run after the current frame
has returned.

Thanks to Alexis for bringing this to my attention.

Change-Id: I3aac43a806d217b0dc8a973f6bb2fa48cdd041bb
Reviewed-on: https://code.wireshark.org/review/3289
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoIgnore RPM output directories.
Jeff Morriss [Thu, 31 Jul 2014 21:26:04 +0000 (17:26 -0400)]
Ignore RPM output directories.

Change-Id: I35cda66d512448317f3c7d6ed922f9dca2893690
Reviewed-on: https://code.wireshark.org/review/3304
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoMove the AirPcap stuff into caputils.
Guy Harris [Fri, 1 Aug 2014 00:29:36 +0000 (17:29 -0700)]
Move the AirPcap stuff into caputils.

Change-Id: I64b45dad36a3ec491aeb9de3439b4fe19b46f9d8
Reviewed-on: https://code.wireshark.org/review/3308
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoCopy over autofoo change: No more .h file.
Joerg Mayer [Thu, 31 Jul 2014 21:53:41 +0000 (23:53 +0200)]
Copy over autofoo change: No more .h file.

Change-Id: I283ffccd0b3e1f10a9fbf85e033c5e07cd426bbe
Reviewed-on: https://code.wireshark.org/review/3305
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
9 years agoDistinguish between wireshark *source files* and wireshark *dependencies*.
Guy Harris [Thu, 31 Jul 2014 21:17:07 +0000 (14:17 -0700)]
Distinguish between wireshark *source files* and wireshark *dependencies*.

Only the former should be run through checkAPI.pl; Windows .rc files,
for example, shouldn't.

Change-Id: I948705b4020b413834c37a0d685eedcb747aa237
Reviewed-on: https://code.wireshark.org/review/3303
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoLua - it's not just for breakfast^Wdissectors any more!
Guy Harris [Thu, 31 Jul 2014 21:00:33 +0000 (14:00 -0700)]
Lua - it's not just for breakfast^Wdissectors any more!

Change-Id: I7cefdec10a2fdd47f8a50ab5a45002662cc14f3c
Reviewed-on: https://code.wireshark.org/review/3302
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agosync and behaviour are defined only for isochronous endpoints
Martin Kaiser [Thu, 31 Jul 2014 08:08:29 +0000 (10:08 +0200)]
sync and behaviour are defined only for isochronous endpoints

Change-Id: Ic7755a7756589167b4fea5cf42a21419f59ecdae
Reviewed-on: https://code.wireshark.org/review/3301
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agodefines for endpoint transfer types
Martin Kaiser [Thu, 31 Jul 2014 08:00:26 +0000 (10:00 +0200)]
defines for endpoint transfer types

Change-Id: Iffd5d81dde15eba12511dc89664d7ea06a70436f
Reviewed-on: https://code.wireshark.org/review/3300
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agothis is the _URB_ transfer type - which is different from the
Martin Kaiser [Thu, 31 Jul 2014 07:59:29 +0000 (09:59 +0200)]
this is the _URB_ transfer type - which is different from the
transfer type in the endpoint descriptor

Change-Id: I9e23d9825efb30311cd3e04d01548c03b163c276
Reviewed-on: https://code.wireshark.org/review/3299
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agoAdd some information on running from the build directory.
Guy Harris [Thu, 31 Jul 2014 20:55:56 +0000 (13:55 -0700)]
Add some information on running from the build directory.

Change-Id: I6c01141cd02af358152d007175ec0b51357e42b3
Reviewed-on: https://code.wireshark.org/review/3298
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoNeed to make Windows installer packages as well.
Guy Harris [Thu, 31 Jul 2014 18:38:48 +0000 (11:38 -0700)]
Need to make Windows installer packages as well.

Change-Id: I5e5483ead229ff74fb7bacba72459e324f9bd510
Reviewed-on: https://code.wireshark.org/review/3294
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoWe need to support building against an SDK on OS X.
Guy Harris [Thu, 31 Jul 2014 18:37:28 +0000 (11:37 -0700)]
We need to support building against an SDK on OS X.

Change-Id: I1fe9390e450dcb3669653a94d95339bce3182799
Reviewed-on: https://code.wireshark.org/review/3293
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoInclude OS X installer dmgs as a package type we need to support.
Guy Harris [Thu, 31 Jul 2014 18:30:28 +0000 (11:30 -0700)]
Include OS X installer dmgs as a package type we need to support.

Change-Id: I419fa4889d1fc2a9fd12ec19385543bd085e6b1e
Reviewed-on: https://code.wireshark.org/review/3292
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoproto_add_subtree_format(): initialize tree_item to 'tree' rather than NULL.
Jeff Morriss [Wed, 30 Jul 2014 20:16:27 +0000 (16:16 -0400)]
proto_add_subtree_format(): initialize tree_item to 'tree' rather than NULL.

... As would be the case if proto_tree_add_text() + proto_item_add_subtree()
were used.  (This initialization value is only used when TRY_TO_FAKE_THIS_ITEM()
shortcuts us out.)

As reported/discussed on -dev:

https://www.wireshark.org/lists/wireshark-dev/201407/msg00031.html

Change-Id: I4af63e3cf0a70607d58b4641597b2ce7907fbb8b
Reviewed-on: https://code.wireshark.org/review/3271
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agocmake also needs to learn to build SVR4 packages.
Jeff Morriss [Thu, 31 Jul 2014 13:20:03 +0000 (09:20 -0400)]
cmake also needs to learn to build SVR4 packages.

Change-Id: I030e84b9247b273b01890a47d92109dd603e3247
Reviewed-on: https://code.wireshark.org/review/3288
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
9 years agossl: fix SSL keylog file live-capture use case
Peter Wu [Fri, 25 Jul 2014 11:19:14 +0000 (13:19 +0200)]
ssl: fix SSL keylog file live-capture use case

Patch "ssl,dtls: simplify keyfile handling" did not account for the use
case where packets are captured and decrypted on the fly using
SSLKEYLOGFILE.

This patch restores that functionality by reading additional lines from
the keylog file when needed (to preserve the benefit of not having to
read the full file) and by watching the open file for deletions.

"Deletion" is detected by comparing st_dev and st_ino. Since these may
be useless on Windows, the size is also checked.

Change-Id: Ieadaef1426a9270587293db28f4dda33b3d17334
Reviewed-on: https://code.wireshark.org/review/3190
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agossl,dtls: simplify keyfile handling
Peter Wu [Sat, 19 Jul 2014 09:06:25 +0000 (11:06 +0200)]
ssl,dtls: simplify keyfile handling

Previously, the keylog file would be fully parsed when an encrypted
pre-master secret is encountered or in the ChangeCipherSpec stage. There
was also a lot of duplication in the key logfile parsing.

This patch simplifies the key logfile parsing by using regular
expressions. Rather than scanning the key logfile for a specific key,
do this scan once at ssl init and save the results to a hashtable. The
map for session ID/tickets to master keys already existed, another one
for client random to master key and encrypted pre-master to pre-master
was added. This could later also be wired to the "Export SSL Keys"
menu item for improved reliability (when no session ID or tickets are
available, the client random could be used).

The ssl_{save,restore}_session{,_ticket} functions have been converted
to a single function that looks up a key (sid / client random / encr.
pre-master) to a (pre-)master secret.

Other minor changes: return booleans for some functions that can only
fail/pass. Remove some functions from the ssl-utils header that have
become private a few commits ago. Remove some outstanding issues
from the comments in packet-ssl as they are already done, add myself
to the ssl-utils header.

These changes pass the test suite and the sample Session Ticket-enabled
capture from https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5963

On-the-fly decryption are broken with this patch since keylog files are
read once at the start of a capture. This will be solved in a future
patch.

Change-Id: Idb343abe161950b5f3ff61bee093d0f4ef9655bd
Reviewed-on: https://code.wireshark.org/review/3057
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoConvert hf_packetbb_error filter (packetbb.error) to expert info.
Michael Mann [Thu, 31 Jul 2014 03:31:13 +0000 (23:31 -0400)]
Convert hf_packetbb_error filter (packetbb.error) to expert info.

Also make dissector "new style" using it's already built in basic heuristics.

Change-Id: I8b9b02d1f32cec96a1104c99647795d6fbda4804
Reviewed-on: https://code.wireshark.org/review/3275
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoMissing end-of-line backslash.
Guy Harris [Thu, 31 Jul 2014 08:56:51 +0000 (01:56 -0700)]
Missing end-of-line backslash.

Change-Id: I99b72e4d38b12e0356f27d29f919484e40b7443b
Reviewed-on: https://code.wireshark.org/review/3287
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAdd more files to the release tarball.
Guy Harris [Thu, 31 Jul 2014 08:55:22 +0000 (01:55 -0700)]
Add more files to the release tarball.

Change-Id: I02ce275154979ff56f8f8929e5909f3035f62c47
Reviewed-on: https://code.wireshark.org/review/3286
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoInclude the gnm dissector.
Guy Harris [Thu, 31 Jul 2014 08:26:50 +0000 (01:26 -0700)]
Include the gnm dissector.

Change-Id: Icc6090cdc8a6321677aaa82df7dd2bb408166c91
Reviewed-on: https://code.wireshark.org/review/3285
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoNobody uses packet-t125.h, so don't bother building it, and delete it.
Guy Harris [Thu, 31 Jul 2014 07:52:05 +0000 (00:52 -0700)]
Nobody uses packet-t125.h, so don't bother building it, and delete it.

Change-Id: I10f8889a64024114106cd8058525cb21c6078279
Reviewed-on: https://code.wireshark.org/review/3284
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAdd a bunch of missing files to the distribution.
Guy Harris [Thu, 31 Jul 2014 07:41:08 +0000 (00:41 -0700)]
Add a bunch of missing files to the distribution.

Files from the debian directory, documents from the doc directory,
graphics from the docbook/wsug_graphics directory, and the echld
Makefile.nmake.

Change-Id: Iccccc58811753581b0b180053defd937aea22f95
Reviewed-on: https://code.wireshark.org/review/3283
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAdd a missed -template.h file
Joerg Mayer [Thu, 31 Jul 2014 05:55:36 +0000 (07:55 +0200)]
Add a missed -template.h file

Change-Id: I83f4680b3b258daf0fdad9f896be5f854b8dc3de
Reviewed-on: https://code.wireshark.org/review/3282
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
9 years agoAdd some missing CMake files to the distribution.
Guy Harris [Thu, 31 Jul 2014 04:45:19 +0000 (21:45 -0700)]
Add some missing CMake files to the distribution.

Change-Id: I67ca59bb77766f4625e64b9042cdcb5d03cd7994
Reviewed-on: https://code.wireshark.org/review/3281
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoaddr_resolution_dlg.c: "OK" button should *do* something: treat as cxl.
Bill Meier [Thu, 31 Jul 2014 04:35:06 +0000 (00:35 -0400)]
addr_resolution_dlg.c: "OK" button should *do* something: treat as cxl.

   Also: remove vestigial line of commented-out code.

Change-Id: Ieb41a0e39a4e0ec14031b1dbd38fc0d7ad47a635
Reviewed-on: https://code.wireshark.org/review/3278
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agoaddr_resolution_dlg.c: Fix crash when 'Statistics ! Show address resolution' is invoked.
Bill Meier [Thu, 31 Jul 2014 04:06:37 +0000 (00:06 -0400)]
addr_resolution_dlg.c: Fix crash when 'Statistics ! Show address resolution' is invoked.

(Introduced when the ipv4_hash_table key format was changed in 5d98ab67)

Change-Id: Ie5d1314f7c7cc8bc71dca8a2db05e34a0a7776d7
Reviewed-on: https://code.wireshark.org/review/3277
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agoAdd more files to the distribution.
Guy Harris [Thu, 31 Jul 2014 04:30:41 +0000 (21:30 -0700)]
Add more files to the distribution.

If it's checked into asn1 or a subdirectory thereof, put it into the
distribution.  (If it's not useful, why is it in Git?)

Change-Id: I4dac8a0d19a770db1513729cf71069a37f1d83fc
Reviewed-on: https://code.wireshark.org/review/3276
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAdd some files under asn1 to the distribution.
Guy Harris [Wed, 30 Jul 2014 23:41:51 +0000 (16:41 -0700)]
Add some files under asn1 to the distribution.

Include CMakeLists.txt files and the gnm subdirectory, along with the
top-level Makefile.inc and Makefile.preinc files.  Don't explicitly
include Custom.make, as automake does that automatically given that it's
included by asn1/Makefile.am.

Add some files to EXTRA_DIST lists.

Move some .asn files to EXTRA_DIST; they don't need to be in SRC_FILES,
as SRC_FILES always includes EXTRA_DIST, and they *do* need to be in
EXTRA_DIST so that they're in the distribution.

Change-Id: Id91df577260fa57028d40fe098be1d79c59398e6
Reviewed-on: https://code.wireshark.org/review/3273
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoAdd libgpg-error6-0 to the GCRYPT_ERROR_LIBRARY search list.
Gerald Combs [Wed, 30 Jul 2014 23:03:27 +0000 (16:03 -0700)]
Add libgpg-error6-0 to the GCRYPT_ERROR_LIBRARY search list.

(Does FIND_LIBRARY support wildcards?)

Change-Id: I240e93070091e445446478b082ad284267c977a6
Reviewed-on: https://code.wireshark.org/review/3272
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoFix dist.
Gerald Combs [Wed, 30 Jul 2014 18:20:39 +0000 (11:20 -0700)]
Fix dist.

Add ui/cli/tshark-tap.h and packaging/nsis/windeployqt-to-nsis.ps1.

Change-Id: I00465aed3f33595ad50be0ba5d0ed0eae54e1137
Reviewed-on: https://code.wireshark.org/review/3268
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoInstall our Qt DLL directories recursively.
Gerald Combs [Wed, 30 Jul 2014 16:33:43 +0000 (09:33 -0700)]
Install our Qt DLL directories recursively.

Qwindows.dll at least needs to be in the "platforms" subdirectory. Use a
PowerShell script to convert the output of windeployqt to its equivalent
NSIS instructions. Give the Qt DLL manifest a .nsh extension. Make sure
we uninstall known Qt DLL directories. DLLs now load correctly according
to Dependency Walker.

Install and uninstall our .qm files while we're here.

Change-Id: I06ed279809e6fce0e008c5f278a56b1ae34c8f21
Reviewed-on: https://code.wireshark.org/review/3267
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoFix the build: add a few more G_GINT64_MODIFIER's when printing 64-bit numbers.
Jeff Morriss [Wed, 30 Jul 2014 17:03:08 +0000 (13:03 -0400)]
Fix the build: add a few more G_GINT64_MODIFIER's when printing 64-bit numbers.

Also use %u instead of %d for these unsigned numbers.

Change-Id: I3d1df3bdcc3c68193b49ba8daf1dc56171356290
Reviewed-on: https://code.wireshark.org/review/3266
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
9 years agoRemove empty variable SHARK_COMMON_CAPTURE_SRC. It's not present
Joerg Mayer [Wed, 30 Jul 2014 16:37:36 +0000 (18:37 +0200)]
Remove empty variable SHARK_COMMON_CAPTURE_SRC. It's not present
for the other build systems as well.
Small whitespace fix.

Change-Id: I071ee4ae0fa85306435d2d82d36265973181b71c
Reviewed-on: https://code.wireshark.org/review/3263
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
9 years agofix encodingmask of DiagnosticInfo
Hannes Mezger [Wed, 30 Jul 2014 10:34:58 +0000 (12:34 +0200)]
fix encodingmask of DiagnosticInfo

In 2008, before the OpcUa specification was released, the EncodingMask was changed to include the Locale after the LocalizedText. This commit applies the changes necessary to display DiagnosticInfo correctly.

Change-Id: Iad35ff0557eac62a259a63505ebce3e637095136
Reviewed-on: https://code.wireshark.org/review/3259
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoFix use of uninitialized field
Peter Wu [Wed, 30 Jul 2014 13:07:24 +0000 (15:07 +0200)]
Fix use of uninitialized field

ssl_print_string uses out->data_len to determine the length of the
printed data, but this was not set. Use ssl_data_set for that and add an
additional DISSECTOR_ASSERT just in case we change something here.

Reported by Alexis La Goutte, found by Clang static analyzer.

Change-Id: I630a9193ff1ece86a0a46924dd86591fedf5c595
Reviewed-on: https://code.wireshark.org/review/3261
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoApply refactored "conversation" (tap) data to TShark.
Michael Mann [Sat, 26 Jul 2014 16:41:27 +0000 (12:41 -0400)]
Apply refactored "conversation" (tap) data to TShark.

I intentionally left the fields displayed alone (so they don't exactly match Wireshark GUI), because as Guy points out in bug 6310, not sure its A Bug or A Feature.  But at least all types of conversations allowed are in sync with Wireshark GUI.

Bug:6310
Change-Id: I722837df510a39dadc1f9a07a99275509516698c
Reviewed-on: https://code.wireshark.org/review/3212
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoFix cmake build for portaudio V18
Peter Wu [Tue, 29 Jul 2014 10:52:12 +0000 (12:52 +0200)]
Fix cmake build for portaudio V18

Note that the cache file (CMakeCache.txt) must be cleared when the
include or library paths change, otherwise the cached result of
CHECK_FUNCTION_EXISTS will be re-used.

Change-Id: Ia18ed4f1b6b162499aeae6e66f612a4945390c2a
Reviewed-on: https://code.wireshark.org/review/3245
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
9 years agoConvert tvb_get_ptr buffer access macros to use much safer tvb access macros.
Michael Mann [Wed, 30 Jul 2014 13:58:53 +0000 (09:58 -0400)]
Convert tvb_get_ptr buffer access macros to use much safer tvb access macros.

Added a few filterable fields in the process of trying to figure out the macros.  Much more can be done to add many more filterable fields (and remove proto_tree_add_text calls hidden in the macros), but that'll be done some other time.

bug:10281
Change-Id: I9788f176c0e721ff4f243d4ecb79d7d0114fffc0
Reviewed-on: https://code.wireshark.org/review/3262
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoGED125: remove a wrong comment regarding the default TCP port
Pascal Quantin [Wed, 30 Jul 2014 08:44:45 +0000 (10:44 +0200)]
GED125: remove a wrong comment regarding the default TCP port

Change-Id: I53aa2053c65280385e13da875979ed09b37fb725
Reviewed-on: https://code.wireshark.org/review/3258
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoFix up some white space.
Jeff Morriss [Wed, 30 Jul 2014 02:46:32 +0000 (22:46 -0400)]
Fix up some white space.

Change-Id: Ie8f1006d6b3a27fe0c8187ce99051c09dea09b66
(cherry picked from commit a3a5c33dad8669e37502f2ce4d0687f7ff7e87a1)
Reviewed-on: https://code.wireshark.org/review/3257
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
9 years agoThe Visual C++ 2013 redistributable uses /quiet instead of /q.
Gerald Combs [Wed, 30 Jul 2014 01:45:47 +0000 (18:45 -0700)]
The Visual C++ 2013 redistributable uses /quiet instead of /q.

Change-Id: I130b1af814b843638498feaecacc7092bacd3b72
Reviewed-on: https://code.wireshark.org/review/3255
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoDont force qt-dll-manifest.txt.
Gerald Combs [Wed, 30 Jul 2014 00:24:14 +0000 (17:24 -0700)]
Dont force qt-dll-manifest.txt.

Change-Id: I06781f9b0b89561a96b00c27f938005ebf5b915f
Reviewed-on: https://code.wireshark.org/review/3254
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agoUse windeployqt with NSIS.
Gerald Combs [Tue, 29 Jul 2014 22:51:57 +0000 (15:51 -0700)]
Use windeployqt with NSIS.

If we find windeployqt, use it to create a DLL manifest for NSIS.
Fall back to the previous manual lists if we don't. This assumes that
your copy of windeployqt works.

New bug: The Windows installer is huge when using the official Digia DLLs
(around 43 MB for the win 64 package).

Change-Id: I1f662381b7a2c5474595b05177dbdfd3138c7e60
Reviewed-on: https://code.wireshark.org/review/3253
Reviewed-by: Gerald Combs <gerald@wireshark.org>
9 years agodon't add nonprinting \000 characters to tftp option strings
Martin Kaiser [Tue, 29 Jul 2014 20:14:53 +0000 (22:14 +0200)]
don't add nonprinting \000 characters to tftp option strings

Change-Id: I81e43fac5176fdd0805001636991efb7f588a3c0
Reviewed-on: https://code.wireshark.org/review/3252
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agoremove unnecessary return; statement
Martin Kaiser [Tue, 29 Jul 2014 16:23:48 +0000 (18:23 +0200)]
remove unnecessary return; statement

Change-Id: Icefbaf632e888e84bcb2cc20ae3a6c4744b82fae
Reviewed-on: https://code.wireshark.org/review/3251
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
9 years ago(trivial) modify, indent a comment
Martin Kaiser [Mon, 28 Jul 2014 07:54:11 +0000 (09:54 +0200)]
(trivial) modify, indent a comment

Change-Id: I64bb64787c83ffe712ffd348cceb5449690dd6d0
Reviewed-on: https://code.wireshark.org/review/3247
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agoFix Argument with 'nonnull' attribute passed null found by Clang
Alexis La Goutte [Tue, 29 Jul 2014 12:15:01 +0000 (14:15 +0200)]
Fix Argument with 'nonnull' attribute passed null found by Clang

Change-Id: I719d8adeb4bc6dbd1e34fe56f7cf68e4c6286dc9
Reviewed-on: https://code.wireshark.org/review/3246
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoEnsure that QT5_BASE_DIR is known by QtShark.pro
Pascal Quantin [Sun, 27 Jul 2014 20:10:23 +0000 (22:10 +0200)]
Ensure that QT5_BASE_DIR is known by QtShark.pro

Otherwise the call to winqtdeploy will fail if it is not already in the PATH

Change-Id: I74db604a6fd45204bda8d6ac9d9c98c0c12598ec
Reviewed-on: https://code.wireshark.org/review/3218
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>

9 years agoRemove duplicated entry for AVP 258 Auth-Application-Id from HP.xml
AndersBroman [Tue, 29 Jul 2014 09:28:22 +0000 (11:28 +0200)]
Remove duplicated entry for AVP 258 Auth-Application-Id from HP.xml
it was overiding the correct one from dictionary.xml

Change-Id: Ic6073a550a15f56584e214eec8bd79057673c25c
Reviewed-on: https://code.wireshark.org/review/3244
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoRemove unused variable
Evan Huus [Tue, 29 Jul 2014 01:55:37 +0000 (21:55 -0400)]
Remove unused variable

Change-Id: I590d4c2d79ee44309cd512057c7eae6df15913e9
Reviewed-on: https://code.wireshark.org/review/3240
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoFix heap-use-after-free via setlocale
Peter Wu [Mon, 28 Jul 2014 22:04:00 +0000 (00:04 +0200)]
Fix heap-use-after-free via setlocale

setlocale returns a statically-allocated memory which can be modified by
subsequent calls of setlocale. This triggers a heap-use-after free in
ASAN when the setlocale function is called again with the previous
pointer.

This was found when trying to use the "Show All Streams" option via
the Telephony -> RTP menu.

While at it, add some modelines

Change-Id: Ide47e877ce828734fd8c5c1b064d9c505ba2b37a
Reviewed-on: https://code.wireshark.org/review/3234
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoAdd a couple more dissector authors.
Jeff Morriss [Tue, 29 Jul 2014 01:46:28 +0000 (21:46 -0400)]
Add a couple more dissector authors.

Change-Id: Ib606efbcaf38803d98d3e755386eab3c4d35fdf7
Reviewed-on: https://code.wireshark.org/review/3238
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoDocument some new features (and API changes) since 1.12.0.
Jeff Morriss [Tue, 29 Jul 2014 00:04:28 +0000 (20:04 -0400)]
Document some new features (and API changes) since 1.12.0.

Change-Id: I404f038a739ca41cb124a979fe6cf807a0b7e978
Reviewed-on: https://code.wireshark.org/review/3235
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoEPL: Fix for Write Multiple by index
Lukas Emersberger [Mon, 28 Jul 2014 08:04:33 +0000 (10:04 +0200)]
EPL: Fix for Write Multiple by index

 Write multiple by index now correctly resolves OD names.

Change-Id: I4d2aad584a47e3682716b95bdda0bc49c3a29d96
Signed-off-by: Lukas Emersberger <lukas.emersberger@gmail.com>
Reviewed-on: https://code.wireshark.org/review/3223
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Lukas Emersberger <lukas.emersberger@br-automation.co.at>
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoBug 10302 - BGP attribute AIGP (draft-ietf-idr-aigp) not decoded - Fix
Matthieu Texier [Mon, 28 Jul 2014 13:18:56 +0000 (15:18 +0200)]
Bug 10302 - BGP attribute AIGP (draft-ietf-idr-aigp) not decoded - Fix

Change-Id: Ib8b3c5666932777218e33b74cca33b791c883fc9
Reviewed-on: https://code.wireshark.org/review/3226
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoFix possible uninitialized session key in netlogin auth
Evan Huus [Tue, 29 Jul 2014 01:41:59 +0000 (21:41 -0400)]
Fix possible uninitialized session key in netlogin auth

Bug:10312
Change-Id: Ia2be812e81b54d6df5a928312cca86ecd95aa6b2
Reviewed-on: https://code.wireshark.org/review/3236
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoBluetooth: Fix OBEX over L2CAP detection
Michal Labedzki [Mon, 28 Jul 2014 11:53:11 +0000 (13:53 +0200)]
Bluetooth: Fix OBEX over L2CAP detection

There are two cases:
1. btl2cap -> btrfcomm -> btobex
2. btl2cap -> btobex

Case 2 is rare, so according to its name and to avoid confusion
I based on it.

Bug:10316
Change-Id: Ibeabeaf2f8376425460c56bad8fb980b460dd940
Reviewed-on: https://code.wireshark.org/review/3225
Reviewed-by: Evan Huus <eapache@gmail.com>
9 years agoadd 恵 to the AUTHORS file
Martin Kaiser [Mon, 28 Jul 2014 21:11:28 +0000 (23:11 +0200)]
add 恵 to the AUTHORS file

Change-Id: Iebddc7be48d6e6aeb3a8620e0cb902fb4d6206b2
Reviewed-on: https://code.wireshark.org/review/3233
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
9 years agoFrom 竹下 恵 (Megumi Takeshita)
Martin Kaiser [Mon, 28 Jul 2014 21:03:58 +0000 (23:03 +0200)]
From 竹下 恵 (Megumi Takeshita)
update the japanese translation for the Qt user interface

Change-Id: Ib4a0f6fc1d58cd71310703950c0f1e646b1d74ad
Reviewed-on: https://code.wireshark.org/review/3232
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
9 years ago(Trivial) config.nmake: fix a spelling error and add some punctuation.
Bill Meier [Mon, 28 Jul 2014 18:37:27 +0000 (14:37 -0400)]
(Trivial) config.nmake: fix a spelling error and add some punctuation.

Change-Id: I326dbae8fe1d3593de00c9e78a124c1221b7314b
Reviewed-on: https://code.wireshark.org/review/3231
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agoFix download of 3rd party packages when WIRESHARK_TARGET_PLATFORM environment variabl...
Pascal Quantin [Sat, 26 Jul 2014 13:11:04 +0000 (15:11 +0200)]
Fix download of 3rd party packages when WIRESHARK_TARGET_PLATFORM environment variable is not explicitly set

Bug: 10317
Change-Id: Ic7b4ffe2bbe4f69928b91a5151d8cef1ae59f723
Reviewed-on: https://code.wireshark.org/review/3203
Reviewed-by: Bill Meier <wmeier@newsguy.com>
9 years agoUse wmem for application Ids
AndersBroman [Mon, 28 Jul 2014 18:18:49 +0000 (20:18 +0200)]
Use wmem for application Ids
Remove soft deprecated APIs

Change-Id: Iecd2f552c1abb7bb2c6969073b3c245af22f4fcd
Reviewed-on: https://code.wireshark.org/review/3230
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoconfig.nmake: Do some minor changes (mostly in comments).
Bill Meier [Mon, 28 Jul 2014 15:50:49 +0000 (11:50 -0400)]
config.nmake: Do some minor changes (mostly in comments).

- Update comment: /O2 enables /Gs which is "Control Stack Checking Calls" not "Buffer Security Check"
- Remove explicit setting of /GS (Buffer Security Check) since it's set by default.
  (The explicit setting did not apply to the CFLAGS used to compile Wireshark
   files because the setting was in the wrong place, but, fortunately, /GS is on
   by default.
- Add a comment about /GS being on by default.
- Remove some trailing whitespace.

Change-Id: I6cf631ee1ba0fb8556171861c7e5eb6d959c8f0c
Reviewed-on: https://code.wireshark.org/review/3228
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoSort diameter.applicationId fix a typo.
AndersBroman [Mon, 28 Jul 2014 17:35:02 +0000 (19:35 +0200)]
Sort diameter.applicationId fix a typo.

Change-Id: Id585371df929cdff17f98dddbebf063fa000ff56
Reviewed-on: https://code.wireshark.org/review/3229
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoAdd a few mor application Ids
AndersBroman [Sun, 27 Jul 2014 22:25:42 +0000 (00:25 +0200)]
Add a few mor application Ids

Change-Id: I98d9735e2b54818a23c9a6e4086692d76f0713d5
Reviewed-on: https://code.wireshark.org/review/3227
Reviewed-by: Anders Broman <a.broman58@gmail.com>
9 years agoDownload the right User Guide...
Pascal Quantin [Mon, 28 Jul 2014 11:52:14 +0000 (13:52 +0200)]
Download the right User Guide...

Change-Id: Icf1f9bd48f0624226c55a622b7b8f774d103e5ae
Reviewed-on: https://code.wireshark.org/review/3224
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoFix MSVC2013 Lua package (previous one was linked against MSVC2012)
Pascal Quantin [Mon, 28 Jul 2014 05:12:14 +0000 (07:12 +0200)]
Fix MSVC2013 Lua package (previous one was linked against MSVC2012)

Change-Id: I632eea7250e7e60482f62d9ea62ac407fc6506d1
Reviewed-on: https://code.wireshark.org/review/3222
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoMake value_string_ext const-correct.
Kevin Cox [Fri, 25 Jul 2014 16:29:04 +0000 (12:29 -0400)]
Make value_string_ext const-correct.

There is still some const-incorrect usage of them but those can be ironed
out after this change has been made.

Change-Id: Iba0631c804bdab34d7c0232b49967130e3370488
Reviewed-on: https://code.wireshark.org/review/3199
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
9 years agoAdd PortableApps temporary files to .gitignore
Pascal Quantin [Sun, 27 Jul 2014 21:19:08 +0000 (23:19 +0200)]
Add PortableApps temporary files to .gitignore

Change-Id: Ie76d2c5cc167a4d63f6c83b64cdf6d1ebb07afa9
Reviewed-on: https://code.wireshark.org/review/3221
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
9 years agoDon't fail if unmounting the CMake disk image fails.
Guy Harris [Sun, 27 Jul 2014 20:30:44 +0000 (13:30 -0700)]
Don't fail if unmounting the CMake disk image fails.

I don't know why, but sometimes it fails - the most recent failure was
due to it having already been unmounted!  Maybe the CMake installer
unmounts it some times but not others.  Just drive on if it fails.

Change-Id: I1b31356f08695b8d3b9e425f8475a422e1da0783
Reviewed-on: https://code.wireshark.org/review/3220
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoRemove printing done for debugging/test purposes.
Guy Harris [Sun, 27 Jul 2014 20:13:43 +0000 (13:13 -0700)]
Remove printing done for debugging/test purposes.

Change-Id: Id6cdb34890c0f1d6c9e64d290ce72ca68183220e
Reviewed-on: https://code.wireshark.org/review/3219
Reviewed-by: Guy Harris <guy@alum.mit.edu>
9 years agoFix the path to the "fix one .pc file" script.
Guy Harris [Sun, 27 Jul 2014 20:12:30 +0000 (13:12 -0700)]
Fix the path to the "fix one .pc file" script.

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