Commit Graph

57805 Commits

Author SHA1 Message Date
Evan Huus b3caf8917c wimax: replace deprecated tvb_length calls
Change-Id: I9db1051e065762b826973ecbc2dba460a7f89013
Reviewed-on: https://code.wireshark.org/review/8123
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-20 06:38:00 +00:00
Evan Huus 8844fbc4f6 replace some deprecated tvb_length calls
Change-Id: I18152e75aec2eedccad4d393c1b4b493cd7b406d
Reviewed-on: https://code.wireshark.org/review/8125
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-20 06:36:38 +00:00
Guy Harris d47373f278 Make sure we handle Booleans even with the upper 32 bits set.
Just pass 1 or 0 to proto_tree_add_boolean() depending on whether the
64-bit value is non-zero or zero.

Change-Id: I5b55c9aff4e559fb8e62bd96ae2b0b34e45189fa
Reviewed-on: https://code.wireshark.org/review/8129
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-20 01:52:28 +00:00
Guy Harris 1edbd5a875 Don't use proto_tree_add_uint() to add FT_BOOLEAN values.
In proto_item_add_bitmask_tree(), if use_value is true, base the routine
we use to add the item to the tree on the type of the field being added.

Also, use DISSECTOR_ASSERT_NOT_REACHED(), not g_assert_not_reached(), to
catch types that aren't integral or Boolean.

Change-Id: I6ff9867bddcae16ddf8b689b48fdc93c6f949105
Reviewed-on: https://code.wireshark.org/review/8127
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-19 21:27:20 +00:00
Guy Harris 9194aab0ab Use 64-bit fixed point to calculate time stamps.
Change-Id: I77c470937366dbaf50adbf174569ef0676ae3658
Reviewed-on: https://code.wireshark.org/review/8126
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-19 21:10:39 +00:00
Julien STAUB 76a0edc741 zbee: add support to ZigBee power configuration cluster
Implemented full power configuration cluster according to
07-5123-04 ZigBee cluster library

Change-Id: Ic9cb9894c2153ce53e2a2762967dbdc6a4a060c2
Reviewed-on: https://code.wireshark.org/review/8032
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Julien STAUB <atsju2@yahoo.fr>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-19 19:34:53 +00:00
Peng Li 2bc5b3a8bb rtcp.psfb.fmt DissectorTable does not work in Lua plugin
Change-Id: I4e26ee5e4d9c1556d62ce01720e40848047c23e0
Reviewed-on: https://code.wireshark.org/review/8119
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-19 17:40:52 +00:00
Gerald Combs daafb9d700 [Automatic update for 2015-04-19]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: Id9886f878c4d7422b779f1361fd9f7fcfb315982
Reviewed-on: https://code.wireshark.org/review/8120
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-19 15:08:02 +00:00
Martin Mathieson 2392e8a30d Ixiatrailer: Requires at least 15 bytes so change test in heuristic.
Change-Id: I00415fc77d2493eccdb3f0511f0a49d670e26d9d
Reviewed-on: https://code.wireshark.org/review/8118
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-19 08:40:09 +00:00
Alexis La Goutte b394aa5f1e QCustomPlot: fix division(or modulo) by zero found by Clang and Coverity (CID 1159170 & 1159171)
Change-Id: Iba9317436983bb4b3730be8b80e7b9c107ffc3a9
Reviewed-on: https://code.wireshark.org/review/8112
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-19 05:56:09 +00:00
Roland Knall fbe39cebf1 openSAFETY: Implementing a tap interface
Implementing a tap interface as well as a packet structure
 which contains all necessary information from a single
 openSAFETY frame.

 This structure is located in a separate packet-opensafety.h so
 that plugins and other programs, which want to utilize the tap
 interface, may benefit from the same defines

 The 40bit calculation was implemented in a wrong fashion,
 so that it never calculated the correct UDID

Change-Id: I62895f91d0a255a5489b9bf397a40d824a27383f
Reviewed-on: https://code.wireshark.org/review/7275
Reviewed-by: Roland Knall <rknall@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-19 05:53:24 +00:00
Michal Labedzki 2ce04184b8 Bluetooth: OBEX: Dissect HeaderID
HeaderID is bitfield in real. There is information about
length-information in value part.

Change-Id: Ib861f658c7b56e16df8a6514de69215138a1740d
Reviewed-on: https://code.wireshark.org/review/8039
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-19 05:05:40 +00:00
Michael Mann aeb9827e4a Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list]
Part 1 of a few

Change-Id: I413f23dfa92da5488ca8a7f62ca0738b25004635
Reviewed-on: https://code.wireshark.org/review/8117
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-18 16:32:27 +00:00
Michal Labedzki 8f9aa33b29 Bluetooth: OBEX: Add DecodeAs for profile-based Application Parameters
Application Parameters are defined in profile specification.
If there is not enough infgormation to recognize profile user must have
ability to do that manually.

