Commit Graph

64893 Commits

Author SHA1 Message Date
Michal Labedzki b4f86c9cb8 androiddump: Fix help - interfaces
Fix help output that describes interfaces provided by tool
to reflect reality - add missed DEVICE_ID that is part of interface.

Change-Id: Ib6374db28d8d4696ce27c5358da49d3ebfcf31e1
Reviewed-on: https://code.wireshark.org/review/18267
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Tested-by: Michael Mann <mmann78@netscape.net>
2016-10-19 12:20:05 +00:00
Vladlen Popov 4ef14c7651 ZigBee Green Power: add dissectors for Sink Table and Proxy Table attributes (GP Cluster)
Change-Id: I9d18aa84e24a713951d5e537dcbc2dee6998192c
Reviewed-on: https://code.wireshark.org/review/18278
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-19 12:07:10 +00:00
Peter Wu d399bfaa07 cmake/FindPOD: improve formatting, add modelines
CMake standard style is to use lowercase function names, do that.

Change-Id: I893825cfac0cc402177ffb1a0f43f0ffc6341c45
Reviewed-on: https://code.wireshark.org/review/18312
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-10-19 11:33:33 +00:00
Hessam Jalali 10c46fc308 Qt: declare one_em to fix compile error when HAVE_PCAP_REMOTE is defined
Occured on Windows(10) x64 build.

Change-Id: I04d88bec1660dae20f459d2e03c88864c9366dc3
Reviewed-on: https://code.wireshark.org/review/18315
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-10-19 11:33:22 +00:00
Jaap Keuter 1d35c7f096 IP: Fix evil flag expert item text
When creating the expert info item definition the copied line wasn't
updated with the correct message text. This change sets the right text.

Change-Id: I9a98126c0b8a650e5ab195f97c53bb32e3053e89
Reviewed-on: https://code.wireshark.org/review/18301
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2016-10-19 10:18:18 +00:00
Gerald Combs 59c3704404 Add a Kerberos decryption test.
Test Kerberos decryption using files from krb-816.zip on the
SampleCaptures page.

Change-Id: Ic1360b637ca6a1f6cb86d09a6aebfd7f5ff89419
Reviewed-on: https://code.wireshark.org/review/18275
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: Anders Broman <a.broman58@gmail.com>
2016-10-19 10:07:13 +00:00
Joerg Mayer a0e1d282f2 Do not update register.c's timestamp if it is unchanged, otherwise it gets recompiled
every time one of its dependencies is touched.

Change-Id: I8c0c4caea8355748e5abf9b9fe3804834353075f
Reviewed-on: https://code.wireshark.org/review/18304
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-10-19 08:51:27 +00:00
Michal Labedzki 9672913350 Bluetooth: ATT: Add missing expert info for Regulatory Certification
Add missed expert info for IEEE 11073-20601
Regulatory Certification Data List.

Change-Id: Id9520e1c604ee38bf11ce42248357ca007bffcfd
Reviewed-on: https://code.wireshark.org/review/18233
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-19 07:53:40 +00:00
Balint Reczey 7edf3eeef8 Use the proper include dirs for ABI check
Ping-Bug: 13018
Change-Id: I05203c56e6b595c5bff6d8e475f16b66264bdd0e
Reviewed-on: https://code.wireshark.org/review/18296
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-10-19 07:45:13 +00:00
Roland Knall e68247e1fd InterfaceTree: Change foreach to const_iterator
Change all occurences of the foreach macro to while loops with
const_iterator for performance reasons

Change-Id: I1cd378696136b3d6cc100b9bfff95295baa2ff83
Reviewed-on: https://code.wireshark.org/review/18286
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-19 07:44:48 +00:00
Roland Knall 864f750be5 ManageInterfacesDialog: Implement View/Data Model
Implement the same interface view/data model as used for
the interface_tree selection in this dialog, to encapsulate
all access to global_capture_devices from the dialog.

Change-Id: I0e568fe236d077befa2a79765638db8bb3ed1a3f
Reviewed-on: https://code.wireshark.org/review/18062
Petri-Dish: Roland Knall <rknall@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-19 07:43:45 +00:00
Jan Spevak 5cbdbecc35 GTPv2: Add support for NB-IoT features
Bug: 13026
Change-Id: I75de63bd58a35e234eef308fa592922e01ea3c18
Reviewed-on: https://code.wireshark.org/review/18300
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-19 07:42:37 +00:00
Michal Labedzki b83ea46665 extcap: put missed parameters into the help
"--debug" and "--extcap-version" are part of extcap-base helper,
do not hide them.

