commit af6365a Author: João Valverde Date: Sun Aug 30 23:18:34 2015 +0100 Allow "Decode As" for IPv6 over UDP Change-Id: Ib28206e9573f1dd624be1d3c265fef405f65b19a Reviewed-on: https://code.wireshark.org/review/10351 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit d512710 Author: Dario Lombardo Date: Wed Sep 2 13:40:46 2015 +0200 idl2wrs: fix clang analyzer Warning complains. 890:9: warning: Access to field 'str' results in a dereference of a null pointer (loaded from variable 'token_list') 3132:4: warning: Value stored to 'str' is never read 3155:4: warning: Value stored to 'str' is never read 3166:4: warning: Value stored to 'str' is never read 3183:4: warning: Value stored to 'str' is never read 3192:4: warning: Value stored to 'str' is never read 3203:4: warning: Value stored to 'str' is never read 3220:4: warning: Value stored to 'str' is never read Change-Id: If1a1acfc331e0648f95f6d6defe6533b6927ccaa Reviewed-on: https://code.wireshark.org/review/10357 Reviewed-by: Alexis La Goutte commit 5518ae0 Author: Pascal Quantin Date: Wed Sep 2 12:43:23 2015 +0200 PER: followup of g59453fb Change-Id: I45c02a249444e5f17d99eeb0ca8dea6f7a012262 Reviewed-on: https://code.wireshark.org/review/10356 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit e1dee7c Author: Dario Lombardo Date: Wed Sep 2 12:27:31 2015 +0200 dcerpc: fixed distcheck. Change-Id: Ide0b95278786d45d9c41fb0fe3214dce0880b830 Reviewed-on: https://code.wireshark.org/review/10355 Reviewed-by: Alexis La Goutte commit 5d8363e Author: Tom Haynes Date: Tue Sep 1 14:07:30 2015 -0700 nfs: Fix order of octets in IPv4 address Before: skull:bugs loghyr$ ~/ipv4/wireshark/tshark -r 2-layoutstats-in-1-compound.pcap -Y nfs -V | grep -i ipv4 [IPv4 address 113.12.31.172, protocol=tcp, port=2049] After: skull:bugs loghyr$ ~/ipv4/wireshark/tshark -r 2-layoutstats-in-1-compound.pcap -Y nfs -V | grep -i ipv4 [IPv4 address 172.31.12.113, protocol=tcp, port=2049] Bug: 11496 Change-Id: Ia6097ae76411f6ff9de1f53191c8fc767856e2d1 Signed-off-by: Tom Haynes Reviewed-on: https://code.wireshark.org/review/10347 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 920e056 Author: Alexis La Goutte Date: Wed Sep 2 07:48:34 2015 +0200 idl2wrs: Make Mac OSX buildbot happy Change-Id: I5f9c860bec0f8d323d9f3cd7cf55e348654c8b8b Reviewed-on: https://code.wireshark.org/review/10354 Reviewed-by: Alexis La Goutte commit 8b6fe35 Author: João Valverde Date: Wed Sep 2 01:33:22 2015 +0100 IPv4: Remove extraneous colon from format string Change-Id: If52f8086ec971cc43947ece3d8e062da8378fa95 Reviewed-on: https://code.wireshark.org/review/10352 Reviewed-by: Alexis La Goutte commit 59453fb Author: Michael Mann Date: Tue Sep 1 22:14:47 2015 -0400 Eliminate proto_tree_add_text from packet-per.c Change-Id: I67f572129821fb00e4478a30bfd4a52287b8b1a1 Reviewed-on: https://code.wireshark.org/review/10350 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit c41a833 Author: Michael Mann Date: Tue Sep 1 20:18:15 2015 -0400 Eliminate proto_tree_add_text from some dissectors. Change-Id: If617016f588bbf940f37699e27559dc5c59cf508 Reviewed-on: https://code.wireshark.org/review/10349 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 630f48f Author: Michael Mann Date: Tue Sep 1 13:28:56 2015 -0400 Eliminate proto_tree_add_text from packet-rsvp.c Change-Id: I95edc1b40c07a4addf194df6a2056e7b61193e5a Reviewed-on: https://code.wireshark.org/review/10348 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 87f2bd4 Author: Dario Lombardo Date: Fri Aug 14 12:02:38 2015 +0200 idl2wrs: some code cleanups. Code cleanups include: - sanity checks for malloc() - change forbidden APIs into g_* versions - minor indentation fixes - add modeline - add compilation for cmake and autotools Bug: 11052 Change-Id: I825f04d9703448f9165d188be2bdd185fce5ff5d Reviewed-on: https://code.wireshark.org/review/10030 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte Reviewed-by: Michael Mann commit aa1f556 Author: Alexis La Goutte Date: Mon Aug 31 13:59:28 2015 +0200 MSDP: fix will never be executed [-Wunreachable-code] Move tvbuff declaration for avoid https://llvm.org/bugs/show_bug.cgi?id=19020 Found by Clang 3.7 Change-Id: I299d2413dc4effc5e6e34c289152b8f401f19342 Reviewed-on: https://code.wireshark.org/review/10326 Reviewed-by: Alexis La Goutte Reviewed-by: Michael Mann commit 998dcc2 Author: Alexis La Goutte Date: Tue Sep 1 19:50:52 2015 +0200 ANSI: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I981336271a8f6b41fe777f732069639df494c5d2 Reviewed-on: https://code.wireshark.org/review/10346 Reviewed-by: Pascal Quantin Reviewed-by: Michael Mann commit b7764fc Author: Alexis La Goutte Date: Mon Aug 31 14:01:46 2015 +0200 UMTS (mac): fix will never be executed [-Wunreachable-code] Move tvbuff_t declaration for avoid https://llvm.org/bugs/show_bug.cgi?id=19020 Found by Clang 3.7 Change-Id: Id26fd62273d6838774db161a8b3f6c7db94a2de1 Reviewed-on: https://code.wireshark.org/review/10328 Reviewed-by: Alexis La Goutte Reviewed-by: Michael Mann commit c8f8784 Author: Pascal Quantin Date: Tue Sep 1 19:39:44 2015 +0200 ANSI A: fix dissection of numerous fields broken in g7298a31 Change-Id: I09898cfc1aedc4b8067c6d12c94effc51a5ebbc0 Reviewed-on: https://code.wireshark.org/review/10345 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit f0e4c49 Author: Gerald Combs Date: Tue Sep 1 08:24:58 2015 -0700 Update the release notes. Change-Id: I0ab4cc92c24048e4e77b12bcc205d7a15a5ddb74 Reviewed-on: https://code.wireshark.org/review/10343 Reviewed-by: Alexis La Goutte Reviewed-by: Gerald Combs commit db2fdfd Author: Gerald Combs Date: Tue Sep 1 07:37:45 2015 -0700 Fixup the main window tab order. Make sure the packet list is directly after the display filter edit in the main window tab order. When we press enter in the display filter edit, go to the next child in the tab order. Change-Id: If46e178365dbd59feb5985e9f8fa8b55d004d864 Reviewed-on: https://code.wireshark.org/review/10342 Reviewed-by: Gerald Combs commit a8682af Author: AndersBroman Date: Tue Sep 1 09:53:38 2015 +0200 [mtp3_summary_dialog] Unused parameter warning with MSVC mtp3_summary_dialog.cpp(315) : warning C4100: 'edt' : unreferenced formal para mtp3_summary_dialog.cpp(314) : warning C4100: 'pinfo' - Change-Id: Ia21e15ff6348f34bf8ae240f867f0ab2cade606a Reviewed-on: https://code.wireshark.org/review/10340 Reviewed-by: Anders Broman commit 7298a31 Author: Michael Mann Date: Mon Aug 31 00:20:49 2015 -0400 Eliminate proto_tree_add_text from ANSI dissectors. Change-Id: I22dccb2f2d71897334e11632f4060ccfbf4794ad Reviewed-on: https://code.wireshark.org/review/10334 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 54d2ff1 Author: Gerald Combs Date: Mon Aug 31 16:06:33 2015 -0700 Convert the WSP stats to generic stat API. Add support for multiple tables to SimpleStatisticsDialog. Change-Id: I843d901db092d2f2856d3d1a16f29f85fb41374b Reviewed-on: https://code.wireshark.org/review/10339 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 377d215 Author: Gerald Combs Date: Mon Aug 31 12:24:48 2015 -0700 Convert the MTP3 stats to new "generic stat API". Convert both the MTP3 statistics and summary. As with the GSM stats this is mostly untested. Change-Id: I7af8d5f21c8161dc95f7f2c710f32364b6f6a431 Reviewed-on: https://code.wireshark.org/review/10338 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit e9614ad Author: Pascal Quantin Date: Mon Aug 31 12:19:34 2015 +0200 Windows: update GeoIP library to 1.6.6 Change-Id: I56f58e52fa39fdddd35bcc7ef6d96cfa4042892d Reviewed-on: https://code.wireshark.org/review/10333 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 1772416 Author: Pascal Quantin Date: Mon Aug 31 22:10:23 2015 +0200 tshark.pod: fix typo Change-Id: Iba5f12637e0f494805f2d9aab370fb42a32c1cb9 Reviewed-on: https://code.wireshark.org/review/10335 Reviewed-by: Pascal Quantin commit 4e236e6 Author: Stig Bjørlykke Date: Sat Aug 29 22:59:00 2015 +0200 Qt/Lua: Call atclose when TextWindow closes The close callback was never called because the destructor was never called. Change-Id: I9f6204858bc5d5e48d0aedc90b0e242ab70e161c Reviewed-on: https://code.wireshark.org/review/10321 Reviewed-by: Stig Bjørlykke commit 7dd8349 Author: Alexis La Goutte Date: Wed Aug 12 20:58:52 2015 +0200 NGHTTP2: Update to 1.3.0 Change-Id: Ia12396b3b4a2bb4dcbdce63d06558b6474cd588e Reviewed-on: https://code.wireshark.org/review/10324 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 026812c Author: Gerald Combs Date: Mon Aug 31 08:37:15 2015 -0700 Redraw timestamps when time display settings change. As with g3bec655, we need to call columnsChanged (which invalidates cached column strings) whenever any settings that generate those strings change. Do so for the time display preferences in the View menu. Bug: 11429 Change-Id: I71bf1cc0df2800902ecb7b734b8f12ebd85a4de5 Reviewed-on: https://code.wireshark.org/review/10331 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 75b8457 Author: Gerald Combs Date: Mon Aug 31 09:24:49 2015 -0700 Add a Telephony→SCTP submenu. Add the current SCTP actions to the telephony menu to match the GTK+ UI. Change-Id: Ie7471bcbd1a82fe3f203d60f5ea8a72d923f34b9 Reviewed-on: https://code.wireshark.org/review/10332 Reviewed-by: Gerald Combs commit 3bec655 Author: Gerald Combs Date: Fri Aug 28 16:46:17 2015 -0700 Redraw the packet list when name resolution changes. Call columnsChanged (which invalidates cached column strings) when we change our name resolution preferences from the View menu. Remove the last sorted column tracking from gf19a173 while we're here (it didn't work properly). Bug: 11468 Change-Id: I7fea58d702b283028235d023f27ab0336d8643a4 Reviewed-on: https://code.wireshark.org/review/10301 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit a060183 Author: Michael Mann Date: Fri Aug 28 22:41:07 2015 -0400 Eliminate proto_tree_add_text from packet-rtps.c Change-Id: I353b4fcb3091e731a4b2a68e1932a5abc60c6038 Reviewed-on: https://code.wireshark.org/review/10323 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 053f53c Author: Joerg Mayer Date: Mon Aug 31 06:00:28 2015 +0400 Add a hidden item that allows to allow filtering on the station address. This currently only works for data frames. A Fixme is in place for managment frames. Change-Id: I0a72a9a3e40cf8269856fbbcd97b270af422afa2 Reviewed-on: https://code.wireshark.org/review/10322 Reviewed-by: Jörg Mayer commit f0b4e8e Author: Martin Kaiser Date: Sun Aug 30 20:31:35 2015 +0200 dlsw: don't THROW() an exception from a dissector Change-Id: I897202e7fb2987f608ca4f98aa1a1dc4b7dbd995 Reviewed-on: https://code.wireshark.org/review/10320 Reviewed-by: Martin Kaiser commit 81c6ecd Author: Martin Kaiser Date: Sun Aug 30 20:08:53 2015 +0200 dlsw: remove unnecessary if (tree) checks don't create an expert info under if (tree) Change-Id: I2c8f90483c434d708a97b621621ca123fc505edc Reviewed-on: https://code.wireshark.org/review/10319 Reviewed-by: Martin Kaiser commit 78007fa Author: Hadriel Kaplan Date: Sun Aug 30 10:16:16 2015 -0400 Add debug printing to tshark Add g_warning functions for tshark debug printing, disabled by default. Change-Id: If1720b790b75bd1228afa62efac49dc04bc8addb Reviewed-on: https://code.wireshark.org/review/10314 Reviewed-by: Hadriel Kaplan commit 00087b4 Author: Pascal Quantin Date: Sat Aug 29 22:28:01 2015 +0200 Add Lua 5.2.3 built with MSVC2015 Change-Id: I9b173f5136f858e4f95fb5b0688ef02c08a8d9e4 Reviewed-on: https://code.wireshark.org/review/10313 Reviewed-by: Anders Broman commit 99e16ce Author: Gerald Combs Date: Sun Aug 30 08:10:04 2015 -0700 [Automatic update for 2015-08-30] Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I37400bf1fac15fcd5f2946913b96184b1828f091 Reviewed-on: https://code.wireshark.org/review/10317 Reviewed-by: Gerald Combs commit faaa6f2 Author: Pyeole Date: Sat Aug 29 15:36:41 2015 -0400 BGP: fixed incorrect NLRI decoding Bug: 11308 Change-Id: I967b9596edad1e3656e139d0ca3a0e3c389d80ea Reviewed-on: https://code.wireshark.org/review/10308 Reviewed-by: Alexis La Goutte commit e0a87d8 Author: Dario Lombardo Date: Thu Aug 27 18:01:27 2015 +0200 stanag4607: add check for wtap max size. Bug: 11472 Change-Id: Ic269046e697ac5e65301caf4ea5586098d030458 Reviewed-on: https://code.wireshark.org/review/10279 Reviewed-by: Evan Huus Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 6c06578 Author: Pascal Quantin Date: Sat Aug 29 22:54:54 2015 +0200 CBOR: fix definition of cbor.type.tag64 field Bug: 11486 Change-Id: I070c8c397a41c0c8231720c611938d7282c03d19 Reviewed-on: https://code.wireshark.org/review/10310 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 7791c6f Author: Hadriel Kaplan Date: Sat Aug 29 19:14:13 2015 -0400 pcapng: drop count is unknown for ISB without isb_if_drop option Bug: 11489 Change-Id: I38bcc2570c2efc461e4eb0edbff8ac2a7371c725 Reviewed-on: https://code.wireshark.org/review/10311 Petri-Dish: Hadriel Kaplan Tested-by: Petri Dish Buildbot Reviewed-by: Hadriel Kaplan commit 605f33c Author: Hadriel Kaplan Date: Sat Aug 29 14:16:52 2015 -0400 pcapng: handle NRB with options If a pcapng Name Resolution Block has options, they should not screw up the pcapng reader and cause it to fail to read the file. Bug: 11485 Change-Id: Ic27cba937b6d93a3d9ed92522ed6b39ae2daeb8f Reviewed-on: https://code.wireshark.org/review/10307 Petri-Dish: Hadriel Kaplan Tested-by: Petri Dish Buildbot Reviewed-by: Hadriel Kaplan commit eacaa1a Author: Kevin Bracey Date: Wed Jul 22 15:36:07 2015 +0300 6LoWPAN: IPv6 Fragment Headers don't have a Length field RFC 6282 specifies special handling of the "Length" field in compressed IPv6 extension headers. However, the Fragment Header does not have a Length field, so this special handling does not apply - the second octet should be treated as opaque data, and the header length is always 8 octets. Bug: 11368 Change-Id: I28fcd66d96f58a5959bb669caf4244afaca9e67e Reviewed-on: https://code.wireshark.org/review/10231 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit 8ddd480 Author: Hadriel Kaplan Date: Sat Aug 29 10:30:15 2015 -0400 pcapng: do not byte-swap NRB IPv4 address Per the spec, it's always encoded in network order (4 separate bytes), and thus should not be swapped on read. Bug: 11484 Change-Id: I6a650896b324f42bfd2e05759c84e87ace733372 Reviewed-on: https://code.wireshark.org/review/10304 Petri-Dish: Hadriel Kaplan Tested-by: Petri Dish Buildbot Reviewed-by: Hadriel Kaplan commit 9158176 Author: Hadriel Kaplan Date: Sat Aug 29 10:00:02 2015 -0400 pcapng: make SPB cap_len the same as packet_len if IDB snaplen is 0 An IDB snaplen of 0 means no limit, so a Simple Packet Block's capture length should be the same as its encoded packet length in such a case. Bug: 11483 Change-Id: I8856d6c6a669a0048ea64b3adbd23c37a598431d Reviewed-on: https://code.wireshark.org/review/10303 Petri-Dish: Hadriel Kaplan Tested-by: Petri Dish Buildbot Reviewed-by: Hadriel Kaplan commit 0badc8c Author: Jim Young Date: Fri Jul 10 01:50:19 2015 -0400 Insure Qt Capture preferences dialog displays default capture device (if any) In CapturePreferencesFrame::updateWidgets() save and restore the default capture device name because the first call (and only the first call) in the loop with addItem() triggers on_defaultInterfaceComboBox_editTextChanged() which unconditionally sets the default name as the first non-hidden device. Bug: 10965 Change-Id: Ie93f84010a19e8144efa46ce889fb9064979e0e9 Reviewed-on: https://code.wireshark.org/review/9584 Reviewed-by: Gerald Combs Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Hadriel Kaplan commit 51e77b6 Author: Alexis La Goutte Date: Fri Aug 28 15:53:42 2015 +0200 CBOR: fix no previous prototype for proto_reg*_cbor [-Wmissing-prototypes] Change-Id: I20476046fc2338484ab85757cad7b19f4e41e4be Reviewed-on: https://code.wireshark.org/review/10283 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 4ebf5b8 Author: Jeffrey Smith Date: Fri Aug 28 17:28:31 2015 -0500 bootp/dhcp: fix Alcatel suboption detection bug Change-Id: I4a4222f3f30bf8e996770295756dd206b5ce101b Reviewed-on: https://code.wireshark.org/review/10297 Reviewed-by: Anders Broman commit e80bd2e Author: Stig Bjørlykke Date: Fri Aug 28 19:45:28 2015 +0200 Added Reload Lua plugins to the release notes. Change-Id: I2ea50b331322e0bc66bf5f3b48d9c2e78bbdd1e5 Reviewed-on: https://code.wireshark.org/review/10285 Reviewed-by: Stig Bjørlykke commit e18e400 Author: Gerald Combs Date: Fri Aug 28 15:49:22 2015 -0700 Fix a GHashTable assertion in DecodeAsDialog. Make sure we don't call g_hash_table_removed from g_hash_table_foreach, which generates an assertion error. Bug: 11426 Change-Id: I00283c97b0fc63551b901c0fd526b60c0fb80ace Reviewed-on: https://code.wireshark.org/review/10296 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 1663224 Author: Guy Harris Date: Fri Aug 28 16:31:33 2015 -0700 Block sizes are unsigned 32-bit quantities; don't stuff them into an int. *Especially* don't stuff the amount of remaining data in a block into an int that will then be passed to file_skip() as an amount to skip ahead, as a Really Large Value will turn into a negative value and produce various forms of bizarre and tricky-to-debug behavior. Change-Id: I4d0a6b36fe50df84925690ad688a3ab0433ceb17 Reviewed-on: https://code.wireshark.org/review/10299 Reviewed-by: Guy Harris commit 15c9923 Author: Stig Bjørlykke Date: Fri Aug 28 23:30:30 2015 +0200 Qt: Fix use-after-free pattern Change-Id: I7f6d9316234c1ccfec1ec5b5c3675b3237f22eda Reviewed-on: https://code.wireshark.org/review/10294 Petri-Dish: Stig Bjørlykke Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 579365e Author: Gerald Combs Date: Fri Aug 28 14:03:34 2015 -0700 Disable most of the main window while we're tapping. Our event loop is nested when we read packets. Disable the main window's central widget while we're retapping packets in order to minimize the chance of ending up in an unexpected state while analyzing packets. Note that we will probably want to disable more of the main window and do so in other parts of the code. Change-Id: I68a00fe43d2ac9e7c0749751abd1c10c47155b3b Reviewed-on: https://code.wireshark.org/review/10293 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 4d71ae7 Author: Guy Harris Date: Fri Aug 28 15:54:53 2015 -0700 Have separate variables for read and write errors. That way, when we check for read errors, we don't run the risk of thinking we have a read error after we get a write error. Change-Id: Idb79822d30989b2529433878798c577a76eacca7 Reviewed-on: https://code.wireshark.org/review/10295 Reviewed-by: Guy Harris commit aa100e0 Author: Gerald Combs Date: Fri Aug 28 12:57:57 2015 -0700 Don't show a progress frame if our file was closed. Change-Id: Ie363f6764f4e8b2b5c476b85f7ddb0233a127f6e Reviewed-on: https://code.wireshark.org/review/10290 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit c1c6132 Author: Gerald Combs Date: Fri Aug 28 12:28:24 2015 -0700 Don't dissect twice from TapParameterDialog. When the user applies a display filter in TapParameterDialog we're about to start tapping. We need to set the display filter in the main window but we shouldn't apply it. Change-Id: I08bed5c7f470f1dbf32817a7d999f09d2c52f168 Reviewed-on: https://code.wireshark.org/review/10287 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit d767186 Author: Guy Harris Date: Fri Aug 28 12:49:18 2015 -0700 Get rid of trailing blanks. Change-Id: I0b705c924464dcc4987ed0e7c67b106b2b648dce Reviewed-on: https://code.wireshark.org/review/10289 Reviewed-by: Guy Harris commit da266af Author: Guy Harris Date: Fri Aug 28 12:46:11 2015 -0700 Don't check the radio information when testing for an HT Control header. I now read 8.2.4.1.10 "Order field" in 802.11-2012 as saying that, in management and QoS data frames, the Order bit shouldn't be set for non-HT, non-VHT frames, so we can just test it for those frame types without bothering to check the radio metadata to see if the frame is an HT or VHT frame. This handles cases where the radio metadata isn't complete, e.g. an HT frame with a radiotap header but no MCS field. Handle this for *all* QoS data frames when capturing. Get rid of the "fixed-length link-layer header" stuff; it's not being used. Fix a case where we're appending text to a tree item without a space separating it from the previous text. Bug: 11351 Change-Id: I980f5b7509603b0c22c297fddc19434c08817913 Reviewed-on: https://code.wireshark.org/review/10288 Reviewed-by: Guy Harris commit 42570f9 Author: Guy Harris Date: Fri Aug 28 12:05:20 2015 -0700 Clean up scanning to guess the bitrate of an MPEG-2 Transport Stream file. Don't treat an EOF at the beginning of a frame as an error. Treat I/O errors as hard errors; treat short reads as an indication that the file isn't an MPEG-2 Transport Stream file. Treat the PCR for a given PID not going forward as an indication that the file isn't an MPEG-2 Transport Stream file. Bug: 11471 Change-Id: I42b5887049423f8265db9d121d7b5bd388e5b244 Reviewed-on: https://code.wireshark.org/review/10286 Reviewed-by: Guy Harris commit c04d54f Author: Pascal Quantin Date: Thu Aug 27 23:35:58 2015 +0200 Preparation Host Flows: make ICMP(v6) code and type retrieval more robust Do not retrieve type and code base on the info column content. Instead store type and code in pinfo structure and retrieve them in sequence analysis tap. Change-Id: I71cd505d7faf713c2372731495d47b45928a41f8 Reviewed-on: https://code.wireshark.org/review/10280 Petri-Dish: Pascal Quantin Reviewed-by: Pascal Artho Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 5179406 Author: Gerald Combs Date: Fri Aug 28 09:50:26 2015 -0700 Update the release notes. Change-Id: I7fb0d307355320a77f011b59c71d1d54066b7d08 Reviewed-on: https://code.wireshark.org/review/10284 Reviewed-by: Gerald Combs commit a7f22aa Author: Alexis La Goutte Date: Mon Jul 27 17:00:18 2015 +0200 ISAKMP: Add new CHACHA20/POLY1305 Transform Types Values (RFC7634) From IANA ikev2-parameters (2015-08-24) Change-Id: I02bfd9a0ffc9f863f4d266fcc56cd707c3e71725 Reviewed-on: https://code.wireshark.org/review/10282 Reviewed-by: Anders Broman commit f19a173 Author: Gerald Combs Date: Wed Aug 26 17:14:39 2015 -0700 Speed up column sorting. The GTK+ UI sequentially dissects and caches column strings for all rows before sorting a column. Do the same in the Qt UI, which can improve performance considerably. Don't colorize packets when sorting in the Qt UI unless it's necessary. When sorting in the Qt UI, let the user cancel the initial packet dissection. Note that we'll need to replace std::sort in order to cancel out of sorting. Use a pre-allocated and pre-compiled GRexex when we prime columns. Note that we probably shouldn't parse a regular expression there. Cache the last result of proto_registrar_get_byname. Note performance hot spots elsewhere in the code. To do: GeoIP in packet-ip.c is pretty slow. Bug: 11467 Change-Id: Ib34038fee08ef0319261faeffc4eca01e52f4bd3 Reviewed-on: https://code.wireshark.org/review/10275 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 01fb470 Author: Gerald Combs Date: Wed Aug 26 12:48:56 2015 -0700 More retapping fixups. Disable the main file close and reload actions while we're retapping, otherwise many of our dialogs will crash. Disable the TapParameterDialog filter entry while we're retapping. This keeps us from enabling the "Apply" button when we shouldn't. Don't prematurely disconnect our signals in WiresharkDialog. Change-Id: Iaf507eb4503b9c296766f109f2b8c71343263982 Reviewed-on: https://code.wireshark.org/review/10274 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 30c2f23 Author: Michael Mann Date: Tue Aug 25 20:58:09 2015 -0400 Eliminate proto_tree_add_text from some dissectors. Change-Id: I066b70cfd58f5fb3ffbcb2e238416747d9e7dd57 Reviewed-on: https://code.wireshark.org/review/10269 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 2ed634d Author: Stig Bjørlykke Date: Mon Aug 24 15:00:39 2015 +0200 Support BER files bigger than 256kB Also support APPLICATION as starting tag. Change-Id: Id85b08e2594969c98c530532a32268b01d50965e Reviewed-on: https://code.wireshark.org/review/10233 Petri-Dish: Stig Bjørlykke Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke commit e3a4188 Author: Didier Arenzana Date: Sun Aug 23 20:54:38 2015 +0200 RADIUS: Validation of response authenticators This patch enables validation of response authenticator messages when the shared secret is known. The validation can be activated in the preferences. It implements the validation protocol described in RFC 2865 page 16: Response Authenticator. When an authenticator is invalid, the information is added in the header information. It adds two flags for the display filter : radius.authenticator.valid and radius.authenticator.invalid: since verification is not always possible we use two flags to determine if the verification has been made or not, in the same way as udp and tcp checksum validation is implemented. The Authenticator field becomes a tree, and the value of the flags are visible in this tree. Change-Id: I33a664f2265c6248e106cee7904c754089d50445 Reviewed-on: https://code.wireshark.org/review/10216 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 6151946 Author: Stig Bjørlykke Date: Tue Aug 25 14:51:50 2015 +0200 Qt: Fixed some memory leakages Change-Id: I5bccf706001f9ff41197ed13b1be5a7404ca594f Reviewed-on: https://code.wireshark.org/review/10251 Petri-Dish: Stig Bjørlykke Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke commit efba977 Author: Stig Bjørlykke Date: Tue Aug 25 15:18:51 2015 +0200 Qt: Fixed some memory leakages Change-Id: Ie8c9b7f8c9203acb5aec00d5553b911e0299f53c Reviewed-on: https://code.wireshark.org/review/10253 Petri-Dish: Stig Bjørlykke Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke commit 8384a5b Author: Stig Bjørlykke Date: Tue Aug 25 20:18:46 2015 +0200 Qt: Fixed some memory leakages And changed strdup -> g_strdup Change-Id: I62de106462259194738d633f16297eb1210f8ccf Reviewed-on: https://code.wireshark.org/review/10259 Reviewed-by: Stig Bjørlykke commit 2e1fa63 Author: Alexis La Goutte Date: Wed Aug 26 10:32:52 2015 +0200 Lemon grammar: fix indent (use tabs) Change-Id: I6fa38d5d85b25ac6c55fcfa67d6c8dba8482cc8c Reviewed-on: https://code.wireshark.org/review/10266 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 0af048b Author: Michael Mann Date: Tue Aug 25 19:14:59 2015 -0400 Remove calls of tvb_ensure_length_remaining. The remaining calls seem to fall into 3 categories: 1. passing it to tvb_find_line_end when -1 (for length) will do. 2. duplicating the checking of tvb_reported_length_remaining, which is already in use near the tvb_ensure_length_remaining call. 3. Those that (probably) need tvb_ensure_capture_length_remaining Change-Id: I1e77695251e055644bcbbb89f3c181c65d1671ca Reviewed-on: https://code.wireshark.org/review/10268 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 374439d Author: Gerald Combs Date: Wed Aug 26 11:24:29 2015 -0700 Don't emit app signals from dialogs. Emitting PacketDissectionChanged from a dialog on can render the main window unusable on OS X. A workaround for this was added to the preferences dialog in g8fc2327. Generalize the workaround and use it elsewhere. Fix the "Enabled Protocols" action name while we're here. Bug: 11361 Bug: 11448 Change-Id: I89e98daaaedc877d3b13b0d33b6f3be033e323d7 Reviewed-on: https://code.wireshark.org/review/10271 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 8ad5611 Author: Martin Kaiser Date: Wed Aug 26 22:52:06 2015 +0200 sv: remove some unnecessary checks http://personal.strath.ac.uk/robert.c.atkinson/papers/sgms2011.pdf implies that appid, length and the two reserved fields are mandatory just try to dissect them, don't check if there's enough bytes remaining correct a typo while at it Change-Id: I09a315fc2c70161af527dca5661f877e09b63ff6 Reviewed-on: https://code.wireshark.org/review/10273 Reviewed-by: Martin Kaiser commit 7b35992 Author: Stig Bjørlykke Date: Mon Aug 24 22:12:17 2015 +0200 Reload IO Graph Y fields when reload Lua plugins Change-Id: Ic3b9096c3c25839dd7d7bfe7af71eeb5b0bd745d Reviewed-on: https://code.wireshark.org/review/10239 Petri-Dish: Stig Bjørlykke Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke commit bc4487a Author: Jeffrey Smith Date: Tue Aug 25 18:40:45 2015 -0500 bootp/dhcp: tighten check for Alcatel extensions The check for Alcatel extensions in bootp/dhcp packets is very weak, resulting in some false positives. Then when trying to parse the suboptions, the result is an error on the packet. This change eliminates some false positives by adding a test that the vendor-specific option contents match the encapsulated format described in section 8.4 of RFC2132. Change-Id: Ie4188ff900426c2d80a5694fbba5c88385625a61 Reviewed-on: https://code.wireshark.org/review/10267 Reviewed-by: Alexis La Goutte commit e1c807c Author: Gerald Combs Date: Wed Aug 26 08:41:50 2015 -0700 Add missing callback support. Change-Id: I90838ccb701c93b11b216d0eb9973cbac8627129 Reviewed-on: https://code.wireshark.org/review/10270 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit e234ce8 Author: Gerald Combs Date: Mon Aug 24 12:30:56 2015 -0700 Rework tapping in Qt dialogs. Add cf_cb_file_retap_started and cf_cb_file_retap_finished to file.[ch]. Add their associated signals to CaptureFile. Add registerTapListener and removeTapListeners to WiresharkDialog, which collect and automatically remove tap listeners. Add beginRetapPackets and endRetapPackets, which can be used to wrap critical sections so that we don't delete ourselves while tapping. Don't cancel tapping on close in WiresharkDialog. Use beginRetapPackets and endRetapPackets in WiresharkDialog and FollowStreamDialog. We will likely need to add them elsewhere. Update comments. Change-Id: I1788a6ade0817c31aa3419216df96be5e36b2178 Reviewed-on: https://code.wireshark.org/review/10261 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit f7e9a79 Author: Gerald Combs Date: Mon Aug 24 12:33:49 2015 -0700 Add per-dialog progress frames. Add ProgressFame::addToButtonBox, which violates the UX guidelines on every platform we support by inserting a ProgressFrame into a QDialogButtonBox. Call addToButtonBox in the constructors of a bunch of dialogs. Change-Id: I33ac5fd7a976ee6e0527de569a5c4b528980dae1 Reviewed-on: https://code.wireshark.org/review/10242 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 8b4ff24 Author: tkc Date: Tue Aug 25 16:58:43 2015 +0530 ieee80211: Qos Control bit4 handling: Make the default case as EOSP, to handle TDLS Packets. When parsing TDLS direct link packets the ToDS: 0 and FromDS:0 so the wireshark treats the 4th bit in QoS Control as "bit4", but it should be treated as EOSP. So changed the default case to EOSP and only when TODS is set treat it as "bit4". Change-Id: Ie2a73320dc9921aed4547e32836e6cd7d89ef109 Reviewed-on: https://code.wireshark.org/review/10250 Reviewed-by: Alexis La Goutte commit 57b2b77 Author: Joerg Mayer Date: Wed Aug 26 08:50:09 2015 +0400 cmake: rework version.h handling to treat it like config.h It wasn't working on my system: I kept seeing the old git revision in '...shark -v' even after deleting version.h Change-Id: I75f41a7afcee4b9384f33a56014e4af6b527fec5 Reviewed-on: https://code.wireshark.org/review/10265 Petri-Dish: Jörg Mayer Tested-by: Petri Dish Buildbot Reviewed-by: Jörg Mayer commit c18d2f8 Author: Stig Bjørlykke Date: Tue Aug 25 15:16:29 2015 +0200 Qt SCTP: Changed prohibited APIs strcpy -> g_strlcpy sprintf ->g_snprintf Also initialize some temp variables. Change-Id: I4d2fa1b0325c6e59aa13ebeb0d9c25d5ff7c4d9c Reviewed-on: https://code.wireshark.org/review/10252 Petri-Dish: Stig Bjørlykke Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit bd21889 Author: Alexis La Goutte Date: Tue Aug 25 19:36:28 2015 +0200 Camel: fix indent (use 2 spaces) Change-Id: I0e8047fca7f24e60e4db8ad77254bcff5f8d6651 Reviewed-on: https://code.wireshark.org/review/10257 Reviewed-by: Anders Broman commit 6b41d2c Author: João Valverde Date: Sat Aug 22 18:31:41 2015 +0100 Do not treat all unknown IP protocols as unknown IPv6 extension headers Change-Id: I229260ce668b60a9756cd3f2e343c278ae27c211 Bug: 9996 Reviewed-on: https://code.wireshark.org/review/10196 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 5e45269 Author: Guy Harris Date: Tue Aug 25 16:56:37 2015 -0700 Explain why the MSDU length field in an A-MSDU is big-endian. Change-Id: I4a1cfd09395860348d71e9f4c86b6343cfdcd02a Reviewed-on: https://code.wireshark.org/review/10262 Reviewed-by: Guy Harris commit 4fe661d Author: Guy Harris Date: Tue Aug 25 15:40:00 2015 -0700 Get subset TVBs correctly. If you know the actual data length, use tvb_new_subset_length(); it will use that as the *reported* length, which is how it *should* be used, and will calculate the *captured* length for you as appropriate. Change-Id: I86dde999f59fdfec58b118729b7b881737983033 Reviewed-on: https://code.wireshark.org/review/10260 Reviewed-by: Guy Harris commit 0e952e6 Author: Pascal Quantin Date: Tue Aug 25 19:55:56 2015 +0200 SIGCOMP: fix sigcomp.copying_bytes_literally field Change-Id: Ib1baa3437579a413899aaba5dd8d31982cda1b0d Reviewed-on: https://code.wireshark.org/review/10258 Reviewed-by: Pascal Quantin commit 8e55f68 Author: Joerg Mayer Date: Mon Aug 24 04:34:06 2015 +0400 Remove gitversion.h Change-Id: Id3144ecaf9289dbe53cd2f5d3e3de57e8de955f6 Reviewed-on: https://code.wireshark.org/review/10256 Reviewed-by: Jörg Mayer commit 0c291f9 Author: Michael Mann Date: Mon Aug 24 22:30:46 2015 -0400 Eliminate proto_tree_add_text from packet-sigcomp.c Some other cleanup noted by the check* scripts. Change-Id: I14d7bfa81c689fff00fc82e966d50d4ae9f0988d Reviewed-on: https://code.wireshark.org/review/10254 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 571f254 Author: João Valverde Date: Sun Aug 23 03:46:36 2015 +0100 Replace "IPv6 header length" with the more correct "payload length" Change-Id: I3e667ba2e3ac49ce99e7a2035d9ff604fd7cbcca Reviewed-on: https://code.wireshark.org/review/10205 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit cc15b11 Author: Alexis La Goutte Date: Mon Aug 24 10:29:18 2015 +0200 Multicast Stream: Fix Dereference of null pointer found by Clang analyzer Change-Id: I419f49132f8b0853c17b2fd1b4e9869ef3fafd13 Reviewed-on: https://code.wireshark.org/review/10224 Reviewed-by: Anders Broman commit 31bf40e Author: AndersBroman Date: Tue Aug 25 12:45:01 2015 +0200 [Camel] The tags used in EstablishTemporaryConnectionArg differs in V2 and V3 versions of Camel. Add ASN1 code for EstablishTemporaryConnectionArgV2 Bug: 11466 Change-Id: I0dbb9c83e520c269dd567f3c3bc34c99c9aa5e15 Reviewed-on: https://code.wireshark.org/review/10249 Reviewed-by: Anders Broman commit 2af5783 Author: João Valverde Date: Sun Aug 23 21:34:21 2015 +0100 Add more validity checks to the IPv6 dissector Check for IP version and header size Change-Id: I69102dda4e0e91ac1617d9a48fe9b0bab26aa9fe Reviewed-on: https://code.wireshark.org/review/10218 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit d5049ea Author: Pascal Quantin Date: Sat Aug 22 20:08:31 2015 +0200 win32: add detection of Npcap to Windows installer If Npcap is installed without WinPcap API-compatible mode, propose to install WinPcap If Npcap is installed with WinPcap API-compatible mode, do not allow to install Winpcap without manually uninstalling Npcap first Change-Id: I606f8b11c950fd54cf7fdda7f4a1886cc2580d31 Reviewed-on: https://code.wireshark.org/review/10197 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Yang Luo Reviewed-by: Anders Broman commit e710f24 Author: Pascal Quantin Date: Mon Aug 24 11:21:29 2015 +0200 win32: update the list of NdisMedium and NdisPhysicalMedium defines used by GTK UI Use hardcoded values instead of enum values so as to avoid any dependency on newest Microsoft SDK. Add WinPcap specific NdisMediumXXX values. Also rename "Medium in use" to "Media in use" to better match the OID query name. Change-Id: I7ccc2763364b65df77927cbf1c265195fc295642 Reviewed-on: https://code.wireshark.org/review/10225 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Reviewed-by: Yang Luo Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit edeaae0 Author: Richard Sharpe Date: Mon Aug 24 07:39:44 2015 -0700 Remove the search back up the proto tree for the capture frequency that was being used to determine if we are dissecting 802.11ad in several places. Since we now have a macro for testing that and the frequency is in the phdr we really should use that. This also prevents problems during display filter execution with respect to fields that are only present for 802.11ad. Change-Id: Id04a31c15b04378b6b0f056baa1f37d94a65b71c Signed-off-by: Richard Sharpe Reviewed-on: https://code.wireshark.org/review/10234 Reviewed-by: Guy Harris commit 4ba5225 Author: Guy Harris Date: Mon Aug 24 18:46:56 2015 -0700 Point to GitHub for the pcapng specification. Change-Id: I33faa41e8b0f36ee49d29fe391feafd94d0a7e80 Reviewed-on: https://code.wireshark.org/review/10245 Reviewed-by: Guy Harris commit 662f4b2 Author: Jeff Morriss Date: Mon Aug 24 20:26:30 2015 -0400 Use one variable that was set but not previously used and delete another. Change-Id: I6bd7a16e3ea97659a0007edfd9f90dbd2060e443 Reviewed-on: https://code.wireshark.org/review/10244 Reviewed-by: Jeff Morriss commit b16cca4 Author: Guy Harris Date: Mon Aug 24 15:13:59 2015 -0700 Some beamforming stuff from 802.11ac. Extracted from Joerg Mayer's Ixia-derived patch to 1.12 in bug 11464. Most of the changes there are already in the trunk. Change-Id: I90ba04e145ffb2b164810320e3510a5bed847ed4 Ping-Bug: 11464 Reviewed-on: https://code.wireshark.org/review/10243 Reviewed-by: Guy Harris commit 1874793 Author: Stig Bjørlykke Date: Mon Aug 24 22:59:21 2015 +0200 Remove unused signal Change-Id: Ic2d4057ee95849bc1b026663dae1430432ad9707 Reviewed-on: https://code.wireshark.org/review/10241 Reviewed-by: Stig Bjørlykke commit 99dab82 Author: Stig Bjørlykke Date: Mon Aug 24 22:19:01 2015 +0200 Use signal to close packet dialogs Change-Id: I312f8de8de933e576b60d2b158e4c4f2d1147ef1 Reviewed-on: https://code.wireshark.org/review/10238 Reviewed-by: Stig Bjørlykke commit fbadcdd Author: Gerald Combs Date: Mon Aug 24 10:56:04 2015 -0700 Add notes about using CMake + Qt Creator. Change-Id: Ib10cc0a407721d62b39628af858f14e749c94d22 Reviewed-on: https://code.wireshark.org/review/10237 Reviewed-by: Gerald Combs commit 75d9167 Author: Alexis La Goutte Date: Mon Aug 24 10:21:55 2015 +0200 Multicast Statistics (Qt Dialog): Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang Change-Id: Ie2802293576bf9edb28bccf7d464b5e687185096 Reviewed-on: https://code.wireshark.org/review/10223 Reviewed-by: Gerald Combs commit 7f60878 Author: Gerald Combs Date: Mon Aug 24 09:01:09 2015 -0700 Add FOP 2.0 to the search list. Change-Id: Ifc462a69e28b875f05770c453b06689c69008c52 Reviewed-on: https://code.wireshark.org/review/10235 Reviewed-by: Gerald Combs commit d7e3076 Author: João Valverde Date: Mon Aug 24 12:16:06 2015 +0100 IPv6 RPL: "cmprI" should be "cumprE" Bug: 10560 Change-Id: I7cf9fb8ad39d128ed375abb8703937be8e3795b3 Reviewed-on: https://code.wireshark.org/review/10228 Reviewed-by: Alexis La Goutte commit bc0d8d1 Author: João Valverde Date: Sat Aug 22 19:20:25 2015 +0100 Remove space from field description for consistency Change-Id: I74b0be1724d0754b7d1b724e177d44c4894d0e6b Reviewed-on: https://code.wireshark.org/review/10198 Reviewed-by: Anders Broman commit a5b5c5a Author: Martin Kaiser Date: Sun Aug 23 18:44:31 2015 +0200 fc: don't THROW() an exception from a dissector bring up an expert info and exit Change-Id: Icbbafb8b7187a66d3ddc9a674502ad728b7c4ffc Reviewed-on: https://code.wireshark.org/review/10222 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 517f4d4 Author: Martin Kaiser Date: Thu Aug 20 23:06:44 2015 +0200 cigi: don't THROW() an exception from a dissector stop the dissection instead and bring up an expert info in the main function Change-Id: I391bf821422ef8e6ae01849c88096e90e4295920 Reviewed-on: https://code.wireshark.org/review/10221 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 7c0b8bd Author: AndersBroman Date: Mon Aug 24 12:41:04 2015 +0200 [Q.2931] Don't use BASE_EXT_STRING for a value_string, fixes the test suite ** (process:10080): WARNING **: Invalid value_string_ext ptr for: q2931.atm_identifier Change-Id: Id4ec745629af7774e480e91fba01ed8da5aac1bd Reviewed-on: https://code.wireshark.org/review/10227 Reviewed-by: Anders Broman commit 079dd03 Author: Stig Bjørlykke Date: Mon Aug 24 11:52:29 2015 +0200 Fixed typo in hfinfo_remove_from_gpa_name_map Change-Id: Ic80fbe9397e50c41fa01ef9147319dd2ac0c0b91 Reviewed-on: https://code.wireshark.org/review/10226 Reviewed-by: Stig Bjørlykke commit a2d8514 Author: Pascal Quantin Date: Sun Aug 23 19:02:23 2015 +0200 ip: fix ip.hdr_len filter value when the header length is too small Change-Id: Ia510d0f4e496ef0577856bf633d6ca19f0b3e1cb Reviewed-on: https://code.wireshark.org/review/10210 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit bd553f6 Author: Michael Mann Date: Sat Aug 22 22:14:30 2015 -0400 Eliminate proto_tree_add_text from packet-q931.c and packet-q2931.c Change-Id: I681b05755429fd7420c423ff88e5a4d3dc95db64 Reviewed-on: https://code.wireshark.org/review/10219 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Reviewed-by: Anders Broman commit 7176958 Author: Stig Bjørlykke Date: Sat Aug 22 22:59:42 2015 +0200 Close packet dialogs when reload Lua plugins. We could keep the dialogs with the current content if postponing proto_free_deregistered_fields() until all dialogs are closed. This would give a feature where the user is able to compare packets before and after a reload. Or we could add functions in PacketDialog to reload the packet details in all open dialogs. This would give a feature to always have a updated dialog for all interesting packets. Change-Id: I805352b65844eafafafc54cd61f08b4605416e64 Reviewed-on: https://code.wireshark.org/review/10201 Petri-Dish: Stig Bjørlykke Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke commit 25ec198 Author: Stig Bjørlykke Date: Thu Aug 20 21:39:12 2015 +0200 Disable streamNumberSpinBox while reloading capture When changing stream in TCPStreamDialog it should not be possible to change stream again until the capture has reloaded, because this will give a crash when doing graph_segment_list_free() or graph_segment_list_get() while already doing this. Also disable mouseMove event (showing packet details) while reloading, as this also will give a crash. We should consider also having a reload progress bar in the TCPStreamDialog to indicate that this is happening when having large capture files, as the main window may not be visible. Change-Id: I622f9e0de8205bc1fd18101dc03100079d7a2d06 Reviewed-on: https://code.wireshark.org/review/10159 Petri-Dish: Stig Bjørlykke Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke commit 47c9aa4 Author: João Valverde Date: Fri Aug 21 09:33:17 2015 +0100 Check if IPv6 payload length exceeds framing byte length Bug: 11418 Change-Id: Icbb980fda4f7addf52db59bc4f2aa27fc8f85837 Reviewed-on: https://code.wireshark.org/review/10176 Reviewed-by: Pascal Quantin commit c6aeaad Author: Stig Bjørlykke Date: Thu Aug 20 22:50:58 2015 +0200 Disable apply button while adding the filter Pressing multiple apply while reloading the capture file will give a crash. Change-Id: I3587b9ab6b6b7f1437f3a7becb8c35277bb5c62c Reviewed-on: https://code.wireshark.org/review/10161 Reviewed-by: Stig Bjørlykke commit 216f06b Author: Stig Bjørlykke Date: Sun Aug 23 20:11:06 2015 +0200 Lua: Support deregister ProtoField with existing abbrev Change-Id: Icb06792bb2662dcee6e5495359ceef420a5b4498 Reviewed-on: https://code.wireshark.org/review/10212 Reviewed-by: Stig Bjørlykke commit 984f87a Author: Michael Mann Date: Thu Aug 20 06:16:22 2015 -0400 Eliminate proto_tree_add_text from some dissectors Change-Id: Id710ab10093227b27ef5f18b0d2960e31d0b95a9 Reviewed-on: https://code.wireshark.org/review/10200 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 296b9cf Author: Richard Sharpe Date: Sat Aug 22 09:51:25 2015 -0700 Add some symbols to wtap.h so that we can correctly support 802.11ad. Currently there are a lot of local hacks in the 802.11ad support and better support can be provided. Also add a structure to track 802.11ad (DMG) specific features in the phdr structure as suggested by Guy Harris. Also, respond to some suggestions by Guy Harris. Change-Id: I8459e3986a134a08ee2e31f0158b8aa5c9b91d86 Signed-off-by: Richard Sharpe Reviewed-on: https://code.wireshark.org/review/10204 Reviewed-by: Guy Harris commit 5ed7a40 Author: Guy Harris Date: Sun Aug 23 16:13:20 2015 -0700 Don't assume we have interface information. Not all capture file formats provide interface information. Check whether we have it, and don't fail if we don't have any. (Note that the current version of the pcapng specification in the Git repository does not require that there be at least one IDB in a file, only that there must be an IDB for each interface to which other blocks in a file refers.) Change-Id: Ia796f639ed3a8cb21e1dbe9b2bc6b4b66c7be479 Reviewed-on: https://code.wireshark.org/review/10220 Reviewed-by: Guy Harris commit ce38df5 Author: Pascal Quantin Date: Sun Aug 23 21:02:24 2015 +0200 CBOR: get rid of INFINITY and NAN defines This triggers an "overflow in constant arithmetic" warning with MSVC2013 Change-Id: Ie3b076019c4722857c8e57f8568a0cb124fd13ad Reviewed-on: https://code.wireshark.org/review/10217 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 4f68c52 Author: Guy Harris Date: Sun Aug 23 11:38:13 2015 -0700 See if this makes MSVC happy. It's complaining about an "overflow in constant arithmetic". Neither INFINITY nor NAN are specified by C90; C99 specifies that they are both floats. Until recently, Microsoft had no interest in C99; if the version we're using supports C99's INFINITY and NAN, it should be OK to assign them to a variable (no "arithmetic" involved), so I'm guessing that the "arithmetic" in question is the use of conditional operators ? and :, so I'm writing it as an if statement instead. Change-Id: I532b9b5943be32e0897e4f03ac4e625ac41ee63b Reviewed-on: https://code.wireshark.org/review/10215 Reviewed-by: Guy Harris commit 6b9a628 Author: Stig Bjørlykke Date: Sun Aug 23 20:36:33 2015 +0200 Lua: remove unneeded todo comments Change-Id: I2591a0f21092a251e6fc4393e97ae0594318dfdf Reviewed-on: https://code.wireshark.org/review/10214 Reviewed-by: Stig Bjørlykke commit fd68385 Author: Guy Harris Date: Sun Aug 23 11:20:39 2015 -0700 Use G_GINT64_MODIFIER, not l, in format strings for 64-bit integers. 64-bit integers are *not* guaranteed to be longs and, in fact, are *not* longs on ILP32 platforms such as 32-bit UN*Xes and 32-bit Windows and on LLP64 platforms such as 64-bit Windows. Change-Id: I6408778f638bb6cea52ffb64be39ea26c9b2ee64 Reviewed-on: https://code.wireshark.org/review/10213 Reviewed-by: Guy Harris commit a451c60 Author: Guy Harris Date: Sun Aug 23 11:12:43 2015 -0700 Rename variable to avoid collisions with math.h's exp(). Spell out "mantissa" while we're at it. Change-Id: I47ddb9882f45ef58a6f7101818683e68bc54983b Reviewed-on: https://code.wireshark.org/review/10211 Reviewed-by: Guy Harris commit 0b03543 Author: Hauke Mehrtens Date: Mon Jul 20 23:36:03 2015 +0200 CBOR: add Concise Binary Object Representation (RFC 7049) dissector This adds a dissector Concise Binary Object Representation (CBOR) (RFC 7049). CBOR is a binary data format designed for implementations with small code size as used in the IoT. It uses a structure similar to JSON, but encodes the data in binary format. This is used on top of CoAP for example. Change-Id: I9d7b7d4f7609c899bfc68250cdfebd5dc64e0402 Signed-off-by: Hauke Mehrtens Reviewed-on: https://code.wireshark.org/review/9848 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 3ce60ed Author: Peter Wu Date: Fri Jul 17 16:31:32 2015 +0200 dtls: do not try to add a zero-length fragment fragment_add does not like adding zero-length fragments, it causes a zero-length memcpy to NULL. According to RFC 6347, fragment_offset=0 and fragment_length=length is an unfragmented message, so fragment>0 and fragment_length=length=0 is a fragmented message. An empty fragment does not extend a previous message, so ignore it. Such fragments are produced by at least GnuTLS 3.3.7[1], so raise a warning instead of an error. Caught by ubsan: epan/tvbuff.c:783:10: runtime error: null pointer passed as argument 1, which is declared to never be null #0 0x7f5319f6ed64 in tvb_memcpy epan/tvbuff.c:783 ... #13 0x7f5319f27e2b in fragment_add epan/reassemble.c:1394 #14 0x7f531a5c70a4 in dissect_dtls_handshake epan/dissectors/packet-dtls.c:1257 [1]: http://comments.gmane.org/gmane.network.gnutls.general/3582 Change-Id: I70bf16d2fb64793d0deaabe612147e238b743b2e Ping-Bug: 11358 Reviewed-on: https://code.wireshark.org/review/9689 Petri-Dish: Peter Wu Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu commit 3703b4e Author: João Valverde Date: Sat Aug 22 19:56:34 2015 +0100 Fix ip_try_dissect() boolean return If dissector_try_heuristic() succeeds return TRUE and vice-versa. Change-Id: I3fb2595604f2f3981468473d0a966efe7387745e Reviewed-on: https://code.wireshark.org/review/10199 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit cc7afd2 Author: Robert Grange Date: Thu Aug 13 15:35:01 2015 +0200 packet-mq: Add new Const/Def for WMQ800 FP3 Add new Const/Def for WMQ800 FP3 Improve Detection of EBCDIC String in MQCONN_REPLY Add Value in comments Change-Id: I695a3afa64fee7f22918f68540901c97dfd38464 Reviewed-on: https://code.wireshark.org/review/10012 Reviewed-by: Robert Grange Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 89ff46e Author: Gerald Combs Date: Sun Aug 23 08:06:46 2015 -0700 [Automatic update for 2015-08-23] Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I3726aa80e1e4d23301500fca326ae2b952bf38f6 Reviewed-on: https://code.wireshark.org/review/10208 Reviewed-by: Gerald Combs commit f95d459 Author: Alexis La Goutte Date: Sat Aug 22 11:27:00 2015 +0200 OSPF: Fix indent (use 4 spaces) Change-Id: I4bd3c4a983b12e8fa053c2362f80dd723b9de572 Reviewed-on: https://code.wireshark.org/review/10191 Reviewed-by: Michael Mann commit 2336743 Author: Joerg Mayer Date: Sun Aug 23 17:02:47 2015 +0400 Remove some svn $Author$ lines that escaped previous cleanups. git does keep of this in a much better way anyway. Change-Id: I9923516105e63e72878e0ed34c74eed44453ab01 Reviewed-on: https://code.wireshark.org/review/10207 Reviewed-by: Jörg Mayer commit ebca184 Author: Guy Harris Date: Sat Aug 22 15:33:15 2015 -0700 Call the MCS field by its correct name. Yes, it *should* have been called "HT", but hindsight is always 20-20. If you want less confusingly named information, look at what the "802.11 radio information" dissector puts into the protocol tree; the radiotap dissection is for people debugging radiotap implementations or looking for vendor-specific information that's not (yet) put into the generic 802.11 radio information. Change-Id: If6e97f82595a6f11a45e34d5a52e70e9ca686d7c Reviewed-on: https://code.wireshark.org/review/10202 Reviewed-by: Guy Harris commit 15ed335 Author: João Valverde Date: Tue Aug 18 07:01:35 2015 +0100 [CLI, GTK] comparestat: Fix typos, output format, argument parsing Optional filter argument wasn't correctly parsed. Change-Id: Ic0418fa866e1a00880b4e41bb28267a155a71aa5 Reviewed-on: https://code.wireshark.org/review/10088 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 9c331f7 Author: João Valverde Date: Tue Aug 18 08:11:34 2015 +0100 [GTK] Fix crash in comparestat.c Selecting a row in the statistics table causes a Glib assertion failure. GLib:ERROR:ghash.c:373:g_hash_table_lookup_node: assertion failed: (hash_table->ref_count > 0) When the comparestat_draw() function is called, the cs->ip_id_set hash table is created and then immediately destroyed, but the hash table lookup to cs->ip_id_set in new_tree_view_selection_changed() can happen anytime the user clicks on a table row. Bug: 11098 Change-Id: I6c7a39c947ca11327c3fc3ab0d4caa735798d142 Reviewed-on: https://code.wireshark.org/review/10096 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 0d61321 Author: Michael Mann Date: Fri Aug 14 21:13:51 2015 -0400 Correct logic for finding shadow variables. Change-Id: Ide03c3b92f70d5dad8d0dceca179ea6f3b9e1fd6 Reviewed-on: https://code.wireshark.org/review/10037 Reviewed-by: Michael Mann commit 5a7f574 Author: Joerg Mayer Date: Sat Aug 22 16:11:35 2015 +0400 Fix two bugs 1) Introduced by me in commit c4fe7129d802752aa4cc89a66d2d5d5f2698e020 where I didn't honor the "print lsa header only" flag properly for data highlighting 2) Introduced in 2001 with commit dd1b7eafafb5748757a0396f4cc6ad6e65f37483 which moved offset increasing into an "if (tree)" statement with code after the if statement continuing to work with offset. Also make display of v2 and v3 LSAs the same again (forgot one case in previous commit. bug:11461 Change-Id: I1986c19842f1fa9c8a6d0a7c9a79c64939eeb9d0 Reviewed-on: https://code.wireshark.org/review/10192 Reviewed-by: Jörg Mayer commit b0a8fa5 Author: Stig Bjørlykke Date: Fri Aug 21 12:43:55 2015 +0200 Initialize extcap for pipes Change-Id: Ia731f281ee9af171c759d7f6f7c614c350cbb4e7 Reviewed-on: https://code.wireshark.org/review/10178 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke commit 532070b Author: João Valverde Date: Sun Aug 16 18:41:53 2015 +0100 Add support for IPv6 stats tree statistics Also add support for alphabetizing stat tree items as the addition of IPv6 stats tree makes it more obvious its needed. Change-Id: I8b319ceac805ce7e3a1fd59f92c1c6fe2a54d3de Reviewed-on: https://code.wireshark.org/review/10062 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 953cdd4 Author: Joerg Mayer Date: Sat Aug 22 08:33:27 2015 +0400 Print two reserved elements as reserved instead of skipping them Change-Id: Ic91e07df4881dfff0f0dd1c4809903cbdee8ef60 Reviewed-on: https://code.wireshark.org/review/10190 Reviewed-by: Jörg Mayer commit c4fe712 Author: Joerg Mayer Date: Sat Aug 22 08:11:45 2015 +0400 Small cleanups and improvements Show the LSA type and length in the summary line Improve a message to make it clear when we are talking about a LLS TLV Add an expert item for LLS bit set but data block missing PI_MALFORMED is an error not a warning. Change-Id: I516c2a2f0c27fcf101671527d4e4f018e17d3025 Reviewed-on: https://code.wireshark.org/review/10189 Reviewed-by: Jörg Mayer commit ee80be6 Author: Gerald Combs Date: Fri Aug 21 17:12:39 2015 -0700 Add the display filter macros dialog. Add some missing functionality to UatDialog. Remove what appears to be unused dfilter macro code. Change-Id: I8a8d6358523f24d5ddfe953d7741fe9af25d98eb Reviewed-on: https://code.wireshark.org/review/10187 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 97014f6 Author: Joerg Mayer Date: Sat Aug 22 05:43:46 2015 +0400 OSPF database packets and OSPF hellos in DC mode are unicast. At least Cisco sends out these packets with a TTL of 1. Change-Id: I9ef0cd486d200a768329cfb758b87e20e3456663 Reviewed-on: https://code.wireshark.org/review/10188 Reviewed-by: Jörg Mayer commit 74177d9 Author: Gerald Combs Date: Fri Aug 21 15:02:20 2015 -0700 Statistics dialog fixups. Fix the "retap on show" behavior in TapParameterDialog. It was filling in the tree when it shouldn't have. Set the capture stop flag when WiresharkDialog closes. Change-Id: I5e85f11cab32e8b958deabb58186a855b5fcaa84 Reviewed-on: https://code.wireshark.org/review/10186 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit a66a95c Author: Gerald Combs Date: Fri Aug 21 08:46:43 2015 -0700 Add packet comments to the properties dialog. This pulls in missing functionality from the comment summary dialog. Change-Id: Ib417896a6e8f2b2f903520b26193c249677bbb83 Reviewed-on: https://code.wireshark.org/review/10185 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 95c8b01 Author: Bill Parker Date: Fri Aug 21 15:24:41 2015 +0200 [echld common] Call to fcntl() missing a test for a return value < 0, indicating failure. Bug: 11056 Change-Id: I87aef31d874224f38226df1725cc29d13ad16b54 Reviewed-on: https://code.wireshark.org/review/10182 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit d32c3da Author: Hadriel Kaplan Date: Fri Aug 21 11:59:34 2015 -0400 Lua: check sscanf return value Wslua's Int64.fromhex() and UInt64.fromhex() need to check the sscanf return value. Found by coverity (CID 1191368 &1191369). Change-Id: I67fba027e18341d429787515f94c794573dc41c2 Reviewed-on: https://code.wireshark.org/review/10183 Reviewed-by: Alexis La Goutte commit dd2a2d4 Author: Gerald Combs Date: Fri Aug 21 09:45:48 2015 -0700 Multicast and wireless lan statistics fixups. Make sure "-z multicast,stat[,filter]" and "-z wlan,stat[,filter]" work. Add some missing "-z" items to the man page. Try to fix some MSVC++ warnings. Change-Id: Ie18e5355d595e351f000f14d82781dcdf33141c3 Reviewed-on: https://code.wireshark.org/review/10184 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 69ec4a5 Author: João Valverde Date: Fri Aug 21 08:45:49 2015 +0100 Add "ip.version" field to bogus IP for filter matching Change-Id: Ibb05b8742e41c1b16c1335ad97af99324ab95223 Reviewed-on: https://code.wireshark.org/review/10175 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Hadriel Kaplan commit f8712ae Author: Bill Parker Date: Fri Aug 21 15:13:16 2015 +0200 [Kerberos] Call to 'fseek()' without a check for a return value < 0, indicating failure. Bug: 11056 Change-Id: Iaa6b7ca07626b78c77e3c1507726ec579764a582 Reviewed-on: https://code.wireshark.org/review/10181 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 856bab6 Author: Luke Mewburn Date: Wed Aug 19 10:42:59 2015 +1000 LWM: fix compilation without libgcrypt Add HAVE_LIBGCRYPT compilation guards. Move gcrypt-related variables into the scope they're used. Change-Id: I81a2c8a54514fb51de53640fa8eceeddb2bf24d9 Reviewed-on: https://code.wireshark.org/review/10118 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit b5ca69b Author: Dave Rigby Date: Thu Aug 20 16:05:57 2015 +0100 Couchbase: dissect sub-document commands Add support for dissecting Couchbase sub-document commands (those which operate on a subset of a whole document). Example pcap file: https://wiki.wireshark.org/SampleCaptures?action=AttachFile&do=get&target=couchbase_subdoc_multi.pcap Change-Id: I5394a6f86c036ebd339574bac4e52f7d0821e4bf Reviewed-on: https://code.wireshark.org/review/10151 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit d097968 Author: João Valverde Date: Fri Aug 21 03:10:10 2015 +0100 Make IPv6 extension header protocol names uniform and consistent with RFC 2460 Example from RFC 2460 (page 7): IPv6 header Hop-by-Hop Options header Destination Options header (note 1) Routing header Fragment header Authentication header (note 2) Encapsulating Security Payload header (note 2) Destination Options header (note 3) Change-Id: I03c1ebedf581f71047b303856052609574110c61 Reviewed-on: https://code.wireshark.org/review/10173 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Reviewed-by: Michael Mann commit 30ce20d Author: AndersBroman Date: Fri Aug 21 13:54:53 2015 +0200 [Expert] Enhance error output to identify the duplicated field. Change-Id: Ie38f51e2fa0f846dbcfd7a19f29eac1bd07cffbc Reviewed-on: https://code.wireshark.org/review/10179 Reviewed-by: Anders Broman commit f73e1c2 Author: Peter Lemenkov Date: Thu Aug 13 18:13:45 2015 +0300 Allow redefining all ports for RADIUS RADIUS configuration sometimes uses more ports - for example, one for authentication, another one for accounting. Sometimes it uses the entire port ranges. In case of FreeRADIUS 2.x.x server it might look like this: ... listen { type = auth ipaddr = * port = 13812 } listen { type = acct ipaddr = * port = 13813 } ... Unfortunately we allow only one port to be redefined, not more. So it forces a person who's analyzing a traffic from such a RADIUS server manually select "Decode as" every time for each port. It was requested at least once to lift this limitation: * https://ask.wireshark.org/questions/2189/decode-multiple-ports-as-radius So let's fix it! With this commit it's possible to set a port ranges for RADIUS dissector to handle. An example (default) configuration looks like (see ~/.wireshark/preferences): radius.ports: 1645,1646,1700,1812,1813,3799 Old "alternate_port" preference is marked as obsolete. It won't be shown to a user but it will still be used if exists (remained from a previous installations). *Ver. 2*: Old alternate_port value is copied to the ports range, thus making transition even more smooth. Change-Id: Ibdd6f4f9fa1e0ac186147cec380bbfc62d509b17 Signed-off-by: Peter Lemenkov Reviewed-on: https://code.wireshark.org/review/10015 Petri-Dish: Anders Broman Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 7d59925 Author: Timo Warns Date: Fri Jul 31 22:30:16 2015 +0200 SSL: refine KEX handling and fix _anon KEX dissecting Dissecting client and server KEX messages requires to precisely distinguish KEX algos. For example, Server KEX for DH_anon do not contain a signature, while DHE_DSS and DHE_RSA do. The patch introduces KEX distinction with full precision and fixes dissecting _anon KEX messages. Change-Id: I0bcd5e2bf899ba9cac79476d5b7a1ffb3accf0db Reviewed-on: https://code.wireshark.org/review/9836 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 8d5ac86 Author: AndersBroman Date: Fri Aug 21 10:43:27 2015 +0200 Try to fix: wlan_statistics_dialog.cpp:466:1: error: unused parameter ‘filter’ [-Werror=unused-parameter] Change-Id: Ib9b2fe245b126f9413dbdcced94c61eacf4d1c5d Reviewed-on: https://code.wireshark.org/review/10177 Reviewed-by: Anders Broman commit eeafab5 Author: Pascal Quantin Date: Thu Aug 20 15:06:41 2015 +0200 file-pcapng: always set pinfo->fd->num before calling next layer dissectors/file-pcapng Also fix an off by 1 error for EPB case Change-Id: I895d82a58ec02c577dcaa67a97d456b42460b947 Reviewed-on: https://code.wireshark.org/review/10149 Reviewed-by: Pascal Quantin commit 5e3388f Author: Alexis La Goutte Date: Thu Aug 20 19:39:26 2015 +0200 GSM_map: Fix indent (use 2 spaces) and add modelines Change-Id: I1549eb55e1fa87c46e2493c37f3ed352970b794b Reviewed-on: https://code.wireshark.org/review/10168 Reviewed-by: Anders Broman commit 8055786 Author: Paul Emge Date: Thu Aug 6 11:00:22 2015 -0500 Fix bug with MVRP dissection where only one message was dissected. Fix whitespace and replace tvb_captured_length with tvb_reported_length Change-Id: I3952e7a1ac00b68e6f6eb1283977bc6299b0baaf Reviewed-on: https://code.wireshark.org/review/9900 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit a5fe54d Author: Pascal Artho Date: Tue Aug 18 08:44:37 2015 +0200 Preparation Host Flows: Syntax Line Edit (allow longer filter text) The "Syntax Line Edit" is based on "QLineEdit". By default, the maximum permitted length of a QLineEdit text is 32767 (16 bits). As the "Host Flows" extension uses the Wireshark filter syntax to filter the data, the filter can be become large. To avoid errors, I increased the maximum permitted length value to the maximum of quint32. Change-Id: I756efa76e1fc84449caef8fea368e6e38e776235 Reviewed-on: https://code.wireshark.org/review/10099 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 0310e5a Author: Alexis La Goutte Date: Thu Aug 20 23:03:01 2015 +0200 gsm map summary (GTK): fix no previous prototype for ‘gsm_map_stat_gtk_sum_cb’ [-Wmissing-prototypes] Change-Id: Ic97434112bc71202354004626ba51e1a22c39abf Reviewed-on: https://code.wireshark.org/review/10165 Reviewed-by: Michael Mann Reviewed-by: Anders Broman commit aec8e93 Author: Alexis La Goutte Date: Thu Aug 20 22:08:18 2015 +0200 SPDY: fix no previous prototype for 'dissect_spdy_heur' [-Wmissing-prototypes] Change-Id: Ife5f44a333227b1df3d2377d12dbec65a4b4d5c3 Reviewed-on: https://code.wireshark.org/review/10164 Reviewed-by: Michael Mann Reviewed-by: Anders Broman commit 8f0fc4b Author: Alexis La Goutte Date: Thu Aug 20 19:34:47 2015 +0200 GSM/ANSI/CAMEL...: fix no previous prototype for '*_stat_init' [-Wmissing-prototypes] Change-Id: I0aedefbb77899ebceac7fb08249faf47964d785b Reviewed-on: https://code.wireshark.org/review/10163 Reviewed-by: Michael Mann Reviewed-by: Anders Broman commit fab0e59 Author: Hadriel Kaplan Date: Thu Aug 20 14:38:35 2015 -0400 Fix memory leaks of dumper SHB and IDB infos Change-Id: I6b81d3e853d503c6a81f9793957b48ab34c6808c Reviewed-on: https://code.wireshark.org/review/10156 Petri-Dish: Hadriel Kaplan Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit b4762a0 Author: Jeff Morriss Date: Wed Aug 12 13:57:20 2015 -0400 Generate Diameter's expert info's even when there's no tree so that they show up in the Expert Infos dialog. Push the if(tree) check down into the basic type dissectors since we can't generate/fill the label (which won't be used anyway) when we're not building the tree (since the proto_item will be faked/NULL). Change-Id: Ie4f1f6856cfad0dabc7c58cdee2c16c8fc032c6d Reviewed-on: https://code.wireshark.org/review/10001 Petri-Dish: Jeff Morriss Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit dc4e960 Author: Jeff Morriss Date: Thu Aug 20 11:00:17 2015 -0400 Add some Gx AVPs from 3GPP 29.212. Change-Id: Iaf2cc67d4d235193b25045895441742bc6531370 Reviewed-on: https://code.wireshark.org/review/10150 Reviewed-by: Anders Broman commit 71e08dd Author: Alexis La Goutte Date: Tue Aug 18 13:34:30 2015 +0200 lemonflex: fix warning: no previous prototype for 'df_scanner_*' [-Wmissing-prototypes] lemonflex-tail.inc:44:1: warning: no previous prototype for 'df_scanner_text' [-Wmissing-prototypes] lemonflex-tail.inc:50:1: warning: no previous prototype for 'df_scanner_file' [-Wmissing-prototypes] lemonflex-tail.inc:59:1: warning: no previous prototype for 'df_scanner_cleanup' [-Wmissing-prototypes] Change-Id: If0476b430592df225234c5c685c8009ab08b5ab6 Reviewed-on: https://code.wireshark.org/review/10162 Reviewed-by: Anders Broman commit a70f591 Author: Alexis La Goutte Date: Thu Aug 20 23:16:04 2015 +0200 proto_dlg: fix no previous prototype for ‘heur_*_all_cb’ [-Wmissing-prototypes] Change-Id: I330ec2cee965f8cc3128c4a7bf794e52581ac290 Reviewed-on: https://code.wireshark.org/review/10166 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit d9395b7 Author: João Valverde Date: Fri Aug 21 03:54:36 2015 +0100 Rename 'ip_next_header_dissector_table' to 'ipv6_next_header_dissector_table' in IPv6 dissector Provides better readability, the dissector table is only used for IPv6 extension headers. Change-Id: I87d877a89c6465d4475f2f0a40636ccd1b6cdd92 Reviewed-on: https://code.wireshark.org/review/10174 Reviewed-by: Hadriel Kaplan commit 56d131c Author: Guy Harris Date: Thu Aug 20 17:06:04 2015 -0700 There is no wlan_statistics_dialog.ui. Change-Id: Ibedb3904cbab88ebae3bc9ec1588263af933dfc1 Reviewed-on: https://code.wireshark.org/review/10172 Reviewed-by: Guy Harris commit 2ed3d91 Author: Gerald Combs Date: Tue Aug 18 11:46:12 2015 -0700 Add the WLAN statistics dialog. Instead of splitting the stats into two lists as with the GTK+ UI, add everything to an expandable tree. This allows viewing nodes on more than one network. Rename the top-level Bluetooth menu item to Wireless and put the WLAN stats dialog there. The Qt UI matches SSIDs (WlanNetworkTreeWidgetItem::isMatch) a bit differently than the GTK+ UI. Try to make the logic as plain as possible since we'll likely have to update it in the future. The addition of a custom BSSID address types means that we can't assume that everything is AT_ETHER. Add routines for checking for broadcast BSSIDs and comparing only the data portions of addresses. Move PercentBarDelegate into its own module. Use it in WlanStatisticsDialog. Change-Id: Ie4214eb00671a890871380c4a07213ebfb7585c6 Reviewed-on: https://code.wireshark.org/review/10171 Reviewed-by: Gerald Combs commit 0f9bbbc Author: Alexis La Goutte Date: Thu Aug 20 22:56:56 2015 +0200 BOOTP: fix indent (use tab) Change-Id: I32ea4d1b9cd8aa351cbdb2bab0642e4ed0c191fb Reviewed-on: https://code.wireshark.org/review/10169 Reviewed-by: Hadriel Kaplan commit b07ae6c Author: Alexis La Goutte Date: Thu Aug 20 22:02:50 2015 +0200 ANSI: Add modelines Change-Id: I641a9525ec5a6315cc4a2d97506a885605b3504b Reviewed-on: https://code.wireshark.org/review/10170 Reviewed-by: Hadriel Kaplan commit 4dd49c5 Author: Alexis La Goutte Date: Thu Aug 20 21:38:19 2015 +0200 Camel: Fix indent (use 2 spaces) and add modelines Change-Id: I6fe835e78e58faabd5cfeeb84e39793b48d3df25 Reviewed-on: https://code.wireshark.org/review/10167 Reviewed-by: Hadriel Kaplan commit 648fe94 Author: Alexis La Goutte Date: Thu Aug 20 07:48:58 2015 +0200 Translations: fix typo coversation => conversation Found by s3erios (Ukrainian translator) Change-Id: Iaecb4e139d049c212956fa8567ee480d2f2aa0d2 Reviewed-on: https://code.wireshark.org/review/10152 Reviewed-by: Hadriel Kaplan commit c4b93e9 Author: Gerald Combs Date: Thu Aug 20 11:54:04 2015 -0700 CMake: Fixup appending to WS_WIN_LIBS In the world of CMake calling "set" with multiple values creates a semicolon-separated list. For WS_WIN_LIBS we want a single string so we need to call "set" with a single, quoted value. Change-Id: I96c5085af58adfb97ce16195eb27cc8ddb612d6a Reviewed-on: https://code.wireshark.org/review/10158 Reviewed-by: Gerald Combs Petri-Dish: Hadriel Kaplan Tested-by: Petri Dish Buildbot Reviewed-by: Hadriel Kaplan commit e67098c Author: Gerald Combs Date: Thu Aug 20 11:39:02 2015 -0700 Squelch recent display filter warnings. Try to keep the main display filter editor from emitting warnings when we populate the recent item list. Change-Id: Ib0c150093e03d4d2ca2ac6cd72c0e37d041fe98b Ping-Bug: 11438 Reviewed-on: https://code.wireshark.org/review/10157 Tested-by: Jeff Morriss Reviewed-by: Gerald Combs commit 36a74cb Author: Gerald Combs Date: Thu Aug 20 08:56:04 2015 -0700 Tap parameter and stats dialog fixups. If we run into an error when trying to register a tap listener, return instead of tapping packets. This should fix some (but likely not all) double frees found by Stig. For now close each statistics dialog if we find an error. Note that we might want to keep them open instead. Add checks and cleanups to some of the stats table free routines. Call fillTree once in TapParameterDialog's constructor instead of each time it's shown. Make fillTree a slot which lets us use a delay timer so that the dialog is visible when we retap packets. Change-Id: Id49f2f2a99bc8e5b1d32990024986b3c8b1abe24 Reviewed-on: https://code.wireshark.org/review/10153 Reviewed-by: Gerald Combs commit 37a737f Author: Gerald Combs Date: Thu Aug 20 10:05:39 2015 -0700 Make sure we can apply deprecated display filters. Deprecated filters are still valid. Update display filter checks to make sure we can apply them. Bug: 11438 Change-Id: Ib5e009c070b40912434e0ffd771203ed1e1ba093 Reviewed-on: https://code.wireshark.org/review/10154 Petri-Dish: Gerald Combs Tested-by: Jeff Morriss Reviewed-by: Stig Bjørlykke commit 829c648 Author: João Valverde Date: Mon Aug 17 01:38:00 2015 +0100 Check for IP version errors in dissect_ip() Change-Id: I7db4ed54be820e5667e1e93880013cc7abf95256 Reviewed-on: https://code.wireshark.org/review/10064 Reviewed-by: Pascal Quantin commit ba69473 Author: Hadriel Kaplan Date: Thu Aug 20 08:48:46 2015 -0400 Link setargv.obj for Windows in CMake so mergecap works Try it again. Change-Id: I511dd3d7d70fa33e246085c8cb79925e92945ebc Reviewed-on: https://code.wireshark.org/review/10148 Reviewed-by: Hadriel Kaplan commit 7249791 Author: Stig Bjørlykke Date: Thu Aug 20 13:00:24 2015 +0200 pcapng: Fixed copying if_filter_bpf_bytes Bug: 11455 Change-Id: Ic99ff1bcd7dad65b3ade5a9f46ce0f64573cb059 Reviewed-on: https://code.wireshark.org/review/10147 Petri-Dish: Stig Bjørlykke Reviewed-by: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo Reviewed-by: Hadriel Kaplan commit 8a71867 Author: João Valverde Date: Wed Aug 19 21:47:50 2015 +0100 UDP jumbogram expert info fix Change-Id: Ifa6170622bc8331097bc3fe9c567c97ce826c340 Reviewed-on: https://code.wireshark.org/review/10140 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit bc8b94d Author: Pascal Quantin Date: Wed Aug 19 21:57:25 2015 +0200 file-pcapng: differentiate captured length and reported length when calling next dissector and catch bound errors Otherwise dissection will fail when analyzing a capture with a snap length set Change-Id: If6714364efffdd1fbf88c947743929a71f75c663 Reviewed-on: https://code.wireshark.org/review/10135 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin Reviewed-by: Michael Mann commit ff78d0a Author: Pascal Quantin Date: Wed Aug 19 21:54:47 2015 +0200 file-pcap: differentiate captured length and reported length when calling next dissector and catch bound errors Otherwise dissection will fail when analyzing a capture with a snap length set Change-Id: I764f48c624d0cc411b04ee62f8ecccaf6abb6f0c Reviewed-on: https://code.wireshark.org/review/10134 Reviewed-by: Pascal Quantin Reviewed-by: Michael Mann commit 2046368 Author: Pascal Quantin Date: Wed Aug 19 21:48:46 2015 +0200 file-pcapng: fix dissection of options in blocks - fix the loop logic - flags in EPB include link-layer-dependent errors Change-Id: Iae0b4869b556abbf3c14f3b865d0f23cee182c84 Reviewed-on: https://code.wireshark.org/review/10132 Reviewed-by: Pascal Quantin commit bc777f9 Author: Stig Bjørlykke Date: Thu Aug 20 10:29:03 2015 +0200 Added a missing break Change-Id: Ia04a112d8df195e271dc11565750a6e28bd7f0c9 Reviewed-on: https://code.wireshark.org/review/10146 Reviewed-by: Stig Bjørlykke commit 950f1dd Author: Stig Bjørlykke Date: Wed Aug 19 15:38:10 2015 +0200 IO Graphs: Don't show unchecked graphs in legend Change-Id: I0a9c4d967ee03a0a8dfc93f87dbe38e4e3a0404c Reviewed-on: https://code.wireshark.org/review/10128 Reviewed-by: Stig Bjørlykke commit 75f4ff7 Author: Stig Bjørlykke Date: Thu Aug 20 10:09:13 2015 +0200 Make empty filter valid in checkFilter Change-Id: Ia5293a228a7044a4cd01b3b2f62f1d7a8f7747e2 Reviewed-on: https://code.wireshark.org/review/10145 Reviewed-by: Stig Bjørlykke commit 29cd036 Author: Stig Bjørlykke Date: Thu Aug 20 10:06:48 2015 +0200 Clear display filter when filterPackets with empty filter Change-Id: Ie3f763d53f5c250bbc58e32490eb83bb2e076a62 Reviewed-on: https://code.wireshark.org/review/10144 Reviewed-by: Stig Bjørlykke commit 3b5a1f2 Author: Hadriel Kaplan Date: Wed Aug 19 23:29:13 2015 -0400 Link setargv.obj for Windows in CMake so mergecap works Mergecap needs setargv.obj in order to get wildcard support. This is linked in nmake but not cmake. Bug: 10354 Change-Id: Icccf6b36495ac4b376f651d689b4a1f9e2c6042d Reviewed-on: https://code.wireshark.org/review/10143 Reviewed-by: Hadriel Kaplan commit 6fb6ede Author: Hadriel Kaplan Date: Wed Aug 19 21:38:13 2015 -0400 Get the windows buildbot working for mergecap test suite Change-Id: Ic9351b9bb8df85086eee3ab21908a2f9a04db767 Reviewed-on: https://code.wireshark.org/review/10141 Reviewed-by: Hadriel Kaplan commit ddaa311 Author: Hadriel Kaplan Date: Wed Aug 19 18:30:29 2015 -0400 Remove unused struct member from wtap The 'number_of_interfaces' member of struct wtap is not used - nor is it needed since the interface_data is a GArray with its own 'len' member. Change-Id: Id0fb25248dea4bea9fc88a8ea35c09ba55029d89 Reviewed-on: https://code.wireshark.org/review/10138 Petri-Dish: Hadriel Kaplan Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris commit b3daf70 Author: Hadriel Kaplan Date: Wed Aug 19 18:42:59 2015 -0400 Pcap: wtap does not set interface timestamp precision when reading pcap Like bug 11447, when wiretap reads a legacy PCAP file it needs to set the interface description's tsprecision member. And like bug 11447, I'm wondering why we have the field to begin with. But I'm fixing this so that the Windows buildbots can get going again. Change-Id: I71d0fe2e999ee7d11f1f5cc424681a99e17b1b1b Reviewed-on: https://code.wireshark.org/review/10139 Reviewed-by: Hadriel Kaplan commit fc0a2f5 Author: Hadriel Kaplan Date: Wed Aug 19 17:59:27 2015 -0400 Add more debug infor for windows buildbot test suite failure Down the rabbit hole we go... Change-Id: I8371b95b85128209b56960eb6e54648a6babbb84 Reviewed-on: https://code.wireshark.org/review/10137 Reviewed-by: Hadriel Kaplan commit 8a86222 Author: Pascal Quantin Date: Wed Aug 19 18:34:20 2015 +0200 PNRP: capitalize protocol name Change-Id: I1cf5d22e12241ef330319ef8fdf176becdefe300 Reviewed-on: https://code.wireshark.org/review/10131 Reviewed-by: Pascal Quantin commit d9dd323 Author: Pascal Quantin Date: Wed Aug 19 21:52:30 2015 +0200 file-pcapng: remove useless hf_pcapng_timestamp_data entry Change-Id: I82b2d4e4b0be8179103b827e0d11a0d8b10e1374 Reviewed-on: https://code.wireshark.org/review/10133 Reviewed-by: Guy Harris commit 0bdf518 Author: Hadriel Kaplan Date: Wed Aug 19 16:25:54 2015 -0400 Try to debug merge test suite failure on windows buildbot This change will be undone once the problem is found. Change-Id: Ica9cfe31b4e30fad2bb9de508af61baa1c455cc1 Reviewed-on: https://code.wireshark.org/review/10136 Reviewed-by: Hadriel Kaplan commit 2c260fa Author: Balint Reczey Date: Sat Aug 15 21:12:17 2015 +0200 Use system's GeoIP database by default on Debian Change-Id: I58c1cbb242c20737dd16a0477858b0225c0b5d14 Reviewed-on: https://code.wireshark.org/review/10051 Petri-Dish: Balint Reczey Tested-by: Petri Dish Buildbot Reviewed-by: Balint Reczey commit bb96725 Author: Balint Reczey Date: Sat Aug 15 21:10:20 2015 +0200 Use system's OpenLayers.js on Debian Change-Id: Id790ee61d3443e2f96a83260514fa3a6d31d09da Reviewed-on: https://code.wireshark.org/review/10050 Reviewed-by: Balint Reczey commit 9380d06 Author: Pascal Quantin Date: Wed Aug 19 18:13:36 2015 +0200 ixiatrailer: remove execute bit Change-Id: I6cd8f98518b21e935b329f5470b706ec059c91eb Reviewed-on: https://code.wireshark.org/review/10129 Reviewed-by: Pascal Quantin commit 89a8ad6 Author: Pascal Artho Date: Tue Aug 18 08:44:04 2015 +0200 Preparation Host Flows: Tap Sequence Analysis The tap_sequence_analysis was adapted to store the protocol of each frame. Therefore a new variable was introduced. In case of an ICMP or ICMPv6 packet, the ICMP message type and code is retrieved. The adapted ICMP and ICMPv6 dissector stores both values in packet info (see [1]). In case of ICMP and ICMPv6 packets, the source and destination port is not set or 0, respectively. Compared to that, the NetFlow service export protocol [2] codes the ICMP message type and code into the port numbers. The source port is zero while the destination is defined as: destination port = ICMP type * 256 + ICMP code. This definition was implemented for the ICMP and ICMPv6 packets. References [1] https://code.wireshark.org/review/10097 [2] http://www.ietf.org/rfc/rfc3954.txt Change-Id: I07518e360975682a3f45e80cb24f82f58cfb15f0 Reviewed-on: https://code.wireshark.org/review/10098 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte Reviewed-by: Anders Broman commit d05b6f9 Author: Alexis La Goutte Date: Wed Aug 19 11:52:51 2015 +0200 Bluetooth: ATT: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Found also by Coverity (CID 1316607) Change-Id: Ib6a4437fd24b51a8aa87d4bcdb5ee2a1dc43dae3 Reviewed-on: https://code.wireshark.org/review/10124 Reviewed-by: Michal Labedzki commit 03b78a0 Author: Alexis La Goutte Date: Wed Aug 19 11:58:44 2015 +0200 Bluetooth: ATT: Fix code will never be executed [-Wunreachable-code] Change-Id: I5048da723ddecde931956ed1af77438f823c1990 Reviewed-on: https://code.wireshark.org/review/10125 Petri-Dish: Alexis La Goutte Reviewed-by: Michal Labedzki Tested-by: Petri Dish Buildbot commit d470ff1 Author: Alexis La Goutte Date: Wed Aug 19 12:33:06 2015 +0200 btsnoop: Missing break in switch (CID 1316606) Change-Id: I105da06b7161a5b5f0cc2b4ce5303c4d5c989280 Reviewed-on: https://code.wireshark.org/review/10126 Reviewed-by: Michal Labedzki commit fa40025 Author: Stig Bjørlykke Date: Wed Aug 19 09:00:54 2015 +0200 Recompile dfilter for all tap listeners when fields changed When fields have changed the compiled display filter may be invalid or need a recompile to be valid. Filters which are not valid after a recompile is set to a filter matching no packets (frame.number == 0) to indicate that this does no longer match anything. We should probably have a better filter matching no packet for this purpose. Change-Id: Id27efa9f46e77e20df50d7366f26d5cada186f93 Reviewed-on: https://code.wireshark.org/review/10123 Petri-Dish: Stig Bjørlykke Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke commit b755a66 Author: João Valverde Date: Wed Aug 19 05:28:17 2015 +0100 Use MAC address documentation range in filter examples https://www.iana.org/assignments/ethernet-numbers/ethernet-numbers.xhtml Change-Id: I997440b7622dae4ea25d94e4041971f89b63fd04 Reviewed-on: https://code.wireshark.org/review/10121 Reviewed-by: Alexis La Goutte commit e328fa5 Author: João Valverde Date: Wed Aug 19 07:11:23 2015 +0100 IPv6: Minor variable name fix Change-Id: Iaef41fa2a212577f1fbdf7705eca65a928faa8c3 Reviewed-on: https://code.wireshark.org/review/10122 Reviewed-by: Alexis La Goutte commit 9976f52 Author: Alexis La Goutte Date: Mon Aug 17 13:30:01 2015 +0200 .mailmap: sort using sort -u Change-Id: I276331070c654e6c57bccb2c26cd0430ac656b26 Reviewed-on: https://code.wireshark.org/review/10069 Reviewed-by: Anders Broman commit dcaa64a Author: Hadriel Kaplan Date: Mon Aug 17 19:22:42 2015 -0400 Mergecap: add test suite for various merging scenarios Add a test suite for mergecap (and indirectly capinfos I guess). This is not exhaustive, but it's a start. Change-Id: I9442b4c32e31a74b1673961ad6ab50821441de3e Reviewed-on: https://code.wireshark.org/review/10082 Reviewed-by: Hadriel Kaplan Reviewed-by: Anders Broman commit d64ad1d Author: Hadriel Kaplan Date: Sun Aug 16 12:37:11 2015 -0400 capinfos: add more info about file and interfaces Add more information about the capture file, and about the interface descriptions in it. Also remove long-unused g_options code. Change-Id: I93cbd70fc7b09ec1b8b2fd6c85bb885c7f749543 Reviewed-on: https://code.wireshark.org/review/10073 Petri-Dish: Hadriel Kaplan Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 3268023 Author: Andrew Chernyh Date: Mon Jul 6 10:29:48 2015 +0600 Added TDMoP protocol dissector Bug: 11340 Change-Id: I04408db376718c7a5392f9521d7d75d0481ec30e Reviewed-on: https://code.wireshark.org/review/9514 Reviewed-by: Anders Broman commit d5caba6 Author: João Valverde Date: Mon Aug 17 20:07:58 2015 +0100 [IPv6] Make "ip.version" field pretty(er) Change-Id: I1e32f666118e36f48edcc1678d75db3ca3f62776 Reviewed-on: https://code.wireshark.org/review/10075 Reviewed-by: Hadriel Kaplan commit a22bb87 Author: Alexis La Goutte Date: Mon Aug 17 13:27:53 2015 +0200 Update .mailmap Change-Id: Ib61ed614c3cfb6885d81a61d82b0974beba786f5 Reviewed-on: https://code.wireshark.org/review/10068 Reviewed-by: Hadriel Kaplan commit c32c1f0 Author: João Valverde Date: Tue Aug 18 18:51:32 2015 +0100 IPv6 Jumbogram expert info cleanup Change-Id: Ic06e50a30330758d6ed0b1b1d9ba0d7f74929a9a Reviewed-on: https://code.wireshark.org/review/10111 Reviewed-by: Hadriel Kaplan commit 8352ff1 Author: João Valverde Date: Sun Aug 16 21:02:35 2015 +0100 Add IPv6 examples to capture/display filters Also use TEST-NET-1 for IPv4 examples. Replaced note using comma with parentheses Change-Id: I9855207aec7a335b80986aa63bd235edc4278d3a Reviewed-on: https://code.wireshark.org/review/10061 Reviewed-by: Alexis La Goutte Reviewed-by: Hadriel Kaplan commit fc1b48f Author: Luke Mewburn Date: Wed Aug 19 10:47:57 2015 +1000 DVBCI: fix typo in comment Change-Id: I0f6e57b7f16526e7c1b96fb8bd69c003c89b7f42 Reviewed-on: https://code.wireshark.org/review/10119 Reviewed-by: Hadriel Kaplan commit 0e8cc9a Author: Gerald Combs Date: Wed Aug 12 14:09:35 2015 -0700 UDP multicast stream dialog. Add the UDP multicast stream dialog. Abuse TapParameterDialog a bit more so that we can edit parameters. Remove some unused struct members and an unused function. Change-Id: I962c70344e792f0959527e4bcba8a20bd7e8acf9 Reviewed-on: https://code.wireshark.org/review/10084 Petri-Dish: Gerald Combs Reviewed-by: Gerald Combs commit 9a3d4e6 Author: Gerald Combs Date: Tue Aug 18 10:36:04 2015 -0700 Move an include guard. Move an include guard to match our conventions (and make it easier to spot). Change-Id: I4bad61a0194219f69217713d051e0ff53ff5a76a Reviewed-on: https://code.wireshark.org/review/10110 Reviewed-by: Anders Broman commit 2eaaffe Author: Alexis La Goutte Date: Tue Aug 18 21:56:52 2015 +0200 simple_statistics_dialog(.h): fix parameter 'st_table' not found in the function declaration [-Wdocumentation] Change-Id: I69814a05fa6ad65315e36fa75ae60634e934be5c Reviewed-on: https://code.wireshark.org/review/10117 Reviewed-by: Anders Broman commit 6ed3e08 Author: Alexis La Goutte Date: Tue Aug 18 21:10:13 2015 +0200 pcapng(file): fix duplicate break Change-Id: Ife7170c050402ab94d368acc6c233714be764824 Reviewed-on: https://code.wireshark.org/review/10114 Reviewed-by: Guy Harris commit 857b144 Author: Stig Bjørlykke Date: Tue Aug 18 21:15:27 2015 +0200 Qt: Syntax check display filter when fields changed Change-Id: I7179d7918e7958373806fb9627a36554ab4b9ddc Reviewed-on: https://code.wireshark.org/review/10115 Reviewed-by: Stig Bjørlykke commit 4abec47 Author: Guy Harris Date: Tue Aug 18 12:14:07 2015 -0700 Clean up handling of time stamps. Use common code for all time stamps, so it's handled the same for the Packet Block, Enhanced Packet Block, and Interface Statistics Block. Show the high and low parts of the time stamp as fields; file dissectors should show the raw file details. Mark the calculated time stamp as generated, as it's not the raw file data. Get the 64-bit time stamp by shifting the high part left 32 bits and ORing in the low part; no need to play games with unions and byte order Change-Id: I19b2c3227a3ca1e93ec653f279136aa18687581f Reviewed-on: https://code.wireshark.org/review/10116 Reviewed-by: Guy Harris commit ea7cf08 Author: Guy Harris Date: Tue Aug 18 11:51:36 2015 -0700 Cast away 64 -> 32 narrowing complaints. "secs" in an nstime_t is a time_t; cast the calculated seconds portion to time_t. Change-Id: Ieaad4c18bb21384a5781f50eadd3a537b414a369 Reviewed-on: https://code.wireshark.org/review/10113 Reviewed-by: Guy Harris commit 7a096c3 Author: Dario Lombardo Date: Tue Aug 18 15:58:34 2015 +0200 Init values set (found by American Fuzzy Lop). Change-Id: Iddd2b4a0ceb409db1afb1a412339134634de631c Reviewed-on: https://code.wireshark.org/review/10104 Petri-Dish: Hadriel Kaplan Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit f49eb37 Author: Guy Harris Date: Tue Aug 18 10:32:16 2015 -0700 Update comment. Change-Id: I51e14a280ba898a321455168ac8ded1853f55e64 Reviewed-on: https://code.wireshark.org/review/10109 Reviewed-by: Guy Harris commit 97f3c1b Author: Stig Bjørlykke Date: Tue Aug 18 19:18:07 2015 +0200 Qt: Reload widgets using prefs when reloading Lua plugins Widgets using prefs must be closed because the prefs may have been free'd when reloading Lua plugins. Change-Id: I4b79b7aff18d7923c77a9eb05acadc29b156edbf Reviewed-on: https://code.wireshark.org/review/10108 Reviewed-by: Stig Bjørlykke commit 8fcdcb9 Author: Hadriel Kaplan Date: Sun Aug 16 12:37:11 2015 -0400 Improve file merging for mergecap and wireshark Refactor the file merging code by removing the duplicate logic from mergecap.c and file.c's cf_merge_files(), into a new merge_files() function in merge.c. Also the following user-visible changes: * Removed the '-T' encap type option from mergecap, as it's illogical for mergecap and would complicate common merge code. * Input files with IDBs of different name, speed, tsprecision, etc., will produce an output PCAPNG file with separate IDBs, even if their encap types are the same. * Added a '-I' IDB merge mode option for mergecap, to control how IDBs are merged. * Changed Wireshark's drag-and-drop merging to use PCAPNG instead of PCAP. Bug: 8795 Bug: 7381 Change-Id: Icc30d217e093d6f40114422204afd2e332834f71 Reviewed-on: https://code.wireshark.org/review/10058 Petri-Dish: Hadriel Kaplan Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit a3c175a Author: AndersBroman Date: Tue Aug 18 16:47:08 2015 +0200 Add casts to passify buildboot. Change-Id: I8aa4695f1f8dfdfc5bfcd4fb4f36e1b332581d5a Reviewed-on: https://code.wireshark.org/review/10106 Reviewed-by: Anders Broman commit db87e62 Author: Dario Lombardo Date: Tue Aug 18 16:29:19 2015 +0200 pcap: add init value. Found compiling with gcc version 4.8.4 (Ubuntu 4.8.4-2ubuntu1~14.04). Change-Id: I21bd3a5ab3365f0065c919aba7d6bd00b878d041 Reviewed-on: https://code.wireshark.org/review/10105 Petri-Dish: Hadriel Kaplan Reviewed-by: Michal Labedzki commit da6f48d Author: Michal Labedzki Date: Tue Aug 18 15:34:53 2015 +0200 Fix typo in makefile Typo: file.pcapng.c -> file-pcapng.c Change-Id: I72c40fd086f1b68b69e950c065877b2733279a04 Reviewed-on: https://code.wireshark.org/review/10102 Petri-Dish: Michal Labedzki Reviewed-by: Alexis La Goutte commit 22364bd Author: Michal Labedzki Date: Sat Feb 15 19:05:44 2014 +0100 File-format: BTSNOOP: Add option to dissect next layers Show next layers of each packet. Change-Id: I8c56eab969fef9a0a712b479dc2cdef6cc1578ae Reviewed-on: https://code.wireshark.org/review/221 Reviewed-by: Anders Broman commit dd57c6b Author: Michal Labedzki Date: Fri Jun 26 15:40:22 2015 +0200 File-format: Add PCAP and PCAPNG dissectors They have educational values and can be used to debugging some issues. Now Wireshark can open three files (BTSNOOP, PCAP, PCAPNG) in two modes: Capture (Traditional) and File-Format. Change-Id: I833b2464d11864f170923dc989a1925d3d217943 Reviewed-on: https://code.wireshark.org/review/10089 Reviewed-by: Anders Broman commit c05df99 Author: Michael Mann Date: Mon Aug 17 20:34:47 2015 -0400 Add udp_dissect_pdus. It works similar to tcp_dissect_pdus, but only works on a single packet. Intended for protocols that go over TCP and UDP so that they can have a common dissection function. Will of course, also work on UDP-only protocols with a fixed length header and size. Used DNP3 as a guinea pig since "multiple PDU support" over UDP was just added. Change-Id: Ib7af8eaf7102c96b4f8b5c1b891ae2d8f0886f9d Reviewed-on: https://code.wireshark.org/review/10083 Tested-by: Petri Dish Buildbot Reviewed-by: Hadriel Kaplan Reviewed-by: Dario Lombardo Reviewed-by: Anders Broman commit db5b786 Author: Michal Labedzki Date: Sat Jun 6 19:37:20 2015 +0200 Bluetooth: Update Assign Numbers +18 ATT attributes to be implemented (IPS 1.0 - 19 May 2015, etc.) Change-Id: Ib30ea20fe9b32a4be842f01ad5b8e8ee081a14ff Reviewed-on: https://code.wireshark.org/review/10095 Reviewed-by: Anders Broman commit a50a49e Author: Michal Labedzki Date: Thu Jan 22 08:27:40 2015 +0100 Bluetooth: ATT: Add some remaining attributes Add 14 attributes (not as easy as the previous), there are still 19 + 3 (no idea for now [Valid Range, Report, IEEE 11073-20601 Regulatory Certification Data List]) attributes to be implemented (soon). Change-Id: Iee5cde4673b62f93084923a592b11824c0683605 Reviewed-on: https://code.wireshark.org/review/10094 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit df17ff3 Author: Stig Bjørlykke Date: Mon Aug 17 13:18:30 2015 +0200 Qt: Fix use-after-free pattern QString.toUtf8() returns a QByteArray object and .constData() returns a pointer inside that object. It is not safe to store this pointer as it will become invalid after the statement. Change-Id: I8f54ede75577719008835038934e935cd5feba3f Reviewed-on: https://code.wireshark.org/review/10067 Reviewed-by: Hadriel Kaplan Petri-Dish: Hadriel Kaplan Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 9e72779 Author: Pascal Artho Date: Tue Aug 18 08:43:06 2015 +0200 Preparation Host Flows: Dissector Packet ICMP and ICMPv6 see https://code.wireshark.org/review/#/c/9976/ Change-Id: Ic301db4deea1a02b9e08c123b3e21e70817a2c85 Reviewed-on: https://code.wireshark.org/review/10097 Reviewed-by: Anders Broman commit 318c3a5 Author: Michal Labedzki Date: Wed Jul 22 17:38:51 2015 +0200 Qt: Add another C++ missing header: for std::sort() Fix build error: ui/qt/packet_list_model.cpp:270:5: error: 'sort' is not a member of 'std' std::sort(visible_rows_.begin(), visible_rows_.end(), recordLessThan); Change-Id: I3a577a268f6c12e8fd97b7b6fd2429989c28e2f5 Reviewed-on: https://code.wireshark.org/review/10092 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 0375244 Author: Michal Labedzki Date: Sat Jul 18 18:25:36 2015 +0200 Qt/Minimap: Fix for Qt < 4.8 I hope it is quite right solution. Change-Id: Ia9c883a832ddd03985eda37a9b344c4d7c8135e2 Reviewed-on: https://code.wireshark.org/review/10091 Reviewed-by: Alexis La Goutte commit e25562b Author: Hadriel Kaplan Date: Mon Jul 20 11:09:06 2015 -0400 Pcapng: clean up Section Header Block handling Change-Id: I8516d0c561ed0b63e49a3594027c9c15bb789258 Reviewed-on: https://code.wireshark.org/review/9726 Reviewed-by: Hadriel Kaplan Petri-Dish: Hadriel Kaplan Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 4048ca0 Author: Martin Kaiser Date: Thu Aug 13 23:00:29 2015 +0200 rewrite the H1 dissector * use the offset variable to keep track of where we are, remove the position variable (previously, offset remained 0 all the time...) * use proto_tree_add_item() * highlight the correct bytes for each field * define a block type and block length instead of naming these fields differently for each block * indent by 4 spaces Change-Id: Ie0995e5fe6364605fd30020f171e51458844fa59 Reviewed-on: https://code.wireshark.org/review/10080 Petri-Dish: Martin Kaiser Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann Reviewed-by: Hadriel Kaplan commit acc0c14 Author: Michael Mann Date: Mon Aug 17 23:06:21 2015 -0400 Eliminate proto_tree_add_text from XMPP dissectors. Change-Id: I32fdf085ef484d147d9f0b27c56efba41bb827bf Reviewed-on: https://code.wireshark.org/review/10086 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Reviewed-by: Anders Broman commit 8fd7197 Author: Hadriel Kaplan Date: Mon Aug 17 23:06:50 2015 -0400 Lua: add FT_PROTOCOL as a ProtoField type Bug: 11450 Change-Id: Ic77ddd193246c0202efcc9c11e61e8f6f85329c5 Reviewed-on: https://code.wireshark.org/review/10087 Petri-Dish: Hadriel Kaplan Tested-by: Petri Dish Buildbot Reviewed-by: Hadriel Kaplan commit 300bb98 Author: Jeff Morriss Date: Mon Aug 17 16:50:39 2015 -0400 Install GTK3 too. It was in the list of packages but not in the final command line. Change-Id: I361e660cc4ac91121314a3f8a7388b48fb2c61b7 Reviewed-on: https://code.wireshark.org/review/10081 Reviewed-by: Jeff Morriss commit c57f585 Author: Gerald Combs Date: Mon Aug 17 10:47:46 2015 -0700 Fixup tap listener registration. Make sure we run make-tap-reg.py on files that register tap listeners. Make sure Qt-specific registration routines start with register_tap_listener_qt_. Change-Id: Idca382180f475db71e4d1965a70ae4cc2fa4f9d5 Reviewed-on: https://code.wireshark.org/review/10074 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 41cb3bd Author: Martin Kaiser Date: Thu Aug 13 22:44:29 2015 +0200 h1: remove if (tree) checks, indent according to the modelines Change-Id: I878aa23b5d718653b9039aeb94a0ece88c9c03cf Reviewed-on: https://code.wireshark.org/review/10079 Reviewed-by: Martin Kaiser commit c78d7c8 Author: Martin Kaiser Date: Thu Aug 13 22:32:43 2015 +0200 h1: don't THROW() an exception from a dissector leaving the parsing loop should be enough in this case... Change-Id: Ic250961aeb4d3cfcd74ee8caacb59657c32444de Reviewed-on: https://code.wireshark.org/review/10078 Reviewed-by: Martin Kaiser commit ec1d25d Author: Stig Bjørlykke Date: Mon Aug 17 22:00:57 2015 +0200 Qt: Avoid double call to toUtf8() Change-Id: I4d31063b4aa37e4b0a68b5dbc17be22ef2cd151a Reviewed-on: https://code.wireshark.org/review/10077 Reviewed-by: Stig Bjørlykke commit 68c5172 Author: Stig Bjørlykke Date: Mon Aug 17 21:39:41 2015 +0200 Qt: Always rebuild columns when fields changed The columns must be recreated even if no capture file is loaded because custom columns may have reference to deregistered fields. Change-Id: I4ed7345b3200e5af211695f1a6511ee229d5f13c Reviewed-on: https://code.wireshark.org/review/10076 Reviewed-by: Stig Bjørlykke commit 0368b82 Author: Gerald Combs Date: Wed Aug 12 15:11:39 2015 -0700 Improve multicast address checking. Check for IPv4 and IPv6 multicast addresses. We might have captured on an "any" interface, or on a PPP link, or used some other method that doesn't result in dl_dst.type == AT_ETHER. Change-Id: I18b0597fd432e4cec8c388a3c7d2d18ac4da0fad Reviewed-on: https://code.wireshark.org/review/10009 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 821ea20 Author: Selvamegala Date: Sat Aug 8 20:35:30 2015 -0400 Add Decryption support for Lwmesh Bug: 10783 Change-Id: Id598838f036b1f312791d9dddbf3767dcbfd1aee Reviewed-on: https://code.wireshark.org/review/9937 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit b660fd4 Author: Hadriel Kaplan Date: Mon Aug 17 11:12:12 2015 -0400 Pcapng: set interface description's tsprecision when reading file Bug: 11447 Change-Id: I5fe14616ed6e86e0bfe02c58cc9fb31e43bc23ef Reviewed-on: https://code.wireshark.org/review/10071 Petri-Dish: Hadriel Kaplan Tested-by: Petri Dish Buildbot Reviewed-by: Hadriel Kaplan commit 2eec7fe Author: Alexis La Goutte Date: Mon Aug 17 13:35:40 2015 +0200 BPDU: Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang Change-Id: I91cc96f92ae2e6b07144120d70f8db5b7ad45fce Reviewed-on: https://code.wireshark.org/review/10070 Reviewed-by: Anders Broman commit 77193ef Author: João Valverde Date: Mon Aug 17 06:00:27 2015 +0100 dissect_ip_heur(): Remove TODO (done) Change-Id: I0c36179b63f5d60037de80badfea352c903c2525 Reviewed-on: https://code.wireshark.org/review/10065 Reviewed-by: Anders Broman commit 9a6e36d Author: Michael Mann Date: Sun Aug 16 20:06:50 2015 -0400 Remove proto_tree_add_text from packet-xml.c Required introducing packet_info* to xml_frame_t structure. Change-Id: Ie777fe3bc8c7ea052d3441dd31e0631ce47324cb Reviewed-on: https://code.wireshark.org/review/10063 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit af62264 Author: Dario Lombardo Date: Thu Aug 13 16:08:18 2015 +0200 DNP3: add support for udp multi frame packets. Bug: 11435 Change-Id: I1f3006a4276e8a95d028294ebb9635f71be0f75e Reviewed-on: https://code.wireshark.org/review/10013 Reviewed-by: Graham Bloice Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 2ba0ea3 Author: Guy Harris Date: Sun Aug 16 12:33:31 2015 -0700 Fix the conversion of milliseconds to seconds and nanoseconds. 1 millisecond = 1000000 nanoseconds, not 1000 nanoseconds, and nstime->nsecs is nanoseconds, not microseconds. Change-Id: I6925ff80f6443015f83ca00bad2a347d10eadd7c Reviewed-on: https://code.wireshark.org/review/10060 Reviewed-by: Guy Harris commit 8b8d378 Author: Petr Gotthard Date: Sun Aug 16 16:50:52 2015 +0200 AMQP 1.0: Fix OSX build errors packet-amqp.c:10660: warning: implicit conversion shortens 64-bit value into a 32-bit value packet-amqp.c:10661: warning: implicit conversion shortens 64-bit value into a 32-bit value Change-Id: Ic1c19edf10432dccb5fc4f3ea07defd45b9eef17 Reviewed-on: https://code.wireshark.org/review/10054 Petri-Dish: Hadriel Kaplan Tested-by: Petri Dish Buildbot Reviewed-by: Hadriel Kaplan commit 6f7811e Author: ff Date: Sun Aug 16 17:27:01 2015 +0200 A new Early Allocation Request for draft-ietf-pce-lsp-setup-type and draft-ietf-pce-segment-routing has been issued. Reference: https://mailarchive.ietf.org/arch/msg/pce/Zdsc0HHl1SLvpANRWhpLvIzJQyI There are implementations out there that are using 5 as SR-ERO subobject identifier (instead of 36 that will be assigned by IANA) and 27 as the PATH-SETUP-TYPE TLV identifier (instead of 28 that will be assigned by IANA). This patch decodes both 5/36 as SR-ERO subobject and 27/28 as PATH-SETUP-TYPE. It is unlikely that IANA will re-assign code points 5 and 27 in the near future. Change-Id: Ie2efa869344e4c1121f19f1ee3a71711d566a037 Signed-off-by: ff Reviewed-on: https://code.wireshark.org/review/10057 Petri-Dish: Hadriel Kaplan Tested-by: Petri Dish Buildbot Reviewed-by: Hadriel Kaplan commit 3755bc6 Author: João Valverde Date: Sun Aug 16 07:35:24 2015 +0100 Fix IP Destinations stats tree Change-Id: I875ecb05e0919e81e6d8d1d00f802c8d5df5b214 Reviewed-on: https://code.wireshark.org/review/10053 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Hadriel Kaplan commit c643cbf Author: Gerald Combs Date: Sat Aug 15 17:05:17 2015 -0700 Run abicheck commands at compile time. The CMake dumpbabi targets collectively copy over 800 files. Do that when when we build the actual targets instead of at configure time. Hopefully this will speed up initial CMake runs. Change-Id: I6e4d691e24c73ea05d638a0f897f570541c84e38 Reviewed-on: https://code.wireshark.org/review/10052 Reviewed-by: Gerald Combs commit 8d1a549 Author: Gerald Combs Date: Sun Aug 16 08:10:40 2015 -0700 [Automatic update for 2015-08-16] Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Idb8a2cff075a1ffe5e3cd1d6f4d3fb1b6c357cdb Reviewed-on: https://code.wireshark.org/review/10055 Reviewed-by: Gerald Combs commit b1d33db Author: Petr Gotthard Date: Sat Jul 4 01:19:02 2015 +0200 AMQP 1.0: Refactor to fix parsing of timestamps Timestamps are currently dissected as integer numbers; two aspects need to be recatored to correctly dissect timestamps: - the add_1_0_proto_item() function - protocol fields (hf_xxx) and the get_amqp_1_0_value_formatter() (1) The AMQP 1.0 dissector rely on the proto_tree_add_item. There is only one invocation common for all datatypes (in add_1_0_proto_item), which cannot pass any type-specific ENC_xxx specifiers and it cannot handle custom datatypes like AMQP timestamp. I propose to replace the add_1_0_proto_item() by type-specific dissectors that will correctly set the ENC_xxx specifiers and handle exceptional cases like the AMQP timestamp or the zero-length true/false datatypes. (2) The get_amqp_1_0_value_formatter implements a table-driven magic to select alternate hf_xxx field based on the actual datatype. This however - defines alternate fields where the standard permits only one datatype - does not support fields that can contain any datatype ("*") - does not support FT_TIMESTAMP I propose to make this mechanism less table-driven (more explicit and more flexible) and allow all alternates permitted by the standard. Change-Id: Ib2cbda632d4c81ec3e6b81f539fe77bb913afc1c Reviewed-on: https://code.wireshark.org/review/9528 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 8fa4016 Author: João Valverde Date: Sat Aug 15 18:07:10 2015 +0100 make-taps.pl: Remove duplicate slash in pathname Change-Id: Id5e13df24409267c405cdd05479610a8ba898289 Reviewed-on: https://code.wireshark.org/review/10047 Reviewed-by: Michael Mann commit 2e2129a Author: Michael Mann Date: Sat Aug 15 09:39:05 2015 -0400 Conversion of random proto_tree_add_text calls. Change-Id: I6505ce34de84bfe46d5bc7b4d6a3c6044f3fb4b5 Reviewed-on: https://code.wireshark.org/review/10041 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 8b45727 Author: Guy Harris Date: Sat Aug 15 11:34:46 2015 -0700 Un-reference actions after adding them to an action group. When created, they have a reference count of 1; when added to an action group, the reference count is increased as a pointer is held by the action group. Release the reference we got, as we're not holding onto it. Also, rename "menu_item" to "menu_action", to indicate that it's an action. Change-Id: I54543dcc2e6c3b341a9f584fe1b6099a134771b3 Reviewed-on: https://code.wireshark.org/review/10049 Reviewed-by: Guy Harris commit 1b46738 Author: Guy Harris Date: Sat Aug 15 11:20:36 2015 -0700 Do the "plugin" menu stuff in one pass. Also, use g_strconcat() in other places where we prepend / to action names. Hopefully, this will make it easier to find common code between all the N different places where we add menus and menu items. Change-Id: Iee876866730cada64428df17f1f3c4552cc3ac93 Reviewed-on: https://code.wireshark.org/review/10048 Reviewed-by: Guy Harris commit c222719 Author: Guy Harris Date: Sat Aug 15 10:49:51 2015 -0700 Fix creation of menu actions in ws_menubar_create_action_group(). Action names are expected to begin with /, so prepend a /. Fixes the "plugin" menu mechanism (which could be used by built-in code as well, so it's not really a "plugin" menu mechanism). Change-Id: Ic45412399078796359649cc876d2c8bfc9a790c6 Reviewed-on: https://code.wireshark.org/review/10046 Reviewed-by: Guy Harris commit 88f334b Author: Stig Bjørlykke Date: Sat Aug 15 19:31:51 2015 +0200 Fixed a comment in cleanup_dissection Change-Id: I445e09803023d1a22a663ba0501c013f113b5bfe Reviewed-on: https://code.wireshark.org/review/10045 Reviewed-by: Stig Bjørlykke commit 5f13933 Author: Stig Bjørlykke Date: Sat Aug 15 19:25:13 2015 +0200 Lua: Free true_false_string values at reload Change-Id: I8ab194bf094e82f08ddafb0a1451aec42989b93d Reviewed-on: https://code.wireshark.org/review/10044 Reviewed-by: Stig Bjørlykke commit 0a16350 Author: João Valverde Date: Sat Aug 15 17:55:27 2015 +0100 Add a newline for readability Change-Id: I7dbfa8f82454bd93ca5a66f22c29982923803918 Reviewed-on: https://code.wireshark.org/review/10043 Reviewed-by: Alexis La Goutte commit 2bc6f01 Author: Guy Harris Date: Sat Aug 15 09:26:45 2015 -0700 *More* issues. Change-Id: Ib415582f4bf2529c412bed329b3ee7daccde29b0 Reviewed-on: https://code.wireshark.org/review/10042 Reviewed-by: Guy Harris commit 7f38b65 Author: Michael Mann Date: Sun Aug 9 08:03:21 2015 -0400 Don't clear the tcp_analysis if a conversation is not provided to get_tcp_conversation_data(). Callers may need to know information like retransmissions, etc which will be lost. Change-Id: I3f8b6b0aeb308701eb34ae6f6f735af6995ed441 Reviewed-on: https://code.wireshark.org/review/9940 Reviewed-by: Michael Mann commit 85e2018 Author: João Valverde Date: Sat Aug 15 08:29:51 2015 +0100 udp: fix minimum jumbo length Change-Id: I5ab4974cc60cdec0c3571bdec815c8cb9e8f7255 Reviewed-on: https://code.wireshark.org/review/10040 Reviewed-by: Michael Mann commit 85d2eef Author: Evan Huus Date: Tue Aug 11 18:35:45 2015 -0400 btatt: guard against incomplete reassembly If we try and reassemble a fragment whose end does not line up exactly with the start of the following fragment, abort or else we will leave uninitialized gaps in the resulting buffer. Bug: 11436 Change-Id: I4cd05c1a9ac4404bf70a3945f80b12f7bf5f74ee Reviewed-on: https://code.wireshark.org/review/9983 Reviewed-by: Evan Huus Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 677d4d6 Author: João Valverde Date: Sun Aug 9 23:13:06 2015 +0100 Add IPv6 Jumbogram support (RFC 2675) Change-Id: Icea1659395d7bc16e367b74a695586926b33149b Reviewed-on: https://code.wireshark.org/review/9968 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann Reviewed-by: Anders Broman commit 8282540 Author: Michael Mann Date: Wed Aug 12 09:01:45 2015 -0400 Eliminate proto_tree_add_text from GSM dissectors. Change-Id: I36a3d15a4fa86847a83d1dbea40111d36d7cfd61 Reviewed-on: https://code.wireshark.org/review/10036 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 8368f3b Author: Guy Harris Date: Fri Aug 14 20:54:22 2015 -0700 Update the previously-added comment. At least with kqueues, NOTE_REVOKE is delivered if the file system containing the vnode in question is unmounted, and that gets mapped to a change notification by QFileSystemWatcher, so the right thing should happen. I'm not sure whether the right thing happens on Windows. Change-Id: I1e4c0d510f31f68d574c4d4cf20524666382930f Reviewed-on: https://code.wireshark.org/review/10039 Reviewed-by: Guy Harris commit 463caf8 Author: Guy Harris Date: Fri Aug 14 18:49:17 2015 -0700 Discuss alternatives to polling all the recent files every 2 seconds. Somebody asked about repeated SMB traffic when running the Qt Wireshark: https://ask.wireshark.org/questions/45036/permanent-smb2-traffic-with-1997 and that's due to said polling. On the main desktop platforms (Windows, OS X, Linux) we can use QFileSystemWatcher plus, on Windows and OS X, some additional stuff to check for unmounts (and get FreeBSD as a freebie, as it works the same as OS X), and avoid timeout-based polling. Change-Id: I3a1d0110fedcdb442ed09c16dab4bf0cb06ca331 Reviewed-on: https://code.wireshark.org/review/10038 Reviewed-by: Guy Harris commit 6137197 Author: Guy Harris Date: Fri Aug 14 17:19:37 2015 -0700 Fix for the current wireshark.desktop. The default version doesn't use GTK+ any more, so the version we distribute doesn't have "Categories=System;Monitor;GTK;", and the Debian version presumably shouldn't put it into category "GNOME". Change-Id: I4e59026b5c4f26d02e4a96686e339f8d54bdcd1e Reviewed-on: https://code.wireshark.org/review/10035 Reviewed-by: Guy Harris commit 0ddae1b Author: Guy Harris Date: Fri Aug 14 16:19:13 2015 -0700 Put it in the Qt category, not the GTK category. The default binary, "wireshark", is now a Qt binary; "wireshark-gtk" is the GTK+ one. Change-Id: Ibfec5d796a9796c2588c4305b18dc4506a435228 Reviewed-on: https://code.wireshark.org/review/10034 Reviewed-by: Guy Harris commit 4c6da64 Author: Hadriel Kaplan Date: Fri Aug 14 10:44:11 2015 -0400 Ident the merge.c/h files by 4 spaces Using 2 spaces for indent is way past its prime. Change-Id: I80caf89f15e576f9aeb25754576a9f18215ccb3c Reviewed-on: https://code.wireshark.org/review/10032 Reviewed-by: Hadriel Kaplan commit 46d6e8c Author: Stig Bjørlykke Date: Fri Aug 14 14:48:49 2015 +0200 Added some missing breaks Change-Id: I3b2f25832ca878ec3e7f9e4dcce258dc870fc5ad Reviewed-on: https://code.wireshark.org/review/10031 Reviewed-by: Stig Bjørlykke commit 7833b93 Author: Stig Bjørlykke Date: Fri Aug 14 13:46:01 2015 +0200 Free all hfi->strings in free_deregister_field Change-Id: I6fe78266a2e881fa80e1e3a3423b685d3c1764de Reviewed-on: https://code.wireshark.org/review/10029 Reviewed-by: Stig Bjørlykke commit 12ff69d Author: Stig Bjørlykke Date: Fri Aug 14 11:02:10 2015 +0200 Qt: Fixed funnel text dialog append and prepend Append to end and prepend to start, not the opposite. Change-Id: Ic0e2a7f04a0d9ff18a6fd7063d0550ad35eece1a Reviewed-on: https://code.wireshark.org/review/10027 Reviewed-by: Stig Bjørlykke commit 28b5206 Author: Stig Bjørlykke Date: Fri Aug 14 09:26:50 2015 +0200 Free protocol in proto_free_deregistered_fields This fixes some issues with use-after-free when reload Lua plugins. Change-Id: I63f3fd9ebe8a19008f560e72067f2078f5eaf759 Reviewed-on: https://code.wireshark.org/review/10026 Reviewed-by: Stig Bjørlykke commit 8426225 Author: Stig Bjørlykke Date: Fri Aug 14 07:54:51 2015 +0200 Qt: Avoid redissect twice when changing fields Changing fields in http, imf or ldap used to trigger redissect twice because of UAT_AFFECTS_FIELDS and UAT_AFFECTS_DISSECTION. Also changed from redrawVisiblePackets() to columnsChanged() because fields in a custom column may have changed. This also fixes reloading Lua plugins with Lua fields in custom columns. Change-Id: I805a765690decbe7434dbf1c33ebd1113e23d16d Reviewed-on: https://code.wireshark.org/review/10025 Reviewed-by: Stig Bjørlykke commit 6cc1c8d Author: Guy Harris Date: Thu Aug 13 20:05:43 2015 -0700 Clean up heuristic checks. Fix heuristic checks to handle sliced packets correctly. "Correctly" means "fail the heuristic", as the heuristic checks every single byte of the putative Ixia trailer, as one thing it does is check the checksum, which is in the last 2 bytes of the trailer and checks everything before it. So just return 0 if the full trailer isn't part of the captured data. Try to handle being handed a tvbuff that contains an FCS by looking at the putative "magic number" locations where it would be if the tvbuff didn't include the FCS and, if that doesn't match, where it would be if it *did* include the FCS. If the former doesn't match but the latter does, assume that means it does include the FCS, and do all other processing under that assumption. Clean up some comments. Fix an hf_ variable name to match the field name, and put the tvbuff value fields in the order of their types. Don't fail if the field length is 0 - it's a value length, so it could in theory be 0. Rely on the length checks for individual types to catch problems. Change-Id: Idc834aa6637cfbbafd6499060a007e720378154e Reviewed-on: https://code.wireshark.org/review/10024 Reviewed-by: Guy Harris commit 3c5fd58 Author: Guy Harris Date: Thu Aug 13 16:36:03 2015 -0700 Get rid of trailing whitespace. Change-Id: I035fad79dd8d01aa3121732f2a9b07d20cc4384f Reviewed-on: https://code.wireshark.org/review/10023 Reviewed-by: Guy Harris commit 814f617 Author: Guy Harris Date: Thu Aug 13 16:30:51 2015 -0700 Update to reflect reality. The Ixia trailer is a variable-length sequence of TLVs followed by some fixed-length fields. Describe it as such. Realign some #defines while we're at it. Change-Id: I5fc45a1d44978f1dc1f13e7098c3f797838db7b3 Reviewed-on: https://code.wireshark.org/review/10022 Reviewed-by: Guy Harris commit 5931da9 Author: Ionut Ceausu Date: Mon Aug 3 18:06:54 2015 +0300 ixiatrailer: Change format of the protocol so that is supports future fields. Protocol is TLV protocol and with this change I add one more field to it. It is entire backward compatible. Format is as follow: Fields Trailer Length 0xAF12(Signature) Trailer Checksum The fields portion of the trailer is a series of 2-byte fields followed by variable length data. The first byte indicates the field type, the 2nd byte indicates the field length. The values supported are listed below: 1 Reserved (Original Packet Size) 3 Timestamp (From Local Timebase) 4 Timestamp (From NTP source) 5 Timestamp (From GPS) 6 Timestamp (From 1588) 7 Timestamp (From Holdover) Change-Id: I0a3b31cfbc5b6273e1f5326d9841e449735967fe Reviewed-on: https://code.wireshark.org/review/9854 Reviewed-by: Martin Mathieson Petri-Dish: Martin Mathieson commit 66f784a Author: Bill Meier Date: Thu Aug 13 12:02:33 2015 -0400 [config.nmake] Add minor comment about /Zo option for MSVC-2015 Change-Id: Ia4ffc543965160aaf6c39dc19764e62e9e82faa8 Reviewed-on: https://code.wireshark.org/review/10020 Reviewed-by: Bill Meier commit cd76cf6 Author: Dario Lombardo Date: Thu Aug 13 17:27:10 2015 +0200 ieee802.11: changed blurb to stop checkAPI complains. Change-Id: I9ec74a7af229a1af3ca946acc5af94ede1913c29 Reviewed-on: https://code.wireshark.org/review/10016 Reviewed-by: Alexis La Goutte commit 7661bb2 Author: Pascal Quantin Date: Thu Aug 13 17:38:09 2015 +0200 Qt: fix copy of newer files when building with qmake Change-Id: I8ea5e2770a0c5be3d981d986fa96fe30445db167 Reviewed-on: https://code.wireshark.org/review/10018 Reviewed-by: Pascal Quantin commit 2d5f2ae Author: Pascal Quantin Date: Thu Aug 13 16:16:03 2015 +0200 GVCP: fix dissection of Stream Channel Packet Size register Bug: 11442 Change-Id: I1c187bdf7ffd14b2a4f66d29883a4b112486bd35 Reviewed-on: https://code.wireshark.org/review/10014 Petri-Dish: Pascal Quantin Reviewed-by: Pascal Quantin commit 738cf42 Author: Anders Date: Fri May 29 10:33:58 2015 +0200 Make building with MSVC2015 work TODO: - LUA is commented out probably needs to be built with MSVC 2015. - GeoIP is commented out, causes packet-ip* to not build. - Qt not built, needs Qt with MSVC 2015 Change-Id: I1658077931b89b9a22ee32e5ed7de38e07fb6a55 Reviewed-on: https://code.wireshark.org/review/8683 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 6087f2a Author: Dario Lombardo Date: Thu Aug 13 10:13:52 2015 +0200 fuzz-test.sh: added missing option in help. Change-Id: I7651e18ec6e8338cddc82be90257c5f183804c7c Reviewed-on: https://code.wireshark.org/review/10011 Reviewed-by: Anders Broman commit beb5c0b Author: Michael Mann Date: Tue Aug 11 19:50:43 2015 -0400 Eliminate proto_tree_add_text from some dissectors. Change-Id: I1e6bf52fad1b1fffefc174a557ff836f400e8fd7 Reviewed-on: https://code.wireshark.org/review/9996 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 61d1ea4 Author: Gerald Combs Date: Wed Aug 12 15:19:25 2015 -0700 Initialize another variable. Change-Id: Ie53a16dc482a9c38538077f6d6a2717cfaddbaa4 Reviewed-on: https://code.wireshark.org/review/10010 Reviewed-by: Gerald Combs commit 0b7d161 Author: Dario Lombardo Date: Tue Aug 11 23:58:54 2015 +0200 editcap: add change offset. This option skips some bytes when fuzzing, that prevents some headers from being changed. This focuses fuzzer to a smaller part of the packet. Change-Id: I1db83235e93f2774a9991e3af70f633487b816fa Reviewed-on: https://code.wireshark.org/review/9982 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 99e3244 Author: Gerald Combs Date: Wed Aug 12 14:12:24 2015 -0700 Initialize a couple of variables. Change-Id: I10471b770356ad46a10740198156055e1480eeb3 Reviewed-on: https://code.wireshark.org/review/10008 Reviewed-by: Gerald Combs commit db2692c Author: Alexis La Goutte Date: Wed Aug 12 20:58:14 2015 +0200 Qt (main_window) fix no previous prototype for '...' [-Wmissing-prototypes] Change-Id: I43901d37817f9b79d508336253e766d740939e70 Reviewed-on: https://code.wireshark.org/review/10003 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 2449c7a Author: Alexis La Goutte Date: Wed Aug 12 21:06:08 2015 +0200 GTP: fix indent (use 4 spaces) Change-Id: I2f0645adee2aff32122a8ccb60843e1bfd0897e1 Reviewed-on: https://code.wireshark.org/review/10004 Reviewed-by: Anders Broman commit 451dd05 Author: Bill Meier Date: Wed Aug 12 16:47:36 2015 -0400 [lwres] Fix (32 bit ?) MSVC-2015 warning: "conversion from 'size_t' to 'guint16', possible loss of data" Change-Id: Ifc71d1c2afc3ff16f950f2f1c3c9e7142d62fc16 Reviewed-on: https://code.wireshark.org/review/10007 Reviewed-by: Bill Meier commit d20f2b6 Author: Bill Meier Date: Wed Aug 12 16:24:03 2015 -0400 [pdc] Fix a few [msvc-2015?] warnings about 'constant compared to constant' Essentially: Do the version checks at compile time using #if statements (even though the compiler probably optimized out the run time checks). Change-Id: I4879b39729ba5bd6b1c478ac43c107cb9fb445b3 Reviewed-on: https://code.wireshark.org/review/10006 Reviewed-by: Bill Meier commit 6ae8df4 Author: Bill Meier Date: Wed Aug 12 16:15:05 2015 -0400 [pdc] [msvc-2015] Change a variable type to prevent 32-bit MSVC-2015 "internal error" [...]\packet-pdc.c(205) : fatal error C1001: An internal error has occurred in the compiler. (compiler file 'f:\dd\vctools\compiler\utc\src\p2\main.c', line 246) To work around this problem, try simplifying or changing the program near the locations listed above. Please choose the Technical Support command on the Visual C++ Help menu, or open the Technical Support help file for more information INTERNAL COMPILER ERROR in 'C:\Program Files\Microsoft Visual Studio 14.0\VC\BIN\cl.EXE' Please choose the Technical Support command on the Visual C++ Help menu, or open the Technical Support help file for more information Change-Id: I505898d0c76244a56d75af1a1c5bf30554dd9a2b Reviewed-on: https://code.wireshark.org/review/10005 Reviewed-by: Bill Meier commit 5c80f08 Author: Gerald Combs Date: Tue Aug 11 11:48:07 2015 -0700 Add DCE-RPC and ONC-RPC service response time dialogs. Add RpcServiceResponseTimeDialog, which handles DCE-RPC and ONC-RPC service response time statistics. Try to make it as lightweight as possible, since we might want to pull this into the RPC dissectors similar to the other SRT statistics. Allow program names on the command line in place of numbers or UUIDs. Make matches case-insensitive. E.g. the following are equivalent: -z rpc,srt,100003,3 -z rpc,srt,nfs,3 -z rpc,srt,NFS,3 as are the following: -z dcerpc,srt,f5cc5a18-4264-101a-8c59-08002b2f8426,56 -z dcerpc,srt,nspi,56 -z dcerpc,srt,NSPI,56 Change-Id: Ie451c64bf6fbc776f27d81e3bc248435c5cbc9e4 Reviewed-on: https://code.wireshark.org/review/9981 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 412f5b3 Author: Gerald Combs Date: Wed Aug 12 10:49:34 2015 -0700 Expert information dialog performance improvements. Inserting QTreeWidgetItems individually is slow. This isn't a problem if you only have a few items but the Expert Information dialog can have thousands. Add "packet" tree items in groups, which should be much faster. Note that we still add "group" tree items individually since that gives us a nice progress indicator. While we're here, make sure we show the dialog before tapping packets. Bug: 11439 Change-Id: I8a182f4158d078cae5f42b8d1355414197f423e1 Reviewed-on: https://code.wireshark.org/review/10000 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit bde416a Author: Stig Bjørlykke Date: Wed Aug 12 15:21:46 2015 +0200 Lua: Moved deregister out of wslua_cleanup Change-Id: Ia43aa0e5f09400ef9923288b362256094a1241b8 Reviewed-on: https://code.wireshark.org/review/9998 Reviewed-by: Stig Bjørlykke commit 5a92694 Author: Stig Bjørlykke Date: Wed Aug 12 14:51:29 2015 +0200 Initialize is_reloading_lua at startup Change-Id: I211e0f4b86cff1c311d4ae67cbb47de14846144f Reviewed-on: https://code.wireshark.org/review/9997 Reviewed-by: Stig Bjørlykke commit dc7443f Author: Stig Bjørlykke Date: Wed Aug 12 14:07:24 2015 +0200 Added guards for deregistered fields This is functions used when redissecting after a Lua plugins reload. Change-Id: Ida14526faec1992006938a6732ee894ac83c2d12 Reviewed-on: https://code.wireshark.org/review/9995 Reviewed-by: Stig Bjørlykke commit a3e3d60 Author: AndersBroman Date: Wed Aug 12 13:24:06 2015 +0200 Align comments Change-Id: Iab59ba51700b018337552018c76e30dcbd41f3f6 Reviewed-on: https://code.wireshark.org/review/9993 Reviewed-by: Anders Broman commit cd16301 Author: AndersBroman Date: Wed Aug 12 10:00:01 2015 +0200 [GTP] Direct Tunnel Flags 7.7.81 is currently specified with one data octet. Change-Id: Iab7917b23e6be03f63a92ef0aaf0814c9cbea2c3 Reviewed-on: https://code.wireshark.org/review/9992 Reviewed-by: Anders Broman commit bfdc2cb Author: Michael Mann Date: Mon Aug 10 19:28:54 2015 -0400 Eliminate proto_tree_add_text from some dissectors. Change-Id: I7a7778802c442b254626a7676cb74ca2855fa65e Reviewed-on: https://code.wireshark.org/review/9977 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 50b51a6 Author: Guy Harris Date: Tue Aug 11 22:42:26 2015 -0700 Some further questions, asked in comments. Change-Id: I41c7918b7396934c651fb957d3b61db0c7a19527 Reviewed-on: https://code.wireshark.org/review/9990 Reviewed-by: Guy Harris commit 260ae6a Author: Guy Harris Date: Tue Aug 11 19:00:26 2015 -0700 Clean up the file header description. Change-Id: I4928f99cdc2b8fc2a3aef648b613ce0b93ed3563 Reviewed-on: https://code.wireshark.org/review/9989 Reviewed-by: Guy Harris commit 1100ba9 Author: Guy Harris Date: Tue Aug 11 18:38:08 2015 -0700 Update comments. Change-Id: I4b0b4bb31901208e09a535ef922e134116309531 Reviewed-on: https://code.wireshark.org/review/9988 Reviewed-by: Guy Harris commit 36c50fe Author: Guy Harris Date: Tue Aug 11 18:32:18 2015 -0700 Document Colasoft Capsa file support. Change-Id: I89374413f3e08e2a35923b8bd4c128b3c659158a Reviewed-on: https://code.wireshark.org/review/9987 Reviewed-by: Guy Harris commit 7b39eac Author: Guy Harris Date: Tue Aug 11 18:27:10 2015 -0700 It looks as if the origin of the time stamps is the UN*X epoch. If we assume that, the time stamps of the sample captures on the Colasoft site are in the range 2000-2014, and the HTTP time stamps in the HTTP capture from there are close to the packet time stamps. Change-Id: Id0e29c03dc8ada40f1040b95f169b4f3a8954a0f Reviewed-on: https://code.wireshark.org/review/9986 Reviewed-by: Guy Harris commit 14c7525 Author: Martin Kaiser Date: Tue Aug 11 21:57:11 2015 +0200 [Qt Expert Info dialogue] remove our tap listener when the dialogue is destroyed if we don't do this, there'll be a dangling tap listener and we'll see a crash when its reset method is called this can be triggered by opening another expert info dialogue, this will invoke cf_retap_packets() and reset_tap_listeners() which in turn calls the reset method of each registered tap listener Bug: 11432 Change-Id: I8fc13351666c875e1a3641f31bada8e80d167ab2 Reviewed-on: https://code.wireshark.org/review/9979 Petri-Dish: Martin Kaiser Reviewed-by: Gerald Combs commit f1a4db3 Author: Stig Bjørlykke Date: Tue Aug 11 22:04:58 2015 +0200 Lua: Remove unneeded call in wslua_cleanup Change-Id: I0cda00001b40e5951d680d72dbc8043cbe8b9309 Reviewed-on: https://code.wireshark.org/review/9980 Reviewed-by: Stig Bjørlykke commit 58ec64c Author: Stig Bjørlykke Date: Tue Aug 11 21:52:32 2015 +0200 wmem: Fix wmem_tree_remove_string Always set is_removed when insert data in a node. Change-Id: I8fb50932a369e3f4fe8a1f743462683fff705cc2 Reviewed-on: https://code.wireshark.org/review/9978 Reviewed-by: Stig Bjørlykke commit 4309b96 Author: Guy Harris Date: Tue Aug 11 12:16:23 2015 -0700 Sort dump_open_table_base[] in the right order. As the comment says, "Entries must be sorted by WTAP_FILE_TYPE_SUBTYPE_xxx values in ascending order." If they're not, the file type to file type string routines don't give the right answer. Change-Id: I06afe7bb98cb36c54ddc831113bb632598ab2eb0 Reviewed-on: https://code.wireshark.org/review/9975 Reviewed-by: Guy Harris commit de70d2a Author: Alexis La Goutte Date: Sat Aug 8 19:11:20 2015 +0200 H225: fix indent (use 2 spaces) and add modelines info Change-Id: Ibe4cf8d004c6c94f745e5c620100af9483fa6a31 Reviewed-on: https://code.wireshark.org/review/9934 Reviewed-by: Bill Meier commit d6c6b08 Author: Stig Bjørlykke Date: Tue Aug 11 16:11:46 2015 +0200 wmem: Mark removed strings with is_removed This will allow integer value 0 again. Change-Id: Ibfa4249ea8b887971d3b3214ad9e4d095d20d155 Reviewed-on: https://code.wireshark.org/review/9973 Reviewed-by: Stig Bjørlykke commit ecc4f75 Author: Stig Bjørlykke Date: Tue Aug 11 14:08:08 2015 +0200 Added Reload Lua plugins. This is initial support for reloading Lua plugins without restarting the application. Still todo: - Deregister FileHandlers - Support deregister ProtoField with existing abbrev (same_name_hfinfo) - Add a progress dialog when reloading many plugins - Search for memory leakages in wslua functions Change-Id: I48870d8741251705ca15ffe1068613fcb0cb18c1 Reviewed-on: https://code.wireshark.org/review/5028 Reviewed-by: Stig Bjørlykke commit 70d06de Author: AndersBroman Date: Tue Aug 11 13:52:34 2015 +0200 [SMCR] Minimum 4 bytes is required to perform the heuristic check. Change-Id: I29426147cb1443af3c9cc9dc1b60beabe9a94277 Reviewed-on: https://code.wireshark.org/review/9972 Reviewed-by: Anders Broman commit f233824 Author: AndersBroman Date: Tue Aug 11 13:32:41 2015 +0200 [Diameter] Add expert info to subdissection of 3GPP AVP:s Change-Id: Ic2ec0696f1f6b8bb918dd04aa898dccdb8b90ece Reviewed-on: https://code.wireshark.org/review/9971 Reviewed-by: Anders Broman commit 2579607 Author: AndersBroman Date: Tue Aug 11 13:06:40 2015 +0200 [ENEA LINX over TCP] Make the TCP port registration a preference defalted to 0. Change-Id: I837bf8ac9d5724dd485f0bc62f3fe32bedd3eb0e Reviewed-on: https://code.wireshark.org/review/9970 Reviewed-by: Anders Broman commit c262bf2 Author: AndersBroman Date: Tue Aug 11 11:08:20 2015 +0200 [GIOP] A GIOP message can have size = 0 (CloseConnection) Change-Id: I1feb6135c79191aa3ac7f36bbc969e6b36314107 Reviewed-on: https://code.wireshark.org/review/9969 Reviewed-by: Anders Broman commit 56a9b53 Author: Martin Kaiser Date: Mon Aug 10 23:09:16 2015 +0200 zbee-nwk-gp: fix a memory leak when keys are defined in the preferences ==5932== 33 (32 direct, 1 indirect) bytes in 1 blocks are definitely lost in loss record 2,124 of 4,121 ==5932== at 0x4C28BED: malloc (vg_replace_malloc.c:263) ==5932== by 0xA024F30: g_malloc (gmem.c:159) ==5932== by 0xA03A9E5: g_memdup (gstrfuncs.c:384) ==5932== by 0x70754D2: gp_init_zbee_security (packet-zbee-nwk-gp.c:1459) ==5932== by 0xA03A78C: g_slist_foreach (gslist.c:840) ==5932== by 0x67E867C: init_dissection (packet.c:249) ==5932== by 0x67DC202: epan_new (epan.c:160) ==5932== by 0x414B16: cf_open (tshark.c:2464) ==5932== by 0x40CF8A: main (tshark.c:2169) Change-Id: I7c0ce0717957525ca18eb4888ed3389debc89a49 Reviewed-on: https://code.wireshark.org/review/9967 Petri-Dish: Martin Kaiser Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit b1be6bc Author: Martin Kaiser Date: Mon Aug 10 22:41:13 2015 +0200 zigbee: remove some more if (tree) checks Change-Id: I81b46ec7d9d919ff2779d1005063e9ef6c92e097 Reviewed-on: https://code.wireshark.org/review/9966 Reviewed-by: Martin Kaiser commit 52a7b79 Author: Martin Kaiser Date: Mon Aug 10 22:27:58 2015 +0200 remove some unnecessary if (tree) checks Change-Id: Ib0f4cc47ede7b840cba38ecad04bd17bb6bccd55 Reviewed-on: https://code.wireshark.org/review/9965 Reviewed-by: Martin Kaiser commit 94bb276 Author: AndersBroman Date: Mon Aug 10 13:19:25 2015 +0200 Try to fix the build bou by copying tha cast made in glib. Change-Id: I6da06b8e6ae272b940ef4ee47ce6b253bf9f3699 Reviewed-on: https://code.wireshark.org/review/9961 Reviewed-by: Anders Broman commit e1003ee Author: Pascal Quantin Date: Fri Aug 7 16:29:50 2015 +0200 editcap: fix -T option when output format is pcapng Right now the output encapsulation type is ignored if the output (default) format is set to pcapng. Change-Id: Ibffaaed5979bf63ed4e3fa3b1f859a82b401d80b Reviewed-on: https://code.wireshark.org/review/9911 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 7fb514f Author: Alexis La Goutte Date: Sat Aug 8 16:52:38 2015 +0200 GSM (a_common): fix indent (replace tab by 8 spaces) Change-Id: Id1d6bfcb04ac75d767fe6f09454dc8235de7bc75 Reviewed-on: https://code.wireshark.org/review/9928 Reviewed-by: Anders Broman commit 76d4b80 Author: AndersBroman Date: Mon Aug 10 10:26:16 2015 +0200 g_slist_free_full () does not exist until GLIB 2.28 Change-Id: I81df5b4dbe1916eca51cdb72199de7a90471bd07 Reviewed-on: https://code.wireshark.org/review/9960 Reviewed-by: Anders Broman commit 75d46fe Author: Guy Harris Date: Mon Aug 10 00:53:34 2015 -0700 Get rid of trailing white space. Change-Id: I3c0091612bdd518f749abbfbefbd0e2097b8c18b Reviewed-on: https://code.wireshark.org/review/9958 Reviewed-by: Guy Harris commit 43c2e57 Author: Guy Harris Date: Mon Aug 10 00:30:33 2015 -0700 Don't try to decrypt the payload if it was cut short by the snapshot length. It's not clear that the decryption code can handle an incomplete payload. If it can, please fix this (bear in mind that you won't have all the MIC, and may not have *any* of the MIC, so...). Bug: 11389 Change-Id: Ie863ddc5c4aa7fbf6cde317823a413d226a41c0d Reviewed-on: https://code.wireshark.org/review/9954 Reviewed-by: Guy Harris commit 3157114 Author: Guy Harris Date: Sun Aug 9 23:55:55 2015 -0700 Use the reported length where appropriate. Use the captured length to know how much data to decrypt. Use the reported length to determine whether we have a null payload and to se the reported length of the decrypted payload and of tvbuffs for the un-decrypted payload. Bug: 11389 Change-Id: I4395c5a48c16110fcf31b611b99749c61000d489 Reviewed-on: https://code.wireshark.org/review/9953 Reviewed-by: Guy Harris commit d108f28 Author: Martin Kaiser Date: Sun Aug 9 18:06:47 2015 +0200 zigbee: fix two memory leaks ==17992== 4 bytes in 1 blocks are definitely lost in loss record 68 of 4,102 ==17992== at 0x4C28BED: malloc (vg_replace_malloc.c:263) ==17992== by 0x9FB2F30: g_malloc (gmem.c:159) ==17992== by 0x9FC89E5: g_memdup (gstrfuncs.c:384) ==17992== by 0x703F977: dissect_zbee_aps (packet-zbee-aps.c:1300) ==17992== by 0x67B4F1E: call_dissector_through_handle (packet.c:618) ==17992== 8 bytes in 1 blocks are definitely lost in loss record 580 of 4,102 ==17992== at 0x4C272B8: calloc (vg_replace_malloc.c:566) ==17992== by 0x9FB2F88: g_malloc0 (gmem.c:189) ==17992== by 0x703F962: dissect_zbee_aps (packet-zbee-aps.c:1299) ==17992== by 0x67B4F1E: call_dissector_through_handle (packet.c:618) second version that uses glib memory routines and does not mix g_hash_table and wmem remove an obsolete comment and an unnecessary return; while at it Change-Id: I2e92db0613f01b6c3009e8ad82ceb65a87cba12e Reviewed-on: https://code.wireshark.org/review/9830 Petri-Dish: Martin Kaiser Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit c462f1b Author: Michael Mann Date: Sun Aug 9 18:33:30 2015 -0400 Eliminate proto_tree_add_text from packet-wbxml.c While I was at it, some (mostly) duplicate functionality allowed rearranging of functions to eliminate most forward declarations. Change-Id: I2d7027d336c391d81dfe81c7a1ebf0d56c0826b2 Reviewed-on: https://code.wireshark.org/review/9951 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 6d8b4af Author: João Valverde Date: Thu Aug 6 22:35:23 2015 +0100 Cleanup variable name in dissect_frag6() Change-Id: Ib6bdea5dbc95b5221e41ca30c11288ff8c1dbb7f Reviewed-on: https://code.wireshark.org/review/9952 Reviewed-by: Anders Broman commit 655b0dc Author: Martin Kaiser Date: Mon Aug 10 00:00:21 2015 +0200 use the captured length as payload length for zigbee decryption this length is used for allocating a buffer and for crypto calculations we should use the bytes that were actually captured, not the reported length the capture in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11389 has one packet with a stupidly large reported length and a reasonable capture length (and one completely bogus packet) - this fix ensures that the decryption does not break for the former packet also, tvb_reported_length_remaining() does not return values < 0 any more, remove the check for this Bug: 11389 Change-Id: I42cb4526483160416b51e3cb72442148b5fac4f3 Reviewed-on: https://code.wireshark.org/review/9950 Reviewed-by: Anders Broman commit aafc7ff Author: Alexis La Goutte Date: Sat Aug 8 16:55:15 2015 +0200 H225: fix no previous prototype for 'h225_stat_init' [-Wmissing-prototypes] Change-Id: I945bbbb3b10258f22c60b04b19cf55671fc6ed94 Reviewed-on: https://code.wireshark.org/review/9933 Reviewed-by: Bill Meier commit a051961 Author: Bill Meier Date: Sun Aug 9 14:55:27 2015 -0400 [wiretap/nettrace_3gpp_32_423] Add editor modelines Change-Id: Ie2b9da2b3a08d18fc913a00cf076aa881a583552 Reviewed-on: https://code.wireshark.org/review/9949 Reviewed-by: Bill Meier commit a29f513 Author: Bill Meier Date: Sun Aug 9 14:16:22 2015 -0400 [skinny] Add missing change to source (.in); Also do minor cleanup. packet-skinny.c is generated from packet-skinny.in and etc. So: Change committed in gceb8d95 to packet-skinny.c should really have been applied as well to packet-skinny.c.in. Minor cleanup: Remove a few unneeded initializers; Remove unneeded code in proto_reg_handoff_skinny(); Replace a tab by spaces; Change editor tab-width specification to be 8 (not 2). No actual indentation change since tabs not used in the file. packet-skinny.c regenerated using 'cog' Change-Id: Ib3510c257e0b98bb7da8fae9aa010e134ec381cb Reviewed-on: https://code.wireshark.org/review/9948 Reviewed-by: Bill Meier commit 2ef3cda Author: Evan Huus Date: Sun Aug 9 10:36:18 2015 -0400 t124: kill evil global variables Bug: 11430 Change-Id: Ia4196ff693806dc1e20eae4075dda7dfe272c5b6 Reviewed-on: https://code.wireshark.org/review/9941 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin Reviewed-by: Evan Huus commit b3207c0 Author: Martin Kaiser Date: Sun Aug 9 18:33:04 2015 +0200 zigbee: remove a numer of unnecessary if (tree) checks Change-Id: Ifd0dcc220cfdd0809f2e7cf2fc54fc8bdeb987be Reviewed-on: https://code.wireshark.org/review/9947 Reviewed-by: Martin Kaiser commit c5af152 Author: Bill Meier Date: Sun Aug 9 12:20:54 2015 -0400 Trivial: Convert 'tabs' indentation to '4 space' indentation Change-Id: If71dd8a04050ce11e37ad88ee862419313c06639 Reviewed-on: https://code.wireshark.org/review/9946 Reviewed-by: Bill Meier commit dbf314a Author: Bill Meier Date: Sun Aug 9 12:14:39 2015 -0400 Trivial: Change editor-modelines tab-width specification from 4 to 8. [There were no actual indentation changes since since none of the files contained tabs]. Change-Id: I92ff551e70274f459c466e1c1d449905e0e7dc92 Reviewed-on: https://code.wireshark.org/review/9945 Reviewed-by: Bill Meier commit 394773c Author: Gerald Combs Date: Sun Aug 9 08:57:29 2015 -0700 Switch the guides back to html output. DocBook's xhtml5 stylesheet output didn't render correctly in Firefox. This reverts commit dc09d18e8ecdc55de2361d8ff6d2b0bf36345a70. This reverts commit 62e56ad92a50c7dd58e83447207b8be0cc0bbb76. This reverts commit 53a80334bcb3ca40a5aaef504e2aca0f04bcc9f3. Change-Id: Iafcf18cfce25772146fc2e155728401fd105a44b Reviewed-on: https://code.wireshark.org/review/9944 Reviewed-by: Gerald Combs commit a8af51d Author: Gerald Combs Date: Sun Aug 9 08:10:47 2015 -0700 [Automatic update for 2015-08-09] Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I14806e32e93b7f189ccc68834afa4645bda3e1aa Reviewed-on: https://code.wireshark.org/review/9942 Reviewed-by: Gerald Combs commit 4bba83b Author: Gerald Combs Date: Sat Aug 8 16:29:24 2015 -0700 Reset the splash timer after processing events. Change-Id: Id71a3ac5e8f04df6a19e92021e47ea64728c2595 Reviewed-on: https://code.wireshark.org/review/9936 Reviewed-by: Gerald Combs commit de872cb Author: Gerald Combs Date: Sat Aug 8 15:44:02 2015 -0700 Generate DocBook conditionally. Add back a check when generating DocBook. Change-Id: I00679853d537f543db6f37a60ae4c46b3cce76e6 Reviewed-on: https://code.wireshark.org/review/9935 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 0626e76 Author: Gerald Combs Date: Fri Aug 7 18:17:04 2015 -0700 CMake: Try to fix generated docbook dependencies. Add custom {developer,user}_guide_docbook targets for docbook output. Make sure the HTML, PDF, and CHM outputs depend on their associated docbook target and not on the output .xml file. This keeps us from running a2x instances in parallel. Change-Id: I73b0db50ae92f62eb08ae284d498cdf2d697ac00 Reviewed-on: https://code.wireshark.org/review/9920 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 11e5422 Author: Alexis La Goutte Date: Sat Aug 8 16:50:17 2015 +0200 GSM (a_common): fix no previous prototype for 'gsm_a_*_init' [-Wmissing-prototypes] Change-Id: I2990cb3432ad377cbed7039ad8fe15019eb7e7f5 Reviewed-on: https://code.wireshark.org/review/9927 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte Reviewed-by: Michael Mann commit 524db99 Author: Alexis La Goutte Date: Sat Aug 8 16:46:45 2015 +0200 GSM (a_common): fix comma at end of enumerator list [-Wpedantic] Change-Id: I0ea06451861412b642d033a70e0a639aae753beb Reviewed-on: https://code.wireshark.org/review/9926 Reviewed-by: Alexis La Goutte Reviewed-by: Michael Mann commit f6fb630 Author: Guy Harris Date: Sat Aug 8 10:04:47 2015 -0700 Fix another typo. Change-Id: I1fee679b4b0f582806b0e9302c3e404c0222cd6d Reviewed-on: https://code.wireshark.org/review/9930 Reviewed-by: Guy Harris commit c60c1b9 Author: Alexis La Goutte Date: Sat Aug 8 16:37:58 2015 +0200 IEEE802.11: Fix typo Pseduo -> Pseudo Change-Id: I34700b3392bfd7e47e79cb2cad0f65a1046a26a2 Reviewed-on: https://code.wireshark.org/review/9925 Reviewed-by: Guy Harris commit 454f08d Author: Michael Mann Date: Sat Aug 8 09:57:14 2015 -0400 If SOCKS server doesnt't require authentication, then client should be ready for commands. Bug: 11417 Change-Id: I62c6d94923dcda2ef8297086faac7d7c4b85a3fb Reviewed-on: https://code.wireshark.org/review/9923 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 9a16a69 Author: Alexis La Goutte Date: Sat Aug 8 16:10:48 2015 +0200 NCP2222.py : fix generate indent (use 4 spaces) Change-Id: Ibe55260e837f0a839649675c08e1bf66d8bcdb52 Reviewed-on: https://code.wireshark.org/review/9924 Reviewed-by: Michael Mann commit 39ad1bf Author: Alexis La Goutte Date: Sat Aug 8 13:20:52 2015 +0200 NCP2222(.inc): fix indent (use 4 spaces) Change-Id: I8161423ae270f685c28003eac36adf15be83c5fd Reviewed-on: https://code.wireshark.org/review/9922 Reviewed-by: Michael Mann commit b703f47 Author: Alexis La Goutte Date: Sat Aug 8 13:08:57 2015 +0200 GTPv2: fix indent (use 4 spaces) Change-Id: I7836360ae4fe67098776911a496ecc969d3e093d Reviewed-on: https://code.wireshark.org/review/9921 Reviewed-by: Michael Mann commit 5cf66db Author: Gerald Combs Date: Fri Aug 7 15:38:34 2015 -0700 Add a missing dependency. Change-Id: I2c9814419882f9bee30e70697d6f284393f275a9 Reviewed-on: https://code.wireshark.org/review/9919 Reviewed-by: Gerald Combs commit 7cb2b11 Author: Gerald Combs Date: Fri Aug 7 15:08:22 2015 -0700 Rework CMake dependendencies in the docbook directory. Create dependencies explicitly using add_dependencies. Otherwise MSBuild only builds one output per run. Change-Id: If42605d7e7df499cf4d4b70336d97ac6d37e8ba6 Reviewed-on: https://code.wireshark.org/review/9918 Reviewed-by: Gerald Combs commit a001ed6 Author: Guy Harris Date: Fri Aug 7 15:27:11 2015 -0700 Avoid (unlikely) NRB record size overflows. If a host name is *so* long that an entry for it won't fit in a 65535-byte Name Resolution Block record, ignore the entry for that host. Use more appropriate data types (guint32 for sizes that are 32-bit unsigned integers, guint16 for the host name length as it'd better fit in 16 bits). Clean up some comments. Remove a _U_ that's applied to a variable that *is* used. Change-Id: I153d5aa885105149c62a5e5d2b78b54cf6ed7b4e Reviewed-on: https://code.wireshark.org/review/9917 Reviewed-by: Guy Harris commit 817d9bd Author: Timothy Geiser Date: Wed Aug 5 15:19:48 2015 -0400 Add SHA2 algos to certificate dissection in SSL Change-Id: If1315496d231e5c8efc44b9235ec8ffb3ce9d8a9 Reviewed-on: https://code.wireshark.org/review/9880 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 240105e Author: Gerald Combs Date: Fri Aug 7 12:37:33 2015 -0700 Fixup the Qt splash overlay progress calculations. Fix a couple of issues in the way we calculate the splash overlay progress. Avoid unnecessary repaints. Change-Id: I1f4800b2c2836b67ca9ff3d6d24af150f4379ba9 Reviewed-on: https://code.wireshark.org/review/9916 Reviewed-by: Gerald Combs commit 0a1d1bd Author: Gerald Combs Date: Fri Aug 7 10:19:22 2015 -0700 More casting issues with older versions of GLib. Try to fix packet-btl2cap.c: In function 'btl2cap_cid_value': packet-btl2cap.c:425: warning: cast to pointer from integer of different size packet-btl2cap.c: In function 'btl2cap_psm_value': packet-btl2cap.c:448: warning: cast to pointer from integer of different size packet-btrfcomm.c: In function 'btrfcomm_directed_channel_value': packet-btrfcomm.c:287: warning: cast to pointer from integer of different size packet-btobex.c: In function 'btobex_profile_value': packet-btobex.c:1134: warning: cast to pointer from integer of different size on the 32-bit OS X builder. Change-Id: Ieb2fe6c31fdad0cf776c24bada7a6a83e8aa91ec Reviewed-on: https://code.wireshark.org/review/9915 Reviewed-by: Gerald Combs commit 147ab19 Author: Gerald Combs Date: Fri Aug 7 08:39:09 2015 -0700 Switch the floats in stat_tap table items to doubles. Use doubles instead of floats in stat_tap_table_item_type. This should make stat taps easier to use with a lot of our API (e.g. nstime) along with Qt and the C math library. This reverts commit 5bbb6ff5e43511ddc57b0b771f3d60da1eb82c02. Change-Id: I113b44fb944a883cde016b7a8961597658be4c0a Reviewed-on: https://code.wireshark.org/review/9912 Petri-Dish: Gerald Combs Reviewed-by: Graham Bloice commit c90fcba Author: Stig Bjørlykke Date: Fri Aug 7 14:55:50 2015 +0200 Lua: Count Lua plugins in splash screen This will avoid slow startup when having many Lua plugins. Change-Id: I67b5f38108a5c500682bc727734375da5fa762c8 Reviewed-on: https://code.wireshark.org/review/9910 Petri-Dish: Stig Bjørlykke Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke commit c8ca0ae Author: Gerald Combs Date: Fri Aug 7 09:10:39 2015 -0700 Try to fix casting issues with older versions of GLib. Try to fix packet-btatt.c: In function 'btatt_handle_value': packet-btatt.c:1420: warning: cast to pointer from integer of different size packet-btatt.c: In function 'btatt_uuid16_value': packet-btatt.c:1443: warning: cast to pointer from integer of different size on the 32-bit OS X builder. Change-Id: I02884c02e7f7f5f7b50da122127fa96c41c3603a Reviewed-on: https://code.wireshark.org/review/9913 Reviewed-by: Gerald Combs commit 7171ee5 Author: Bill Meier Date: Thu Aug 6 17:44:42 2015 -0400 [ieee80211] Rework QoS Capability and QoS info code. Specifically: - Replace/remove much of 'dissect_qos_capability()' code to use existing 'fixed field' code to dissect QoS_Info field. Note: Much of the code added in g40d6131 to dissect the QoS Info field duplicated already existing (but unused) "fixed field" code to do same. - Rework some QoS Info field filter names, variable names and value-strings to better match the text used in 802.11-2012. - Rename 'dissect_qos_info()' to 'dissect_wme_qos_info()' to reflect the fact that this code is only for the (now preumably obsolete) original WME(WMM) specification for the QoS Info field. Change-Id: Id89780dfe60b2e4c63332bdb946cc29c67b5127a Reviewed-on: https://code.wireshark.org/review/9903 Petri-Dish: Bill Meier Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte Reviewed-by: Bill Meier commit f657e6a Author: AndersBroman Date: Fri Aug 7 14:50:02 2015 +0200 [GTPv2] Mark a parameter as unused. Change-Id: I37c983d756f23469e4cf1abd31b9c591f5612542 Reviewed-on: https://code.wireshark.org/review/9909 Reviewed-by: Anders Broman commit 5bbb6ff Author: AndersBroman Date: Fri Aug 7 14:19:30 2015 +0200 Try to fix packet-rpc.c:3909: warning: implicit conversion shortens 64-bit value into a 32-bit value Change-Id: I8962f93662047d01ef71ba9689b338d095f31300 Reviewed-on: https://code.wireshark.org/review/9908 Reviewed-by: Anders Broman commit 99873f7 Author: AndersBroman Date: Fri Aug 7 14:04:52 2015 +0200 [GTPv2] Dissect IE MM Context for CS to PS SRVCC, update value strings. Bug: 11423 Change-Id: I5a845e40fcbd4e06dec60c64edca9e8fea1459e1 Reviewed-on: https://code.wireshark.org/review/9907 Reviewed-by: Anders Broman commit fd19aaf Author: Gerald Combs Date: Thu Aug 6 10:56:22 2015 -0700 Add ONC RPC program stats. Convert ONC RPC program stats to the stat_tap API. Add a "user_data" member to the stat_tap_table_item_type struct. Change-Id: I5cbf000a447ff93d30fa7f098124bdcbc34f2935 Reviewed-on: https://code.wireshark.org/review/9904 Petri-Dish: Gerald Combs Reviewed-by: Gerald Combs commit 0c9998d Author: Jan-Hendrik Bolte Date: Mon Jul 20 14:37:49 2015 +0200 Add dissector for MQTT-SN v1.2 Bug: 11388 Change-Id: I5d961b19132a9904080e9494467826d15659c54e Reviewed-on: https://code.wireshark.org/review/9711 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 4557c17 Author: Michal Labedzki Date: Wed Aug 5 17:30:47 2015 +0200 androiddump: Try to make MVS14.0 happy I guess using glib's gssize instead of ssize_t should be enough for: extcap/androiddump.c(736): error C2220: warning treated as error - no 'object' f ile generated extcap/androiddump.c(736): warning C4477: 'fprintf' : format string '%I64i' requ ires an argument of type '__int64', but variadic argument 3 has type 'ssize_t' extcap/androiddump.c(736): note: to simplify migration, consider the temporary use of /Wv:18 flag with the version of the compiler with which you used to build without warnings extcap/androiddump.c(736): note: consider using '%i' in the format string extcap/androiddump.c(736): note: consider using '%I32i' in the format string Change-Id: I1030694aed61d413be1aad54531f99db45e99c9d Reviewed-on: https://code.wireshark.org/review/9876 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit dc33bba Author: Bill Meier Date: Thu Aug 6 21:47:37 2015 -0400 [ieee80211] Change one ENC_LITTLE_ENDIAN MAC address to ENC_NA; byte order doesn't apply to them. Change-Id: I4b0fcfe5d970877d7f8453e6c6f8c48ee69c2e38 Reviewed-on: https://code.wireshark.org/review/9905 Reviewed-by: Bill Meier commit ff24ecc Author: Gerald Combs Date: Thu Aug 6 11:23:55 2015 -0700 Fixup stat_tap table freeing. As it turns out we *do* need to free table elements. We also need to free the tables themselves and clear the table array. Do so. Change-Id: Ic1c81388eac8f47f74caea0169c79685a83aaff9 Reviewed-on: https://code.wireshark.org/review/9901 Petri-Dish: Gerald Combs Reviewed-by: Gerald Combs commit 9fd3bcc Author: Gerald Combs Date: Thu Aug 6 12:31:21 2015 -0700 Add an elide mode preference for the Qt packet list. Change-Id: I081cc1e9b2a0eea7f0a3ef1157561c50beb4c4db Reviewed-on: https://code.wireshark.org/review/9902 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit fda29e1 Author: Gerald Combs Date: Thu Aug 6 08:39:22 2015 -0700 Use int_to_qstring in a few more places. Change-Id: Id324fe21f436a233088d106553db2ed6f6e410ac Reviewed-on: https://code.wireshark.org/review/9899 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 5fa57ec Author: AndersBroman Date: Thu Aug 6 13:30:59 2015 +0200 [MSVC 2015]Once agin revert tho original, now as a separate patch. Change-Id: If25a1e4ced74d88c87def010b9d8032b5d870307 Reviewed-on: https://code.wireshark.org/review/9898 Reviewed-by: Anders Broman commit 544bca7 Author: AndersBroman Date: Thu Aug 6 13:21:26 2015 +0200 include to make windows build boot happy. Change-Id: I7a8b259698fdca0707464929a77c0b320f6a19f1 Reviewed-on: https://code.wireshark.org/review/9897 Reviewed-by: Anders Broman commit aa2184f Author: AndersBroman Date: Thu Aug 6 13:01:45 2015 +0200 Fix pcapng.c:3788: warning: implicit conversion shortens 64-bit value into a 32-bit value Change-Id: Ie796cee755470bea0416b46ff8ff6a94cd8d93d3 Reviewed-on: https://code.wireshark.org/review/9896 Reviewed-by: Anders Broman commit 8906e93 Author: Michal Labedzki Date: Thu Aug 6 10:59:51 2015 +0200 Bluetooth: Fix some MSVC2015 warnings/errors packet-btobex.c(1134): error C2220: warning treated as error - no 'object' file generated packet-btobex.c(1134): warning C4312: 'type cast': conversion from 'gulong' to ' gpointer' of greater size packet-btatt.c(1420): error C2220: warning treated as error - no 'object' file generated packet-btatt.c(1420): warning C4312: 'type cast': conversion from 'gulong' to 'gpointer' of greater size packet-btatt.c(1443): warning C4312: 'type cast': conversion from 'gulong' to 'gpointer' of greater size packet-btl2cap.c(425): error C2220: warning treated as error - no 'object' file generated packet-btl2cap.c(425): warning C4312: 'type cast': conversion from 'gulong' to 'gpointer' of greater size packet-btl2cap.c(448): warning C4312: 'type cast': conversion from 'gulong' to 'gpointer' of greater size packet-btrfcomm.c(287): error C2220: warning treated as error - no 'object' file generated packet-btrfcomm.c(287): warning C4312: 'type cast': conversion from 'gulong' to 'gpointer' of greater size Change-Id: Ie5b4fd1c47725b966f9b98d9480c1858b553efff Reviewed-on: https://code.wireshark.org/review/9894 Petri-Dish: Michal Labedzki Reviewed-by: Michal Labedzki Tested-by: Michal Labedzki commit b4dea54 Author: Gerald Combs Date: Wed Aug 5 20:44:09 2015 -0700 Try to fix dist. Change-Id: I04c4a06f8d2db4d9ac1a09fea25d4f587c1f1fc1 Reviewed-on: https://code.wireshark.org/review/9893 Reviewed-by: Gerald Combs commit 910438b Author: Hadriel Kaplan Date: Mon Jul 20 10:35:06 2015 -0400 Pcapng: support Name Resolution Block options Make pcapng decode options in an NRB during read, and store the comment option, and write it back out as well. Also make it handle plugin handlers for unknown options in received NRB(s). Change-Id: I81863ef8d85cb1c8b5ba6673ba0e562efe77714f Reviewed-on: https://code.wireshark.org/review/9723 Petri-Dish: Hadriel Kaplan Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 1420f3d Author: Guy Harris Date: Wed Aug 5 20:12:31 2015 -0700 Add ui_gsm_map_summary_dialog.h so it goes into the source tarball. Change-Id: Ib0780e5ba62d069d2b41ef7ac7da513981660c7f Reviewed-on: https://code.wireshark.org/review/9892 Reviewed-by: Guy Harris commit c6889d8 Author: Guy Harris Date: Wed Aug 5 19:45:12 2015 -0700 Fix some encoding arguments. 802.11 is overwhelmingly little-endian; change all 1-byte fields that were ENC_BIG_ENDIAN to ENC_LITTLE_ENDIAN. Change one ENC_BIG_ENDIAN MAC address to ENC_NA; byte order doesn't apply to them. The remaining ENC_BIG_ENDIANs should be checked. Change-Id: I3dc51a5555b99c25dce0d3b7f3be4c441b13d1a3 Reviewed-on: https://code.wireshark.org/review/9890 Reviewed-by: Guy Harris commit f30ac4a Author: Guy Harris Date: Wed Aug 5 19:08:36 2015 -0700 Fix a bunch of typoes in variable and field names. Fix spelling, get rid of period at end of some field names. Change-Id: I1963cdc92657dca8708133796f8835bdffee0c47 Reviewed-on: https://code.wireshark.org/review/9888 Reviewed-by: Guy Harris commit b7f5eaa Author: Gerald Combs Date: Tue Aug 4 17:42:53 2015 -0700 Convert the GSM MAP stats to new "generic stat API". Convert both the MAP statistics and summary. As with the GSM A stats this are mostly untested. Change-Id: Ibd3a7346b09d1401e78724c0197ec2a38deb97a3 Reviewed-on: https://code.wireshark.org/review/9883 Petri-Dish: Gerald Combs Reviewed-by: Gerald Combs commit 05eb9b6 Author: Gerald Combs Date: Wed Aug 5 17:03:03 2015 -0700 Add proper base prefixes in display filter expressions. When the user selects an enum in the display filter expression dialog make sure we add the proper base prefix Add a Qt UI convenience routine for formatting integers. Because deprecating QString::sprintf was a well-thought-out decision that will be regarded highly for decades to come. Fix search visibility while we're here. Bug: 11421 Change-Id: I1368bc8f464983793bdc90760cf3b7c18b6bd859 Reviewed-on: https://code.wireshark.org/review/9885 Reviewed-by: Gerald Combs commit ef0bdbc Author: Guy Harris Date: Wed Aug 5 18:23:53 2015 -0700 Cleanup a bunch of 802.11ad stuff. Make all the multi-byte fields, except for OUIs, little-endian - including fields that contain bitfields. Make the bits in the bitfields little-endian as well. For the "number of taps" bitfields, interpret the values. Fix a typo ("pseduo" -> "pseudo"). The length of an OCT MMPDU is 16 bits, not 8 bits, and it's not a text string, it's an octet string. The Beacon Interval Control is 48 bits, not 64 bits. Handle the beam refinement UI as a 2-byte field that overlaps with a 4-byte field - *none* of the bitfields align on nice 8-bit boundaries, so that's the best we can do. Bug: 11419 Change-Id: Ib00ad030ecb33cf676bec23c05b15a4211c75c07 Reviewed-on: https://code.wireshark.org/review/9886 Reviewed-by: Guy Harris commit dc09d18 Author: Gerald Combs Date: Wed Aug 5 16:19:24 2015 -0700 Output xhtml guides everywhere. Update Autotools / Nmake to generate xhtml5 user and developer guides. Change-Id: I5024151aecaee62ea6d8469807fabda552d3f663 Reviewed-on: https://code.wireshark.org/review/9884 Reviewed-by: Gerald Combs commit 6aabad5 Author: Roland Knall Date: Wed Aug 5 09:36:20 2015 +0200 epl: Fix Payload sub-dissection Current implementation gives all remaining data to sub-dissector. This is not correct, as with "Write Multiple by Index" the data given includes the following indeces and their datasets Change-Id: I5343bf61431a7b5507b51f53f0de8c6e3dc72cf1 Reviewed-on: https://code.wireshark.org/review/9870 Reviewed-by: Roland Knall Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 504f5b3 Author: Guy Harris Date: Wed Aug 5 13:00:38 2015 -0700 Clean up some fields. The "LEN" field is the "length of the MAC frame", in bytes; confusingly, it includes the extended header length, but not the fixed-length part of the header (including the FCS), so it's not the "length after HCS". Rename it to "docsis.len", as it's always LEN, not SID; there's a separate field for the SID. Rename the Extended Header Length field to docsis.ehdrlen, and the Number of Concatenated Frames to docsis.concat_cnt, so that different uses of the "MACPARM" part of the header are flagged differently. Update some comments while we're at it. Change-Id: Ib7c4a0cda65cef25dcaf0051b3de89758ef4c29c Reviewed-on: https://code.wireshark.org/review/9881 Reviewed-by: Guy Harris commit f0beaa1 Author: Roland Knall Date: Wed Aug 5 09:39:08 2015 +0200 openSAFETY: Better display of packet info If multiple packets of openSAFETY are present in a single network packet, searching for the packet needed is complicated. This patch increases the information along the same lines as the eth and frame subdissectors Change-Id: Id3d237135cfadb35c839208749aeeb1652b29830 Reviewed-on: https://code.wireshark.org/review/9871 Reviewed-by: Roland Knall Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 62e56ad Author: Gerald Combs Date: Wed Aug 5 10:59:51 2015 -0700 Make sure we use "*.html" in our chunked output. Change-Id: Idb441084ec50ec336b7f514895aba799832e8f66 Reviewed-on: https://code.wireshark.org/review/9879 Reviewed-by: Gerald Combs commit 3b2e6d9 Author: Michal Labedzki Date: Wed Aug 5 16:25:16 2015 +0000 Revert "[MSVC 2015] Fix errors seen with the released version by reverting the code to what failed on the RC version *sigh*" Reverted commit break DecodeAs for Bluetooth, also caused crashes. This reverts commit 2221153a9cc083a50248a72a4b4009908d84e38b. Change-Id: Idb91747b986f110fffa3444f8c52d800c128e141 Reviewed-on: https://code.wireshark.org/review/9877 Reviewed-by: Anders Broman commit 53a8033 Author: Gerald Combs Date: Wed Aug 5 09:30:40 2015 -0700 Generate XHTML5 documentation. When converting from DocBook to HTML, use DocBook's xhtml5 XSL stylesheets. Change-Id: I7a49d60c46a17e1e639b78ee10c4b9fa832d4a77 Reviewed-on: https://code.wireshark.org/review/9878 Reviewed-by: Gerald Combs commit 2221153 Author: AndersBroman Date: Wed Aug 5 14:37:20 2015 +0200 [MSVC 2015] Fix errors seen with the released version by reverting the code to what failed on the RC version *sigh* Change-Id: I1b7f6d57da4cb71473a074291da7e5a0d5242c95 Reviewed-on: https://code.wireshark.org/review/9874 Reviewed-by: Anders Broman commit 5de487a Author: AndersBroman Date: Wed Aug 5 14:30:27 2015 +0200 [MSVC 2015] Compiler and visual studio version are off by 5 not 6 in MSVC 2015. Change-Id: I5476656789893af2c8aeb5dfe5cf06972fd8bd4b Reviewed-on: https://code.wireshark.org/review/9873 Reviewed-by: Anders Broman commit 8bf1237 Author: Pascal Quantin Date: Mon Aug 3 22:21:24 2015 +0200 MAC CTRL: fix dissection of PAUSE frame According to 802.3 table 31A-1, only opcodes from 0x0002 to 0x0006 have a timestamp While we are at it, rename the opcodes to a name matching the specification Bug: 11403 Change-Id: Iaadc2b801e86523e962b4eb319541bc74de22071 Reviewed-on: https://code.wireshark.org/review/9857 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit ad4ab2a Author: Gerald Combs Date: Tue Aug 4 14:56:46 2015 -0700 Convert the GSM A stats to new "generic stat API". These are largely untested, but the two abis captures on the wiki seem to work OK. The menu item names could also use some work. Patches welcome. Change-Id: I19a5b5fe3476b49d1dd0b684cbb7f367c6ebd4b4 Reviewed-on: https://code.wireshark.org/review/9869 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 4d673b2 Author: Gerald Combs Date: Tue Aug 4 08:56:28 2015 -0700 Convert Camel tap stats to new "generic stat API". Migrate the Camel stats similar to the recent BOOTP and H.225 migrations. Change-Id: If82617068ff4b8fa186899f66dc34a08585f66cb Reviewed-on: https://code.wireshark.org/review/9865 Petri-Dish: Gerald Combs Reviewed-by: Gerald Combs commit 3e6b527 Author: Gerald Combs Date: Tue Aug 4 10:16:23 2015 -0700 Remove the CLI H.225 counter. Stats were moved to the dissector in g03802cc. Change-Id: I1aaf43789695ba3aae54cfaf201263cd0aed74ea Reviewed-on: https://code.wireshark.org/review/9867 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 4e14a26 Author: Gerald Combs Date: Tue Aug 4 11:45:24 2015 -0700 Don't zero stat tap elements. Let the reset callback take care of resetting our rows. Change-Id: I59b0e9d36a9a1cedc5a5893664c875b7416a5229 Reviewed-on: https://code.wireshark.org/review/9868 Reviewed-by: Gerald Combs commit d51d83b Author: Gerald Combs Date: Tue Aug 4 10:00:23 2015 -0700 Fix the selected packet indicator width. Change-Id: Ic792c232524b4124bb4607cbe1979cdce8fd7e23 Reviewed-on: https://code.wireshark.org/review/9866 Reviewed-by: Gerald Combs commit 03802cc Author: Gerald Combs Date: Mon Aug 3 10:30:04 2015 -0700 Convert H.225 tap stats to new "generic stat API". Migrate the H.225 stats similar to the recent BOOTP migration. Change-Id: I70ff7ab6cf3e9796f257412ba7d65ec9fe7f77ad Reviewed-on: https://code.wireshark.org/review/9859 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 632b402 Author: Gerald Combs Date: Mon Aug 3 21:25:00 2015 -0700 Zero stat table elements instead of freeing them. Stat table element arrays are allocated once at startup. Reset each element in free_stat_table() instead of freeing them. Change-Id: Ia63af93c76a1348bbb809137a521eead58a52dd1 Reviewed-on: https://code.wireshark.org/review/9860 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 3413ddf Author: Alexis La Goutte Date: Sat Jul 25 20:07:59 2015 +0200 EPL: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: Id8fac193a2f3521986c0f91df84950ff581d4b6b Reviewed-on: https://code.wireshark.org/review/9790 Reviewed-by: Roland Knall Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 992c892 Author: AndersBroman Date: Tue Aug 4 16:48:06 2015 +0200 MIB/OID Fix assertion in proto.c tmp_fld_check_assert(). It seems like oid_data->name may get freed so do a g_strdup() as it's done for hf.hfinfo.abbrev. Change-Id: Ie05fb42d59556aec300d4e007b1db5cc79d8d6f1 Reviewed-on: https://code.wireshark.org/review/9864 Reviewed-by: Anders Broman commit 8421af3 Author: Luke Mewburn Date: Tue Aug 4 19:42:19 2015 +1000 Rename nettrace3gpp324423 to 3gpp32423 Use "3gpp32423" instead of "nettrace3gpp324423": - There were too many "4"s in the previous name ("324423" vs "32423"). - "nettrace" isn't an official name, per 3GPP TS 32 423 - It's shorter. Change-Id: Ic981d0351a3014fb79702955ebef7b13f6ce4a2e Reviewed-on: https://code.wireshark.org/review/9863 Reviewed-by: Anders Broman commit 4908c75 Author: AndersBroman Date: Tue Aug 4 10:58:45 2015 +0200 [ISUP] Read the country code at offset Change-Id: I5a03fdbdf7079c354bc9b63acba3d205f82a4e8a Reviewed-on: https://code.wireshark.org/review/9862 Reviewed-by: Anders Broman commit 6e87802 Author: AndersBroman Date: Tue Aug 4 10:46:48 2015 +0200 tvb_new_octet_aligned() should return both the captured and reported length set to datalen in the returned tvb. Change-Id: Ie6649a285a9fa4a0564e29ce18ec9459b8da2541 Reviewed-on: https://code.wireshark.org/review/9861 Reviewed-by: Anders Broman commit 2964c28 Author: Guy Harris Date: Mon Aug 3 14:14:50 2015 -0700 Update a comment to reflect reality as of 1997. "IEEE 802.3" has, since IEEE 802.3y-1997, supported a type/length field, not just a length field (i.e., they acknowledged reality), so it's no as if there are "802.3" as opposed to "D/I/X" or "Ethernet II" frames. Change-Id: Ie7f61e48cb2a343a7c83e0747a6eee46964fc335 Reviewed-on: https://code.wireshark.org/review/9858 Reviewed-by: Guy Harris commit ae05f77 Author: Guy Harris Date: Mon Aug 3 11:58:36 2015 -0700 Give an I-D reference for this. Change-Id: I5bbc1b390215e11cba86af9b325ae94d3708ae93 Reviewed-on: https://code.wireshark.org/review/9855 Reviewed-by: Guy Harris commit 56ee4b1 Author: Martin Mathieson Date: Mon Aug 3 12:02:37 2015 +0100 TFTP: strengthen heuristic used over STUN/TURN Change-Id: I133199abda100a89e219804c3003dee76389c43a Reviewed-on: https://code.wireshark.org/review/9839 Reviewed-by: Martin Mathieson commit 9557c73 Author: Gerald Combs Date: Sun Aug 2 15:33:07 2015 -0700 Make sure per-packet tap callbacks return gbooleans. The tap API changed the return type of per-packet listener callbacks from int to gboolean back in 2009. Update a bunch of functions and some documentation accordingly. Change-Id: I79affe65db975caed3cc296a7e2985b7b9cdf4cc Reviewed-on: https://code.wireshark.org/review/9853 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 08e80b1 Author: Evan Huus Date: Sun Aug 2 08:41:27 2015 -0400 Skip files larger than 8MB in valgrind fuzzing Follow-up to g2eabd35 which added a 20MB limit, this lowers it quite a bit since we're still seeing out-of-memory failures with files slightly larger than 8MB. Based on a quick scan of the menagerie this only excludes another dozen or so files so we won't lose much coverage. Ping-Bug: 11395 Change-Id: I8d684bebad553408c68b125330f2878deedc3bff Reviewed-on: https://code.wireshark.org/review/9849 Reviewed-by: Evan Huus commit 7c46b25 Author: Evan Huus Date: Sun Aug 2 09:12:23 2015 -0400 qt: fix scrollbar crash applying conv. filter When applying a conversation filter via context menu on the packet list, something triggers the scrollbar to redraw when it has a maximum value of 0, leading to a div-by-0. Guard against that (for now) though there may be a better long-term fix. Change-Id: I5fa0cac3e67f50a6c603a6fa10b117de5540d444 Reviewed-on: https://code.wireshark.org/review/9850 Reviewed-by: Gerald Combs commit 78ca0af Author: Pascal Quantin Date: Sat Aug 1 11:38:03 2015 +0200 HTTP2: remove weak part of the heuristic It is so fragile that it triggers too many false positives and it was not activated by default prior to g21e5a95. If required, a user can still use 'Decode As' functionality. Change-Id: I0236609665c57c6f3961cb9596c47b54da777641 Reviewed-on: https://code.wireshark.org/review/9842 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit d12283b Author: Pascal Quantin Date: Sat Aug 1 18:38:15 2015 +0200 proto.c: exclude hf_text_only from proto_registrar_is_protocol() This pseudo field is a specific case that is not linked to any protocol (despite parent being set to -1). This prevents a crash in Qt GUI when selecting a line added with proto_tree_add_subtree() or similar. Change-Id: I3b1cc2e6c7e71a71898f2ee9a02e9158eccf6fac Reviewed-on: https://code.wireshark.org/review/9845 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 37a1bb8 Author: Hauke Mehrtens Date: Mon Jul 20 23:31:43 2015 +0200 CoAP: add media type number for application/cbor application/cbor got the number 60 by the IANA, see https://www.iana.org/assignments/core-parameters/core-parameters.xml#content-formats Change-Id: I4dbfd9eff8bacb46e815140c4640359f9a951869 Signed-off-by: Hauke Mehrtens Reviewed-on: https://code.wireshark.org/review/9847 Reviewed-by: Pascal Quantin commit b1ce653 Author: Gerald Combs Date: Sun Aug 2 08:10:45 2015 -0700 [Automatic update for 2015-08-02] Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I1c6b1044870e93459bcf4743f00be68ff8ce8ff6 Reviewed-on: https://code.wireshark.org/review/9851 Reviewed-by: Gerald Combs commit 711edcf Author: Guy Harris Date: Sat Aug 1 11:27:09 2015 -0700 Set the reported length of chunk data correctly. The reported length should be the size of the chunk, not the remaining size of dechunked data. Update some comments while we're at it. Change-Id: Ia71948fb5ecebdaae3e171c53fd88cf72dcf76a3 Reviewed-on: https://code.wireshark.org/review/9846 Reviewed-by: Guy Harris commit 86a8b9c Author: Pascal Quantin Date: Sat Aug 1 13:28:01 2015 +0200 MS-WSP: fix some Coverity warnings - prevent some NULL pointer deference pointer - remove DISSECTOR_ASSERT calls: it should be used only for dissector bugs - replace g_slist_next macro calls as the NULL pointer checks are already performed in the for loop Change-Id: If4efd5bb055c7806107ec9646e9864c7e345246d Reviewed-on: https://code.wireshark.org/review/9843 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit f8cac8e Author: Pascal Quantin Date: Sat Aug 1 16:41:52 2015 +0200 PNRP: add support for message reassembly Bug: 11412 Change-Id: I2e8ca62e1babbca20654e8907e8a0b04991bb18f Reviewed-on: https://code.wireshark.org/review/9844 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 1afe288 Author: Gerald Combs Date: Fri Jul 31 16:52:37 2015 -0700 More packet detail context menu items. Add the wiki and field reference items to the packet detail context menu. Add the "Go To Linked Packet" item in the Go menu and packet detail context menu. Use "Linked Packet" instead of "Packet Reference" and "Corresponding Packet". Remove more pending item comments. Change-Id: I66c40f71738f0996690f4818a546520ea0747088 Reviewed-on: https://code.wireshark.org/review/9841 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit c8fec28 Author: Guy Harris Date: Fri Jul 31 15:37:49 2015 -0700 Print times with the resolution from the capture file. Print the first packet and last packet time stamps with the resolution supplied for them, and print the difference between them with the higher of those two resolutions. Change-Id: I111fbbf91b5957e63dca650b85f182c5f103c5fd Reviewed-on: https://code.wireshark.org/review/9840 Reviewed-by: Guy Harris commit 2e3be54 Author: Pascal Quantin Date: Fri Jul 31 22:20:34 2015 +0200 RRC: upgrade dissector to v12.6.0 Change-Id: Ied56f90a8689a25d4093795bfd97d57d40e382c6 Reviewed-on: https://code.wireshark.org/review/9838 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 26c933b Author: Gerald Combs Date: Fri Jul 31 13:44:42 2015 -0700 Fix binary data copying. As the QClipboard::setMimeData documentation says, "Ownership of the data is transferred to the clipboard." Allocate the mime data object accordingly. Note the results of trying to paste into hex editors on Windows. Frhed works. Hex Editor Neo and HxD do not. Change-Id: I46691ba95bf1f5c38817cd42ded73e8e67e4ee97 Reviewed-on: https://code.wireshark.org/review/9837 Reviewed-by: Gerald Combs commit 5336c9a Author: Gerald Combs Date: Fri Jul 31 12:21:28 2015 -0700 More spacing fixups. Make spacing more consistent. Change-Id: I8980a84ca70660057016985299b0f95761076893 Reviewed-on: https://code.wireshark.org/review/9835 Reviewed-by: Gerald Combs commit 787fa27 Author: Gerald Combs Date: Fri Jul 31 12:08:30 2015 -0700 Remove spaces. Change-Id: Iabf5f7610ea5205ad4500502e2b531a8ee130484 Reviewed-on: https://code.wireshark.org/review/9834 Reviewed-by: Gerald Combs commit d8d3c52 Author: Gerald Combs Date: Fri Jul 31 10:34:43 2015 -0700 Use an ellipsis character instead of three dots. The OS X Human Interface Guidelines at https://developer.apple.com/library/mac/documentation/UserExperience/Conceptual/OSXHIGuidelines/TerminologyWording.html#//apple_ref/doc/uid/20000957-CH15-SW3 says: "Be sure to create the ellipsis character using the key combination Option-; (Option-semicolon). This ensures that an assistive app can provide the correct interpretation of the character to a disabled user. If you use three period characters to simulate an ellipsis, many assistive apps will be unable to make sense of them. Also, three period characters and an ellipsis don't look the same because the periods are spaced differently than the points of an ellipsis." The Windows desktop applications guidelines has a section on ellipses: https://msdn.microsoft.com/en-us/library/windows/desktop/dn742478.aspx but doesn't specify the a single glyph vs three dots. The GNOME HIG at https://developer.gnome.org/hig/stable/typography.html.en says "Take Advantage of Unicode" then specifically says to use U+2026 HORIZONTAL ELLIPSIS. Remove the ellipsis from "Find Next" and "Find Previous". Neither requires user interaction. Change-Id: I0e6c28bb8b3a84b242731e2ca96f1a6f6f42c303 Reviewed-on: https://code.wireshark.org/review/9833 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit c768087 Author: Noel Power Date: Thu Jul 30 14:27:01 2015 +0100 MSWSP: Fix clang warnings and handle gracefully needed missing messages In addition to fixing some clang warnings code now handles the scenario where some needed messages may be missing in the capture, instead of silently ignoring now tell how many bytes we can't dissect and why. Change-Id: Ia6fd70d204d279799bc02209865c7f1da35d8191 Signed-off-by: Noel Power Reviewed-on: https://code.wireshark.org/review/9824 Reviewed-by: Pascal Quantin commit c321171 Author: Gerald Combs Date: Thu Jul 30 16:15:40 2015 -0700 Add Colorize to the packet detail menu. Change-Id: Idaac0b52e6e4534f40e13839e6dbce2408ca6bfa Reviewed-on: https://code.wireshark.org/review/9831 Reviewed-by: Gerald Combs commit da07c62 Author: Gerald Combs Date: Thu Jul 30 13:55:46 2015 -0700 More context menu updates. Add "Follow" and "Export Packet Bytes" to the packet detail context menu. Remove duplicate SCTP menu. Remove redunant action text. Change-Id: If69815dc774806e267fbd71aa390b0af6f3b0d14 Reviewed-on: https://code.wireshark.org/review/9829 Reviewed-by: Gerald Combs commit 9603db4 Author: Gerald Combs Date: Thu Jul 30 12:34:53 2015 -0700 Make copy menu item names more consistent. Change-Id: Ia7b2a87ba9ad843dfa9200d69eeb94275a3dc0bb Reviewed-on: https://code.wireshark.org/review/9827 Reviewed-by: Gerald Combs commit 549b8f0 Author: Gerald Combs Date: Thu Jul 30 12:23:03 2015 -0700 Add a missing menu item. Add "Copy as Filter" to the packet list context menu. Remove completed item comments. Change-Id: I1e2d9ebcff2fb36918d3e7525690cfb105cb1b13 Reviewed-on: https://code.wireshark.org/review/9826 Reviewed-by: Gerald Combs commit 16b048d Author: Gerald Combs Date: Wed Jul 29 16:24:39 2015 -0700 Packet list and detail context menu updates. Add some missing items to the packet list and detail "Copy" context menus. Don't nest the "Copy" items so deeply. Add YAML to the supported summary formats. Note that "Copy as Binary" copies to the clipboard as application/octet-stream, which is a) arguably correct, and b) not very useful. Fixes welcome. Enable and disable packet detail context menu items from a set of booleans similar to the packet list. Change-Id: Iaa931c766aa476c33f27de089e5c4dbaf9ce74d6 Ping-Bug: 9320 Bug: 10831 Reviewed-on: https://code.wireshark.org/review/9825 Reviewed-by: Gerald Combs commit e482786 Author: Alexis La Goutte Date: Mon Jul 27 23:21:15 2015 +0200 conversation: fix indent (use tabs) Change-Id: I256c364954e1b9edd479e5f25a1d742cc216ffff Reviewed-on: https://code.wireshark.org/review/9809 Reviewed-by: Michael Mann commit e4f418c Author: Bill Meier Date: Wed Jul 29 18:48:14 2015 -0400 [ieee80211] Don't call expert_...() under 'if (tree)' Change-Id: Idcda58191ca664412ef874a69f40eb09a5b38234 Reviewed-on: https://code.wireshark.org/review/9820 Reviewed-by: Bill Meier commit d6f59cd Author: Gerald Combs Date: Wed Jul 29 12:09:28 2015 -0700 Main menu and packet list menu updates. Enable and disable packet list-relasted menu items in one place. Add "Colorize Conversation" items to the packet list context menu. In the GTK+ UI we tend to disable entire menus, which makes their items inaccessible. Try not to do that in the Qt UI so that menu items are always visible even if they're disabled. Remove commented items which are now complete. Change-Id: I69b878b45334bf88014694b1bf016278fa55a94b Reviewed-on: https://code.wireshark.org/review/9819 Reviewed-by: Gerald Combs commit a03a43b Author: Gerald Combs Date: Wed Jul 29 10:36:46 2015 -0700 Capture file retapping fixups. Add CaptureFile::delayedRetapPackets, which starts retapping after the current batch of UI event are processed. Call it in the constructors of various dialogs so that they are shown before tapping starts. This *might* fix a crash found when following large streams from the Conversations dialog. Change-Id: If1b87491621ab7efcc0519f95891d34dcd9d18c1 Reviewed-on: https://code.wireshark.org/review/9818 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 5b85613 Author: Luca Melette Date: Fri Jul 10 22:55:27 2015 +0200 GSM_MAP: adding dissector for sendParameters (MAPv1) The current ASN.1 description of MAP (3GPP 29.002) is missing this operation. I recovered the needed code from an old MAP description (ets_300599e01p) and integrated the missing parts into the asn tree and C template file (via asn2wrs). Change-Id: Ibe05e6a99f3f95ac66740b5d319a7200fdb3e54b Reviewed-on: https://code.wireshark.org/review/9594 Petri-Dish: Anders Broman Reviewed-by: Anders Broman commit b467f1c Author: Noel Power Date: Mon Jul 27 12:44:56 2015 +0100 SMB2: only move ssi for request if request is really complete MS-SMB2 section '3.2.5.1.5 Handling Asynchronous Responses' states "If SMB2_FLAGS_ASYNC_COMMAND is set in the Flags field of the SMB2 header and Status is not STATUS_PENDING, this is a final response to a request which was processed by the server asynchronously" This patch delays moving ssi information for a processed request to the matched hashmap until the request is actually completed. Without this patch the ssi information for the *final* matching message id response will not be available (on first pass) so a subdissector (e.g. MS-WSP) will not have the ssi information available to it. After this patch the ssi infomation will remain in the 'unmatched' hashmap until the 'final' response for the request is seen. While processing the 'final' matching response the ssi will be moved to the matched hashmap. Change-Id: Id501179ecb4f967a34c82b07d34dcdcd92537dc3 Bug: 11402 Signed-off-by: Noel Power Reviewed-on: https://code.wireshark.org/review/9805 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 254dd6b Author: Alexis La Goutte Date: Mon Jul 27 16:06:32 2015 +0200 MSWSP: Enhance dissector * Use a value_string for display OS version * Remove unused pref modules * Remove boiteplate comment * Use boolean for TRUE/FALSE * Replace parseBoolean by proto_tree_add_bitmask * Remove unneed #include * Fix indent * ... Change-Id: I007dc2a92e8c8f8a9a921c2c091e6c9276f1873b Reviewed-on: https://code.wireshark.org/review/9806 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 65a1f60 Author: Gerald Combs Date: Mon Jul 27 16:17:44 2015 -0700 Add "Disable Protocol..." to the ProtoTree context menu. Assume that "I don't want to see this" counts as a preference and add it under the "Protocol Preferences" submenu. Change-Id: I396e2476509db9df895826f8817b191893bcb14a Reviewed-on: https://code.wireshark.org/review/9812 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 01bc31c Author: Gerald Combs Date: Mon Jul 27 15:28:50 2015 -0700 Fixup packet list context menu behavior. Add logic to setMenusForSelectedPacket for setting the enabled states for the "Apply As" and "Prepare A" actions. Update the PacketList context menu code to fill in the right filter at the right time. Exit out of setMenusForSelectedTreeRow if the packet list has focus so that we don't clobber the enabled states of various actions. Take the "Apply As" and "Prepare A" context menu titles from their main window counterparts. Remove actionApply_as_Filter and actionPrepare_a_Filter. Remove completed to-do items. Change-Id: I8f6f538bb7786d8df02a999f3b449dfde640e847 Reviewed-on: https://code.wireshark.org/review/9810 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 2c79830 Author: Evan Huus Date: Sun Jul 26 22:29:58 2015 -0400 tcp: only reset dupACK counter when ACk# changes Otherwise things like window changes will reset the dup-ack counter incorrectly and confusingly. Bug: 11397 Change-Id: I80b63cf989a952547bec48562a92078c8ab29081 Reviewed-on: https://code.wireshark.org/review/9802 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit 1732017 Author: Gerald Combs Date: Sun Jul 26 13:21:40 2015 -0700 Add an application-wide style sheet. Use it to work around poorly drawn splitters on OS X. Change-Id: Ic8e7331b1ba37fe783312b4460961f361297c7f0 Reviewed-on: https://code.wireshark.org/review/9798 Reviewed-by: Gerald Combs commit 000ce64 Author: Luke Mewburn Date: Sun Jul 26 21:54:12 2015 +1000 nettrace3gpp324423: fix name consistency Improve consistency when referring to 3GPP TS 32.423: - The standard name is "3GPP TS 32.423" (with "TS", and "." separator). - Fix typo in number series ("32" not "34"). - The standard refers to "Trace", not "Nettrace". Change-Id: If9994b9c6de69b6e1bdfc6679fbaabe698971949 Reviewed-on: https://code.wireshark.org/review/9795 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 8b316ff Author: Hadriel Kaplan Date: Sun Jul 26 17:31:26 2015 -0400 Tshark doesn't display column text as field in 2-pass mode Bug: 11401 Change-Id: I6aa43d5cdd996aaf0980ab59b690212e41046acc Reviewed-on: https://code.wireshark.org/review/9800 Petri-Dish: Hadriel Kaplan Tested-by: Petri Dish Buildbot Reviewed-by: Hadriel Kaplan commit 179da0f Author: Gerald Combs Date: Sun Jul 26 08:10:01 2015 -0700 [Automatic update for 2015-07-26] Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I3ddd31b2ebded50dcbe974ce99ef9b417b39aa2f Reviewed-on: https://code.wireshark.org/review/9796 Reviewed-by: Gerald Combs commit 29f2f09 Author: Alexis La Goutte Date: Sun Jul 26 10:53:02 2015 +0200 MSWSP: Remove usage of stdbool.h For fix build on Solaris "/usr/include/stdbool.h", line 42: #error: "Use of is valid only in a c99 compilation environment." Replace bool -> gboolean Replace true -> TRUE, false -> FALSE (for fix Wcompat error..) Change-Id: Ia3f39bfbbaf7cf35a916eb37edfc6745ea50ad36 Reviewed-on: https://code.wireshark.org/review/9793 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice commit cc134b1 Author: Alexis La Goutte Date: Sun Jul 26 11:17:04 2015 +0200 MSWSP: Try to fix Mac OS X Buildbot Change-Id: I0c7bd3ea3900630ce4516cb00e6400cca353b672 Reviewed-on: https://code.wireshark.org/review/9794 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Hadriel Kaplan commit 0795931 Author: Alexis La Goutte Date: Sun Jul 26 10:32:41 2015 +0200 VoIP Call: fix Ubuntu Buildbot Missing init of new sip_frame_num variable... voip_calls_dlg.c: In function ‘voip_calls_get_info’: voip_calls_dlg.c:132:3: error: enum conversion in initialization is invalid in C++ [-Werror=c++-compat] voip_calls_dlg.c:132:3: error: (near initialization for ‘the_tapinfo_struct.fs_option’) [-Werror=c++-compat] voip_calls_dlg.c:132:3: error: missing initializer for field ‘redraw’ of ‘voip_calls_tapinfo_t’ [-Werror=missing-field-initializers] ^ Change-Id: Ib76dec02d03f66d365ef18926bc4507a6f70556d Reviewed-on: https://code.wireshark.org/review/9792 Reviewed-by: Alexis La Goutte commit c711a63 Author: Michal Pazdera Date: Fri Jul 3 10:21:04 2015 +0200 Avoid duplicate SIP and Q.931 calls in VoIP Calls list in case of Q.931 transported over SIP as described in RFC 3204, 3.2 QSIG Media Type. Change-Id: Ida30a7b115e60fa64d30cfc1f4b7c11be724f8ee Reviewed-on: https://code.wireshark.org/review/9479 Reviewed-by: Anders Broman commit 19578ba Author: Gerald Combs Date: Fri Jul 24 09:53:09 2015 -0700 Minor Enabled Protocols tweaks. Try to keep long protocol names from widening the first column too much. Expand all tree items. Change-Id: I4f09aa2a895aa0ee5a6faab8242768b62b1208bc Reviewed-on: https://code.wireshark.org/review/9771 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit fe7a35a Author: Alexis La Goutte Date: Thu Jul 23 22:38:41 2015 +0200 ISAKMP: Remove uneeded space before HF name and HF filter Change-Id: I5669277b9a03cba17067d52e6a9f9df933c3eb5d Reviewed-on: https://code.wireshark.org/review/9767 Reviewed-by: Anders Broman commit 3ea89e6 Author: Alexis La Goutte Date: Mon Jul 6 09:51:11 2015 +0200 lemon (tools): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: Ibfa0bfd589e77a58b7b242c7c2fe25ef052a874e Reviewed-on: https://code.wireshark.org/review/9516 Reviewed-by: Martin Kaiser Reviewed-by: Alexis La Goutte commit 47c1753 Author: Richard Sharpe Date: Fri Jul 24 20:41:31 2015 -0700 Fix an error where we expect the tagged parameters field to be present even though the spec (802.11ad-2012) says they are optional. Communicated to me by the WiFi Alliance. I have captures. Not sure if I can share them. Change-Id: Id5998594214ac4b6a1d3baf3cb2f0d4fe6227b40 Signed-off-by: Richard Sharpe Reviewed-on: https://code.wireshark.org/review/9785 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 92fa272 Author: Andrei Cipu Date: Thu Jul 23 17:25:57 2015 +0300 ISAKMP: Add 3GPP IMS Options for IKEv2 Bug:11392 Change-Id: I53045f25cf9f3daf910e9fd5240033ffcd1941a2 Reviewed-on: https://code.wireshark.org/review/9757 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 2874334 Author: Alexis La Goutte Date: Thu Jul 23 22:31:09 2015 +0200 ISAKMP: The modecfg attribute type INTERNAL_IP6_ADDRESS is not decoded correctly According to RFC7296, section 3.15.1: "The INTERNAL_IP6_ADDRESS is made up of two fields: the first is a 16-octet IPv6 address, and the second is a one-octet prefix-length as defined in [ADDRIPV6]." In the code, the type is declared as FT_IPv4 and the field is decoded only if it has 16 bytes. Instead, it should be declared as FT_IPv6 and the first 16 bytes should be added to the tree. Issue reported by Andrei Cipu Bug: 11393 Ping-Bug: 11392 Change-Id: I8dbc268e71fd6239dffa5469652345a68e0adc86 Reviewed-on: https://code.wireshark.org/review/9761 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 38a2385 Author: Pascal Quantin Date: Sat Jul 25 17:10:31 2015 +0200 MAC LTE: fix dissection of Long DRX Command Control Element Change-Id: I2d122a9ad8cd768499bff8e1af8754d2eb504594 Reviewed-on: https://code.wireshark.org/review/9788 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 8c4b831 Author: Pascal Quantin Date: Sat Jul 25 16:30:55 2015 +0200 MAC LTE: fix dissection of CCCH SDU for Category 0 UE Change-Id: I2d840ad2ba70cdf87b3cd12b9d4a433f05e0b1b2 Reviewed-on: https://code.wireshark.org/review/9787 Reviewed-by: Pascal Quantin commit 190e313 Author: Hadriel Kaplan Date: Sat Jul 25 09:24:48 2015 -0400 DNS: move DNS name resolution pref to Name Resolution prefs Move the boolean flag for using captured DNS packet info for name resolution to the Name Resolution preferences settings, as it was rather surprising to disable Name Resolution preferences and still have names being resolved. Also disble them all if the '-n' command line switch is used, and re-enable it for a 'd' character in the '-N' option. Bug: 10337 Change-Id: Ie4d47bab0100db3360cc447cd3e446b2e39aa917 Reviewed-on: https://code.wireshark.org/review/9786 Petri-Dish: Hadriel Kaplan Tested-by: Petri Dish Buildbot Reviewed-by: Hadriel Kaplan commit 3fc4a83 Author: Jeff Morriss Date: Fri Jul 24 14:51:37 2015 -0400 Fix ptvcursor_add() so it can dissect the last bytes in a TVB again. ptvc->offset has already been incremented by the item length so don't use it as the offset to test_length(); we need to use the original offset. Problem introduced by Idfd258c734e7a946300b2564bebf6e4cb374c8d1 . Change-Id: I0421539bde6e8eb7b5aa3e22dbb0ca8098e88d6f Reviewed-on: https://code.wireshark.org/review/9779 Reviewed-by: Michael Mann Reviewed-by: Anders Broman commit c425334 Author: Gregor Beck Date: Mon Sep 17 13:22:32 2012 +0200 MSWSP: Initial implementation of MS-WSP (windows search protocol) dissector This changeset is a forward port of Gregors ms-wsp branch from his repo http://repo.or.cz/w/wireshark-wip.git. Most of the messages of the MS-WSP protocol are implemented here and as such consists of the majority of the changes for the dissector. In addition to the forward porting Gregors work I added some extra bits 1) cater for SMB2 Read Response and Write Request msgs that can also contain MSWSP messages 2) update property specifications with info extracted from MS-WSP protocol doc 3) store some basic data about previously seen messages that are needed for dissecting CPMGetRows request 4) expand/update dissect_CPMSetBindings & parse_CTableColumn routines 5) parse and store CTableColumn & CPMSetBindingsIn structures in conversation related data for use later. 6) fully dissect/parse SeekDesciption of CPMGetRowsOut 7) dissect CPMGetRows out message specifically the Rows & Columns 8) flesh out the boolean properties of uBooleanOptions field 9) flesh out various other dissectors: CPMRatioFinished CPMRestartPosition CPMCompareBmkIn/CPMCompareBmkOut CPMGetApproximatePosition CPMGetSendNotifyOut FindIndicesIn/Out FetchValue Bug: 11321 Change-Id: I68b5c2f3e63874c1dbb271feab89b2b8aa65ac39 Signed-off-by: Noel Power Reviewed-on: https://code.wireshark.org/review/9440 Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 23ca456 Author: Pascal Quantin Date: Sat Jul 25 00:08:52 2015 +0200 MAC LTE: fix dump of last SDU Change-Id: Ice39b71fab564cde0688c451bdf46c7e426475ce Reviewed-on: https://code.wireshark.org/review/9782 Reviewed-by: Pascal Quantin commit 7be155e Author: Gerald Combs Date: Fri Jul 24 10:24:15 2015 -0700 Try deleting WiresharkDialog when we close it. QDialog::accept and ::reject hide the dialog but don't delete it. In the case of WiresharkDialog and its subclasses we might leak memory or leave files open. Call deleteLater when we close the dialog. Change-Id: Ie0b848a7deeeee4667925b0d886e498f13a86bfc Reviewed-on: https://code.wireshark.org/review/9781 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit d24614c Author: Pascal Quantin Date: Fri Jul 24 19:50:29 2015 +0200 MAC LTE: fix dissection when only header is captured but full PDU length is reported Change-Id: I66ccfc26b3a0e948fdcf8dfe4ec8e87e6ed756da Reviewed-on: https://code.wireshark.org/review/9778 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit bb7e657 Author: Pascal Quantin Date: Fri Jul 24 19:13:31 2015 +0200 RLC: fix dissection when only header is captured but full PDU length is reported Change-Id: I06e7bed71a42c6cbe500d7f1994a625b37d6586c Reviewed-on: https://code.wireshark.org/review/9777 Reviewed-by: Pascal Quantin commit b962fdd Author: Pascal Quantin Date: Fri Jul 24 19:12:45 2015 +0200 RLC LTE: fix dissection when only header is captured but full PDU length is reported Change-Id: I67654bb0ca30d9bb56c9a4b3be179161ecd0de3a Reviewed-on: https://code.wireshark.org/review/9776 Reviewed-by: Pascal Quantin commit b9a4bab Author: Pascal Quantin Date: Fri Jul 24 19:10:30 2015 +0200 PDCP LTE: fix dissection when only header is captured but full PDU length is reported Change-Id: I62c89a49f3cf2ed566e16a978b2ed237f09d466e Reviewed-on: https://code.wireshark.org/review/9775 Reviewed-by: Pascal Quantin commit 1ea2565 Author: Pascal Quantin Date: Fri Jul 24 18:32:26 2015 +0200 SIP: heuristic dissectors should use the captured length, not the reported one Otherwise it triggers a "packet size limited during capture" exception preventing following heuristic dissectors to be called Change-Id: Ifc97e84b4e40a1c7dc0b0c63b7b9e015bd99d178 Reviewed-on: https://code.wireshark.org/review/9774 Reviewed-by: Pascal Quantin commit efefdbb Author: Gerald Combs Date: Fri Jul 24 12:04:27 2015 -0700 1.99.8 → 1.99.9. Change-Id: I014399c332136a10b1c560d4c68be5b8bab97552 Reviewed-on: https://code.wireshark.org/review/9780 Reviewed-by: Gerald Combs