Also add expert info that packet is manually "Decoded As".

Change-Id: I8a735d46d365d712995cd8cc00b2f46849c8afb4
Reviewed-on: https://code.wireshark.org/review/8044
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-18 15:48:31 +00:00
Michal Labedzki 39968ac432 MIME: Allow to dissect big files
Increase file size limit for mime files that can be
loaded by Wireshark to AddressSpace/2. On 32bit machines the limit can be
2 GiB.

Change-Id: I5b38b3ebe401077f4e1e873cff4b37da560d592f
Reviewed-on: https://code.wireshark.org/review/4907
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-18 15:11:02 +00:00
Alexis La Goutte e9926ff3af ZigBee: commissioning dissection
Miscellaneous corrections in ZigBee Green Power commissioning cluster dissection.

Change-Id: I6aaf5f2c1ad5c70d1961709c0e94ab5c5af81ec7
Reviewed-on: https://code.wireshark.org/review/8094
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-18 15:04:50 +00:00
Alexis La Goutte 735f08a051 GIOP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I5cd8fe72e6288578d4fa316096dfa606bf3e7aea
Reviewed-on: https://code.wireshark.org/review/8116
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-18 14:53:57 +00:00
Alexis La Goutte 4b65a8dcd3 GIAS: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I430e044d838b0d81bda15d3f8012b81f7247080e
Reviewed-on: https://code.wireshark.org/review/8115
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-18 14:50:20 +00:00
Alexis La Goutte 0d368daead Bluetooth: OBEX: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I5c260b6af14786119a324c3fed98178ddad01c6d
Reviewed-on: https://code.wireshark.org/review/8114
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-18 14:48:45 +00:00
Alexis La Goutte 1c86217387 Bluetooth: HFP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I1509a9ee9b136c15b5da8ff88fa6eadab3dd7f99
Reviewed-on: https://code.wireshark.org/review/8113
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-18 14:46:46 +00:00
Alexis La Goutte 3d2516715a 802.11 fix unchecked return value (CID 1293628)
following ge243b0041 check the last add_tagged_field for avoid a Coverity warning
(Yes the code is already safe..)

Ping-Bug: 11110
Change-Id: Iaceb8cf9c91de426bc5e5408b4271091cab57862
Reviewed-on: https://code.wireshark.org/review/8084
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-18 06:47:32 +00:00
Alexis La Goutte adf0d671fd proto(.h): fix '@return' command used in a comment that is attached to a function returning void [-Wdocumentation]
Change-Id: Ice88ddf2d35293f23be2d5a61a6ae77ed540f886
Reviewed-on: https://code.wireshark.org/review/8107
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-18 06:46:05 +00:00
Gerald Combs 3d7b728173 Make androiddump loadable on OS X.
Make sure the target location for extcap executables and extcap_dir
match on OS X.

Set the extcap directory to Contents/MacOS/extcap. The Mac Developer
Library documentation doesn't explicitly define "Resources", but
examples include data files and not executables. It does state that
executables shouldn't go into PlugIns.

Make sure we rpathify androiddump.

Change-Id: If36c762e2a1991c26e5c01a870deaf191bcf9f94
Reviewed-on: https://code.wireshark.org/review/8093
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-17 18:08:36 +00:00
Jeff Morriss f2070bdbf9 Consistently used (derived) type Enumerated (rather than Unsigned32 or
Integer32) when the AVP is of type Enumerated.

Just for correctness.

Change-Id: Ia485d6e06ca16d6da82aa5d1b60025120e45242f
Reviewed-on: https://code.wireshark.org/review/8109
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-04-17 17:50:18 +00:00
Jeff Morriss e5e2465c6b Fix up some indentation/white space issues.
Change-Id: I73a1a1dd567970f99df769d5976cc82a7e5b9a60
Reviewed-on: https://code.wireshark.org/review/8108
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-04-17 17:34:01 +00:00
Gerald Combs 3ac9921065 Retire git_version.xml.
Remove check_git_version.sh and its associated targets. We haven't used
git_version.xml since the AsciiDoc conversion.

Change-Id: I480f0094c4355d71201f2dd285198581bbbfc415
Reviewed-on: https://code.wireshark.org/review/8104
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-17 17:02:22 +00:00
Graham Bloice e280df605f Fix CMake warnings
Newer versions of CMake generate warnings about the use of
@variable@ references, replace @CPACK_PACKAGE_NAME@ with
${CPACK_PACKAGE_NAME}

Set the policy for CMP0026 to be old to squelch warnings about the
use of target LOCATION