Change-Id: I287b68dbed5344c188fede69d112ab007a6ee18b
Reviewed-on: https://code.wireshark.org/review/18279
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-10-19 06:44:05 +00:00
Dario Lombardo ba00be5266 mgcp: use ws_strtou function.
Change-Id: Ia2a7fac5d1bd86d4f163117993e2e897e5dd315e
Reviewed-on: https://code.wireshark.org/review/18280
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-19 04:22:42 +00:00
Balint Reczey bf96599f19 Drop redundant SIZEOF() macro
Change-Id: I6db2033746f5f22dd0229c96727bb352bdb1e866
Reviewed-on: https://code.wireshark.org/review/18298
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Petri-Dish: Balint Reczey <balint@balintreczey.hu>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-19 04:02:06 +00:00
Michael Mann 739bdfb45f Some Pref <-> Decode As bugfixes.
1. If a deprecated port preference is found, populate the new port preference with the value
2. Mark preferences as changed to trigger preference callback at startup.

Change-Id: Ic271841686617e847d2e0ed8800bbb0fa874df47
Reviewed-on: https://code.wireshark.org/review/18274
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-18 23:03:23 +00:00
Joerg Mayer 09b43591a1 While the channelwidth was dissected the information was not passed to the phdr
No other flags were verified.

Change-Id: I77e35af8accb83595d3046dc804f0c6a7e1d1000
Reviewed-on: https://code.wireshark.org/review/18295
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-10-18 20:59:22 +00:00
Guy Harris 6a14408bf6 Fix typo.
Change-Id: Ie28490c93736c7e95f0b1eaed1e075e61f005e16
Reviewed-on: https://code.wireshark.org/review/18289
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-18 20:50:10 +00:00
Peter Wu 537705a8b2 wslua: prepare for split class/instance (meta)methods
Previously the metatables for classes were the same for the class and
its instances. This results in issues like calling __gc on the class
table on exit.

Make it possible to declare separate class methods (functions) and
instance methods. Observe that all attributes apply to the instances
only, so make these just available on the instance.

The attribute/methods lookup method (via __index/__newindex) have been
rewritten to use upvalues, removing the technical need for the
properties __getters/__setters/__methods. The "lua globals" test still
checks for these, but it could be removed in the future.

To fix bug 12968, the __gc method is removed from the class method.
Future patches should remove the WSLUA_REGISTER_CLASS,
WSLUA_REGISTER_META and WSLUA_REGISTER_ATTRIBUTES macros completely and
create split class functions/methods (such that __call for an instance
cannot accidentally be invoked on the class).

Removed duplicate "fragmented" property from Pinfo (which triggered an
error) and replaced exit() by g_error() for debugger friendliness.
Remove lua_shiftstring since checkstring always returns non-NULL.

Bug: 12968
Change-Id: I57f8a93d08bb84c79b0e94cf2c82d8402fc16646
Reviewed-on: https://code.wireshark.org/review/18026
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-10-18 20:41:34 +00:00
Guy Harris 41c6b944b4 Rename a function to have a name different from a data object's name.
Change-Id: Iefef8b2161b43900fd81fb1b163a4feee69fd069
Reviewed-on: https://code.wireshark.org/review/18285
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-18 20:08:40 +00:00
Michal Labedzki 2898c2a244 Fix wrong local function names
Copy->Paste issue.

Change-Id: I77bc755c772df0fb95a9e4ce91b8b3bc8a8e019d
Reviewed-on: https://code.wireshark.org/review/18282
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-18 19:33:17 +00:00
Michael Mann 7a906dc877 Ensure http_tcp_range gets initialized through preference callback.
Bug: 13016
Change-Id: I814c901898790045be0e2003ebe5a8000704b8af
Reviewed-on: https://code.wireshark.org/review/18273
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-18 17:51:27 +00:00
Roland Knall 4a4698259c WiresharkApplication: Add signal emitter for Interface Changes
Change-Id: I468ef9462aa91d02c5568cec0d08081a2b3840bb
Reviewed-on: https://code.wireshark.org/review/18269
Petri-Dish: Roland Knall <rknall@gmail.com>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-10-18 14:46:39 +00:00
Dario Lombardo 63eb48adaa sdp: use ws_strtou function.
Change-Id: Idd624170cf8d3bb0441c765ecfebcbe51f99deaf
Reviewed-on: https://code.wireshark.org/review/18264
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-18 14:45:55 +00:00
Dario Lombardo 397065bb59 mrcpv2: use ws_strtou function.
Change-Id: I2d3ddf1f376ac44e3ccc618d94aebdba9c86e3df
Reviewed-on: https://code.wireshark.org/review/18250
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-18 14:40:12 +00:00
Alexis La Goutte 47e9345116 fc00: Fix Dead Store (Dead assignement/Dead increment) Warning found by Clang
Change-Id: I3c494b190f93e9a1d042fa666d4f7037cd69c986
Reviewed-on: https://code.wireshark.org/review/18262
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-18 14:27:49 +00:00
Gerald Combs 41e9bbac91 Qt: Main welcome show/hide interface updates.
Pluralize the text in the main welcome show/hide interfaces button.
Remove the styling, which matches other places we use a pushbutton +
menu.