Change-Id: I424083260c51875dde80f98a23d6528c31ff0aec
Reviewed-on: https://code.wireshark.org/review/7977
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-17 16:09:22 +00:00
Michal Labedzki 1948d026f6 androiddump: Fix build on onther than Win platforms
androiddump should be put in extcat directory.

Change-Id: I360eef2d5a68178c73181949b0fe3346585f5190
Reviewed-on: https://code.wireshark.org/review/8083
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-17 16:03:48 +00:00
Jeff Morriss bd58617063 Add a few items to the Release Notes.
- GIAS dissector
- Netscaler 3.5 support
- GUI menu API for plugins

Change-Id: I88f52a73e1149de6fe0588c1316b27fac9af59ce
Reviewed-on: https://code.wireshark.org/review/8090
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-17 09:37:05 +00:00
Gerald Combs 76d355de26 CMake: Set WIN32 for GUI executables.
Pass WIN32 to add_executable where needed. Require CMake 2.8.11
on Windows.

Change-Id: I6a119bbb0f16f9e21f2e7378bae7ed52b8abb2dc
Reviewed-on: https://code.wireshark.org/review/8091
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-04-17 09:10:22 +00:00
Pascal Quantin a8efae3be5 Do not package debug files when building PortableApps.com installer with (the soon to be dead) nmake
Change-Id: Ifd6fc71cebe6db06923e2d764cb415bf5b2ed025
Reviewed-on: https://code.wireshark.org/review/8106
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-17 08:40:38 +00:00
Guy Harris 9992063c6f Download the Qt dmg and just do a binary installation.
That's a *lot* faster than building from source.

That means we should suggest adding the Qt pkg-config directory to
PKG_CONFIG_PATH; do so.

Change-Id: I9a70ea73fbace1f736cad8a4da11b62df8e5818e
Reviewed-on: https://code.wireshark.org/review/8105
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-17 06:19:48 +00:00
Guy Harris a0254ff9d4 Mount the CMake dmg we downloaded, don't download it again.
Amazingly, "hdiutil attach" can take a URL as an argument; it will
attempt to download the file in question and mount it.  We've already
downloaded the file, so there's no point in downloading it again
(especially not with a URL with "v2.8" coded in).

Change-Id: I106fc0c32a378aeead66ed32bceb454d23efa297
Reviewed-on: https://code.wireshark.org/review/8103
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-17 01:58:57 +00:00
Guy Harris 59060e1b64 Fix spelling error.
Also clean up alignment.

Change-Id: Ib1efb5f642489ea2ddfe2d129c083eda72551bad
Reviewed-on: https://code.wireshark.org/review/8100
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-16 23:17:07 +00:00
Alexis La Goutte 8e03c6e02e ZigBee: dissection of commissioning frame
Fix miscelleanous errors in ZigBee Green Power

Change-Id: Ie5d379228a755ea09821148dc508108c6293da81
Reviewed-on: https://code.wireshark.org/review/8095
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-04-16 22:42:18 +00:00
Evan Huus 5829f5d999 giop: replace glib with wmem
One structure and one hash table with very simple uses. Fixes a memory leak.

Change-Id: I727b7d5b0b17c2fcfaaad57797d11090e392253b
Ping-Bug: 11123
Reviewed-on: https://code.wireshark.org/review/8088
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-04-16 22:40:41 +00:00
Evan Huus 8825b55303 giop: fix uninitialized use of request id
Move the req_id field to the "message-dependent data" section of the header
struct, since in the spec I found it is not specified in the common GIOP header
(even though it appears to be present in all message types). Regardless, this
better reflects the fact that it is not initialized by the primary tvb_memcpy,
only the independent fields are.

Initialize it and use it rather than creating a local for no reason; fixes the
possibility of using it uninitialized.

Bug: 11123
Change-Id: I3bae1df5123fbb1f2b86f7c42cee392b5b045c4f
Reviewed-on: https://code.wireshark.org/review/8087
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-04-16 22:40:35 +00:00
Alexis La Goutte 32bbe0af23 Extcap: fix logically dead code (CID 1232344)
Change-Id: Ia6c178a9a5ec413004107f63c8dcaa38c19690b9
Reviewed-on: https://code.wireshark.org/review/8096
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-04-16 22:40:02 +00:00
Gerald Combs 51d4d0af72 Minor Win32 console fix.
Fix a no-op in set_has_console. Mark it and set_console_wait GTK+ only.

Change-Id: Ifc6540b30edc0296c4a47c004a397cc309e71d2b
Reviewed-on: https://code.wireshark.org/review/8099
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-16 21:33:39 +00:00
Guy Harris c455049c83 Fix copy-and-pasteo.
"Recursion(n).  See "recursion"."