Change-Id: I7559f98d0c1afbfb2920b09c3885d9b1fbdf76f1
Reviewed-on: https://code.wireshark.org/review/18260
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-18 14:04:05 +00:00
Alexis La Goutte 9796e811f5 BGP: fix bgp.ls.tlv.link_protection_type_value is not of an FT_{U}INTn type]
Bug: 13021
Change-Id: I3464c7af61323efb25dd89655865d536aeae6e59
Reviewed-on: https://code.wireshark.org/review/18261
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-18 13:49:57 +00:00
Vladlen Popov 5d2c54ed20 ZigBee Green Power: fix commissioning cmd dissection
Dissect fields: number of gpd commands, GPD cmd list, Cluster list

Change-Id: Ifda60987072c3526d5f0ae4687ddf2b6e46bfb93
Reviewed-on: https://code.wireshark.org/review/18259
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-18 13:07:40 +00:00
Babak Farrokhi 256f834293 Update MNC list for MCC 432 (Iran)
The official E.212 list does not contain the latest
MNC codes that are in use for MCC 432. This commit
contains an up to date list according to:

http://mcclist.com/mobile-network-codes-country-codes.asp#Iran

Change-Id: I847d31b1d77825c6f95f4e5879ee1f688834ed88
Reviewed-on: https://code.wireshark.org/review/18258
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>
2016-10-18 12:20:01 +00:00
Pascal Quantin 418b7d125d CQL: free buffer earlier in case of Snappy decompression failure
Change-Id: I3048823b4057caf49f2f6bf28cf2389dc3c88f27
Reviewed-on: https://code.wireshark.org/review/18255
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-10-18 08:36:13 +00:00
Parav Pandit 2c071296f5 packet-infiniband: Add support for CM DREQ/DRSP
Added support for decoding CM Disconnect and CM Disconnect response
packets.
Reusing ATTR macros in CM_Attributes definition.

Change-Id: Ic6065b67d2007fc68848441e0c866e4a637a3657
Tested-by: paravpandit@yahoo.com
Reviewed-on: https://code.wireshark.org/review/18229
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>
2016-10-18 05:14:30 +00:00
Peter Wu c7e75770e1 wslua: add support for negative indices
Internal change, this allows use of negative indices for
lua_rawgetfield/lua_rawsetfield convenience functions and is closer to
lua_getfield/lua_setfield semantics in terms of indices.

Add lua_absindex for compatibility with Lua 5.1 (do not bother exporting
it yet since it is only used in this file, also do not rename it since
it is the same functionality with no Wireshark-specific changes.)

Change-Id: I322954ef461164ec514ed9f034ae2691775e67da
Reviewed-on: https://code.wireshark.org/review/18025
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-18 04:10:39 +00:00
Peter Wu 8a1adf1a66 wslua: fix errors in documentation, add notational conventions
Improve example with better formatting, clarification comments and more
common variable names.

Extend make-wsluarm.pl to support arguments containing underscores.
Fixes the description of dissect_tcp_pdus.

Change TvbRange.tvb(tvb) into tvbrange:tvb() and ByteArray.tvb(name)
into bytearray:tvb(name), these are really instance methods.

Change-Id: I1e20ef46195dc6c06f9ac790d3432db283d21a5e
Reviewed-on: https://code.wireshark.org/review/18226
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-18 04:09:14 +00:00
Balint Reczey f07b1bc604 debian: Update lintian-overrides to cover updated manpages
Change-Id: Ie69b82b752ab82910ee3126a25c49da8bc383a97
Reviewed-on: https://code.wireshark.org/review/18243
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Petri-Dish: Balint Reczey <balint@balintreczey.hu>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-18 04:06:12 +00:00
Peter Wu 954e7c4ded wslua: Do not crash on the root tree item
ti->item is NULL for the root item, prevent a NULL-deref by Lua script.

Bug: 13017
Change-Id: I5e7f71d014a01bab615288df76509b3ef97b1bf6
Reviewed-on: https://code.wireshark.org/review/18247
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-18 04:04:25 +00:00
Pascal Quantin 303948500f CQL: add LZ4/Snappy decompression support on Windows
Change-Id: I34374cf29357e2ed5062da1a5245b9adbabf732d
Reviewed-on: https://code.wireshark.org/review/18249
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-18 04:00:35 +00:00
Guy Harris 867f2829c1 Separate "Link Access Control Protocol" and the version number with a space.
Change-Id: I11d3e3b5b25d8f42fac613f464620371d2643ab5
Reviewed-on: https://code.wireshark.org/review/18251
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-17 23:31:13 +00:00
Joerg Mayer 7b73a04116 $Id$ is useless with git - treat it exaclty like this
Change-Id: I607ce7ded40864c1b4dcc0a2d577a65923af4225
Reviewed-on: https://code.wireshark.org/review/18248
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-10-17 19:09:45 +00:00
Benoît Canet 47649d1c7f cql: add lz4 and snappy decompression
We do not use the STARTUP negotiation since a stream
can be captured in its middle but try to decompress
if the flag is present and fallback if it fails.

Change-Id: Iecbf49a45220b04be7808869c9884548eb1e7694
Signed-off-by: Benoît Canet <benoit@scylladb.com>
Reviewed-on: https://code.wireshark.org/review/17952
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-10-17 18:28:45 +00:00
Balint Reczey 5c42d8a24c debian: Override Lintian warning for missing wireshark-gtk man page
Change-Id: I16e09c88046c55b3a7d610bf81c28850e2984f9a
Reviewed-on: https://code.wireshark.org/review/18244
Petri-Dish: Balint Reczey <balint@balintreczey.hu>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-10-17 15:45:17 +00:00
Balint Reczey b973b001bf debian: Bump standards version to 3.9.7 used in Ubuntu 16.04
Change-Id: I4a2a3dfad440f17f1b9cfae282623038d9b0981a
Reviewed-on: https://code.wireshark.org/review/18242
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-10-17 15:30:05 +00:00
Balint Reczey 3b3185eb65 debian: Build-depend on cmake (>= 2.8.8)
Change-Id: I3097a06fa7cbe858f7b8b2af22d56da6ae027974
Reviewed-on: https://code.wireshark.org/review/18240
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-10-17 15:29:20 +00:00
Balint Reczey dca176c232 debian: Drop unused renaming of wireshark-qt binary
Change-Id: I9ff77d97016f33d1a276c7392f076413590a1099
Reviewed-on: https://code.wireshark.org/review/18241
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-10-17 15:29:07 +00:00
Balint Reczey f3ae5f1b4d debian: Update changelog timestamp to silence Lintian warning
Change-Id: I4a27c10766587c3b61b088290a5f05a34d3c3cd8
Reviewed-on: https://code.wireshark.org/review/18239
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-10-17 15:28:55 +00:00
Balint Reczey 511bb81433 debian: Stop using hardening-check during .deb package build
Hardening-check script has been removed from Debian unstable. Checking
binaries' security features is implemented in Lintian instead which
will raise proper warnings for not Position Independent Executables
and binaries missing "bindnow" linker flag.

This also fixes the Lintian error complaining about dependency on
obsolete hardening-includes package.

Change-Id: If3387aa1f2297927c19d85f27361ba639203aad9
Reviewed-on: https://code.wireshark.org/review/18238
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-10-17 15:27:52 +00:00
Balint Reczey ad3fe1572b debian: Update symbols file for new symbols
Change-Id: I2a38196fe8aa93b72a94a1b95caf665e2de645f3
Reviewed-on: https://code.wireshark.org/review/18237
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-10-17 15:27:34 +00:00
Roland Knall 81904c70a8 InterfaceList: Change Buttons to combobox
Change the buttons to a combobox selector, and move that selector
to the right of the capture filter box.

Bug: 12971
Change-Id: Ib85d51cca128ed76eb08886e92660ede51d5982f
Reviewed-on: https://code.wireshark.org/review/18186
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
2016-10-17 14:43:22 +00:00
Dario Lombardo 0c4eb2779f ftp: use ws_strtou function.
Change-Id: Idd0496f5afe41506ae3b5e22bc0aec09b737be6c
Reviewed-on: https://code.wireshark.org/review/18146
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-10-17 14:34:31 +00:00
Peter Wu a30dcd9951 cmake: fix missing docbook dependency
Running "ninja developer_guide_html" somehow did not produce a new HTML
docbook once wsluarm.ascii (a dependency of developer-guide.xml) was
modified.

It turns out that output file docbook/wsdg_html/index.html only had a
ordering-only dependency on target generate_developer-guide.xml. An
extra dependency is needed on the output file to ensure that the HTML
file gets rebuild on changes.

See the last note on
https://samthursfield.wordpress.com/2015/11/21/cmake-dependencies-between-targets-and-files-and-custom-commands/

Fixes v2.1.0rc0-2137-gd544ecd ("cmake: fix parallel docbook build").

Change-Id: I7689c71994f13b29cf7f8561f7c993aa8298632d
Reviewed-on: https://code.wireshark.org/review/18225
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2016-10-17 14:33:04 +00:00