Change-Id: Ic0acab13a6da8e0e00ead32653498d13edf212ac
Reviewed-on: https://code.wireshark.org/review/8098
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-04-16 21:21:51 +00:00
Gerald Combs 7c1243c804 Update README.cmake.
Change-Id: I2aaae7936639dc2775a8f7fdb1d4276893c8a6dc
Reviewed-on: https://code.wireshark.org/review/8097
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-16 19:43:34 +00:00
Alexis La Goutte 21004154ee RADIUS: fix test suite by comment new rfc dicto
tshark: radius: Vendor: 'integer', does not exist in /home/wireshark/builders/wireshark-master/ubuntu-14.04-x64/build/radius/dictionary.rfc7499:10
Vendor: 'integer', does not exist in /home/wireshark/builders/wireshark-master/ubuntu-14.04-x64/build/radius/dictionary.rfc7499:11

Change-Id: I2852658235b7025e429e891401088de91c542424
Reviewed-on: https://code.wireshark.org/review/8092
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-16 18:03:11 +00:00
AndersBroman 338f3a5eb1 Remove deprecated tvb_lengt APIs
Change-Id: Ic3c364384dcc1d87089d646665f5900081de13df
Reviewed-on: https://code.wireshark.org/review/8089
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-16 14:01:45 +00:00
Alexis La Goutte 4171f5590b RADIUS: Sync with FreeRADIUS Master
commit dec7ff66f34d773d25dee412fe218b4e108d7680
Author: Alan T. DeKok <aland@freeradius.org>
Date:   Wed Apr 1 13:49:22 2015 -0400

    added VALUEs

commit 634bdb7b29089ed9fd9548a4ed033bfca82832d2
Author: Alan T. DeKok <aland@freeradius.org>
Date:   Wed Apr 1 13:34:19 2015 -0400

    Added from RFC which has numbers assigned

commit 005437d9f260c233f165e5f1a8a0e00ab48d6456
Author: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date:   Thu Mar 26 09:09:13 2015 -0400

    Hyphens

commit 88332d8e5dc6bae25270500902cdcb511e0e08a6
Author: Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com>
Date:   Thu Mar 26 12:13:39 2015 +0200

    Update dictionary.mikrotik

    Update dictionary.mikrotik to have new attributes and values mentioned
    in Mikrotik wiki:

    http://wiki.mikrotik.com/index.php?title=Manual:RADIUS_Client/vendor_dictionary

commit 849336c73dda97ac2a1185f19e21fd2d4d086180
Author: Alan T. DeKok <aland@freeradius.org>
Date:   Wed Mar 25 15:40:02 2015 -0500

    Motorola error message

Change-Id: I03ab7666dd64cef75e8ebf088766b6b28497817c
Reviewed-on: https://code.wireshark.org/review/7974
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-16 13:23:35 +00:00
AndersBroman 95f138e407 Replace deprecated tvb_length APIs
Change-Id: Idfd3bed012e823de544fe4de483c8f095fc7c65d
Reviewed-on: https://code.wireshark.org/review/8086
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-16 11:36:43 +00:00
Balint Reczey 2d79f56df1 Fix wireshark.pc when CMAKE_INSTALL_LIBDIR is absolute
Change-Id: I9667660329c0888f35e1ac332537eda995509a85
Reviewed-on: https://code.wireshark.org/review/8010
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2015-04-16 10:21:48 +00:00
Arnd Hannemann ec83c79c74 Fix misspellings in German debconf translation
Change-Id: I6cd3ce90dd3ffe5ebdf5f39f14cb3dabb38c62e9
Reviewed-on: https://code.wireshark.org/review/8009
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-16 06:05:07 +00:00
Pascal Quantin 8e7d904880 androiddump: stop recompiling systematically androiddump.c with nmake
Our default rules are confused because source file is in a subfolder of the nmake makefile

Change-Id: If3dee4cd5b3be493abfe8c696383fb170952260b
Reviewed-on: https://code.wireshark.org/review/8068
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-16 06:04:53 +00:00
Gerald Combs b845785a73 CMake: Try not to clobber our gspawn exes.
Try not to overwrite gspawn*.exe between signing them and packaging
them. (Second try.)

Change-Id: I717f5fca6dc6afbc146927d06e6f74ae6a0a87c8
Reviewed-on: https://code.wireshark.org/review/8082
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-15 23:24:59 +00:00
Gerald Combs 973b2884c6 Revert "CMake: Try not to clobber our gspawn exes."
This accidentally reverted code from g40ce324. Will try again shortly.

This reverts commit 8d9fdda991.

Change-Id: I0bf7f351b926f1ce4b0c9e19fe0367add1dfee1e
Reviewed-on: https://code.wireshark.org/review/8081
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-15 23:22:34 +00:00