diff options
| -rw-r--r-- | ChangeLog | 9688 | ||||
| -rw-r--r-- | NEWS | 92 | ||||
| -rw-r--r-- | version.conf | 7 |
3 files changed, 4781 insertions, 5006 deletions
@@ -1,6832 +1,6568 @@ -commit af6365a -Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -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 <alexis.lagoutte@gmail.com> - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit d512710 -Author: Dario Lombardo <lomato@gmail.com> -Date: Wed Sep 2 13:40:46 2015 +0200 +commit 707268e +Author: Gerald Combs <gerald@wireshark.org> +Date: Tue Oct 13 14:03:56 2015 -0700 - idl2wrs: fix clang analyzer Warning complains. + Update the new protocols list for 2.0 - 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 + Update the new protocols list based on diffing the output of `tshark -G + protocols` from 1.12 and 2.0 + The "--sort-and-group--" macro does just that -- it sorts and + comma-separates a list of items. Move sentences out of those blocks. - Change-Id: If1a1acfc331e0648f95f6d6defe6533b6927ccaa - Reviewed-on: https://code.wireshark.org/review/10357 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I2852f82249413a099a3162acbcb3bcfb13fc3065 + Reviewed-on: https://code.wireshark.org/review/10986 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 5518ae0 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Wed Sep 2 12:43:23 2015 +0200 +commit 4c80b3a +Author: Gerald Combs <gerald@wireshark.org> +Date: Tue Oct 13 11:30:49 2015 -0700 - PER: followup of g59453fb + Prep for 2.0.0rc1. - Change-Id: I45c02a249444e5f17d99eeb0ca8dea6f7a012262 - Reviewed-on: https://code.wireshark.org/review/10356 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: If1d8dd7df27567281d03f6f46382bdb1cf5655c3 + Reviewed-on: https://code.wireshark.org/review/10983 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit e1dee7c -Author: Dario Lombardo <lomato@gmail.com> -Date: Wed Sep 2 12:27:31 2015 +0200 +commit b982f49 +Author: Gerald Combs <gerald@wireshark.org> +Date: Tue Oct 13 12:01:25 2015 -0700 - dcerpc: fixed distcheck. + Handle quotes in "Show in Finder". - Change-Id: Ide0b95278786d45d9c41fb0fe3214dce0880b830 - Reviewed-on: https://code.wireshark.org/review/10355 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I422e4679c86d23363a604e54ef2f91b1ad5b948c + Reviewed-on: https://code.wireshark.org/review/10981 + Reviewed-by: Gerald Combs <gerald@wireshark.org> + (cherry picked from commit f0d1b50044c0fed20e324f37f5cc706aa9277624) + Reviewed-on: https://code.wireshark.org/review/10982 -commit 5d8363e -Author: Tom Haynes <loghyr@primarydata.com> -Date: Tue Sep 1 14:07:30 2015 -0700 +commit 1f400db +Author: Gerald Combs <gerald@wireshark.org> +Date: Mon Oct 12 14:34:08 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: + Update the Qt welcome banner. - 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] + Empty the "flavor" banner text by default to allow room for custom + builds. Make the main welcome message more prominent. - Bug: 11496 - Change-Id: Ia6097ae76411f6ff9de1f53191c8fc767856e2d1 - Signed-off-by: Tom Haynes <loghyr@primarydata.com> - Reviewed-on: https://code.wireshark.org/review/10347 - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: I92d2ed88abbe504af8a0818f9902e39a9fc3d6d5 + Reviewed-on: https://code.wireshark.org/review/10969 + Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 920e056 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Sep 2 07:48:34 2015 +0200 +commit a590aca +Author: Martin Mathieson <martin.r.mathieson@googlemail.com> +Date: Mon Oct 12 01:35:18 2015 -0700 - idl2wrs: Make Mac OSX buildbot happy + Try to fix OS X buildbot but using a different QBrush constructor in the cases that were failing (where implicit conversion seems to be failing) - Change-Id: I5f9c860bec0f8d323d9f3cd7cf55e348654c8b8b - Reviewed-on: https://code.wireshark.org/review/10354 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: Id0393c2403ed953579c7d571e9880849b7dff8b3 + Reviewed-on: https://code.wireshark.org/review/10952 + Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> + (cherry picked from commit 0f27ed7ed7d7717852413026b65e155c5126a72b) + Reviewed-on: https://code.wireshark.org/review/10960 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 8b6fe35 -Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Wed Sep 2 01:33:22 2015 +0100 +commit c94bbe9 +Author: Guy Harris <guy@alum.mit.edu> +Date: Mon Oct 12 00:45:18 2015 -0700 - IPv4: Remove extraneous colon from format string + Include <stdlib.h> to declare exit(). - Change-Id: If52f8086ec971cc43947ece3d8e062da8378fa95 - Reviewed-on: https://code.wireshark.org/review/10352 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit 59453fb -Author: Michael Mann <mmann78@netscape.net> -Date: Tue Sep 1 22:14:47 2015 -0400 - - Eliminate proto_tree_add_text from packet-per.c + Also, flag the exit() call as a Bad Idea, as is done in some other tap + files. - Change-Id: I67f572129821fb00e4478a30bfd4a52287b8b1a1 - Reviewed-on: https://code.wireshark.org/review/10350 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I4e077f5923bb36ed9c8b34aff3dda6d44b2b8721 + Reviewed-on: https://code.wireshark.org/review/10950 + Reviewed-by: Guy Harris <guy@alum.mit.edu> + (cherry picked from commit a342d1f3b9030a5c8df4d6b0ecac37fa971d4194) + Reviewed-on: https://code.wireshark.org/review/10959 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit c41a833 -Author: Michael Mann <mmann78@netscape.net> -Date: Tue Sep 1 20:18:15 2015 -0400 +commit 50f43c8 +Author: Martin Mathieson <martin.r.mathieson@googlemail.com> +Date: Sat Oct 10 15:53:45 2015 -0700 - Eliminate proto_tree_add_text from some dissectors. + LTE RLC graphs - initial version - Change-Id: If617016f588bbf940f37699e27559dc5c59cf508 - Reviewed-on: https://code.wireshark.org/review/10349 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: Ic5f2c353ae1f787ac19cb575a938cb093ff5f6dc + Reviewed-on: https://code.wireshark.org/review/10930 + Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> + Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> + (cherry picked from commit 3221dbf542217cea5acd9ec764cf4779edaf65e8) + Reviewed-on: https://code.wireshark.org/review/10958 -commit 630f48f -Author: Michael Mann <mmann78@netscape.net> -Date: Tue Sep 1 13:28:56 2015 -0400 +commit a4cb2dc +Author: Gerald Combs <gerald@wireshark.org> +Date: Fri Oct 9 13:56:27 2015 -0700 - Eliminate proto_tree_add_text from packet-rsvp.c + Qt: Recent list context menu. - Change-Id: I95edc1b40c07a4addf194df6a2056e7b61193e5a - Reviewed-on: https://code.wireshark.org/review/10348 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> + Add a context menu to the main window recent list. Add items that let + the user open each file's containing folder and copy the file path to + the clipboard. When opening the folder on Windows and OS X try to + highlight the file in Explorer or the Finder. + + Change-Id: I991e8df8ba9f1f8c6385d1a861eb40223cfdd047 + Reviewed-on: https://code.wireshark.org/review/10915 + Reviewed-by: Gerald Combs <gerald@wireshark.org> + Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + (cherry picked from commit 7c3800228881f45049b29f491b9d7648c0a5ae5d) + Reviewed-on: https://code.wireshark.org/review/10975 -commit 87f2bd4 -Author: Dario Lombardo <lomato@gmail.com> -Date: Fri Aug 14 12:02:38 2015 +0200 +commit 0f7d465 +Author: Gerald Combs <gerald@wireshark.org> +Date: Mon Oct 12 09:20:14 2015 -0700 - idl2wrs: some code cleanups. + Use system highlight+hover colors in the welcome screen. - Code cleanups include: - - sanity checks for malloc() - - change forbidden APIs into g_* versions - - minor indentation fixes - - add modeline - - add compilation for cmake and autotools + Don't override the highlight and hover colors in the recent file list in + the main welcome screen. This appears to be a leftover from the + pre-g8b24471 layout. - Bug: 11052 - Change-Id: I825f04d9703448f9165d188be2bdd185fce5ff5d - Reviewed-on: https://code.wireshark.org/review/10030 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: Ia5239424340632f53f41f7f3067c798c882c069d + Reviewed-on: https://code.wireshark.org/review/10957 + Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> + Reviewed-by: Gerald Combs <gerald@wireshark.org> + (cherry picked from commit f8daf498a03e15e72cd1aecceaedbd04ee50d934) + Reviewed-on: https://code.wireshark.org/review/10966 -commit aa1f556 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Aug 31 13:59:28 2015 +0200 +commit ff89019 +Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> +Date: Sun Oct 11 17:51:40 2015 +0100 - MSDP: fix will never be executed [-Wunreachable-code] - - Move tvbuff declaration for avoid https://llvm.org/bugs/show_bug.cgi?id=19020 + Add BASE_PT_ types to proto_registrar_dump_fields() - Found by Clang 3.7 - - Change-Id: I299d2413dc4effc5e6e34c289152b8f401f19342 - Reviewed-on: https://code.wireshark.org/review/10326 + Change-Id: Ic6b3d71c3c9a14688b55d98f402d359f69524394 + Reviewed-on: https://code.wireshark.org/review/10939 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Peter Wu <peter@lekensteyn.nl> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> + (cherry picked from commit 2eb7e879f414b1f415e0c79ae9a4f7b3d2d1e77e) + Reviewed-on: https://code.wireshark.org/review/10965 -commit 998dcc2 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Tue Sep 1 19:50:52 2015 +0200 +commit 4646de5 +Author: Dario Lombardo <lomato@gmail.com> +Date: Sun Oct 11 00:07:33 2015 +0200 - ANSI: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + extcap: fix a bug in create_tempfile() return check (CID 1323930) - Change-Id: I981336271a8f6b41fe777f732069639df494c5d2 - Reviewed-on: https://code.wireshark.org/review/10346 + Change-Id: Ifacdfee5c12e676969cfe536dfeda2be93426a46 + Reviewed-on: https://code.wireshark.org/review/10929 + Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> + Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit b7764fc -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -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 + (cherry picked from commit 23beb9700c3fc8eea9f3540813a7b0edeaee98ae) + Reviewed-on: https://code.wireshark.org/review/10964 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> -commit c8f8784 -Author: Pascal Quantin <pascal.quantin@gmail.com> -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 <pascal.quantin@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit f0e4c49 +commit f4949c5 Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Sep 1 08:24:58 2015 -0700 +Date: Mon Oct 12 10:15:09 2015 -0700 - Update the release notes. + RTP player: Always include QPushButton. - Change-Id: I0ab4cc92c24048e4e77b12bcc205d7a15a5ddb74 - Reviewed-on: https://code.wireshark.org/review/10343 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + It looks like QPushButton gets included via ui_rtp_player_dialog.h in Qt + 5 but not in Qt 4. Make sure we include it explicitly whether or not + QT_MULTIMEDIA_LIB is defined. + + Change-Id: I8203a1cc6f7b9beef0f749b93836a75885f85edd + Reviewed-on: https://code.wireshark.org/review/10962 Reviewed-by: Gerald Combs <gerald@wireshark.org> + (cherry picked from commit fe3e0df1607afbe61e675a3f08619e4460a6b753) + Reviewed-on: https://code.wireshark.org/review/10963 -commit db2fdfd +commit 70150c9 Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Sep 1 07:37:45 2015 -0700 +Date: Fri Oct 9 15:19:45 2015 -0700 - Fixup the main window tab order. + Try to fix wireless toolbar behavior on Linux. - 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. + Split interface get and set activity into explicit getInterfaceInfo and + setInterfaceInfo member functions. Make sure we connect to QComboBox + "activated" signals (which are only triggered by user activity) + instead of "currentIndexChanged" signals (which are triggered on + any change). Hopefully this will make the wireless toolbar read-only + until the user selects a combobox item. - Change-Id: If46e178365dbd59feb5985e9f8fa8b55d004d864 - Reviewed-on: https://code.wireshark.org/review/10342 + Bug: 11487 + Change-Id: I236ff3f5972b0b7d543f21bb955d7892190a7814 + Reviewed-on: https://code.wireshark.org/review/10918 Reviewed-by: Gerald Combs <gerald@wireshark.org> + (cherry picked from commit c5a056832dc9e3afaeb89beb6feedf134287183c) + Reviewed-on: https://code.wireshark.org/review/10956 -commit a8682af -Author: AndersBroman <anders.broman@ericsson.com> -Date: Tue Sep 1 09:53:38 2015 +0200 +commit 202fbbc +Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> +Date: Sun Oct 11 14:15:20 2015 +0100 - [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' - + Fix hfinfo_*_format_display() for BASE_PT_ display types - Change-Id: Ia21e15ff6348f34bf8ae240f867f0ab2cade606a - Reviewed-on: https://code.wireshark.org/review/10340 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I1a2a988a737c6821db6ac3a2b9ee9ff48add28c2 + Reviewed-on: https://code.wireshark.org/review/10935 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Peter Wu <peter@lekensteyn.nl> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> + (cherry picked from commit 14498f03a3529e82231c372332939be40599f755) + Reviewed-on: https://code.wireshark.org/review/10954 -commit 7298a31 -Author: Michael Mann <mmann78@netscape.net> -Date: Mon Aug 31 00:20:49 2015 -0400 +commit 55fa261 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Sun Oct 11 14:58:19 2015 +0200 - Eliminate proto_tree_add_text from ANSI dissectors. + NTP: fix dissection of SHA1 based message authentication code - Change-Id: I22dccb2f2d71897334e11632f4060ccfbf4794ad - Reviewed-on: https://code.wireshark.org/review/10334 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + The maximum MAC length is 160 bits, not 128. MAX_MAC_LEN can be safely + increased as an extension should be > 4 bytes. + + Bug: 11580 + Change-Id: I0ea5a1f85d644e57315f033f09241d7a79dd3a45 + Reviewed-on: https://code.wireshark.org/review/10934 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> + (cherry picked from commit 52e5ada040e2697e3f3e6a43bb847481a7884609) + Reviewed-on: https://code.wireshark.org/review/10948 -commit 54d2ff1 -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Aug 31 16:06:33 2015 -0700 +commit 48f1b75 +Author: Guy Harris <guy@alum.mit.edu> +Date: Sun Oct 11 14:35:47 2015 -0700 - Convert the WSP stats to generic stat API. + Handle installing Qt 4.x. - Add support for multiple tables to SimpleStatisticsDialog. + Or, at least, 4.8.6. I guess they had to do an updated build or + something, as the actual dmg has "4.8.6-1", so handle that extra + versioning. - Change-Id: I843d901db092d2f2856d3d1a16f29f85fb41374b - Reviewed-on: https://code.wireshark.org/review/10339 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Clean up some white space while we're at it. + + Change-Id: I62b99dd99e7e5cb84cca68bdc59b02e4bf65411f + Reviewed-on: https://code.wireshark.org/review/10943 + Reviewed-by: Guy Harris <guy@alum.mit.edu> + (cherry picked from commit a6673b3fde1cac904a405cb1125d547d064d3aa7) + Reviewed-on: https://code.wireshark.org/review/10944 -commit 377d215 +commit a4dc724 Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Aug 31 12:24:48 2015 -0700 +Date: Sun Oct 11 08:21:26 2015 -0700 - Convert the MTP3 stats to new "generic stat API". + [Automatic update for 2015-10-11] - Convert both the MTP3 statistics and summary. As with the GSM stats this - is mostly untested. + Update manuf, services enterprise-numbers, translations, and other items. - Change-Id: I7af8d5f21c8161dc95f7f2c710f32364b6f6a431 - Reviewed-on: https://code.wireshark.org/review/10338 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Change-Id: If8573d4a62c8af08d96dfd67e2f1cb14c0d255b2 + Reviewed-on: https://code.wireshark.org/review/10937 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit e9614ad -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Mon Aug 31 12:19:34 2015 +0200 +commit a8e3529 +Author: Philipp Hancke <fippo@andyet.net> +Date: Thu Oct 8 12:55:22 2015 -0700 - Windows: update GeoIP library to 1.6.6 + Allow TURN channeldata to be padded on both UDP and TCP. + Microsoft's Edge browser does this, UDP padding is a MAY in https://tools.ietf.org/html/rfc5766#section-11.5 - Change-Id: I56f58e52fa39fdddd35bcc7ef6d96cfa4042892d - Reviewed-on: https://code.wireshark.org/review/10333 + Bug: 11584 + Change-Id: I513638d8a3eb257576af3cfc8e6b81cc93b22d05 + Reviewed-on: https://code.wireshark.org/review/10889 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + (cherry picked from commit ccb5bcaa0d3a9cca034d25f0d6f3bb0e3de101ec) + Reviewed-on: https://code.wireshark.org/review/10932 -commit 1772416 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Mon Aug 31 22:10:23 2015 +0200 +commit 9218a30 +Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> +Date: Fri Oct 9 10:10:31 2015 +0100 - tshark.pod: fix typo + IPv6: Set destination address for RPL routing header - Change-Id: Iba5f12637e0f494805f2d9aab370fb42a32c1cb9 - Reviewed-on: https://code.wireshark.org/review/10335 + Change-Id: I5d83370424cc0002a0bf965138b7fbdad69557fb + Reviewed-on: https://code.wireshark.org/review/10895 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + (cherry picked from commit 69a70df0a0fa0d9953a66222006a45af5572ff04) + Reviewed-on: https://code.wireshark.org/review/10927 -commit 4e236e6 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Sat Aug 29 22:59:00 2015 +0200 +commit c397f4c +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Mon Oct 5 14:56:42 2015 -0400 - Qt/Lua: Call atclose when TextWindow closes - - The close callback was never called because the destructor was never called. + Fix capitalization in MATE's "you need to restart to reconfigure" message. - Change-Id: I9f6204858bc5d5e48d0aedc90b0e242ab70e161c - Reviewed-on: https://code.wireshark.org/review/10321 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - -commit 7dd8349 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Aug 12 20:58:52 2015 +0200 - - NGHTTP2: Update to 1.3.0 + Fix up some formatting and white space while we're there. - Change-Id: Ia12396b3b4a2bb4dcbdce63d06558b6474cd588e - Reviewed-on: https://code.wireshark.org/review/10324 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I869659d6fb1f8b4946f6e13a928ecd53dbabf1a4 + Reviewed-on: https://code.wireshark.org/review/10807 + Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> + (cherry picked from commit ea753e428807143f9d5763417c9bc53ecc3ec394) + Reviewed-on: https://code.wireshark.org/review/10926 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 026812c -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Aug 31 08:37:15 2015 -0700 +commit e47abc8 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Fri Oct 9 15:45:41 2015 +0200 - 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. + asn1.c: fix printf arguments used with DEBUG flag - Bug: 11429 - Change-Id: I71bf1cc0df2800902ecb7b734b8f12ebd85a4de5 - Reviewed-on: https://code.wireshark.org/review/10331 - Petri-Dish: Gerald Combs <gerald@wireshark.org> + Bug: 11581 + Change-Id: If960e45d5ed71abb3cadcb6dd83832b9098e11a7 + Reviewed-on: https://code.wireshark.org/review/10904 + Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + (cherry picked from commit 626c61c1266ae7b961810dc87c2f75ee409d7c7b) + Reviewed-on: https://code.wireshark.org/review/10925 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 75b8457 -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Aug 31 09:24:49 2015 -0700 +commit d54e500 +Author: Guy Harris <guy@alum.mit.edu> +Date: Sat Oct 10 10:38:19 2015 -0700 - Add a Telephony→SCTP submenu. + Clean up from cherry-picking. - Add the current SCTP actions to the telephony menu to match the GTK+ UI. + I think two changes were cherry-picked in reverse order, which left + duplicate declarations and definitions of addPlayerButton. - Change-Id: Ie7471bcbd1a82fe3f203d60f5ea8a72d923f34b9 - Reviewed-on: https://code.wireshark.org/review/10332 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I553f28c80695537207e5fc353c2833e863c37c3a + Reviewed-on: https://code.wireshark.org/review/10924 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 3bec655 +commit 8d8d1c9 Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Aug 28 16:46:17 2015 -0700 +Date: Thu Oct 8 11:31:42 2015 -0700 - Redraw the packet list when name resolution changes. + Qt: Add a play button to the RTP Stream Analysis dialog. - Call columnsChanged (which invalidates cached column strings) when we - change our name resolution preferences from the View menu. + Rename the "Play Call" button to "Play Streams". Move the button + creation code to a common routine. Use it to add a "Play Streams" button + to the RTP Stream Analysis, similar to the GTK+ UI. - Remove the last sorted column tracking from gf19a173 while we're here - (it didn't work properly). + Don't restrict RTP to IPv[46] as suggested by Michal. I don't have any + RTP-over-Bluetooth captures so I can't test this directly. - Bug: 11468 - Change-Id: I7fea58d702b283028235d023f27ab0336d8643a4 - Reviewed-on: https://code.wireshark.org/review/10301 + Change-Id: I4703cac1d5bf5b3ff0255d36da2c5164feb0547d + Reviewed-on: https://code.wireshark.org/review/10888 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> + (cherry picked from commit f274902be581b52db68c66f4864d85b7ea8fefe4) + Reviewed-on: https://code.wireshark.org/review/10909 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit a060183 -Author: Michael Mann <mmann78@netscape.net> -Date: Fri Aug 28 22:41:07 2015 -0400 +commit 4c061df +Author: Gerald Combs <gerald@wireshark.org> +Date: Thu Oct 8 14:56:06 2015 -0700 - Eliminate proto_tree_add_text from packet-rtps.c + Make sure we can compile without QtMultimedia. - Change-Id: I353b4fcb3091e731a4b2a68e1932a5abc60c6038 - Reviewed-on: https://code.wireshark.org/review/10323 - Petri-Dish: Michael Mann <mmann78@netscape.net> + Change-Id: I8db453a735956435fc6e2e4276961adb1f7ed11a + Reviewed-on: https://code.wireshark.org/review/10892 + Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Gerald Combs <gerald@wireshark.org> + (cherry picked from commit 5bdfb5c36be80511bf814fd6e999985edb75d81d) + Reviewed-on: https://code.wireshark.org/review/10917 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 053f53c -Author: Joerg Mayer <jmayer@loplof.de> -Date: Mon Aug 31 06:00:28 2015 +0400 +commit 0e42914 +Author: Jim Young <jyoung@gsu.edu> +Date: Fri Oct 9 01:19:21 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. + Qt: Horizontal- and vertical-only zoom modifier keys for IO and TCP Stream graphs. - Change-Id: I0a72a9a3e40cf8269856fbbcd97b270af422afa2 - Reviewed-on: https://code.wireshark.org/review/10322 - Reviewed-by: Jörg Mayer <jmayer@loplof.de> - -commit f0b4e8e -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sun Aug 30 20:31:35 2015 +0200 - - dlsw: don't THROW() an exception from a dissector + Use lower case "x" or upper case "X" (Shift-X) to zoom in or out respectively only + the horizontal (X) axis. Use lower case "y" or upper case "Y" (Shift-Y) to zoom + in or out respectively only the vertical (Y) axis. - Change-Id: I897202e7fb2987f608ca4f98aa1a1dc4b7dbd995 - Reviewed-on: https://code.wireshark.org/review/10320 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> + Change-Id: I2f4de3c81795c289a626cc917d46ec0b1d620f49 + Reviewed-on: https://code.wireshark.org/review/10894 + Petri-Dish: Gerald Combs <gerald@wireshark.org> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Gerald Combs <gerald@wireshark.org> + (cherry picked from commit 460e1d8728d65b39d2f3f15ae62318f9ed9b3d40) + Reviewed-on: https://code.wireshark.org/review/10921 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 81c6ecd -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sun Aug 30 20:08:53 2015 +0200 +commit f8e044b +Author: Pedro Jose Marron <pjmarron@locoslab.com> +Date: Fri Oct 9 14:59:37 2015 +0200 - dlsw: remove unnecessary if (tree) checks + Support in 6lowpan for RFC4944 address generation - don't create an expert info under if (tree) + For the conversion of a 16-bit short address in 6lowpan to an IID, there + are several RFCs that produce different results. RFC 4944 section 6 + specifies that the conversion uses the given PAN ID and the 16-bit short + address. RFC 6282, on the other hand, specifies thta the conversion only + uses the 16-bit short address and no longer uses the PAN ID. - Change-Id: I2c8f90483c434d708a97b621621ca123fc505edc - Reviewed-on: https://code.wireshark.org/review/10319 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - -commit 78007fa -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Sun Aug 30 10:16:16 2015 -0400 - - Add debug printing to tshark + The current version of the 6lowpan dissector supports only the newer RFC + 6282, but there are protocols out there that assume that the address + conversion still abides to RFC 4944. - Add g_warning functions for tshark debug printing, disabled by default. + In order to support these protocols and following the discussion from - Change-Id: If1720b790b75bd1228afa62efac49dc04bc8addb - Reviewed-on: https://code.wireshark.org/review/10314 - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - -commit 00087b4 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Aug 29 22:28:01 2015 +0200 - - Add Lua 5.2.3 built with MSVC2015 + https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8970 - Change-Id: I9b173f5136f858e4f95fb5b0688ef02c08a8d9e4 - Reviewed-on: https://code.wireshark.org/review/10313 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 99e16ce -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Aug 30 08:10:04 2015 -0700 - - [Automatic update for 2015-08-30] + this patch introduces a boolean preference in the 6lowpan dissector that + indicates whether or not the older RFC 4944 should be used for address + conversion. By default, it is set to FALSE, thus leaving the behavior of + the dissector unchanged. - Update manuf, services enterprise-numbers, translations, and other items. + Besides the boolean preference, another helper function + lowpan_addr16_with_panid_to_ifcid has been written that implements the + expected behavior from RFC 4944 using the same hint mechanism already in + place in the dissector for the support of RFC 6282. - Change-Id: I37400bf1fac15fcd5f2946913b96184b1828f091 - Reviewed-on: https://code.wireshark.org/review/10317 + Bug: 8970 + Change-Id: I8d202c69a225d7b1212080a174e0111e5203553c + Reviewed-on: https://code.wireshark.org/review/10902 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Gerald Combs <gerald@wireshark.org> + Petri-Dish: Michael Mann <mmann78@netscape.net> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> + (cherry picked from commit 911da8b9d5e2215e7851e0874f0cdffac5961c73) + Reviewed-on: https://code.wireshark.org/review/10920 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit faaa6f2 -Author: Pyeole <pyeole@ncsu.edu> -Date: Sat Aug 29 15:36:41 2015 -0400 +commit bf594af +Author: Pedro Jose Marron <pjmarron@locoslab.com> +Date: Fri Oct 9 11:48:35 2015 +0200 - BGP: fixed incorrect NLRI decoding + Add WS_DLL_PUBLIC for Address Type Registration - Bug: 11308 - Change-Id: I967b9596edad1e3656e139d0ca3a0e3c389d80ea - Reviewed-on: https://code.wireshark.org/review/10308 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit e0a87d8 -Author: Dario Lombardo <lomato@gmail.com> -Date: Thu Aug 27 18:01:27 2015 +0200 - - stanag4607: add check for wtap max size. + Dissectors developed as plugins in wireshark that create new address + types require the use of address_type_dissector_register. Without + WS_DLL_PUBLIC, the function is not found when loading the plugin and + wireshark refuses to initialize it. - Bug: 11472 - Change-Id: Ic269046e697ac5e65301caf4ea5586098d030458 - Reviewed-on: https://code.wireshark.org/review/10279 - Reviewed-by: Evan Huus <eapache@gmail.com> - Petri-Dish: Evan Huus <eapache@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 6c06578 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Aug 29 22:54:54 2015 +0200 - - CBOR: fix definition of cbor.type.tag64 field + This very simple patch fixes this problem. - Bug: 11486 - Change-Id: I070c8c397a41c0c8231720c611938d7282c03d19 - Reviewed-on: https://code.wireshark.org/review/10310 - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: I8594a7be525830dd4ab9e1b3ea633aac0a07938a + Reviewed-on: https://code.wireshark.org/review/10899 + Reviewed-by: Balint Reczey <balint@balintreczey.hu> + Petri-Dish: Balint Reczey <balint@balintreczey.hu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Reviewed-by: Michael Mann <mmann78@netscape.net> + (cherry picked from commit 38ba49e220dfaedb7072e8f481c8fe8169428c9d) + Reviewed-on: https://code.wireshark.org/review/10913 -commit 7791c6f -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Sat Aug 29 19:14:13 2015 -0400 +commit a993ff8 +Author: Guy Harris <guy@alum.mit.edu> +Date: Fri Oct 9 08:39:27 2015 -0700 - pcapng: drop count is unknown for ISB without isb_if_drop option + Now that we're using AC_PROG_CC_STDC, let it handle HP C. - Bug: 11489 - Change-Id: I38bcc2570c2efc461e4eb0edbff8ac2a7371c725 - Reviewed-on: https://code.wireshark.org/review/10311 - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> + AC_PROG_CC_STDC should be setting whatever flags are needed for ISO C + plus extensions, including requesting C99 if available. Don't set -Ae + ourselves for HP C. + + Change-Id: Icd4dfc0c2078586d5773075ee25c40bfc787a482 + Reviewed-on: https://code.wireshark.org/review/10910 + Reviewed-by: Guy Harris <guy@alum.mit.edu> + (cherry picked from commit 12446da29bf57dc95b9050cc0ec669d60a381dc0) + Reviewed-on: https://code.wireshark.org/review/10911 -commit 605f33c -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Sat Aug 29 14:16:52 2015 -0400 +commit 7ade4eb +Author: Peter Wu <peter@lekensteyn.nl> +Date: Wed Oct 7 14:24:56 2015 +0200 - pcapng: handle NRB with options + airpdcap: add free_key_string function, fix memleaks - 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. + Do not leak the key and SSID. Note that there are still some leaks in + the GTK UI related to get_wireshark_keys(), but I did not track them + down. - Bug: 11485 - Change-Id: Ic27cba937b6d93a3d9ed92522ed6b39ae2daeb8f - Reviewed-on: https://code.wireshark.org/review/10307 - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> + Caught by LeakSanitizer. + + Change-Id: I639166e6ea457605d6ae0ebd58e56d7594a7b7db + Reviewed-on: https://code.wireshark.org/review/10860 + Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> + Reviewed-by: Michael Mann <mmann78@netscape.net> + Reviewed-by: Peter Wu <peter@lekensteyn.nl> + (cherry picked from commit a7ab4af2ab4db5d5fdd5d489bf6b4171a8b1b8d9) + Reviewed-on: https://code.wireshark.org/review/10905 -commit eacaa1a -Author: Kevin Bracey <kevin.bracey@arm.com> -Date: Wed Jul 22 15:36:07 2015 +0300 +commit e5fa882 +Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> +Date: Tue Oct 6 00:04:26 2015 +0100 - 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. + WSP: Fix add_addresses() - Bug: 11368 - Change-Id: I28fcd66d96f58a5959bb669caf4244afaca9e67e - Reviewed-on: https://code.wireshark.org/review/10231 - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: I25d84c725559f5f077dcc03fb425a89d87e90f55 + Reviewed-on: https://code.wireshark.org/review/10897 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Evan Huus <eapache@gmail.com> + Reviewed-by: Michael Mann <mmann78@netscape.net> + (cherry picked from commit 3dd7e69ed7c72594f676396be822d35b130ab2e6) + Reviewed-on: https://code.wireshark.org/review/10903 -commit 8ddd480 -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Sat Aug 29 10:30:15 2015 -0400 +commit 1e81a68 +Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> +Date: Mon Oct 5 23:48:04 2015 +0100 - 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. + FTP: Fix EPRT IPv6 set address - Bug: 11484 - Change-Id: I6a650896b324f42bfd2e05759c84e87ace733372 - Reviewed-on: https://code.wireshark.org/review/10304 - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> + Change-Id: I944b3e6667027b251d0f3d894294bfda331abce2 + Reviewed-on: https://code.wireshark.org/review/10898 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + (cherry picked from commit 41c94bfa7a64f5f34cc3e94756a87f93b66b2a3a) + Reviewed-on: https://code.wireshark.org/review/10901 -commit 9158176 -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Sat Aug 29 10:00:02 2015 -0400 +commit d10c384 +Author: Dario Lombardo <lomato@gmail.com> +Date: Tue Oct 6 13:55:07 2015 +0200 - pcapng: make SPB cap_len the same as packet_len if IDB snaplen is 0 + catapult_dct2000: code restyle - 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. + Remove a clang 3.7 complain. - Bug: 11483 - Change-Id: I8856d6c6a669a0048ea64b3adbd23c37a598431d - Reviewed-on: https://code.wireshark.org/review/10303 - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> + Change-Id: I5237b130dcd0ffd3a4ea61a3c98fa344fddbe633 + Reviewed-on: https://code.wireshark.org/review/10834 + Reviewed-by: Peter Wu <peter@lekensteyn.nl> + Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + (cherry picked from commit 5f2576be3b7d9fa7240647719927d65279bcdf0a) + Reviewed-on: https://code.wireshark.org/review/10900 -commit 0badc8c -Author: Jim Young <jyoung@gsu.edu> -Date: Fri Jul 10 01:50:19 2015 -0400 +commit f063c85 +Author: Guy Harris <guy@alum.mit.edu> +Date: Thu Oct 8 13:43:08 2015 -0700 - Insure Qt Capture preferences dialog displays default capture device (if any) + The second argument to AC_PATH_PROGS is a list of program names. - 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. + The *third* argument is the value to use if we don't find the program; + we shouldn't fall back on "python3" if we can't find "python", we should + try both "python" and "python3" and just set $PYTHON to nothing if we + don't find either one. - Bug: 10965 - Change-Id: Ie93f84010a19e8144efa46ce889fb9064979e0e9 - Reviewed-on: https://code.wireshark.org/review/9584 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> + Change-Id: I5168455f09bc3165c49db4334f05856dec46bf62 + Reviewed-on: https://code.wireshark.org/review/10890 + Reviewed-by: Guy Harris <guy@alum.mit.edu> + (cherry picked from commit 2bd7c48b44af5ebedefdb4c98d1b8cb708463881) + Reviewed-on: https://code.wireshark.org/review/10891 -commit 51e77b6 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Fri Aug 28 15:53:42 2015 +0200 +commit cbc7116 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Thu Oct 8 19:37:46 2015 +0200 - CBOR: fix no previous prototype for proto_reg*_cbor [-Wmissing-prototypes] + GTPv2: display Sequence Number as BASE_HEX_DEC - Change-Id: I20476046fc2338484ab85757cad7b19f4e41e4be - Reviewed-on: https://code.wireshark.org/review/10283 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + As requested on https://ask.wireshark.org/questions/46393/gtpv2-teid-and-sqn-decoded-in-decimal-instead-of-hexa-in-ws-1127 + + Change-Id: Id0963394959eff979129470c70258323653e3fdf + Reviewed-on: https://code.wireshark.org/review/10886 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> + (cherry picked from commit 03d853400c61f6784e6ccf37fe5a5ba7f7da312a) + Reviewed-on: https://code.wireshark.org/review/10887 -commit 4ebf5b8 -Author: Jeffrey Smith <whydoubt@gmail.com> -Date: Fri Aug 28 17:28:31 2015 -0500 +commit 7e2f9db +Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> +Date: Thu Oct 8 11:28:16 2015 +0100 - bootp/dhcp: fix Alcatel suboption detection bug + UDP: Fix forgotten column info - Change-Id: I4a4222f3f30bf8e996770295756dd206b5ce101b - Reviewed-on: https://code.wireshark.org/review/10297 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I620d24c1a1cf7340d651e8840275759de860e5ef + Reviewed-on: https://code.wireshark.org/review/10881 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Reviewed-by: Evan Huus <eapache@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + (cherry picked from commit bcd9849fae7ecd8f0f4d5550b5749f1b018b4d7c) + Reviewed-on: https://code.wireshark.org/review/10884 -commit e80bd2e -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Fri Aug 28 19:45:28 2015 +0200 +commit 6b36a0f +Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> +Date: Thu Oct 8 12:51:10 2015 +0100 - Added Reload Lua plugins to the release notes. + DCCP: Fix destination port offset - Change-Id: I2ea50b331322e0bc66bf5f3b48d9c2e78bbdd1e5 - Reviewed-on: https://code.wireshark.org/review/10285 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + Regression introduced in ga459ac72 + + Change-Id: Ib69299280599b181f9068b3b81eb9fd74bb1d55d + Reviewed-on: https://code.wireshark.org/review/10882 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + (cherry picked from commit e4863f9569ada55c29895acb9ba553ad9a39ea66) + Reviewed-on: https://code.wireshark.org/review/10883 -commit e18e400 -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Aug 28 15:49:22 2015 -0700 +commit f29960f +Author: Nils Ohlmeier <github@ohlmeier.org> +Date: Thu Sep 24 12:58:15 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. + Added ICE TCP Framing support to STUN dissector - Bug: 11426 - Change-Id: I00283c97b0fc63551b901c0fd526b60c0fb80ace - Reviewed-on: https://code.wireshark.org/review/10296 - Petri-Dish: Gerald Combs <gerald@wireshark.org> + Change-Id: I1dddb09cb1eebc3d23375aa9d2450731fa51cb90 + Reviewed-on: https://code.wireshark.org/review/10643 + Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Reviewed-by: Anders Broman <a.broman58@gmail.com> + (cherry picked from commit 546fe80b7abf6ce0a1f19d0a02f438a7367747a9) + Reviewed-on: https://code.wireshark.org/review/10878 -commit 1663224 -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Aug 28 16:31:33 2015 -0700 +commit 630b907 +Author: Dario Lombardo <lomato@gmail.com> +Date: Fri Oct 2 17:43:47 2015 +0200 - 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. + epl: fix bug in g_hash_table_lookup_extended() call (CID 1254382) - Change-Id: I4d0a6b36fe50df84925690ad688a3ab0433ceb17 - Reviewed-on: https://code.wireshark.org/review/10299 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: Iebf0fc5d3e86fba9a2ea4da5784256d820598e39 + Reviewed-on: https://code.wireshark.org/review/10744 + Reviewed-by: Michael Mann <mmann78@netscape.net> + Petri-Dish: Michael Mann <mmann78@netscape.net> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Anders Broman <a.broman58@gmail.com> + (cherry picked from commit 291bca0056f0f3c6d3bcd232991cec66d79b17f2) + Reviewed-on: https://code.wireshark.org/review/10879 -commit 15c9923 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Fri Aug 28 23:30:30 2015 +0200 +commit dd59b0f +Author: Dario Lombardo <lomato@gmail.com> +Date: Wed Oct 7 17:00:51 2015 +0200 - Qt: Fix use-after-free pattern + qt: add initialization of variable (CID 1311960) - Change-Id: I7f6d9316234c1ccfec1ec5b5c3675b3237f22eda - Reviewed-on: https://code.wireshark.org/review/10294 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> + Change-Id: I25bae2899f19982ee52c5ffb933a1459897b933b + Reviewed-on: https://code.wireshark.org/review/10864 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> + (cherry picked from commit af3beb8beb94884d4dabac03b342de41d79bea0c) + Reviewed-on: https://code.wireshark.org/review/10877 + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 579365e -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Aug 28 14:03:34 2015 -0700 +commit 2dfff1d +Author: Michael Mann <mmann78@netscape.net> +Date: Wed Oct 7 13:50:11 2015 -0400 - 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. + Replace or rename "duplicate" UDP protocols shown in Decode As - Change-Id: I68a00fe43d2ac9e7c0749751abd1c10c47155b3b - Reviewed-on: https://code.wireshark.org/review/10293 - Petri-Dish: Gerald Combs <gerald@wireshark.org> + Change-Id: I8cfd1c223c70c7e03728af8b2f7cbf9354d7ad86 + Ping-Bug: 3949 + Reviewed-on: https://code.wireshark.org/review/10865 + Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Reviewed-by: Roland Knall <rknall@gmail.com> + Reviewed-by: Anders Broman <a.broman58@gmail.com> + (cherry picked from commit ec82648b0989d409adcc404df69b691a260f16e9) + Reviewed-on: https://code.wireshark.org/review/10876 -commit 4d71ae7 -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Aug 28 15:54:53 2015 -0700 +commit c31ef22 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Thu Oct 8 07:48:50 2015 +0200 - Have separate variables for read and write errors. + Blind attempt trying to fix CMake based installer - 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. + Looks like Petri-Dish does not generate it - Change-Id: Idb79822d30989b2529433878798c577a76eacca7 - Reviewed-on: https://code.wireshark.org/review/10295 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I90823d82ac9d223d840ab20331a856550dffdc87 + Reviewed-on: https://code.wireshark.org/review/10872 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + (cherry picked from commit 4a20f576da686237bcb66edeb1e195364ddd2a49) + Reviewed-on: https://code.wireshark.org/review/10875 -commit aa100e0 -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Aug 28 12:57:57 2015 -0700 +commit ff95722 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Thu Oct 8 07:29:25 2015 +0200 - Don't show a progress frame if our file was closed. + Add USBPcapPage.ini file to distribution - Change-Id: Ie363f6764f4e8b2b5c476b85f7ddb0233a127f6e - Reviewed-on: https://code.wireshark.org/review/10290 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I05ed2c561818fd4293543199063551dd65fb5c55 + Reviewed-on: https://code.wireshark.org/review/10871 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + (cherry picked from commit 29b87a368ac241e582ad46a7b5185937efc3e0ad) + Reviewed-on: https://code.wireshark.org/review/10874 -commit c1c6132 -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Aug 28 12:28:24 2015 -0700 +commit bfa452d +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Wed Oct 7 23:27:17 2015 +0200 - 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. + Add USBPcap 1.1.0.0-g794bf26 to Windows installer - Change-Id: I08bed5c7f470f1dbf32817a7d999f09d2c52f168 - Reviewed-on: https://code.wireshark.org/review/10287 - Petri-Dish: Gerald Combs <gerald@wireshark.org> + Change-Id: Idb88cd41436e49b7a29bd4a8e896c92d8489318d + Reviewed-on: https://code.wireshark.org/review/10868 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Reviewed-by: Anders Broman <a.broman58@gmail.com> + (cherry picked from commit 7d252d4b55e06d577f56f2169a757e81276dba7b) + Reviewed-on: https://code.wireshark.org/review/10873 -commit d767186 +commit 35f6478 Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Aug 28 12:49:18 2015 -0700 +Date: Wed Oct 7 17:52:01 2015 -0700 - Get rid of trailing blanks. + No RCS/CVS/SVN Ids any more. - Change-Id: I0b705c924464dcc4987ed0e7c67b106b2b648dce - Reviewed-on: https://code.wireshark.org/review/10289 + Change-Id: Ia9057a1851be17238c35094f14e847b387943186 + Reviewed-on: https://code.wireshark.org/review/10869 Reviewed-by: Guy Harris <guy@alum.mit.edu> + (cherry picked from commit fb02613c9ad2fe1a7e9343599774bd777af0da7d) + Reviewed-on: https://code.wireshark.org/review/10870 -commit da266af +commit c72d16f Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Aug 28 12:46:11 2015 -0700 +Date: Wed Oct 7 11:00:31 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. + Don't just ask for C, ask for standard C - preferably C99. - This handles cases where the radio metadata isn't complete, e.g. an HT - frame with a radiotap header but no MCS field. + We're using some C99 features, such as variadic macros, so if there's a + compiler flag needed for C99 features, make sure it's supplied. If the + compiler doesn't support standard C, complain. - Handle this for *all* QoS data frames when capturing. + Change-Id: I6fb18f5222567249370b3d43065f2258dbde7e4d + Reviewed-on: https://code.wireshark.org/review/10866 + Reviewed-by: Guy Harris <guy@alum.mit.edu> + (cherry picked from commit 8b030b61a931892ff46eae438f6b9f3b7119115e) + Reviewed-on: https://code.wireshark.org/review/10867 + +commit 9244de8 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Wed Oct 7 14:22:32 2015 +0200 + + wslua: fix memleak in lua_prime_all_fields - Get rid of the "fixed-length link-layer header" stuff; it's not being - used. + Would leak some bytes after startup. - Fix a case where we're appending text to a tree item without a space - separating it from the previous text. + Caught by LeakSanitizer. - Bug: 11351 - Change-Id: I980f5b7509603b0c22c297fddc19434c08817913 - Reviewed-on: https://code.wireshark.org/review/10288 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I4644f204343ce5a803a7dfdedac6a1960882807f + Reviewed-on: https://code.wireshark.org/review/10859 + Petri-Dish: Peter Wu <peter@lekensteyn.nl> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Peter Wu <peter@lekensteyn.nl> + (cherry picked from commit 53cfeca535c657b348cd232629e07d783a36aa88) + Reviewed-on: https://code.wireshark.org/review/10863 -commit 42570f9 -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Aug 28 12:05:20 2015 -0700 +commit 898f70e +Author: Petr Gotthard <petr.gotthard@honeywell.com> +Date: Tue Oct 6 17:00:34 2015 +0200 - Clean up scanning to guess the bitrate of an MPEG-2 Transport Stream file. + AMQP: Fix usage of p_(add|get)_proto_data. - Don't treat an EOF at the beginning of a frame as an error. + The p_(add|get)_proto_data() functions are used to store data related + to an AMQP frame. The stored information gets overwritten if there are + multiple small AMQP frames in one TCP/IP packet. - Treat I/O errors as hard errors; treat short reads as an indication that - the file isn't an MPEG-2 Transport Stream file. + As suggested by Pascal and https://code.wireshark.org/review/#/c/10579/, + we should use tvb_raw_offset as key for p_(add|get)_proto_data(). - 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 <guy@alum.mit.edu> + Change-Id: I860df8af51a6fbbef495985747313ae96402cc5c + Reviewed-on: https://code.wireshark.org/review/10836 + Reviewed-by: Michael Mann <mmann78@netscape.net> + Petri-Dish: Michael Mann <mmann78@netscape.net> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + (cherry picked from commit c4f00a825d318777b7e29168996988eb2e495b13) + Reviewed-on: https://code.wireshark.org/review/10858 -commit c04d54f +commit de9b4de Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Thu Aug 27 23:35:58 2015 +0200 +Date: Wed Oct 7 08:11:57 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. + IPv6: add changes forgotten in gbedda9b - Change-Id: I71cd505d7faf713c2372731495d47b45928a41f8 - Reviewed-on: https://code.wireshark.org/review/10280 + Bug: 11570 + Change-Id: I5a8d89253becd550e0330c82ab0811c502db6d61 + Reviewed-on: https://code.wireshark.org/review/10849 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Pascal Artho <pascalartho@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + (cherry picked from commit 869530331400d8cae3694980fa114289cc03e081) + Reviewed-on: https://code.wireshark.org/review/10857 -commit 5179406 -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Aug 28 09:50:26 2015 -0700 +commit 2840bd8 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Tue Oct 6 23:28:38 2015 +0200 - Update the release notes. + SCTP: fix dissection of DATA chunks - Change-Id: I7fb0d307355320a77f011b59c71d1d54066b7d08 - Reviewed-on: https://code.wireshark.org/review/10284 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Regression introduced in gd52322e + + Change-Id: I57baf53d81c7e95ea8ad15e4799033d341e4ee61 + Reviewed-on: https://code.wireshark.org/review/10845 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + (cherry picked from commit a37ac98c5eb5c44794ca36418f93e7ed1c3e0af5) + Reviewed-on: https://code.wireshark.org/review/10856 -commit a7f22aa +commit 1b1a8d5 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Jul 27 17:00:18 2015 +0200 +Date: Tue Oct 6 09:06:54 2015 +0200 - ISAKMP: Add new CHACHA20/POLY1305 Transform Types Values (RFC7634) + Update last updated DNS parameters (2015-07-26) - From IANA ikev2-parameters (2015-08-24) + * draft-ietf-dnsop-delegation-trust-maintainance-14 => RFC 7344 - Change-Id: I02bfd9a0ffc9f863f4d266fcc56cd707c3e71725 - Reviewed-on: https://code.wireshark.org/review/10282 + Update also DNS-Based Authentication of Named Entities (DANE) Parameters ( + 2014-04-23) (no change) + + Change-Id: I7aa7dddf8c26d2ea2ccb4a0533d835ce119737bd + Reviewed-on: https://code.wireshark.org/review/10825 + Petri-Dish: Anders Broman <a.broman58@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> + (cherry picked from commit 4bd74c7def392a93c8a96177ac249a7a9ddaf52a) + Reviewed-on: https://code.wireshark.org/review/10855 -commit f19a173 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Aug 26 17:14:39 2015 -0700 +commit 6902fef +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Fri Oct 2 12:00:04 2015 +0200 - 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. + DNS: Add DNS Cookie Option - Don't colorize packets when sorting in the Qt UI unless it's necessary. + draft-ietf-dnsop-cookies-05.txt - 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. + Change-Id: Ife550d8fe0c6604329c78bb34e94276050148a8a + Reviewed-on: https://code.wireshark.org/review/10824 + Reviewed-by: Anders Broman <a.broman58@gmail.com> + (cherry picked from commit c6742d9d9125eab9bd9dd047752158b7d87f0531) + Reviewed-on: https://code.wireshark.org/review/10854 + +commit 64d0333 +Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> +Date: Sat Oct 3 23:27:49 2015 +0100 + + UDP: Refactor some dissector code - Cache the last result of proto_registrar_get_byname. + Add UDP length as a generated field of UDP-Lite subtree. - Note performance hot spots elsewhere in the code. + Change-Id: I35291cc5f5b2a8909a7124cbae8c39fc91d7751d + Reviewed-on: https://code.wireshark.org/review/10775 + Reviewed-by: Evan Huus <eapache@gmail.com> + Petri-Dish: Evan Huus <eapache@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Anders Broman <a.broman58@gmail.com> + (cherry picked from commit 9fea515efcd025140d018df6d1cf4e3d9ee4f4ac) + Reviewed-on: https://code.wireshark.org/review/10853 + +commit 263ff53 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Sun Oct 4 11:22:41 2015 +0200 + + ssl-utils: load RSA keys based on their modulus+exponent - To do: + Load RSA private keys based on their public key instead of relying on + the user to specify a valid address and port mapping. This is more + reliable and prepares for simplification of the SSL Keys dialog. - GeoIP in packet-ip.c is pretty slow. + After this change, the "address" part of the UAT dialog will be ignored + when loading the private key. The port+protocol mapping is still + imported, but should probably be removed too. - Bug: 11467 - Change-Id: Ib34038fee08ef0319261faeffc4eca01e52f4bd3 - Reviewed-on: https://code.wireshark.org/review/10275 - Petri-Dish: Gerald Combs <gerald@wireshark.org> + Change-Id: I4d7a2bfcf63d17e66e336ef770759f20510fc176 + Reviewed-on: https://code.wireshark.org/review/10766 + Reviewed-by: Peter Wu <peter@lekensteyn.nl> + Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Reviewed-by: Anders Broman <a.broman58@gmail.com> + (cherry picked from commit 877fd03cbffa96bfb6c4c030ce9f8bade57cfc75) + Reviewed-on: https://code.wireshark.org/review/10852 -commit 01fb470 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Aug 26 12:48:56 2015 -0700 +commit 9d4080b +Author: Peter Wu <peter@lekensteyn.nl> +Date: Sat Oct 3 19:23:55 2015 +0200 - More retapping fixups. + ssl-utils: simplify private key storage, fix resource leaks - Disable the main file close and reload actions while we're retapping, - otherwise many of our dialogs will crash. + The certificate and GnuTLS private key are never used except for + reporting in the log file. Remove the unused certificate-related code + from the PKCS#12 file parsing. Report an immediate error instead of + opening key file if GnuTLS is disabled. - Disable the TapParameterDialog filter entry while we're retapping. This - keeps us from enabling the "Apply" button when we shouldn't. + Made ssl_load_key and ssl_load_pkcs12 static, they are not used outside + the SSL dissector. If for some reason the PKCS#12 bag contains multiple + private keys, then the previous one would be overwritten (leaking + memory). Fix this by returning the first private key found. - Don't prematurely disconnect our signals in WiresharkDialog. + Simplify key_hash (dtls_key_hash/ssl_key_hash) memory management, now + the table automatically frees keys/values when items are removed. - Change-Id: Iaf507eb4503b9c296766f109f2b8c71343263982 - Reviewed-on: https://code.wireshark.org/review/10274 - Petri-Dish: Gerald Combs <gerald@wireshark.org> + Fix memory leaks: + - ssldecrypt_uat_fld_password_chk_cb: release ssl_load_pkcs12 memory. + - ssl_load_key: avoid leaking gnutls_x509_privkey_t on error. + - ssl_load_pkcs12: fix ssl_pkey leak on error path. + + Change-Id: I5db6fecb0d74e5c78796392aeb17e3eb7985a2ef + Reviewed-on: https://code.wireshark.org/review/10764 + Reviewed-by: Peter Wu <peter@lekensteyn.nl> + Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Reviewed-by: Anders Broman <a.broman58@gmail.com> + (cherry picked from commit 40ff4ffee88977b2981e29cb4ad8658394c8442e) + Reviewed-on: https://code.wireshark.org/review/10851 -commit 30c2f23 +commit ebad12f Author: Michael Mann <mmann78@netscape.net> -Date: Tue Aug 25 20:58:09 2015 -0400 +Date: Tue Oct 6 22:23:19 2015 -0400 - Eliminate proto_tree_add_text from some dissectors. + Remove heur_dissector_set_enabled. - Change-Id: I066b70cfd58f5fb3ffbcb2e238416747d9e7dd57 - Reviewed-on: https://code.wireshark.org/review/10269 + With the adjustment to heur_dissector_add passing an enable/disable flag and "global" control of heuristic dissectors just like regular ones, this is no longer needed. + + Change-Id: I2d433c7bff8353421eca31f8813992e38b716911 + Reviewed-on: https://code.wireshark.org/review/10848 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> + (cherry picked from commit 42f5d862b00a21d211abba4d66dc852deb7e5c38) + Reviewed-on: https://code.wireshark.org/review/10850 -commit 2ed634d -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Mon Aug 24 15:00:39 2015 +0200 +commit 2cba6bb +Author: Gerald Combs <gerald@wireshark.org> +Date: Tue Oct 6 15:40:37 2015 -0700 - Support BER files bigger than 256kB + Add -2.0 to FindWSWinLibs. - Also support APPLICATION as starting tag. - - Change-Id: Id85b08e2594969c98c530532a32268b01d50965e - Reviewed-on: https://code.wireshark.org/review/10233 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - -commit e3a4188 -Author: Didier Arenzana <darenzana@yahoo.fr> -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 <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: Ica7963bfe124f591b5f236661073c940670e6f78 + Reviewed-on: https://code.wireshark.org/review/10847 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 6151946 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Tue Aug 25 14:51:50 2015 +0200 +commit 92e8fa5 +Author: Gerald Combs <gerald@wireshark.org> +Date: Tue Oct 6 13:29:14 2015 -0700 - Qt: Fixed some memory leakages + CMake: Don't clobber ZLIB_*. - Change-Id: I5bccf706001f9ff41197ed13b1be5a7404ca594f - Reviewed-on: https://code.wireshark.org/review/10251 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> + On Windows we set a few (but not all) ZLIB_* variables, then depend on + FindZLIB to fill in the rest. Make sure FindZLIB doesn't unset everything + the first time we run CMake. + + Bug: 11569 + Change-Id: I199c83570c29343466b9ff63080b6a964dfd8d73 + Reviewed-on: https://code.wireshark.org/review/10843 + Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + Reviewed-by: Gerald Combs <gerald@wireshark.org> + (cherry picked from commit 81d8b7dcdcf67ef530deea0002a638aa57724c51) + Reviewed-on: https://code.wireshark.org/review/10846 -commit efba977 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Tue Aug 25 15:18:51 2015 +0200 +commit 4b4fc34 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Tue Oct 6 22:38:43 2015 +0200 - Qt: Fixed some memory leakages + Another (blind) attempt to fix CMake builds - Change-Id: Ie8c9b7f8c9203acb5aec00d5553b911e0299f53c - Reviewed-on: https://code.wireshark.org/review/10253 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + Change-Id: Icd365e81618a0dc043c9b722ce5542d799cc625c + Reviewed-on: https://code.wireshark.org/review/10844 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 8384a5b -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Tue Aug 25 20:18:46 2015 +0200 +commit e6b61a7 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Tue Oct 6 22:01:59 2015 +0200 - Qt: Fixed some memory leakages + Try to fix CMake builds - And changed strdup -> g_strdup + Follow-up of g09dc3b5 - Change-Id: I62de106462259194738d633f16297eb1210f8ccf - Reviewed-on: https://code.wireshark.org/review/10259 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + Change-Id: I7d0727d0177dc85e009de575239e070e083f1121 + Reviewed-on: https://code.wireshark.org/review/10842 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 2e1fa63 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Aug 26 10:32:52 2015 +0200 +commit 6c45d21 +Author: Guy Harris <guy@alum.mit.edu> +Date: Tue Oct 6 11:44:51 2015 -0700 - Lemon grammar: fix indent (use tabs) + Report an error if we don't find fop and are going to try to use it. - Change-Id: I6fa38d5d85b25ac6c55fcfa67d6c8dba8482cc8c - Reviewed-on: https://code.wireshark.org/review/10266 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: Ide5c43b797a2fa07c7d3c7f986d306a158d68c6b + Reviewed-on: https://code.wireshark.org/review/10840 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 0af048b -Author: Michael Mann <mmann78@netscape.net> -Date: Tue Aug 25 19:14:59 2015 -0400 +commit 09dc3b5 +Author: Gerald Combs <gerald@wireshark.org> +Date: Tue Oct 6 10:08:00 2015 -0700 - Remove calls of tvb_ensure_length_remaining. + Update the CMake Windows library directory. - 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 + Try to match NMake. - Change-Id: I1e77695251e055644bcbbb89f3c181c65d1671ca - Reviewed-on: https://code.wireshark.org/review/10268 - Petri-Dish: Michael Mann <mmann78@netscape.net> + Change-Id: Id3a3aeb136b41e3ccadf345c6b318dec79c9be2c + Reviewed-on: https://code.wireshark.org/review/10839 + Reviewed-by: Gerald Combs <gerald@wireshark.org> + +commit 98d847f +Author: AndersBroman <anders.broman@ericsson.com> +Date: Tue Oct 6 11:00:41 2015 +0200 + + [NSIP] Wrong offset used for proto_tree_add_bitmask() for the reset flag. + + Change-Id: Ica9ed514e593079ba4cb287d4165eb6e967ec903 + Reviewed-on: https://code.wireshark.org/review/10833 + Petri-Dish: Anders Broman <a.broman58@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> + (cherry picked from commit 12b735d0dc2b78991a5147c1e26a93d786029195) + Reviewed-on: https://code.wireshark.org/review/10838 -commit 374439d +commit 7c4b909 Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Aug 26 11:24:29 2015 -0700 +Date: Mon Oct 5 17:28:39 2015 -0700 - Don't emit app signals from dialogs. + Fix an I/O graph crash. - 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. + QTreeWidget::removeItemWidget calls QAbstractItemView::setIndexWidget, + which deletes the current item widget. As a result we shouldn't try to + delete itemWidgets ourselves. - Fix the "Enabled Protocols" action name while we're here. + Add a note explaining why we use hand-crafted item widgets instead of a + custom item delegate. - Bug: 11361 - Bug: 11448 - Change-Id: I89e98daaaedc877d3b13b0d33b6f3be033e323d7 - Reviewed-on: https://code.wireshark.org/review/10271 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Bug: 11449 + Change-Id: I485bacc0fae60ea3174e003ef0032948ee5c720f + Reviewed-on: https://code.wireshark.org/review/10820 Reviewed-by: Gerald Combs <gerald@wireshark.org> + (cherry picked from commit 082b0d7ba279b0a87eb2620f2875b77fd24e7931) + Reviewed-on: https://code.wireshark.org/review/10837 -commit 8ad5611 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Wed Aug 26 22:52:06 2015 +0200 +commit 6e9b1b3 +Author: Roland Knall <roland.knall@br-automation.com> +Date: Tue Oct 6 10:00:54 2015 +0200 - sv: remove some unnecessary checks + openSAFETY: Add Producer ID to info field - 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 + Cosmetic change, to better distinguish if multiple + SPDO packages have been detected. - correct a typo while at it + This should also be back-ported to 1.12 and 2.0 - Change-Id: I09a315fc2c70161af527dca5661f877e09b63ff6 - Reviewed-on: https://code.wireshark.org/review/10273 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> + Change-Id: I3d0b26ecb6e0cc60b3cdc9861920c5ccaeb70cbd + Reviewed-on: https://code.wireshark.org/review/10829 + Reviewed-by: Roland Knall <rknall@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + (cherry picked from commit 63b9bc110dd2423baac539a3d8762cc92be0b223) + Reviewed-on: https://code.wireshark.org/review/10835 -commit 7b35992 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Mon Aug 24 22:12:17 2015 +0200 +commit ba41fc5 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Tue Oct 6 10:46:49 2015 +0200 - Reload IO Graph Y fields when reload Lua plugins + Remove an extra comma - Change-Id: Ic3b9096c3c25839dd7d7bfe7af71eeb5b0bd745d - Reviewed-on: https://code.wireshark.org/review/10239 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + Change-Id: I14e89d9db53166b43ef6bee901ba0fdc545657b1 + Reviewed-on: https://code.wireshark.org/review/10831 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + (cherry picked from commit 295641dece432c189eb35003f4d88b42ec6097d5) + Reviewed-on: https://code.wireshark.org/review/10832 -commit bc4487a -Author: Jeffrey Smith <whydoubt@gmail.com> -Date: Tue Aug 25 18:40:45 2015 -0500 +commit 87cc775 +Author: David Arnold <d@0x1.org> +Date: Sun Sep 20 22:04:08 2015 +1000 - 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. + Fix SoupBinTCP sequence number tracking. - Change-Id: Ie4188ff900426c2d80a5694fbba5c88385625a61 - Reviewed-on: https://code.wireshark.org/review/10267 + Change-Id: Ia31b21894a6f0ba2da6cc2aea6babda9f37f5e09 + Reviewed-on: https://code.wireshark.org/review/10579 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + (cherry picked from commit 7e1f5247d8cfc476603222a2036859e3e22f4c20) + Reviewed-on: https://code.wireshark.org/review/10827 -commit e1c807c -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Aug 26 08:41:50 2015 -0700 +commit 95c1d18 +Author: YFdyh000 <yfdyh000@gmail.com> +Date: Mon Oct 5 23:03:30 2015 +0800 - Add missing callback support. + Qt: refine some strings for l10n - Change-Id: I90838ccb701c93b11b216d0eb9973cbac8627129 - Reviewed-on: https://code.wireshark.org/review/10270 - Petri-Dish: Gerald Combs <gerald@wireshark.org> + Change-Id: I460559c99c79c9fd40f284c750d64210fe5de50b + Reviewed-on: https://code.wireshark.org/review/10813 + Reviewed-by: Michael Mann <mmann78@netscape.net> + Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + (cherry picked from commit be187b99c77a06af49a25156f32a9d536788bbf1) + Reviewed-on: https://code.wireshark.org/review/10823 -commit e234ce8 -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Aug 24 12:30:56 2015 -0700 +commit f4e03f4 +Author: Guy Harris <guy@alum.mit.edu> +Date: Mon Oct 5 23:46:53 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. + Calculate the channel if we have only the frequency. - Use beginRetapPackets and endRetapPackets in WiresharkDialog and - FollowStreamDialog. We will likely need to add them elsewhere. + That way, the generic 802.11 radio dissector, and any future taps if we + add a tap with radio information, can get the channel for radiotap and + PPI headers, as we do for some other radio headers that supply just a + frequency. - Update comments. + Change-Id: I9e3037f69938bed3b3ba563689ff00aaed486a16 + Reviewed-on: https://code.wireshark.org/review/10821 + Reviewed-by: Guy Harris <guy@alum.mit.edu> + (cherry picked from commit e8d0bf8a5b7962d155586583d7f769a6b03f51bf) + Reviewed-on: https://code.wireshark.org/review/10822 + +commit edc3d361 +Author: Balint Reczey <balint@balintreczey.hu> +Date: Mon Oct 5 02:58:00 2015 +0200 + + debian: Build .debs with Qt 5 - Change-Id: I1788a6ade0817c31aa3419216df96be5e36b2178 - Reviewed-on: https://code.wireshark.org/review/10261 + Change-Id: I085d5332a0a1c8151b5781c0a94cffe2fe32aeb7 + Reviewed-on: https://code.wireshark.org/review/10800 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Balint Reczey <balint@balintreczey.hu> + Tested-by: Balint Reczey <balint@balintreczey.hu> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + (cherry picked from commit fd603f6f99c3ad3527616a1491804953a2a591c0) + Reviewed-on: https://code.wireshark.org/review/10817 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit f7e9a79 +commit 970b537 Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Aug 24 12:33:49 2015 -0700 +Date: Mon Oct 5 09:38:51 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. + Show progress in the Supported Protocols dialog. - Call addToButtonBox in the constructors of a bunch of dialogs. + Make sure we update the UI when building our tree. - Change-Id: I33ac5fd7a976ee6e0527de569a5c4b528980dae1 - Reviewed-on: https://code.wireshark.org/review/10242 + Change-Id: I8b24e5c017c9521a00e3dfcb48afe0e6b6124aa2 + Reviewed-on: https://code.wireshark.org/review/10806 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> + (cherry picked from commit 289ee5a9d5ba0fabbe98e2ee08d2efab89d83188) + Reviewed-on: https://code.wireshark.org/review/10819 -commit 8b4ff24 -Author: tkc <chaitanya.mgit@gmail.com> -Date: Tue Aug 25 16:58:43 2015 +0530 +commit 1ef2f21 +Author: Gerald Combs <gerald@wireshark.org> +Date: Mon Oct 5 15:54:51 2015 -0700 - 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. + CMake+NSIS: Fix our minor version. - So changed the default case to EOSP and only when TODS is set - treat it as "bit4". + CMake's configure_file command helpfully undefs any zero value. Our + minor version is zero. Feed it "#cmakedefine01 MINOR_VERSION" to + compensate. Remove a previous workaround that didn't work. - Change-Id: Ie2a73320dc9921aed4547e32836e6cd7d89ef109 - Reviewed-on: https://code.wireshark.org/review/10250 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I28d1ecd21b3c87d0a80301100bef207b4e10f034 + Reviewed-on: https://code.wireshark.org/review/10818 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 57b2b77 -Author: Joerg Mayer <jmayer@loplof.de> -Date: Wed Aug 26 08:50:09 2015 +0400 +commit 37dbded +Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> +Date: Mon Oct 5 11:53:07 2015 +0100 - cmake: rework version.h handling to treat it like config.h + Add BASE_PT_ field display types - It wasn't working on my system: I kept seeing the old git revision - in '...shark -v' even after deleting version.h + Avoid displaying duplicate port numbers with transport name resolution disabled and + make some dissector code simpler. - Change-Id: I75f41a7afcee4b9384f33a56014e4af6b527fec5 - Reviewed-on: https://code.wireshark.org/review/10265 - Petri-Dish: Jörg Mayer <jmayer@loplof.de> + Introduces port_with_resolution_to_str_buf() function and amends UDP/TCP/DCCP/SCTP to + use the new field display type. + + Change-Id: Ifb97810b9c669ccbb1a310a2c0ffd6e2b63af210 + Reviewed-on: https://code.wireshark.org/review/10625 + Petri-Dish: Michael Mann <mmann78@netscape.net> + Reviewed-by: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Jörg Mayer <jmayer@loplof.de> + Reviewed-by: Michael Mann <mmann78@netscape.net> + (cherry picked from commit a459ac72a2c01ec12d186907837aff891e3e223b) + Reviewed-on: https://code.wireshark.org/review/10816 -commit c18d2f8 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Tue Aug 25 15:16:29 2015 +0200 +commit b77829e +Author: Michael Mann <mmann78@netscape.net> +Date: Fri Oct 2 23:42:38 2015 -0400 - Qt SCTP: Changed prohibited APIs - - strcpy -> g_strlcpy - sprintf ->g_snprintf + MATE: Add ~ operator support - Also initialize some temp variables. - - Change-Id: I4d2fa1b0325c6e59aa13ebeb0d9c25d5ff7c4d9c - Reviewed-on: https://code.wireshark.org/review/10252 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> + Bug: 9025 + Change-Id: Ica92a7026ba8a89a8970b76e4e7d27f9e6288eb6 + Reviewed-on: https://code.wireshark.org/review/10760 + Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> + (cherry picked from commit c913a61c742ccf98248afb5ba921464a9ee8f50a) + Reviewed-on: https://code.wireshark.org/review/10815 -commit bd21889 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Tue Aug 25 19:36:28 2015 +0200 +commit 2d00601 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Mon Oct 5 08:01:44 2015 +0200 - Camel: fix indent (use 2 spaces) + Qt: fix crash when double clicking on a row in 'Decode As' dialog - Change-Id: I0e8047fca7f24e60e4db8ad77254bcff5f8d6651 - Reviewed-on: https://code.wireshark.org/review/10257 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 6b41d2c -Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Sat Aug 22 18:31:41 2015 +0100 - - Do not treat all unknown IP protocols as unknown IPv6 extension headers + No need to register for the destroyed() signal: it is emitted after the new + QComboBox object is created and resetting pointers to NULL is useless as they + are locals initialized in the constructor - Change-Id: I229260ce668b60a9756cd3f2e343c278ae27c211 - Bug: 9996 - Reviewed-on: https://code.wireshark.org/review/10196 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Bug: 11532 + Change-Id: Ie707cafa370053df846a4732aed20c182e030c40 + Reviewed-on: https://code.wireshark.org/review/10792 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Reviewed-by: Gerald Combs <gerald@wireshark.org> + (cherry picked from commit 3f56b5e6b91ec2d57c8ce48606332368c17665dd) + Reviewed-on: https://code.wireshark.org/review/10811 -commit 5e45269 -Author: Guy Harris <guy@alum.mit.edu> -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 <guy@alum.mit.edu> - -commit 4fe661d -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Aug 25 15:40:00 2015 -0700 +commit 6fb0a48 +Author: Gerald Combs <gerald@wireshark.org> +Date: Mon Oct 5 13:01:19 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. + Copy over git-compare-apis from master-1.12. - Change-Id: I86dde999f59fdfec58b118729b7b881737983033 - Reviewed-on: https://code.wireshark.org/review/10260 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I94fa4dfc18efccd2a90e175ec4985788833caf8e + Reviewed-on: https://code.wireshark.org/review/10809 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 0e952e6 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Tue Aug 25 19:55:56 2015 +0200 +commit eb21b1f +Author: Gerald Combs <gerald@wireshark.org> +Date: Mon Oct 5 12:17:40 2015 -0700 - SIGCOMP: fix sigcomp.copying_bytes_literally field + Initialize master-2.0. - Change-Id: Ib1baa3437579a413899aaba5dd8d31982cda1b0d - Reviewed-on: https://code.wireshark.org/review/10258 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 8e55f68 -Author: Joerg Mayer <jmayer@loplof.de> -Date: Mon Aug 24 04:34:06 2015 +0400 - - Remove gitversion.h + There is a checklist for all of this. It is sizeable. - Change-Id: Id3144ecaf9289dbe53cd2f5d3e3de57e8de955f6 - Reviewed-on: https://code.wireshark.org/review/10256 - Reviewed-by: Jörg Mayer <jmayer@loplof.de> + Change-Id: Ib538ac32a2764753a3f339c8466cac077c470166 + Signed-off-by: Gerald Combs <gerald@wireshark.org> + Reviewed-on: https://code.wireshark.org/review/10808 -commit 0c291f9 -Author: Michael Mann <mmann78@netscape.net> -Date: Mon Aug 24 22:30:46 2015 -0400 +commit d52322e +Author: ruengeler <ruengeler@wireshark.org> +Date: Mon Oct 5 15:55:40 2015 +0200 - Eliminate proto_tree_add_text from packet-sigcomp.c + SCTP I-DATA support - Some other cleanup noted by the check* scripts. - - Change-Id: I14d7bfa81c689fff00fc82e966d50d4ae9f0988d - Reviewed-on: https://code.wireshark.org/review/10254 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> + Change-Id: I459942b9e3287d500dda517568252d4cb56d3216 + Reviewed-on: https://code.wireshark.org/review/10802 + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Michael Tüxen <tuexen@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Michael Tüxen <tuexen@wireshark.org> -commit 571f254 -Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Sun Aug 23 03:46:36 2015 +0100 +commit a24eeb9 +Author: Gerald Combs <gerald@zing.org> +Date: Sun Oct 4 10:20:55 2015 -0700 - Replace "IPv6 header length" with the more correct "payload length" + Make the capture comment icon more Wireshark-y. - Change-Id: I3e667ba2e3ac49ce99e7a2035d9ff604fd7cbcca - Reviewed-on: https://code.wireshark.org/review/10205 + Change-Id: Ic693c7afc1658c3b89ae5cddf9c7ab32c435cf2e + Reviewed-on: https://code.wireshark.org/review/10788 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit cc15b11 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Aug 24 10:29:18 2015 +0200 +commit 31aefa4 +Author: Gerald Combs <gerald@wireshark.org> +Date: Mon Oct 5 09:12:43 2015 -0700 - Multicast Stream: Fix Dereference of null pointer found by Clang analyzer + Fix initialization order. - Change-Id: I419f49132f8b0853c17b2fd1b4e9869ef3fafd13 - Reviewed-on: https://code.wireshark.org/review/10224 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I5eb59108860c9282d798aedfe40eccf1ee85658d + Reviewed-on: https://code.wireshark.org/review/10805 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 31bf40e -Author: AndersBroman <anders.broman@ericsson.com> -Date: Tue Aug 25 12:45:01 2015 +0200 +commit 0eeeab7 +Author: Michal Pazdera <michal.pazdera@gmail.com> +Date: Mon Oct 5 12:25:05 2015 +0200 - [Camel] The tags used in EstablishTemporaryConnectionArg differs in V2 and - V3 versions of Camel. - Add ASN1 code for EstablishTemporaryConnectionArgV2 + H225, H245 over IPv6 - Bug: 11466 + This commit extends h225 and h245 dissectors to support dissection + of ipv6 packets. - Change-Id: I0dbb9c83e520c269dd567f3c3bc34c99c9aa5e15 - Reviewed-on: https://code.wireshark.org/review/10249 + Change-Id: Id8c045344711a96f15d619ddd72065aa3712c429 + Reviewed-on: https://code.wireshark.org/review/10799 + Reviewed-by: Tomáš Kukosa <tomas.kukosa@unify.com> + Petri-Dish: Anders Broman <a.broman58@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 2af5783 +commit c00420e Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Sun Aug 23 21:34:21 2015 +0100 +Date: Sun Oct 4 18:10:29 2015 +0100 - Add more validity checks to the IPv6 dissector - - Check for IP version and header size + Move utf8_entities.h to wsutil - Change-Id: I69102dda4e0e91ac1617d9a48fe9b0bab26aa9fe - Reviewed-on: https://code.wireshark.org/review/10218 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I6298b3de5f0a1cb988014ff16082eaf8c2a3c3c0 + Reviewed-on: https://code.wireshark.org/review/10786 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit d5049ea -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Aug 22 20:08:31 2015 +0200 +commit 9b83b09 +Author: Michael Mann <mmann78@netscape.net> +Date: Sat Oct 3 11:56:43 2015 -0400 - win32: add detection of Npcap to Windows installer + Don't count packets twice for average using avg_stat_node_add_value_notick. - 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 + Bug: 10535 + Change-Id: I9c61a1f10f257bc6dd390c2a9370653bbd45b205 + Reviewed-on: https://code.wireshark.org/review/10772 + Petri-Dish: Michael Mann <mmann78@netscape.net> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> + +commit 32f872c +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Mon Oct 5 11:43:32 2015 +0200 + + file.c: fix resource leak reported by Coverity (CID 1159387) - Change-Id: I606f8b11c950fd54cf7fdda7f4a1886cc2580d31 - Reviewed-on: https://code.wireshark.org/review/10197 + Change-Id: I24f85f41bcb0c3a0dda0b6658dbfdb4098eb64b9 + Reviewed-on: https://code.wireshark.org/review/10796 + Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Yang Luo <hsluoyz@sohu.com> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit e710f24 +commit 4fbfd3e Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Mon Aug 24 11:21:29 2015 +0200 +Date: Mon Oct 5 11:27:54 2015 +0200 - win32: update the list of NdisMedium and NdisPhysicalMedium defines used by GTK UI + Qt: fix uninitialized members (UNINIT_CTOR) reported by Coverity (CID 1228882) - 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: I1f09fa9a8421e702d2fff963afc899617f2e6222 + Reviewed-on: https://code.wireshark.org/review/10794 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + +commit fc5bc45 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Mon Oct 5 11:29:04 2015 +0200 + + Qt: fix control flow issues (UNREACHABLE) reported by Coverity (CID 1224614) - Change-Id: I7ccc2763364b65df77927cbf1c265195fc295642 - Reviewed-on: https://code.wireshark.org/review/10225 + Change-Id: I5e59490e0c913f4648fd1024bcf1792a936a39dd + Reviewed-on: https://code.wireshark.org/review/10795 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Yang Luo <hsluoyz@sohu.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit edeaae0 -Author: Richard Sharpe <rsharpe@samba.org> -Date: Mon Aug 24 07:39:44 2015 -0700 +commit c7d98e1 +Author: Petr Gotthard <petr.gotthard@honeywell.com> +Date: Mon Oct 5 08:24:46 2015 +0200 - 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. + AMQP: Fix warnings and the OSX 10.5 x86 build - 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. + The AMQP channel number is 16-bit only. - Change-Id: Id04a31c15b04378b6b0f056baa1f37d94a65b71c - Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com> - Reviewed-on: https://code.wireshark.org/review/10234 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 4ba5225 -Author: Guy Harris <guy@alum.mit.edu> -Date: Mon Aug 24 18:46:56 2015 -0700 - - Point to GitHub for the pcapng specification. + packet-amqp.c: In function 'dissect_amqp_0_9_method_channel_close': + packet-amqp.c:8481: warning: cast to pointer from integer of different size + packet-amqp.c: In function 'get_conversation_channel': + packet-amqp.c:10512: warning: cast to pointer from integer of different size + packet-amqp.c:10518: warning: cast to pointer from integer of different size - Change-Id: I33faa41e8b0f36ee49d29fe391feafd94d0a7e80 - Reviewed-on: https://code.wireshark.org/review/10245 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I398ecfb19ecb7e741c2ed0675c1c625bf6a894f9 + Reviewed-on: https://code.wireshark.org/review/10793 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 662f4b2 -Author: Jeff Morriss <jeff.morriss.ws@gmail.com> -Date: Mon Aug 24 20:26:30 2015 -0400 +commit 6d7b295 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Sun Oct 4 16:27:02 2015 +0200 - Use one variable that was set but not previously used and delete another. + Allow use of variadic macros - Change-Id: I6bd7a16e3ea97659a0007edfd9f90dbd2060e443 - Reviewed-on: https://code.wireshark.org/review/10244 - Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> - -commit b16cca4 -Author: Guy Harris <guy@alum.mit.edu> -Date: Mon Aug 24 15:13:59 2015 -0700 - - Some beamforming stuff from 802.11ac. + Remove variadic macros restriction (c99, c++11 feature) from + README.developer. GCC, Clang, MSVC 2005 all support it. + + Enable -Wno-variadic-macros in configure.ac and CMakeLists.txt when + -Wpedantic is enabled (which would enable -Wvariadic-macros). - Extracted from Joerg Mayer's Ixia-derived patch to 1.12 in bug 11464. - Most of the changes there are already in the trunk. + For all files matching 'define\s*\w+[0-9]\(', replace "FOO[0-9]" by + "FOO" and adjust the macro definition accordingly. The nbap dissector + was regenerated after adjusting its template and .cnf file. The + generated code is the same since all files disabled the debug macros. - Change-Id: I90ba04e145ffb2b164810320e3510a5bed847ed4 - Ping-Bug: 11464 - Reviewed-on: https://code.wireshark.org/review/10243 + Discussed at: + https://www.wireshark.org/lists/wireshark-dev/201209/msg00142.html + https://www.wireshark.org/lists/wireshark-dev/201510/msg00012.html + + Change-Id: I3b2e22487db817cbbaac774a592669a4f44314b2 + Reviewed-on: https://code.wireshark.org/review/10781 + Petri-Dish: Peter Wu <peter@lekensteyn.nl> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 1874793 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Mon Aug 24 22:59:21 2015 +0200 +commit 5b1d142 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Sun Oct 4 11:52:26 2015 +0200 - Remove unused signal + Fix warnings introduced by "Qt: Initial RTP playback" - Change-Id: Ic2d4057ee95849bc1b026663dae1430432ad9707 - Reviewed-on: https://code.wireshark.org/review/10241 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + Change-Id: I28ae077be535f32ef81ac370d6782033f219017d + Reviewed-on: https://code.wireshark.org/review/10777 + Reviewed-by: Peter Wu <peter@lekensteyn.nl> + Petri-Dish: Peter Wu <peter@lekensteyn.nl> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 99dab82 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Mon Aug 24 22:19:01 2015 +0200 +commit 908cdc6 +Author: YFdyh000 <yfdyh000@gmail.com> +Date: Mon Oct 5 02:35:57 2015 +0800 - Use signal to close packet dialogs + Fix typos in rtp_player_dialog files - Change-Id: I312f8de8de933e576b60d2b158e4c4f2d1147ef1 - Reviewed-on: https://code.wireshark.org/review/10238 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + Change-Id: I0df33dc156601187a6a180d8786ef18c5c05467a + Reviewed-on: https://code.wireshark.org/review/10787 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit fbadcdd -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Aug 24 10:56:04 2015 -0700 +commit 9e3a5fe +Author: Petr Gotthard <petr.gotthard@honeywell.com> +Date: Fri Oct 2 20:06:04 2015 +0200 - Add notes about using CMake + Qt Creator. + AMQP: Navigation between publish/delivery and related ack/nack - Change-Id: Ib10cc0a407721d62b39628af858f14e749c94d22 - Reviewed-on: https://code.wireshark.org/review/10237 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 75d9167 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -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 + This patch adds cross-references between publish/delivery and + ack/nack frames. This improves user comfort when inspecting the traffic. - Change-Id: Ie2802293576bf9edb28bccf7d464b5e687185096 - Reviewed-on: https://code.wireshark.org/review/10223 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I819b19474a3f0351eb769eadf3d32042cb5f5256 + Reviewed-on: https://code.wireshark.org/review/10745 + Petri-Dish: Michael Mann <mmann78@netscape.net> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 7f60878 -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Aug 24 09:01:09 2015 -0700 +commit 2496aed +Author: Gerald Combs <gerald@zing.org> +Date: Sat Oct 3 09:45:16 2015 -0700 - Add FOP 2.0 to the search list. + Qt: Don't update the recent list while capturing. + + If a recent file is on a network share we'll create traffic which can + show up in the capture. - Change-Id: Ifc462a69e28b875f05770c453b06689c69008c52 - Reviewed-on: https://code.wireshark.org/review/10235 + This doesn't fix the issue entirely, e.g. if you're capturing in one + instance of Wireshark and have another one open. The proper fix in that + case is to switch to QFileSystemWatcher as described at the top of + ::WiresharkApplication. + + Ping-Bug: 11546 + Change-Id: If21f1bb213fe1d862c09b1b2edd78c8baf983461 + Reviewed-on: https://code.wireshark.org/review/10774 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> -commit d7e3076 -Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Mon Aug 24 12:16:06 2015 +0100 +commit 05e0375 +Author: YFdyh000 <yfdyh000@gmail.com> +Date: Mon Oct 5 02:35:13 2015 +0800 - IPv6 RPL: "cmprI" should be "cumprE" + Remove tr() for setObjectName - Bug: 10560 - Change-Id: I7cf9fb8ad39d128ed375abb8703937be8e3795b3 - Reviewed-on: https://code.wireshark.org/review/10228 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I4561ded123df3c2152da543e8a6786cb8b386dd5 + Reviewed-on: https://code.wireshark.org/review/10790 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit bc0d8d1 +commit 5d0b3c2 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Sat Aug 22 19:20:25 2015 +0100 +Date: Sun Oct 4 02:52:10 2015 +0100 - Remove space from field description for consistency + UDP: Make port column info similar to TCP, add length information - Change-Id: I74b0be1724d0754b7d1b724e177d44c4894d0e6b - Reviewed-on: https://code.wireshark.org/review/10198 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I3f7a35db53a1ecc9d543b80f143eb6082616e458 + Reviewed-on: https://code.wireshark.org/review/10702 + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Evan Huus <eapache@gmail.com> -commit a5b5c5a -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sun Aug 23 18:44:31 2015 +0200 +commit 82b2258 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Tue Sep 29 12:20:07 2015 +0200 - fc: don't THROW() an exception from a dissector + wslua: fix crash when a LUA error is raised in TRY block - bring up an expert info and exit + The dissect_tcp_pdus function in LUA is passed two LUA functions that + get the PDU length and the dissect a PDU. When one of these functions + fail, a longjmp is made to the the caller of lua_pcall. - Change-Id: Icbbafb8b7187a66d3ddc9a674502ad728b7c4ffc - Reviewed-on: https://code.wireshark.org/review/10222 - Petri-Dish: Anders Broman <a.broman58@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 517f4d4 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Thu Aug 20 23:06:44 2015 +0200 - - cigi: don't THROW() an exception from a dissector + This is no problem for the PDU length function, but the PDU dissect + function is wrapped in a TRY/CATCH/ENDTRY block which also uses longjmp + and need to be fully executed. Without doing so, LUA exceptions will + crash on a weird location (except_pop). - stop the dissection instead and bring up an expert info in the main function + Fix the crash by not using luaL_error, but throw dissector errors which + properly breaks out of the tcp_dissect_pdus C function and then convert + it to a LUA error such that the dissector can handle it. - Change-Id: I391bf821422ef8e6ae01849c88096e90e4295920 - Reviewed-on: https://code.wireshark.org/review/10221 - Petri-Dish: Anders Broman <a.broman58@gmail.com> + Test with `tshark -X lua_script:crash.lua -r ssl.pcap`: + + trivial_proto = Proto("trivial", "Trivial Protocol") + function dissect_foo(tvb, pinfo, tree) + error("triggering a LUA error"); + end + function get_pdu_len(tvb, pinfo, tree) return 5; end + function trivial_proto.dissector(tvb, pinfo, tree) + dissect_tcp_pdus(tvb, tree, 5, get_pdu_len, dissect_foo) + end + tcp_table = DissectorTable.get("tcp.port") + tcp_table:add(443, trivial_proto) + + It should not crash and will print this: + + Lua Error: dissect_tcp_pdus dissect_func: [string "crash.lua"]:3: triggering a LUA error + + Change-Id: Ibd079cc5eb3a2e4d2e62ea49a512fa2cc8e561ea + Reviewed-on: https://code.wireshark.org/review/10685 + Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Peter Wu <peter@lekensteyn.nl> + Reviewed-by: Evan Huus <eapache@gmail.com> -commit 7c0b8bd -Author: AndersBroman <anders.broman@ericsson.com> -Date: Mon Aug 24 12:41:04 2015 +0200 +commit 3182fba +Author: Peter Wu <peter@lekensteyn.nl> +Date: Sun Oct 4 19:08:03 2015 +0200 - [Q.2931] Don't use BASE_EXT_STRING for a value_string, fixes the test - suite + bacapp: attempt to fix windows build - ** (process:10080): WARNING **: Invalid value_string_ext ptr for: q2931.atm_identifier + Reported by Graham: - Change-Id: Id4ec745629af7774e480e91fba01ed8da5aac1bd - Reviewed-on: https://code.wireshark.org/review/10227 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 079dd03 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Mon Aug 24 11:52:29 2015 +0200 - - Fixed typo in hfinfo_remove_from_gpa_name_map + packet-bacapp.c(5299) : warning C4146: unary minus operator applied to unsigned type, result still unsigned - Change-Id: Ic80fbe9397e50c41fa01ef9147319dd2ac0c0b91 - Reviewed-on: https://code.wireshark.org/review/10226 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + Regression in v1.99.10rc0-330-g71ec57a ("bacapp: fix + -Wshift-negative-value"). + + Change-Id: Ia3ea3acad3afdf7b8a449224c815ea45d7fdbc2b + Reviewed-on: https://code.wireshark.org/review/10785 + Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> + Petri-Dish: Peter Wu <peter@lekensteyn.nl> + Reviewed-by: Peter Wu <peter@lekensteyn.nl> -commit a2d8514 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Aug 23 19:02:23 2015 +0200 +commit 9a61687 +Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> +Date: Sat Oct 3 15:23:36 2015 +0100 - ip: fix ip.hdr_len filter value when the header length is too small + UDP: Rename UDPlite to UDP-Lite - Change-Id: Ia510d0f4e496ef0577856bf633d6ca19f0b3e1cb - Reviewed-on: https://code.wireshark.org/review/10210 - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Keep "UDPLite" in ipproto.c in accordance with the IANA Considerations + section of RFC 3828. + + Change-Id: Icfa2bc07ea3c6782e838b4896f9e4aec28422d34 + Reviewed-on: https://code.wireshark.org/review/10765 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit bd553f6 -Author: Michael Mann <mmann78@netscape.net> -Date: Sat Aug 22 22:14:30 2015 -0400 +commit f6283eb +Author: Guy Harris <guy@alum.mit.edu> +Date: Sun Oct 4 11:50:00 2015 -0700 - Eliminate proto_tree_add_text from packet-q931.c and packet-q2931.c + Expand, correct, and otherwise improve comments. - Change-Id: I681b05755429fd7420c423ff88e5a4d3dc95db64 - Reviewed-on: https://code.wireshark.org/review/10219 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: Id33a1a66114f6b01d203ad717342ae90c12981cc + Reviewed-on: https://code.wireshark.org/review/10789 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 7176958 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Sat Aug 22 22:59:42 2015 +0200 +commit 89b227f +Author: Peter Wu <peter@lekensteyn.nl> +Date: Sun Oct 4 12:45:21 2015 +0200 - Close packet dialogs when reload Lua plugins. + qt: fix crash when dragging RTP player out of view - 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. + Fix invalid memory access when dragging the RTP player out of view when + a stream is selected. lowerBound() returns QMap.end() when no item is + found, use that instead. - 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. + Found using ASAN. - Change-Id: I805352b65844eafafafc54cd61f08b4605416e64 - Reviewed-on: https://code.wireshark.org/review/10201 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + Change-Id: I5444a047bc242dfe481bd0581c5217030fca28f1 + Reviewed-on: https://code.wireshark.org/review/10778 + Petri-Dish: Peter Wu <peter@lekensteyn.nl> + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 25ec198 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Thu Aug 20 21:39:12 2015 +0200 +commit 076d07d +Author: Martin Kaiser <wireshark@kaiser.cx> +Date: Sun Oct 4 18:26:34 2015 +0200 + + [isns]: use proto_tree_add_bitmask() for the iscsi node type + + Change-Id: I9ba0ca0cfa7e0547b535bfe80c042f541047fc4e + Reviewed-on: https://code.wireshark.org/review/10784 + Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> + +commit c647faa +Author: Peter Wu <peter@lekensteyn.nl> +Date: Sun Oct 4 11:31:19 2015 +0200 - Disable streamNumberSpinBox while reloading capture + Fix various memleaks - 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. + Found by starting Wireshark within an empty profile, opening + Preferences, search for Protocol "IEEE 802.11" (because it has radio + buttons), then close everything again. - Also disable mouseMove event (showing packet details) while reloading, - as this also will give a crash. + Many fixes are trivial, but the various recent_read_* functions in + recent.c were changed to return a boolean such that the result can + always be checked even if errno==0. - 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. + QButtonGroup leak was hinted by Clang Static Analyzer, all other + memleaks were found using ASAN/LSan. - Change-Id: I622f9e0de8205bc1fd18101dc03100079d7a2d06 - Reviewed-on: https://code.wireshark.org/review/10159 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> + Change-Id: Ia73f5d4c09d92f22e72377be59e23342f8ad7211 + Reviewed-on: https://code.wireshark.org/review/10776 + Reviewed-by: Michael Mann <mmann78@netscape.net> + Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 47c9aa4 -Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Fri Aug 21 09:33:17 2015 +0100 +commit 49151eb +Author: Gerald Combs <gerald@wireshark.org> +Date: Sun Oct 4 08:11:24 2015 -0700 - Check if IPv6 payload length exceeds framing byte length + [Automatic update for 2015-10-04] - Bug: 11418 - Change-Id: Icbb980fda4f7addf52db59bc4f2aa27fc8f85837 - Reviewed-on: https://code.wireshark.org/review/10176 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Update manuf, services enterprise-numbers, translations, and other items. + + Change-Id: Ieb909c2aea62525b763cab6765704093c7fea706 + Reviewed-on: https://code.wireshark.org/review/10782 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit c6aeaad -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Thu Aug 20 22:50:58 2015 +0200 +commit d3edda6 +Author: Graham Bloice <graham.bloice@trihedral.com> +Date: Sun Oct 4 13:35:01 2015 +0100 - Disable apply button while adding the filter - - Pressing multiple apply while reloading the capture file will - give a crash. + Fix shortening error introduced by commit f28e23f1 - Change-Id: I3587b9ab6b6b7f1437f3a7becb8c35277bb5c62c - Reviewed-on: https://code.wireshark.org/review/10161 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + Change-Id: I6cab511f65a8ec89e7fa05cdacc9bb11ca0901ce + Reviewed-on: https://code.wireshark.org/review/10779 + Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> + Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> -commit 216f06b -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Sun Aug 23 20:11:06 2015 +0200 +commit 71ec57a +Author: Peter Wu <peter@lekensteyn.nl> +Date: Sun Oct 4 15:34:58 2015 +0200 - Lua: Support deregister ProtoField with existing abbrev + bacapp: fix -Wshift-negative-value - Change-Id: Icb06792bb2662dcee6e5495359ceef420a5b4498 - Reviewed-on: https://code.wireshark.org/review/10212 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + Shifting a negative signed value is undefined. Found by Clang. + + Change-Id: If58d7b82899859892d8c58d627e98a8a902dd7fd + Reviewed-on: https://code.wireshark.org/review/10780 + Reviewed-by: Peter Wu <peter@lekensteyn.nl> -commit 984f87a +commit 5c17f1f Author: Michael Mann <mmann78@netscape.net> -Date: Thu Aug 20 06:16:22 2015 -0400 +Date: Sat Oct 3 12:16:53 2015 -0400 - Eliminate proto_tree_add_text from some dissectors + Add preference to dissect DHCPv6 option 18 as a CableLab option. - Change-Id: Id710ab10093227b27ef5f18b0d2960e31d0b95a9 - Reviewed-on: https://code.wireshark.org/review/10200 - Reviewed-by: Michael Mann <mmann78@netscape.net> + Bug: 9877 + Change-Id: I84fbfb0ae2dcfc98b005b0f4243d07bd929bb195 + Reviewed-on: https://code.wireshark.org/review/10773 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 296b9cf -Author: Richard Sharpe <rsharpe@samba.org> -Date: Sat Aug 22 09:51:25 2015 -0700 +commit c36a23e +Author: Michael Mann <mmann78@netscape.net> +Date: Fri Oct 2 22:19:44 2015 -0400 - 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. + Add NTP authentication dissection. + It just dissects the fields, it doesn't do any decryption. - Also, respond to some suggestions by Guy Harris. + Also general cleanup while in the neighborhood. - Change-Id: I8459e3986a134a08ee2e31f0158b8aa5c9b91d86 - Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com> - Reviewed-on: https://code.wireshark.org/review/10204 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Bug: 11022 + Change-Id: I9acc787473c04730eab6016dce988dd194287894 + Reviewed-on: https://code.wireshark.org/review/10759 + Petri-Dish: Michael Mann <mmann78@netscape.net> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 5ed7a40 -Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Aug 23 16:13:20 2015 -0700 +commit 98f64de +Author: Thomas Wiens <th.wiens@gmx.de> +Date: Sat Oct 3 20:07:41 2015 +0200 - Don't assume we have interface information. + Added cotp_is to heuristic dissector list for ISO transport. - Not all capture file formats provide interface information. Check - whether we have it, and don't fail if we don't have any. + S7 communication is also possible without TCP/IP. + This ISO transport uses the following protocols: + LLC->ISO8473->ISO8073->s7comm. + The cotp dissector has two subdissector lists. + cotp is uses with ISO-on-TCP, cotp_is with ISO transport. - (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 <guy@alum.mit.edu> + Change-Id: Ife543bee8331184d2181b347e683dfc1c2e4a05a + Reviewed-on: https://code.wireshark.org/review/10771 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit ce38df5 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Aug 23 21:02:24 2015 +0200 +commit 07fc579 +Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> +Date: Sat Oct 3 14:24:04 2015 +0100 - CBOR: get rid of INFINITY and NAN defines - - This triggers an "overflow in constant arithmetic" warning with MSVC2013 + IPv6: don't call expert_info on if(tree) - Change-Id: Ie3b076019c4722857c8e57f8568a0cb124fd13ad - Reviewed-on: https://code.wireshark.org/review/10217 + Change-Id: Ie915a60aba3190bdb7acb4dc364fbe58f3e90007 + Reviewed-on: https://code.wireshark.org/review/10673 + Reviewed-by: João Valverde <j@v6e.pt> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Reviewed-by: Evan Huus <eapache@gmail.com> -commit 4f68c52 +commit a368ba5 Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Aug 23 11:38:13 2015 -0700 +Date: Sat Oct 3 10:50:19 2015 -0700 - See if this makes MSVC happy. + COMPOSE_FRAME_TYPE(fcf) is stored in frame_type_subtype. - 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. + At that point, we've calculated COMPOSE_FRAME_TYPE(fcf) and stored it in + frame_type_subtype; use that variable. - Change-Id: I532b9b5943be32e0897e4f03ac4e625ac41ee63b - Reviewed-on: https://code.wireshark.org/review/10215 + Change-Id: Id15f55e77dd3072fa15f270ec02840b4299bd3a0 + Reviewed-on: https://code.wireshark.org/review/10770 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 6b9a628 -Author: Stig Bjørlykke <stig@bjorlykke.org> -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 <stig@bjorlykke.org> - -commit fd68385 +commit 877f450 Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Aug 23 11:20:39 2015 -0700 +Date: Sat Oct 3 10:30:11 2015 -0700 - Use G_GINT64_MODIFIER, not l, in format strings for 64-bit integers. + Expand some comments. - 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. + Fix some indentation while we're at it. - Change-Id: I6408778f638bb6cea52ffb64be39ea26c9b2ee64 - Reviewed-on: https://code.wireshark.org/review/10213 + Change-Id: Ic25bebadd8c2c3941e6f965b48e22a6a1aac6168 + Reviewed-on: https://code.wireshark.org/review/10769 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit a451c60 +commit 4909b3f Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Aug 23 11:12:43 2015 -0700 +Date: Sat Oct 3 09:48:00 2015 -0700 - Rename variable to avoid collisions with math.h's exp(). + Remove incorrect comment. - Spell out "mantissa" while we're at it. + (-1 means "we don't know whether there's an FCS", not "there's no FCS".) - Change-Id: I47ddb9882f45ef58a6f7101818683e68bc54983b - Reviewed-on: https://code.wireshark.org/review/10211 + Change-Id: I8e422e0351fddb12d6593f08da35288160ede616 + Reviewed-on: https://code.wireshark.org/review/10768 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 0b03543 -Author: Hauke Mehrtens <hauke@hauke-m.de> -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 <hauke@hauke-m.de> - Reviewed-on: https://code.wireshark.org/review/9848 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 3ce60ed -Author: Peter Wu <peter@lekensteyn.nl> -Date: Fri Jul 17 16:31:32 2015 +0200 +commit e1669c4 +Author: Guy Harris <guy@alum.mit.edu> +Date: Sat Oct 3 09:42:05 2015 -0700 - 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 + Fill in some 11ac fields in the pseudo-header. - #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 + But don't look for any VHT stuff unless FLAGS_CHAN_VHT is set. - [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 <peter@lekensteyn.nl> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Peter Wu <peter@lekensteyn.nl> + Change-Id: I3f464344bce3b0b5c5a06808d851ef9d559c05e8 + Reviewed-on: https://code.wireshark.org/review/10767 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 3703b4e -Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Sat Aug 22 19:56:34 2015 +0100 +commit 1bc7357 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Sat Oct 3 12:04:56 2015 +0200 - Fix ip_try_dissect() boolean return - - If dissector_try_heuristic() succeeds return TRUE and vice-versa. + Windows: add missing folders to uninstaller - Change-Id: I3fb2595604f2f3981468473d0a966efe7387745e - Reviewed-on: https://code.wireshark.org/review/10199 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> + Change-Id: I1f3ff0aff3233b4eec708208cb533b8a027a4db7 + Reviewed-on: https://code.wireshark.org/review/10763 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit cc7afd2 -Author: Robert Grange <robionekenobi@bluewin.ch> -Date: Thu Aug 13 15:35:01 2015 +0200 +commit bedda9b +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Sat Oct 3 11:06:46 2015 +0200 - packet-mq: Add new Const/Def for WMQ800 FP3 + IPv6: store address in pinfo->pool instead of putting it on the stack - Add new Const/Def for WMQ800 FP3 - Improve Detection of EBCDIC String in MQCONN_REPLY - Add Value in comments + Otherwise memory is no more available when printing fields + Regression introduced in gf693b4d - Change-Id: I695a3afa64fee7f22918f68540901c97dfd38464 - Reviewed-on: https://code.wireshark.org/review/10012 - Reviewed-by: Robert Grange <robionekenobi@bluewin.ch> - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> + Bug: 11566 + Change-Id: I51bd4d813363663c7f99ab8edf6439d87130e279 + Reviewed-on: https://code.wireshark.org/review/10761 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 89ff46e -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Aug 23 08:06:46 2015 -0700 +commit 653023f +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Sat Oct 3 11:33:55 2015 +0200 - [Automatic update for 2015-08-23] + ixveriwave: initialize vw_msdu_length - Update manuf, services enterprise-numbers, translations, and other items. + Remove an unused field while we are at it - Change-Id: I3726aa80e1e4d23301500fca326ae2b952bf38f6 - Reviewed-on: https://code.wireshark.org/review/10208 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: If9506642b298afa1ffbb7fa4eeb1dc534099328e + Reviewed-on: https://code.wireshark.org/review/10762 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit f95d459 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Aug 22 11:27:00 2015 +0200 +commit 8c9ae89 +Author: Guy Harris <guy@alum.mit.edu> +Date: Fri Oct 2 18:14:32 2015 -0700 - OSPF: Fix indent (use 4 spaces) + If we don't have an NDP flag, make it 0. - Change-Id: I4bd3c4a983b12e8fa053c2362f80dd723b9de572 - Reviewed-on: https://code.wireshark.org/review/10191 - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: If2576eb6023776a348b3e2c85329509a9f9e80d3 + Reviewed-on: https://code.wireshark.org/review/10758 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 2336743 -Author: Joerg Mayer <jmayer@loplof.de> -Date: Sun Aug 23 17:02:47 2015 +0400 +commit bf71621 +Author: Guy Harris <guy@alum.mit.edu> +Date: Fri Oct 2 16:56:19 2015 -0700 - Remove some svn $Author$ lines that escaped previous cleanups. - git does keep of this in a much better way anyway. + Clean up whitespace. - Change-Id: I9923516105e63e72878e0ed34c74eed44453ab01 - Reviewed-on: https://code.wireshark.org/review/10207 - Reviewed-by: Jörg Mayer <jmayer@loplof.de> + Change-Id: I9c9301d7eff85b68a892af7b8c1318d0bf8d29bf + Reviewed-on: https://code.wireshark.org/review/10757 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit ebca184 +commit f28e23f Author: Guy Harris <guy@alum.mit.edu> -Date: Sat Aug 22 15:33:15 2015 -0700 +Date: Fri Oct 2 16:40:13 2015 -0700 - Call the MCS field by its correct name. + Fix some issues with Series III. + + The packet data in some records has an FCS and in some records doesn't. + It appears that only the Series III packets do. Handle that. - Yes, it *should* have been called "HT", but hindsight is always 20-20. + Handle HT and VHT information supplied by Series III. - 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. + Get rid of an unused include while we're at it, and make the checks for + whether the protocol tree is being built a bit clearer, by testing the + tree pointer we'll actually be using. Make some style cleanups. Get + rid of some unused cruft. - Change-Id: If6e97f82595a6f11a45e34d5a52e70e9ca686d7c - Reviewed-on: https://code.wireshark.org/review/10202 + Fix FPGA version checks. + + This is based on Ixia's patches to an older version of Wireshark, but is + much cleaned up. + + Bug: 11464 + + Change-Id: Ia341e6ffb1771cf38be812bf786f59b3250b7d5b + Reviewed-on: https://code.wireshark.org/review/10756 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 15ed335 -Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Tue Aug 18 07:01:35 2015 +0100 +commit 42ae721 +Author: Dario Lombardo <lomato@gmail.com> +Date: Fri Oct 2 17:56:26 2015 +0200 - [CLI, GTK] comparestat: Fix typos, output format, argument parsing + arp: fix typo in switch (CID 1250809) - Optional filter argument wasn't correctly parsed. - - Change-Id: Ic0418fa866e1a00880b4e41bb28267a155a71aa5 - Reviewed-on: https://code.wireshark.org/review/10088 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Change-Id: I4679861383e9548d1cc042d084443a73f73a30de + Reviewed-on: https://code.wireshark.org/review/10743 Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 9c331f7 -Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Tue Aug 18 08:11:34 2015 +0100 +commit e7c0e5b +Author: Gerald Combs <gerald@wireshark.org> +Date: Fri Oct 2 15:47:52 2015 -0700 - [GTK] Fix crash in comparestat.c + Add another speex cast. - 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 <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: Ic46823788fa240ebadd44ec2c6d332980af597be + Reviewed-on: https://code.wireshark.org/review/10755 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 0d61321 -Author: Michael Mann <mmann78@netscape.net> -Date: Fri Aug 14 21:13:51 2015 -0400 +commit 8d3b97c +Author: Gerald Combs <gerald@wireshark.org> +Date: Fri Oct 2 14:11:32 2015 -0700 - Correct logic for finding shadow variables. + Use QVector::size instead of ::length. - Change-Id: Ide03c3b92f70d5dad8d0dceca179ea6f3b9e1fd6 - Reviewed-on: https://code.wireshark.org/review/10037 - Reviewed-by: Michael Mann <mmann78@netscape.net> + Qt < 5.2 doesn't have ::length. + + Change-Id: Ie6a06034c5e2ea8ddc1f9e1131a682ff9442fb75 + Reviewed-on: https://code.wireshark.org/review/10754 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 5a7f574 -Author: Joerg Mayer <jmayer@loplof.de> -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 <jmayer@loplof.de> - -commit b0a8fa5 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Fri Aug 21 12:43:55 2015 +0200 +commit 835cfa5 +Author: Gerald Combs <gerald@wireshark.org> +Date: Fri Oct 2 20:50:11 2015 +0000 - Initialize extcap for pipes + Revert "CMake: Don't feed -fPIC to Visual C++." - Change-Id: Ia731f281ee9af171c759d7f6f7c614c350cbb4e7 - Reviewed-on: https://code.wireshark.org/review/10178 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + This doesn't appear to fix the issue unfortunately. + + This reverts commit fd5eafa50a77bc319a240727600be38307e54f86. + + Change-Id: Ida25881fca0a667c7d47692465b8f1fc9d335697 + Reviewed-on: https://code.wireshark.org/review/10753 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 532070b -Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Sun Aug 16 18:41:53 2015 +0100 +commit 93d8bbd +Author: Gerald Combs <gerald@wireshark.org> +Date: Fri Oct 2 13:23:08 2015 -0700 - Add support for IPv6 stats tree statistics + Add casts to the speex resampler. - Also add support for alphabetizing stat tree items as the addition of IPv6 stats tree makes it more obvious its needed. + Try to fix - Change-Id: I8b319ceac805ce7e3a1fd59f92c1c6fe2a54d3de - Reviewed-on: https://code.wireshark.org/review/10062 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + speex/resample.c:294: warning: implicit conversion shortens 64-bit value into a 32-bit value + speex/resample.c:294: warning: implicit conversion shortens 64-bit value into a 32-bit value + speex/resample.c:324: warning: implicit conversion shortens 64-bit value into a 32-bit value + speex/resample.c:419: warning: implicit conversion shortens 64-bit value into a 32-bit value + speex/resample.c:536: warning: implicit conversion shortens 64-bit value into a 32-bit value + speex/resample.c:632: warning: implicit conversion shortens 64-bit value into a 32-bit value + speex/resample.c:638: warning: implicit conversion shortens 64-bit value into a 32-bit value + speex/resample.c:645: warning: implicit conversion shortens 64-bit value into a 32-bit value + speex/resample.c:697: warning: implicit conversion shortens 64-bit value into a 32-bit value + speex/resample.c:699: warning: implicit conversion shortens 64-bit value into a 32-bit value + speex/resample.c:817: warning: implicit conversion shortens 64-bit value into a 32-bit value + speex/resample.c:818: warning: implicit conversion shortens 64-bit value into a 32-bit value + speex/resample.c:819: warning: implicit conversion shortens 64-bit value into a 32-bit value + + on the 64-bit OS X builder. + + Change-Id: Ifad32f5cd6ffe1186c8f9db593cc1c34e67357ce + Reviewed-on: https://code.wireshark.org/review/10752 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 953cdd4 -Author: Joerg Mayer <jmayer@loplof.de> -Date: Sat Aug 22 08:33:27 2015 +0400 +commit be41ebc +Author: Guy Harris <guy@alum.mit.edu> +Date: Fri Oct 2 12:42:54 2015 -0700 - Print two reserved elements as reserved instead of skipping them + Fix indentation after previous change. - Change-Id: Ic91e07df4881dfff0f0dd1c4809903cbdee8ef60 - Reviewed-on: https://code.wireshark.org/review/10190 - Reviewed-by: Jörg Mayer <jmayer@loplof.de> + Change-Id: I64ead71afe09cb330163d4a15fc1310d07a23bb1 + Reviewed-on: https://code.wireshark.org/review/10751 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit c4fe712 -Author: Joerg Mayer <jmayer@loplof.de> -Date: Sat Aug 22 08:11:45 2015 +0400 +commit e7c3775 +Author: Guy Harris <guy@alum.mit.edu> +Date: Fri Oct 2 12:40:27 2015 -0700 - 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. + Rename vwr_read_s2_W_rec - it handles both series II and III records. - Change-Id: I516c2a2f0c27fcf101671527d4e4f018e17d3025 - Reviewed-on: https://code.wireshark.org/review/10189 - Reviewed-by: Jörg Mayer <jmayer@loplof.de> + Change-Id: Ia6c61500345a9f80945c900813e502046ac870c1 + Reviewed-on: https://code.wireshark.org/review/10750 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit ee80be6 +commit 4d10e81 Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Aug 21 17:12:39 2015 -0700 +Date: Fri Oct 2 12:37:20 2015 -0700 - Add the display filter macros dialog. + Distcheck fixes. - Add some missing functionality to UatDialog. + Add more speex files to the distribution. - Remove what appears to be unused dfilter macro code. + Comment out a for-now-unused variable. - Change-Id: I8a8d6358523f24d5ddfe953d7741fe9af25d98eb - Reviewed-on: https://code.wireshark.org/review/10187 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Change-Id: Iea3a0fad81e2cb599209e1c30ecbdbdb153d1328 + Reviewed-on: https://code.wireshark.org/review/10749 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 97014f6 -Author: Joerg Mayer <jmayer@loplof.de> -Date: Sat Aug 22 05:43:46 2015 +0400 +commit 605e319 +Author: Guy Harris <guy@alum.mit.edu> +Date: Fri Oct 2 12:31:44 2015 -0700 - OSPF database packets and OSPF hellos in DC mode are unicast. At - least Cisco sends out these packets with a TTL of 1. + More formatting cleanups (no space between "no" and comma). - Change-Id: I9ef0cd486d200a768329cfb758b87e20e3456663 - Reviewed-on: https://code.wireshark.org/review/10188 - Reviewed-by: Jörg Mayer <jmayer@loplof.de> + Change-Id: I873756df4f78977bcee416c089537cd238d6104a + Reviewed-on: https://code.wireshark.org/review/10748 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 74177d9 -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Aug 21 15:02:20 2015 -0700 +commit c11fea5 +Author: Guy Harris <guy@alum.mit.edu> +Date: Fri Oct 2 12:23:59 2015 -0700 + + Get rid of unused variable. + + Change-Id: Ife7f0c972ed67ef4f89c71faf6bc9cdccf007284 + Reviewed-on: https://code.wireshark.org/review/10747 + Reviewed-by: Guy Harris <guy@alum.mit.edu> - Statistics dialog fixups. +commit 1f355ab +Author: Guy Harris <guy@alum.mit.edu> +Date: Fri Oct 2 12:22:26 2015 -0700 + + Clean up formatting. - Fix the "retap on show" behavior in TapParameterDialog. It was filling - in the tree when it shouldn't have. + Fix "a ,b" to "a, b" in both code and displayed output. - Set the capture stop flag when WiresharkDialog closes. + Indent continuation lines of multi-line statements. - Change-Id: I5e85f11cab32e8b958deabb58186a855b5fcaa84 - Reviewed-on: https://code.wireshark.org/review/10186 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: Ic2d96a498fbb716fa2be23bcd94bed14b9df7823 + Reviewed-on: https://code.wireshark.org/review/10746 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit a66a95c +commit 9498c8d Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Aug 21 08:46:43 2015 -0700 +Date: Thu Oct 1 15:51:34 2015 -0700 - Add packet comments to the properties dialog. + Qt: Show the QtMultimedia status. - This pulls in missing functionality from the comment summary dialog. + Show the QtMultimedia status in the compiled version info instead of + PortAudio. - Change-Id: Ib417896a6e8f2b2f903520b26193c249677bbb83 - Reviewed-on: https://code.wireshark.org/review/10185 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Change-Id: Id4a657b1a65e4d0127a3a36643d1c446ed79b8e5 + Reviewed-on: https://code.wireshark.org/review/10742 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 95c8b01 -Author: Bill Parker <wp02855@gmail.com> -Date: Fri Aug 21 15:24:41 2015 +0200 +commit 3687d39 +Author: Gerald Combs <gerald@wireshark.org> +Date: Fri Dec 12 16:51:40 2014 -0800 - [echld common] Call to fcntl() missing a test for a return value < 0, - indicating failure. + Qt: Initial RTP playback. - Bug: 11056 + Note the "initial". This is woefully incomplete. See the "to do" lists + below and in the code. - Change-Id: I87aef31d874224f38226df1725cc29d13ad16b54 - Reviewed-on: https://code.wireshark.org/review/10182 - Petri-Dish: Anders Broman <a.broman58@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit d32c3da -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Fri Aug 21 11:59:34 2015 -0400 - - Lua: check sscanf return value + This differs a bit from the GTK+ version in that you specify one or more + streams to be decoded. - Wslua's Int64.fromhex() and UInt64.fromhex() need to check the sscanf return - value. Found by coverity (CID 1191368 &1191369). + Instead of showing waveforms in individual widgets, add them all to a + single QCustomPlot. This conserves screen real estate and lets us more + easily take advantage of the QCP API. It also looks better IMHO. - Change-Id: I67fba027e18341d429787515f94c794573dc41c2 - Reviewed-on: https://code.wireshark.org/review/10183 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit dd2a2d4 -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Aug 21 09:45:48 2015 -0700 - - Multicast and wireless lan statistics fixups. + Change a bunch of checks for QtMultimediaWidgets to QtMultimedia. We + probably won't use the widgets until we make 5.0 our minimum Qt + version and plain old QtMultimedia lets us support Qt 4 more easily + (in theory at least). + + Add resampling code from libspeex. I initially used this to resample + each packet to match the preferred rate of our output device, but this + resulted in poorer audio quality than expected. Leave it in and use to + create visual samples for QCP and to match rates any time the rate + changes. The latter is currently untested. + + Add some debugging macros. - Make sure "-z multicast,stat[,filter]" and "-z wlan,stat[,filter]" work. + Note that both the RTP player and RTP analysis dialogs decode audio data + using different code. - Add some missing "-z" items to the man page. + Note that voip_calls_packet and voip_calls_init_tap appear to be dead + code. - Try to fix some MSVC++ warnings. + To do: + + - Add silence frames where needed. + - Implement the jitter buffer. + - Implement the playback timing controls. + - Tapping / scanning streams might be too slow. - Change-Id: Ie18e5355d595e351f000f14d82781dcdf33141c3 - Reviewed-on: https://code.wireshark.org/review/10184 + Change-Id: I20dd3b66d3df53c9b1f3501262dc01458849f6b4 + Bug: 9007 + Reviewed-on: https://code.wireshark.org/review/10458 Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 69ec4a5 -Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Fri Aug 21 08:45:49 2015 +0100 +commit fd5eafa +Author: Gerald Combs <gerald@wireshark.org> +Date: Thu Oct 1 15:39:38 2015 -0700 - Add "ip.version" field to bogus IP for filter matching + CMake: Don't feed -fPIC to Visual C++. - Change-Id: Ibb05b8742e41c1b16c1335ad97af99324ab95223 - Reviewed-on: https://code.wireshark.org/review/10175 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: If6dd0619052b7735d7c5eb84aadc191545df7bee + Reviewed-on: https://code.wireshark.org/review/10735 + Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit f8712ae -Author: Bill Parker <wp02855@gmail.com> -Date: Fri Aug 21 15:13:16 2015 +0200 +commit 284f2cc +Author: Martin Kaiser <wireshark@kaiser.cx> +Date: Wed Sep 30 23:03:21 2015 +0200 - [Kerberos] Call to 'fseek()' without a check for a return value < 0, - indicating failure. + [isns] replace THROW() with an expert info - Bug: 11056 + this removes 37 THROW() calls + do some minor reformatting while at it - Change-Id: Iaa6b7ca07626b78c77e3c1507726ec579764a582 - Reviewed-on: https://code.wireshark.org/review/10181 - Petri-Dish: Anders Broman <a.broman58@gmail.com> + Change-Id: Ib1611d9a9e7cca9c59451b4040bbaa26cd300aa0 + Reviewed-on: https://code.wireshark.org/review/10733 + Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> + Reviewed-by: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 856bab6 -Author: Luke Mewburn <luke@mewburn.net> -Date: Wed Aug 19 10:42:59 2015 +1000 +commit 1c671c5 +Author: Michael Mann <mmann78@netscape.net> +Date: Thu Oct 1 20:55:19 2015 -0400 - LWM: fix compilation without libgcrypt - - Add HAVE_LIBGCRYPT compilation guards. - Move gcrypt-related variables into the scope they're used. + Conversation filter address types for IEEE 802.11 should include WLAN Address types - Change-Id: I81a2c8a54514fb51de53640fa8eceeddb2bf24d9 - Reviewed-on: https://code.wireshark.org/review/10118 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Bug: 11562 + Change-Id: I49338e12c80963403c1253ec9251a3a3767f2526 + Reviewed-on: https://code.wireshark.org/review/10738 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit b5ca69b -Author: Dave Rigby <daver@couchbase.com> -Date: Thu Aug 20 16:05:57 2015 +0100 +commit b6d03e5 +Author: Richard Sharpe <rsharpe@samba.org> +Date: Sun Jul 26 20:13:57 2015 -0700 - Couchbase: dissect sub-document commands - - Add support for dissecting Couchbase sub-document commands (those - which operate on a subset of a whole document). + Add support for the FSCTL_QUERY_FILE_REGION FSCTL. - Example pcap file: - https://wiki.wireshark.org/SampleCaptures?action=AttachFile&do=get&target=couchbase_subdoc_multi.pcap + Found when looking at support for HyperV under Samba. - Change-Id: I5394a6f86c036ebd339574bac4e52f7d0821e4bf - Reviewed-on: https://code.wireshark.org/review/10151 + Change-Id: I78d7d0c68c7821c952316beb6fc34cd047d146aa + Reviewed-on: https://code.wireshark.org/review/9803 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit d097968 -Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Fri Aug 21 03:10:10 2015 +0100 +commit 8976b78 +Author: Gerald Combs <gerald@zing.org> +Date: Thu Oct 1 17:42:43 2015 -0700 - Make IPv6 extension header protocol names uniform and consistent with RFC 2460 - - Example from RFC 2460 (page 7): + CMake: Fix the dmg_package target. - 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) + We don't have Wireshark.pkgproj so don't try to copy it. - Change-Id: I03c1ebedf581f71047b303856052609574110c61 - Reviewed-on: https://code.wireshark.org/review/10173 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: I649fce27e53cbd45ffc50e4095252a665c49165d + Reviewed-on: https://code.wireshark.org/review/10739 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 30ce20d -Author: AndersBroman <anders.broman@ericsson.com> -Date: Fri Aug 21 13:54:53 2015 +0200 +commit b02b037 +Author: Gerald Combs <gerald@zing.org> +Date: Thu Oct 1 17:34:57 2015 -0700 - [Expert] Enhance error output to identify the duplicated field. + Try to fix the NMake + QMake build. - Change-Id: Ie38f51e2fa0f846dbcfd7a19f29eac1bd07cffbc - Reviewed-on: https://code.wireshark.org/review/10179 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Add supported_protocols_dialog.cpp to Wireshark.pro. + + Change-Id: I7ff95960ca2ddccaa3f8d997173142cc77950efa + Reviewed-on: https://code.wireshark.org/review/10736 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit f73e1c2 -Author: Peter Lemenkov <lemenkov@gmail.com> -Date: Thu Aug 13 18:13:45 2015 +0300 +commit cc9de69 +Author: Gerald Combs <gerald@wireshark.org> +Date: Thu Oct 1 10:36:22 2015 -0700 - 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: + Set the minimum Qt version to 4.7. - ... - listen { - type = auth - ipaddr = * - port = 13812 - } - listen { - type = acct - ipaddr = * - port = 13813 - } - ... + We've been using QElapsedTimer for a while now with no complaints. It + was introduced in Qt 4.7, which was first released in September 2010. - 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. + Change-Id: I21ca768c6a7bab8a08626957583d81fd771c64b4 + Reviewed-on: https://code.wireshark.org/review/10732 + Petri-Dish: Gerald Combs <gerald@wireshark.org> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Gerald Combs <gerald@wireshark.org> + +commit 77a9181 +Author: Gerald Combs <gerald@wireshark.org> +Date: Thu Oct 1 10:18:56 2015 -0700 + + Add the supported protocols internals dialog. - It was requested at least once to lift this limitation: + Includes a bonus search field. - * https://ask.wireshark.org/questions/2189/decode-multiple-ports-as-radius + Change-Id: I0b101b725d531a59c8a2fdbfbf4690b507135546 + Reviewed-on: https://code.wireshark.org/review/10731 + Petri-Dish: Gerald Combs <gerald@wireshark.org> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Gerald Combs <gerald@wireshark.org> + +commit cf3d279 +Author: Gerald Combs <gerald@wireshark.org> +Date: Thu Oct 1 14:00:51 2015 -0700 + + CMake: OS X packaging updates. - So let's fix it! + Add a dmg_package_prep target as an alias to app_bundle. Rename the + osx-dmg target to dmg_package. This matches the Windows packaging + target names. - 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): + In osx-app.sh, make sure we rpathify the bundle plugin directory. - radius.ports: 1645,1646,1700,1812,1813,3799 + Change-Id: If41195c9d405ad6bff865625500a8227b77e8092 + Reviewed-on: https://code.wireshark.org/review/10734 + Reviewed-by: Gerald Combs <gerald@wireshark.org> + +commit 57d954e +Author: Jeffrey Smith <whydoubt@gmail.com> +Date: Sun Sep 6 20:56:30 2015 -0500 + + Treat IPv4 subnet masks as distinct from addresses - 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). + While IPv4 subnet masks are obviously related and similar to IPv4 + addresses, they are distinct enough that they need to be treated + seperately in some aspects. For instance, there is no value in + attempting to resolve a subnet mask. - *Ver. 2*: - Old alternate_port value is copied to the ports range, thus making - transition even more smooth. + This change creates a new display type: BASE_NETMASK, which allows distinction from FT_IPv4 + (and possible name resolution) where appropriate. - Change-Id: Ibdd6f4f9fa1e0ac186147cec380bbfc62d509b17 - Signed-off-by: Peter Lemenkov <lemenkov@gmail.com> - Reviewed-on: https://code.wireshark.org/review/10015 - Petri-Dish: Anders Broman <a.broman58@gmail.com> - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: I99e19c9a58eb613f8e58d481af84c30e2e5e14d7 + Reviewed-on: https://code.wireshark.org/review/10438 + Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 7d59925 -Author: Timo Warns <timow+github@DiningPhilosopher.DE> -Date: Fri Jul 31 22:30:16 2015 +0200 +commit b02a0ee +Author: Peter Wu <peter@lekensteyn.nl> +Date: Thu Oct 1 16:56:01 2015 +0200 - SSL: refine KEX handling and fix _anon KEX dissecting + Fix crashes related to RTP Streams analysis - 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. + The data that describes RTP streams become invalid when packets are + re-dissected. This results in a crash in GTK when the "RTP Analyse" + option is used and and a crash in Qt when the display filter is changed + while the RTP Streams dialog is open. - Change-Id: I0bcd5e2bf899ba9cac79476d5b7a1ffb3accf0db - Reviewed-on: https://code.wireshark.org/review/9836 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Fix this by adding a tap_reset callback (modelled after mcaststream) to + the RTP tap listener that allows the GTK+ and Qt dialogs to clear the + displayed list of RTP streams. + + Bug: 10016 + Change-Id: I7478678db63d7ac8110c44c163844e9f66fad9e9 + Reviewed-on: https://code.wireshark.org/review/10728 + Reviewed-by: Peter Wu <peter@lekensteyn.nl> + Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 8d5ac86 -Author: AndersBroman <anders.broman@ericsson.com> -Date: Fri Aug 21 10:43:27 2015 +0200 +commit ba5df1e +Author: Peter Wu <peter@lekensteyn.nl> +Date: Thu Oct 1 16:29:59 2015 +0200 - Try to fix: wlan_statistics_dialog.cpp:466:1: error: unused parameter filter [-Werror=unused-parameter] + Revert "gtk: Fix crash on Analyze RTP stream" - Change-Id: Ib9b2fe245b126f9413dbdcced94c61eacf4d1c5d - Reviewed-on: https://code.wireshark.org/review/10177 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit eeafab5 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Thu Aug 20 15:06:41 2015 +0200 - - file-pcapng: always set pinfo->fd->num before calling next layer dissectors/file-pcapng + Qt is affected by a similar issue, a different approach is needed. - Also fix an off by 1 error for EPB case + This reverts commit 01bd832b9df9570ddfd81ab4985f71ff6abd9b12. - Change-Id: I895d82a58ec02c577dcaa67a97d456b42460b947 - Reviewed-on: https://code.wireshark.org/review/10149 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: Ic03807e8d00a3114bac1507762df05870b0346d9 + Reviewed-on: https://code.wireshark.org/review/10727 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 5e3388f -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Aug 20 19:39:26 2015 +0200 +commit a6f0923 +Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> +Date: Thu Oct 1 16:31:04 2015 +0100 - GSM_map: Fix indent (use 2 spaces) and add modelines + IPv6: Remove two offsetof()s - Change-Id: I1549eb55e1fa87c46e2493c37f3ed352970b794b - Reviewed-on: https://code.wireshark.org/review/10168 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I41c93927595be523528d44c263b7028f40e524e2 + Reviewed-on: https://code.wireshark.org/review/10706 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 8055786 -Author: Paul Emge <paul.emge@digidescorp.com> -Date: Thu Aug 6 11:00:22 2015 -0500 +commit a013823 +Author: Gerald Combs <gerald@wireshark.org> +Date: Wed Sep 30 16:54:40 2015 -0700 - Fix bug with MVRP dissection where only one message was dissected. + Add the conversation hash tables internals dialog. - Fix whitespace and replace tvb_captured_length with tvb_reported_length + The GTK+ version dumps "new" and "old" hash values. It looks like + neither are valid since the code in conversation.c and + conversation_hashtables_dlg.c have diverged. - Change-Id: I3952e7a1ac00b68e6f6eb1283977bc6299b0baaf - Reviewed-on: https://code.wireshark.org/review/9900 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> + For now just dump the addresses and ports for each hash table in the Qt + UI. + + Change-Id: I832522dff06da769bd4ad3ead3d541206f283a90 + Reviewed-on: https://code.wireshark.org/review/10713 + Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit a5fe54d -Author: Pascal Artho <pascalartho@gmail.com> -Date: Tue Aug 18 08:44:37 2015 +0200 +commit 6193e3c +Author: AndersBroman <anders.broman@ericsson.com> +Date: Thu Oct 1 18:42:54 2015 +0200 - Preparation Host Flows: Syntax Line Edit (allow longer filter text) + Add dissection of 3GPP AVP 655 refactor to use proto_tree_add_bitmask_with_flags() in some cases. - The "Syntax Line Edit" is based on "QLineEdit". By default, the maximum - permitted length of a QLineEdit text is 32767 (16 bits). + Part 2 - 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 <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Change-Id: I18a17202f1c547b2257549ea0245350227edafa0 + Reviewed-on: https://code.wireshark.org/review/10730 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 0310e5a -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Aug 20 23:03:01 2015 +0200 +commit 7199fc7 +Author: Gerald Combs <gerald@wireshark.org> +Date: Thu Oct 23 10:57:45 2014 -0700 - gsm map summary (GTK): fix no previous prototype for ‘gsm_map_stat_gtk_sum_cb’ [-Wmissing-prototypes] + OS X: Integrate CMake and osx-dmg.sh - Change-Id: Ic97434112bc71202354004626ba51e1a22c39abf - Reviewed-on: https://code.wireshark.org/review/10165 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: Ide608f5e73ecd40c67a6b1c0e16f11233cd49c9d + Reviewed-on: https://code.wireshark.org/review/10694 + Petri-Dish: Gerald Combs <gerald@wireshark.org> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit aec8e93 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Aug 20 22:08:18 2015 +0200 +commit ba50bf9 +Author: AndersBroman <anders.broman@ericsson.com> +Date: Thu Oct 1 18:02:41 2015 +0200 - SPDY: fix no previous prototype for 'dissect_spdy_heur' [-Wmissing-prototypes] + [Diameter] Add dissection of 3GPP AVP 655 refactor to use + proto_tree_add_bitmask_with_flags() in some cases. - Change-Id: Ife5f44a333227b1df3d2377d12dbec65a4b4d5c3 - Reviewed-on: https://code.wireshark.org/review/10164 - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: I280c8f33aeacb84561243b38497276099621bfe9 + Reviewed-on: https://code.wireshark.org/review/10729 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 8f0fc4b -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Aug 20 19:34:47 2015 +0200 +commit c53d2f0 +Author: Michael Tüxen <tuexen@wireshark.org> +Date: Thu Oct 1 14:17:26 2015 +0000 - GSM/ANSI/CAMEL...: fix no previous prototype for '*_stat_init' [-Wmissing-prototypes] + Revert "SCTP: Add I_DATA support" - Change-Id: I0aedefbb77899ebceac7fb08249faf47964d785b - Reviewed-on: https://code.wireshark.org/review/10163 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + This reverts commit 4e9361dc88eefef27d031e29e2f8ca9891cc03eb. + + Change-Id: Ia7aee9ffbe5bc5d3ae88e957c234cbee7b65f457 + Reviewed-on: https://code.wireshark.org/review/10723 + Reviewed-by: Michael Tüxen <tuexen@wireshark.org> -commit fab0e59 -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Thu Aug 20 14:38:35 2015 -0400 +commit d923358 +Author: Michael Tüxen <tuexen@wireshark.org> +Date: Thu Oct 1 14:11:47 2015 +0000 - Fix memory leaks of dumper SHB and IDB infos + Revert "Fix typos." - Change-Id: I6b81d3e853d503c6a81f9793957b48ab34c6808c - Reviewed-on: https://code.wireshark.org/review/10156 - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + This reverts commit e47ea6d7493c60e1761da4f5fbb6bee68fdb5847. + + Change-Id: Ia5b7f5cdb1f17705010ac60bd2105156014f6d00 + Reviewed-on: https://code.wireshark.org/review/10721 + Reviewed-by: Michael Tüxen <tuexen@wireshark.org> -commit b4762a0 -Author: Jeff Morriss <jeff.morriss.ws@gmail.com> -Date: Wed Aug 12 13:57:20 2015 -0400 +commit 63e8f16 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Thu Oct 1 13:21:54 2015 +0200 - 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). + ZigBee: fix dissection of Link Status Address field - Change-Id: Ie4f1f6856cfad0dabc7c58cdee2c16c8fc032c6d - Reviewed-on: https://code.wireshark.org/review/10001 - Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> + Bug: 11564 + Change-Id: I4320c794a0b6ba1693e2729eea424a0a43cf54d8 + Reviewed-on: https://code.wireshark.org/review/10715 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit dc4e960 -Author: Jeff Morriss <jeff.morriss.ws@gmail.com> -Date: Thu Aug 20 11:00:17 2015 -0400 +commit e47ea6d +Author: Michael Tüxen <tuexen@wireshark.org> +Date: Thu Oct 1 14:23:00 2015 +0200 - Add some Gx AVPs from 3GPP 29.212. + Fix typos. - Change-Id: Iaf2cc67d4d235193b25045895441742bc6531370 - Reviewed-on: https://code.wireshark.org/review/10150 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I3c03cbb064d1d7ffd579982b2e670b84b1768db2 + Reviewed-on: https://code.wireshark.org/review/10717 + Reviewed-by: Michael Tüxen <tuexen@wireshark.org> -commit 71e08dd -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Tue Aug 18 13:34:30 2015 +0200 +commit 4e9361d +Author: ruengeler <ruengeler@wireshark.org> +Date: Thu Oct 1 13:36:24 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] + SCTP: Add I_DATA support - Change-Id: If0476b430592df225234c5c685c8009ab08b5ab6 - Reviewed-on: https://code.wireshark.org/review/10162 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: Ib8566b7d94fdafdb9735b356d129f378c94af3cf + Reviewed-on: https://code.wireshark.org/review/10716 + Reviewed-by: Michael Tüxen <tuexen@wireshark.org> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> -commit a70f591 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Aug 20 23:16:04 2015 +0200 +commit 778fede +Author: AndersBroman <anders.broman@ericsson.com> +Date: Thu Oct 1 12:40:14 2015 +0200 - proto_dlg: fix no previous prototype for ‘heur_*_all_cb’ [-Wmissing-prototypes] + [Diameter] Add 3GPP AVP 652-655 - Change-Id: I330ec2cee965f8cc3128c4a7bf794e52581ac290 - Reviewed-on: https://code.wireshark.org/review/10166 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: I4db21e3e095f7cb466759a96706ec17c8429386e + Reviewed-on: https://code.wireshark.org/review/10714 + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit d9395b7 -Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Fri Aug 21 03:54:36 2015 +0100 +commit 9cf43d8 +Author: Guy Harris <guy@alum.mit.edu> +Date: Wed Sep 30 15:22:58 2015 -0700 - Rename 'ip_next_header_dissector_table' to 'ipv6_next_header_dissector_table' in IPv6 dissector + It's "-Wno-XXX", not "-WnoXXX". - 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 <hadrielk@yahoo.com> + Change-Id: I90ac4872e2a792dac07a6c12c8f059795f7f6bc3 + Reviewed-on: https://code.wireshark.org/review/10712 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 56d131c +commit df72810 Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Aug 20 17:06:04 2015 -0700 +Date: Wed Sep 30 15:20:06 2015 -0700 - There is no wlan_statistics_dialog.ui. + Another big hammer to shut Apple's deprecation squealing up. - Change-Id: Ibedb3904cbab88ebae3bc9ec1588263af933dfc1 - Reviewed-on: https://code.wireshark.org/review/10172 + Change-Id: Ifeb37566468fca0afceab1d74baa23fd05a46057 + Reviewed-on: https://code.wireshark.org/review/10711 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 2ed3d91 +commit 7ba52b8 Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Aug 18 11:46:12 2015 -0700 +Date: Wed Sep 30 09:53:46 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. + Add more CORBA dissectors back to the dirty list. - 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 + Change-Id: Ic55a2d444b924a6b13bdfd479a38d90589be8a1f + Reviewed-on: https://code.wireshark.org/review/10709 + Petri-Dish: Gerald Combs <gerald@wireshark.org> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 0f9bbbc -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Aug 20 22:56:56 2015 +0200 +commit 0be98aa +Author: Martin Kaiser <wireshark@kaiser.cx> +Date: Thu Sep 24 18:13:36 2015 +0200 - BOOTP: fix indent (use tab) + [isns] refactor the attribute parsing code - Change-Id: I32ea4d1b9cd8aa351cbdb2bab0642e4ed0c191fb - Reviewed-on: https://code.wireshark.org/review/10169 - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - -commit b07ae6c -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Aug 20 22:02:50 2015 +0200 - - ANSI: Add modelines + * go through the data only once, increment offset along the way + * remove tag, length dissection from the payload functions + * handle all undecoded elements in the default case + * don't bring up an exception for an invalid ip address length, + proto_tree_add_item() already does this for us + * replace the payload functions for string, integer, ip address + with proto_tree_add_item() - Change-Id: I641a9525ec5a6315cc4a2d97506a885605b3504b - Reviewed-on: https://code.wireshark.org/review/10170 - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> + Change-Id: I2a96cb0b22961f63256d7bf0dfe138c6d8100fde + Reviewed-on: https://code.wireshark.org/review/10682 + Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> -commit 4dd49c5 +commit 4573a39 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Aug 20 21:38:19 2015 +0200 +Date: Wed Sep 30 12:34:14 2015 +0200 - Camel: Fix indent (use 2 spaces) and add modelines + DNS: Replace cinfo by pinfo->cinfo (no longer need to check if cinfo is not NULL) - Change-Id: I6fe835e78e58faabd5cfeeb84e39793b48d3df25 - Reviewed-on: https://code.wireshark.org/review/10167 - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> + Change-Id: Ib7cebd588924270b2003fad575f4cd0c3ec2678e + Reviewed-on: https://code.wireshark.org/review/10698 + Petri-Dish: Michael Mann <mmann78@netscape.net> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 648fe94 +commit 826e2b6 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Aug 20 07:48:58 2015 +0200 +Date: Wed Sep 30 11:14:43 2015 +0200 - Translations: fix typo - - coversation => conversation - - Found by s3erios (Ukrainian translator) + DNS: Fix Col Info display (Missing space between rcodes) - Change-Id: Iaecb4e139d049c212956fa8567ee480d2f2aa0d2 - Reviewed-on: https://code.wireshark.org/review/10152 - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> + Change-Id: I79ecb77ac5ab7e18f9986f2987fafeab8a117644 + Reviewed-on: https://code.wireshark.org/review/10697 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit c4b93e9 -Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Aug 20 11:54:04 2015 -0700 +commit e3ace4f +Author: Martin Mathieson <martin.r.mathieson@googlemail.com> +Date: Wed Sep 30 04:49:01 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. + Use a 'recent' setting to persist the checkbox controlling the source of PDUs to use in LTE RLC statistics - Change-Id: I96c5085af58adfb97ce16195eb27cc8ddb612d6a - Reviewed-on: https://code.wireshark.org/review/10158 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> + Change-Id: I20234c3a3bf7761f70b0db5a6acbbf54ffbfcef5 + Reviewed-on: https://code.wireshark.org/review/10699 + Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> + Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> -commit e67098c -Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Aug 20 11:39:02 2015 -0700 +commit 1d0532f +Author: Peter Wu <peter@lekensteyn.nl> +Date: Wed Sep 30 14:35:13 2015 +0200 - Squelch recent display filter warnings. + qt: warn when jumping to an invalid packet number - Try to keep the main display filter editor from emitting warnings when - we populate the recent item list. + I was confused when double-clicking a packet number did not work. It + turns out that the display filter was hiding the destination. - Change-Id: Ib0c150093e03d4d2ca2ac6cd72c0e37d041fe98b - Ping-Bug: 11438 - Reviewed-on: https://code.wireshark.org/review/10157 - Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Check the packet number for sanity, just like GTK+ does. + + Change-Id: If50b2a3091a468f880b42fd2385f1b74c30d2f2b + Reviewed-on: https://code.wireshark.org/review/10700 + Reviewed-by: Peter Wu <peter@lekensteyn.nl> -commit 36a74cb -Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Aug 20 08:56:04 2015 -0700 +commit f52d1d5 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Mon Sep 28 00:08:39 2015 +0200 - Tap parameter and stats dialog fixups. + wslua: do not pop from empty stack on newer LUA versions - 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. + Fixes this failure: - Add checks and cleanups to some of the stats table free routines. + tshark: lapi.c:175: lua_settop: Assertion `(-(idx+1) <= (L->top - (func + 1))) && "invalid new top"' failed. - 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. + Found using LUA 5.2 compiled with -DLUA_USE_APICHECK. Note that the + value returned by luaopen_bit does not affect the size of the stack + after using lua_call; if there are excess return values, then these will + be dropped after calling lua_call. See http://www.lua.org/pil/26.2.html - Change-Id: Id49f2f2a99bc8e5b1d32990024986b3c8b1abe24 - Reviewed-on: https://code.wireshark.org/review/10153 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + I also verified that the stack is still empty after calling all + wslua_reg_module functions. + + Change-Id: Ia72635277ca4d8077e47a5c472391a78fe6d311e + Reviewed-on: https://code.wireshark.org/review/10664 + Petri-Dish: Peter Wu <peter@lekensteyn.nl> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Peter Wu <peter@lekensteyn.nl> -commit 37a737f -Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Aug 20 10:05:39 2015 -0700 +commit 01bd832 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Tue Sep 29 22:30:06 2015 +0200 - Make sure we can apply deprecated display filters. + gtk: Fix crash on Analyze RTP stream - Deprecated filters are still valid. Update display filter checks to make - sure we can apply them. + When updating the RTP streams list, the data associated with the current + selection becomes invalid when the old list is cleared. + gtk_list_store_clear somehow triggers the selection callback which + attempts to access the invalid memory. - Bug: 11438 - Change-Id: Ib5e009c070b40912434e0ffd771203ed1e1ba093 - Reviewed-on: https://code.wireshark.org/review/10154 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com> - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - -commit 829c648 -Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Mon Aug 17 01:38:00 2015 +0100 - - Check for IP version errors in dissect_ip() + Avoid this by disabling selectability while clearing the list. - Change-Id: I7db4ed54be820e5667e1e93880013cc7abf95256 - Reviewed-on: https://code.wireshark.org/review/10064 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Bug: 10016 + Change-Id: Id5126ec5ffa41fa6a65339f4453546223124ed67 + Reviewed-on: https://code.wireshark.org/review/10690 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Peter Wu <peter@lekensteyn.nl> -commit ba69473 -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Thu Aug 20 08:48:46 2015 -0400 +commit 6ac0d84 +Author: Cody Doucette <doucette@bu.edu> +Date: Sat Aug 29 23:57:11 2015 -0400 - Link setargv.obj for Windows in CMake so mergecap works + nwp: add support for NWP packets - Try it again. + Neighborhood Watch Protocol (NWP) is an XIA protocol for resolving network + addresses to link-layer addresses. Hosts on a LAN send NWP Announcement + packets with their host identifiers (HIDs), and neighbors in the LAN respond + with NWP Neighbor List packets containing their HIDs and associated link-layer + addresses. - Change-Id: I511dd3d7d70fa33e246085c8cb79925e92945ebc - Reviewed-on: https://code.wireshark.org/review/10148 - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> + Bug: 11492 + Change-Id: Ib1e801474b1aa72f5dd3d8303eeec36b96ee0a99 + Reviewed-on: https://code.wireshark.org/review/10316 + Reviewed-by: Michael Mann <mmann78@netscape.net> + Petri-Dish: Michael Mann <mmann78@netscape.net> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 7249791 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Thu Aug 20 13:00:24 2015 +0200 +commit 50ac769 +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Mon Sep 28 12:50:13 2015 -0400 - pcapng: Fixed copying if_filter_bpf_bytes + automake: get docbook builds working for out of (source) tree builds. - Bug: 11455 - Change-Id: Ic99ff1bcd7dad65b3ade5a9f46ce0f64573cb059 - Reviewed-on: https://code.wireshark.org/review/10147 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Reviewed-by: Evan Huus <eapache@gmail.com> + Change-Id: I483596d21f072b97ae87d5032bd450adcafcf243 + Reviewed-on: https://code.wireshark.org/review/10678 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Dario Lombardo <lomato@gmail.com> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 8a71867 +commit 1bc7a19 Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Wed Aug 19 21:47:50 2015 +0100 +Date: Fri Sep 25 13:53:18 2015 +0100 - UDP jumbogram expert info fix + IPv6: Remove extra spacing from info arrays. - Change-Id: Ifa6170622bc8331097bc3fe9c567c97ce826c340 - Reviewed-on: https://code.wireshark.org/review/10140 - Petri-Dish: Michael Mann <mmann78@netscape.net> + Internal formatting: remove extra spacing from 'hf_register_info' array + (as suggested during review), plus indentation changes. Do the same + for expert info array. + + External formatting: Minor cleanups. + + Change-Id: I4d8db4891824e75d413b0eb53ebcc2e7b128c0bb + Reviewed-on: https://code.wireshark.org/review/10683 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> + Reviewed-by: Anders Broman <a.broman58@gmail.com> + +commit 1fb5f8f +Author: Bill Meier <wmeier@newsguy.com> +Date: Tue Sep 29 20:54:46 2015 -0400 + + [ieee80211] Fix: "DSCP Range description user priority" off by 1 + + Bug: 11555 + Change-Id: Ic12c7882dbe4f6eca72f7eed3ee8d0e5618afdd8 + Reviewed-on: https://code.wireshark.org/review/10695 + Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit bc8b94d +commit 737e2d7 Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Wed Aug 19 21:57:25 2015 +0200 +Date: Tue Sep 29 23:27:01 2015 +0200 - file-pcapng: differentiate captured length and reported length when calling next dissector and catch bound errors + file.c: do not rescan packets is no capture file is opened - Otherwise dissection will fail when analyzing a capture with a snap length set + Otherwise we will end up calling cf_cb_file_rescan_started and cf_cb_file_rescan_finished callbacks while no capture file is available - Change-Id: If6714364efffdd1fbf88c947743929a71f75c663 - Reviewed-on: https://code.wireshark.org/review/10135 + Bug: 11552 + Change-Id: Ib6fd7b13ce1b083d5f5b4e05d80152112c1451f6 + Reviewed-on: https://code.wireshark.org/review/10692 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit ff78d0a -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Wed Aug 19 21:54:47 2015 +0200 +commit c2f0cd5 +Author: Gerald Combs <gerald@wireshark.org> +Date: Tue Sep 29 13:41:44 2015 -0700 - file-pcap: differentiate captured length and reported length when calling next dissector and catch bound errors + Add back DIRTY_CORBA_IDL_DISSECTOR_SRC. - Otherwise dissection will fail when analyzing a capture with a snap length set + Add DIRTY_CORBA_IDL_DISSECTOR_SRC back to our various makefiles and move + packet-cosnaming.c back to it. - Change-Id: I764f48c624d0cc411b04ee62f8ecccaf6abb6f0c - Reviewed-on: https://code.wireshark.org/review/10134 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: I2f0427ad47bf0e2f166577608da7f5feaf848a48 + Reviewed-on: https://code.wireshark.org/review/10691 + Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 2046368 +commit 1a949ba Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Wed Aug 19 21:48:46 2015 +0200 +Date: Tue Sep 29 22:29:41 2015 +0200 - file-pcapng: fix dissection of options in blocks + NCP2222: change ncp.nds_return_all_classes filter type from FT_STRING to FT_UINT32 - - fix the loop logic - - flags in EPB include link-layer-dependent errors + Otherwise a call to proto_tree_add_uint_format_value will trigger an assert - Change-Id: Iae0b4869b556abbf3c14f3b865d0f23cee182c84 - Reviewed-on: https://code.wireshark.org/review/10132 + Bug: 11550 + Change-Id: Ic30b07a424cd94b861cee8999b91154ceeb72469 + Reviewed-on: https://code.wireshark.org/review/10689 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit bc777f9 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Thu Aug 20 10:29:03 2015 +0200 +commit 4ea7a9a +Author: Michal Labedzki <michal.labedzki@tieto.com> +Date: Tue Sep 8 15:42:12 2015 +0200 - Added a missing break + Qt: Add F5 as shortcut to refresh interfaces - Change-Id: Ia04a112d8df195e271dc11565750a6e28bd7f0c9 - Reviewed-on: https://code.wireshark.org/review/10146 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - -commit 950f1dd -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Wed Aug 19 15:38:10 2015 +0200 - - IO Graphs: Don't show unchecked graphs in legend + I am tired to go menu to refresh interfaces. + Shortcut make our live easier. - Change-Id: I0a9c4d967ee03a0a8dfc93f87dbe38e4e3a0404c - Reviewed-on: https://code.wireshark.org/review/10128 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + Change-Id: Ic2a478d7857b8138897088f0a6610df7988b1be9 + Reviewed-on: https://code.wireshark.org/review/10520 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 75f4ff7 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Thu Aug 20 10:09:13 2015 +0200 +commit 8426b4b +Author: Martin Mathieson <martin.r.mathieson@googlemail.com> +Date: Tue Sep 29 09:54:48 2015 -0700 - Make empty filter valid in checkFilter + lte_rlc_statistics: fix cosmetic issues with data in columns - Change-Id: Ia5293a228a7044a4cd01b3b2f62f1d7a8f7747e2 - Reviewed-on: https://code.wireshark.org/review/10145 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + Change-Id: I2bec8de3d5fe84f0a2287c750c9c9151906fe71e + Reviewed-on: https://code.wireshark.org/review/10688 + Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> -commit 29cd036 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Thu Aug 20 10:06:48 2015 +0200 +commit a225908 +Author: AndersBroman <anders.broman@ericsson.com> +Date: Tue Sep 29 16:00:30 2015 +0200 - Clear display filter when filterPackets with empty filter + [Diameter] Add command code 8388717 Ericsson Trace-Report - Change-Id: Ie3f763d53f5c250bbc58e32490eb83bb2e076a62 - Reviewed-on: https://code.wireshark.org/review/10144 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + Change-Id: Ifabb920eb4ddb1a46f2dbf7e03478d0abe10305a + Reviewed-on: https://code.wireshark.org/review/10687 + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 3b5a1f2 -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Wed Aug 19 23:29:13 2015 -0400 +commit 022a7dd +Author: AndersBroman <anders.broman@ericsson.com> +Date: Tue Sep 29 15:07:44 2015 +0200 - 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. + [Diameter] Add enum value to 3GPP AVP PDN-Type" code="1456" + <enum name="IPv4_OR_IPv6" code="3"/> - Bug: 10354 - Change-Id: Icccf6b36495ac4b376f651d689b4a1f9e2c6042d - Reviewed-on: https://code.wireshark.org/review/10143 - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> + Change-Id: I8fa328c0c6915cda835754d12bc4d48608608500 + Reviewed-on: https://code.wireshark.org/review/10686 + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 6fb6ede -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Wed Aug 19 21:38:13 2015 -0400 +commit 12172e6 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Mon Sep 28 14:22:44 2015 +0200 - Get the windows buildbot working for mergecap test suite + tcp: remove misleading, outdated comment - Change-Id: Ic9351b9bb8df85086eee3ab21908a2f9a04db767 - Reviewed-on: https://code.wireshark.org/review/10141 - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> + v1.99.1rc0-717-ga2c2f87 removed pinfo->private_data assignment, but left + the comment in place. Since v1.99.1rc0-761-g6d207fe, the member is + removed completely, so let's drop the comment. + + Change-Id: Ib36b6b979abda786202867ea1e6ef0d11487f61c + Reviewed-on: https://code.wireshark.org/review/10684 + Reviewed-by: Peter Wu <peter@lekensteyn.nl> -commit ddaa311 -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Wed Aug 19 18:30:29 2015 -0400 +commit edcbc24 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Mon Sep 28 21:40:00 2015 +0200 - Remove unused struct member from wtap + Decode as (Qt): fix dereference of null pointer found by Clang analyzer - 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. + Also fix usage of 'Decode As' window when no file is opened (broken by gf189cb8) - Change-Id: Id0fb25248dea4bea9fc88a8ea35c09ba55029d89 - Reviewed-on: https://code.wireshark.org/review/10138 - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> + Change-Id: I06ff83394cf31763cecfbbedd99ce7438488872a + Reviewed-on: https://code.wireshark.org/review/10665 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit b3daf70 -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Wed Aug 19 18:42:59 2015 -0400 +commit c65c014 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Mon Sep 28 22:35:19 2015 +0200 - Pcap: wtap does not set interface timestamp precision when reading pcap + LTE RRC: upgrade dissector to v12.7.0 - 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 <hadrielk@yahoo.com> + Change-Id: I95660eb302fde06c2034b023e60c7b83c67fe71b + Reviewed-on: https://code.wireshark.org/review/10680 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit fc0a2f5 -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Wed Aug 19 17:59:27 2015 -0400 +commit 3e481a0 +Author: Martin Kaiser <wireshark@kaiser.cx> +Date: Mon Sep 28 22:44:42 2015 +0200 - Add more debug infor for windows buildbot test suite failure + [isns] re-indent the AddAttribute() function - Down the rabbit hole we go... + hopefully, this will make my further patches easier to review - Change-Id: I8371b95b85128209b56960eb6e54648a6babbb84 - Reviewed-on: https://code.wireshark.org/review/10137 - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> + Change-Id: If9fe4aa03c08dd38eccae3d4a0accdcbb5d62111 + Reviewed-on: https://code.wireshark.org/review/10681 + Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> -commit 8a86222 +commit 5a39cf8 Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Wed Aug 19 18:34:20 2015 +0200 +Date: Mon Sep 28 22:13:24 2015 +0200 - PNRP: capitalize protocol name + Qt: fix OVERRUN error reported by Coverity in LTE MAC statistics window (CID 1325078) - Change-Id: I1cf5d22e12241ef330319ef8fdf176becdefe300 - Reviewed-on: https://code.wireshark.org/review/10131 + Change-Id: I281b344ea76418399e2a8038f1220310f6a50bc2 + Reviewed-on: https://code.wireshark.org/review/10679 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> -commit d9dd323 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Wed Aug 19 21:52:30 2015 +0200 +commit 009b40b +Author: Graham Bloice <graham.bloice@trihedral.com> +Date: Mon Sep 28 17:07:37 2015 +0100 - file-pcapng: remove useless hf_pcapng_timestamp_data entry + Fix tests to allow selection of suite 10 - Change-Id: I82b2d4e4b0be8179103b827e0d11a0d8b10e1374 - Reviewed-on: https://code.wireshark.org/review/10133 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 0bdf518 -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Wed Aug 19 16:25:54 2015 -0400 - - Try to debug merge test suite failure on windows buildbot + The tests only allowed a single character suite selection, which + prevented suite 10 from being run on its own. - This change will be undone once the problem is found. + Modified test.sh to now require a newline in addition to the input + so that a 2 digit number can be entered. - Change-Id: Ica9cfe31b4e30fad2bb9de508af61baa1c455cc1 - Reviewed-on: https://code.wireshark.org/review/10136 - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> + Also fixed test display to remove illusion that an individual step + could be run. Only whole suites can be run. + + Change-Id: I4dee0ec6a8e1f34fa443a6a0a3f2d52a73146e54 + Reviewed-on: https://code.wireshark.org/review/10676 + Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> -commit 2c260fa -Author: Balint Reczey <balint@balintreczey.hu> -Date: Sat Aug 15 21:12:17 2015 +0200 +commit 1e8ad87 +Author: Graham Bloice <graham.bloice@trihedral.com> +Date: Mon Sep 28 15:29:55 2015 +0100 - Use system's GeoIP database by default on Debian + Cosmetic tidy up for the projects in the Visual Studio solution - Change-Id: I58c1cbb242c20737dd16a0477858b0225c0b5d14 - Reviewed-on: https://code.wireshark.org/review/10051 - Petri-Dish: Balint Reczey <balint@balintreczey.hu> + Change-Id: Ie4ed28ee7e59def2e8a15433334988b4d0225d1d + Reviewed-on: https://code.wireshark.org/review/10675 + Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Balint Reczey <balint@balintreczey.hu> + Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> -commit bb96725 -Author: Balint Reczey <balint@balintreczey.hu> -Date: Sat Aug 15 21:10:20 2015 +0200 +commit a9445a4 +Author: Michael Mann <mmann78@netscape.net> +Date: Sat Sep 26 00:08:18 2015 -0400 - Use system's OpenLayers.js on Debian + idl2wrs: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - Change-Id: Id790ee61d3443e2f96a83260514fa3a6d31d09da - Reviewed-on: https://code.wireshark.org/review/10050 - Reviewed-by: Balint Reczey <balint@balintreczey.hu> - -commit 9380d06 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Wed Aug 19 18:13:36 2015 +0200 - - ixiatrailer: remove execute bit + It looks like "items" could have contributed to fields/data being at an incorrect level off of a tree. - Change-Id: I6cd8f98518b21e935b329f5470b706ec059c91eb - Reviewed-on: https://code.wireshark.org/review/10129 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: I93616ef8b6b364c578f989882045dee42cb6d3c3 + Reviewed-on: https://code.wireshark.org/review/8558 + Petri-Dish: Michael Mann <mmann78@netscape.net> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 89a8ad6 -Author: Pascal Artho <pascalartho@gmail.com> -Date: Tue Aug 18 08:44:04 2015 +0200 +commit f693b4d +Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> +Date: Sun Sep 6 13:08:08 2015 +0100 - 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]). + Improve IPv6 routing header dissection - 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. + Remove size limitation of 23 addresses to Type 0. Add validity checks to Type 0 and Type 2. + Add address count vs segments left check to RPL. - References - [1] https://code.wireshark.org/review/10097 - [2] http://www.ietf.org/rfc/rfc3954.txt + Use hf_ipv6_routing_* for shared routing header fields and hf_ipv6_routing_<type>_* for the rest. - Change-Id: I07518e360975682a3f45e80cb24f82f58cfb15f0 - Reviewed-on: https://code.wireshark.org/review/10098 + Change-Id: I98796504a0f7643476c4c3550586b5da2cf70f6d + Reviewed-on: https://code.wireshark.org/review/10470 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit d05b6f9 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Aug 19 11:52:51 2015 +0200 +commit d4d0311 +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Mon Sep 28 12:20:19 2015 -0400 - Bluetooth: ATT: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + WSUG: send readers to the wiki's SSL page for help on decryption. - Found also by Coverity (CID 1316607) + This replaces a question (recently remarked upon on -users) with a link to + someplace where we already have documentation on the subject. - Change-Id: Ib6a4437fd24b51a8aa87d4bcdb5ee2a1dc43dae3 - Reviewed-on: https://code.wireshark.org/review/10124 - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> + Change-Id: I6c5cf2b0f674c129aaa017da0ca44176c5be665f + Reviewed-on: https://code.wireshark.org/review/10677 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 03b78a0 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Aug 19 11:58:44 2015 +0200 +commit 1f9fb57 +Author: Dario Lombardo <lomato@gmail.com> +Date: Mon Sep 28 15:11:44 2015 +0200 - Bluetooth: ATT: Fix code will never be executed [-Wunreachable-code] + editcap/reordercap: rename time to frame_time. + + According to checkAPI. - Change-Id: I5048da723ddecde931956ed1af77438f823c1990 - Reviewed-on: https://code.wireshark.org/review/10125 + Change-Id: Iddad6253fc4711ed7870eccadb91d94e5fecd24d + Reviewed-on: https://code.wireshark.org/review/10672 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit d470ff1 +commit 76f03c4 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Aug 19 12:33:06 2015 +0200 +Date: Mon Sep 28 15:46:10 2015 +0200 - btsnoop: Missing break in switch (CID 1316606) + IPv6: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - Change-Id: I105da06b7161a5b5f0cc2b4ce5303c4d5c989280 - Reviewed-on: https://code.wireshark.org/review/10126 - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> + Change-Id: Ibe53f22f4f68efd121b8eae48418bad8baabd1a8 + Reviewed-on: https://code.wireshark.org/review/10674 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit fa40025 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Wed Aug 19 09:00:54 2015 +0200 +commit 32849b2 +Author: Martin Mathieson <martin.r.mathieson@googlemail.com> +Date: Mon Sep 28 03:38:29 2015 -0700 - 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. + LTE RLC Statistics Dialog - 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 <stig@bjorlykke.org> + Change-Id: Id0af0227a398fd06ba37c23097fa6809db432d0f + Reviewed-on: https://code.wireshark.org/review/10669 + Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> -commit b755a66 -Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Wed Aug 19 05:28:17 2015 +0100 +commit ea2b451 +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Mon Sep 28 10:26:14 2015 +0200 - Use MAC address documentation range in filter examples - - https://www.iana.org/assignments/ethernet-numbers/ethernet-numbers.xhtml + NCP2222: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - Change-Id: I997440b7622dae4ea25d94e4041971f89b63fd04 - Reviewed-on: https://code.wireshark.org/review/10121 + Change-Id: I739262c0d6b8bd961cc75a18e7bdbb794806e2b7 + Reviewed-on: https://code.wireshark.org/review/10668 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit e328fa5 -Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Wed Aug 19 07:11:23 2015 +0100 +commit 0b1d7b4 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Mon Sep 28 13:39:42 2015 +0200 - IPv6: Minor variable name fix + Qt: mlt_info parameter is unused - Change-Id: Iaef41fa2a212577f1fbdf7705eca65a928faa8c3 - Reviewed-on: https://code.wireshark.org/review/10122 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: Ie5744d076ae4997bd2252dd66bbc92780ffe73e0 + Reviewed-on: https://code.wireshark.org/review/10670 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 9976f52 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Aug 17 13:30:01 2015 +0200 +commit 3bbb580 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Sat Sep 26 22:46:00 2015 +0200 - .mailmap: sort using sort -u + MAC LTE: upgrade dissector to v12.7.0 - Change-Id: I276331070c654e6c57bccb2c26cd0430ac656b26 - Reviewed-on: https://code.wireshark.org/review/10069 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I5d97bc9199349c20598d68a92065e72fcaa88795 + Reviewed-on: https://code.wireshark.org/review/10663 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit dcaa64a -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Mon Aug 17 19:22:42 2015 -0400 +commit cd8eb6e +Author: Balint Reczey <balint@balintreczey.hu> +Date: Sat Sep 26 19:07:22 2015 +0200 - Mergecap: add test suite for various merging scenarios + debian: Enable parallel package build - Add a test suite for mergecap (and indirectly capinfos I guess). - This is not exhaustive, but it's a start. + Debian packages used to build with parallel build enabled when + debian/rules used autotools but with switching to CMake the + parallel build failed sometimes. Now the CMake based build + system seems to be working for parallel builds, too, thus + it seems to be safe to enable parallel building of .debs again. - Change-Id: I9442b4c32e31a74b1673961ad6ab50821441de3e - Reviewed-on: https://code.wireshark.org/review/10082 - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I79003bf6c4b74640f24d907b763a5cc3da595e68 + Reviewed-on: https://code.wireshark.org/review/10657 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit d64ad1d -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Sun Aug 16 12:37:11 2015 -0400 +commit eaf4746 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Sun Sep 27 20:31:42 2015 +0200 - capinfos: add more info about file and interfaces + SNA: add value 0xC8 to the list registered SAP - Add more information about the capture file, and about the interface - descriptions in it. Also remove long-unused g_options code. + Bug: 11551 - Change-Id: I93cbd70fc7b09ec1b8b2fd6c85bb885c7f749543 - Reviewed-on: https://code.wireshark.org/review/10073 - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> + Change-Id: I74e2c1b67b3d7a3462d99e941b1c637ba1227a71 + Reviewed-on: https://code.wireshark.org/review/10662 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 3268023 -Author: Andrew Chernyh <andrew.chernyh@gmail.com> -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 <a.broman58@gmail.com> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit d5caba6 -Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Mon Aug 17 20:07:58 2015 +0100 +commit 087afc8 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Sun Sep 27 15:46:09 2015 +0200 - [IPv6] Make "ip.version" field pretty(er) + addr_resolv: cosmetic change for flags - Change-Id: I1e32f666118e36f48edcc1678d75db3ca3f62776 - Reviewed-on: https://code.wireshark.org/review/10075 - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - -commit a22bb87 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Aug 17 13:27:53 2015 +0200 - - Update .mailmap + Reduce some magic numbers and add parentheses, + change ((flags & X) == X) to simply (flags * X), + change tp->flags = tp->flags | x to tp->flags |= x. - Change-Id: Ib61ed614c3cfb6885d81a61d82b0974beba786f5 - Reviewed-on: https://code.wireshark.org/review/10068 - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> + Change-Id: Ida2d1aa59a3efc20d5fe6910d7b757277eb7e627 + Reviewed-on: https://code.wireshark.org/review/10659 + Petri-Dish: Peter Wu <peter@lekensteyn.nl> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Peter Wu <peter@lekensteyn.nl> -commit c32c1f0 -Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Tue Aug 18 18:51:32 2015 +0100 +commit 47eb321 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Sun Sep 27 15:41:25 2015 +0200 - IPv6 Jumbogram expert info cleanup + ui/gtk: fix weird check for axis orientation - Change-Id: Ic06e50a30330758d6ed0b1b1d9ba0d7f74929a9a - Reviewed-on: https://code.wireshark.org/review/10111 - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - -commit 8352ff1 -Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Sun Aug 16 21:02:35 2015 +0100 - - Add IPv6 examples to capture/display filters + There is only one meaning for the flags parameter, namely axis + orientation (x or y). Replace the bitmap by a bool instead. - Also use TEST-NET-1 for IPv4 examples. + Clang 3.7.0 reported this warning: - Replaced note using comma with parentheses + ui/gtk/tcp_graph.c:1652:29: warning: shifting a negative signed value is undefined [-Wshift-negative-value] + g->y_axis->flags &= ~AXIS_ORIENTATION; + ~^~~~~~~~~~~~~~~~ + ui/gtk/tcp_graph.c:140:28: note: expanded from macro 'AXIS_ORIENTATION' + #define AXIS_ORIENTATION 1 << 0 + ^ + 1 warning generated. - Change-Id: I9855207aec7a335b80986aa63bd235edc4278d3a - Reviewed-on: https://code.wireshark.org/review/10061 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - -commit fc1b48f -Author: Luke Mewburn <luke@mewburn.net> -Date: Wed Aug 19 10:47:57 2015 +1000 - - DVBCI: fix typo in comment + This (~1 << 0) happened to work because nothing is actually shifted. - Change-Id: I0f6e57b7f16526e7c1b96fb8bd69c003c89b7f42 - Reviewed-on: https://code.wireshark.org/review/10119 - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> + Change-Id: I406235148b7826649d35647f5d0702cd72a925a5 + Reviewed-on: https://code.wireshark.org/review/10658 + Reviewed-by: Peter Wu <peter@lekensteyn.nl> + Petri-Dish: Peter Wu <peter@lekensteyn.nl> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> -commit 0e8cc9a +commit 6d10efc Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Aug 12 14:09:35 2015 -0700 +Date: Fri Sep 25 14:33:54 2015 -0700 - UDP multicast stream dialog. + Qt: Add the Dissector Tables dialog. - Add the UDP multicast stream dialog. Abuse TapParameterDialog a bit more - so that we can edit parameters. + Add the "Internals" menu under the View menu instead of at the top level + for now at least. Add the Dissector Tables dialog there. - Remove some unused struct members and an unused function. + Change-Id: Ieb23b0015591bac196e4ef94e3443832288333f9 + Reviewed-on: https://code.wireshark.org/review/10654 + Reviewed-by: Gerald Combs <gerald@wireshark.org> + +commit d4b3a96 +Author: Balint Reczey <balint@balintreczey.hu> +Date: Sat Sep 26 15:46:14 2015 +0200 + + debian: Show hardening results after build - Change-Id: I962c70344e792f0959527e4bcba8a20bd7e8acf9 - Reviewed-on: https://code.wireshark.org/review/10084 - Petri-Dish: Gerald Combs <gerald@wireshark.org> + Change-Id: I121d264b86ecf9e0607e6fe00c2791a91d8fe974 + Reviewed-on: https://code.wireshark.org/review/10656 + Reviewed-by: Balint Reczey <balint@balintreczey.hu> + Petri-Dish: Balint Reczey <balint@balintreczey.hu> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 9a3d4e6 +commit fd61778 Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Aug 18 10:36:04 2015 -0700 +Date: Sun Sep 27 08:12:32 2015 -0700 - Move an include guard. + [Automatic update for 2015-09-27] - Move an include guard to match our conventions (and make it easier - to spot). + Update manuf, services enterprise-numbers, translations, and other items. - Change-Id: I4bad61a0194219f69217713d051e0ff53ff5a76a - Reviewed-on: https://code.wireshark.org/review/10110 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: Ia290c7a187630547265bfd014c18e2523a36842b + Reviewed-on: https://code.wireshark.org/review/10660 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 2eaaffe +commit 7645bae Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Tue Aug 18 21:56:52 2015 +0200 +Date: Thu Sep 24 17:17:51 2015 +0200 - simple_statistics_dialog(.h): fix parameter 'st_table' not found in the function declaration [-Wdocumentation] + QUIC: Update QUIC Error Codes lists... - Change-Id: I69814a05fa6ad65315e36fa75ae60634e934be5c - Reviewed-on: https://code.wireshark.org/review/10117 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + From See src/net/quic/quic_protocol.h + + Change-Id: I5fbc037186491dc8555f7f41b3e43d7d6a628f88 + Reviewed-on: https://code.wireshark.org/review/10647 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 6ed3e08 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Tue Aug 18 21:10:13 2015 +0200 +commit 8980919 +Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> +Date: Fri Sep 11 09:06:49 2015 +0100 - pcapng(file): fix duplicate break + More consistency for IPv6 extension headers - Change-Id: Ife7170c050402ab94d368acc6c233714be764824 - Reviewed-on: https://code.wireshark.org/review/10114 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + 'hf_ipv6_opt_length' is being used both for extension header length + and option length. + + Change-Id: I012e4d43abdf57997a24ab6f2d2c93d121f9f123 + Reviewed-on: https://code.wireshark.org/review/10478 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 857b144 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Tue Aug 18 21:15:27 2015 +0200 +commit bb36f05 +Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> +Date: Fri Sep 18 02:08:34 2015 +0100 - Qt: Syntax check display filter when fields changed + Try to make IPv6 fragmentation code simpler - Change-Id: I7179d7918e7958373806fb9627a36554ab4b9ddc - Reviewed-on: https://code.wireshark.org/review/10115 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + Fixes two issues: + - Null IPv6 Fragment extension headers confuse Wireshark, because the 'offlg' + variable gets reset + - Dissection doesn't stop when reassembly is enabled and it is the first + fragment followed by more IPv6 extension headers + + Bug: 8362 + Change-Id: Ibe229a63d7a6ab8523ddfcae30e58d19cc2ce2bd + Reviewed-on: https://code.wireshark.org/review/10482 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 4abec47 -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Aug 18 12:14:07 2015 -0700 +commit 4150bae +Author: Graham Bloice <graham.bloice@trihedral.com> +Date: Sat Sep 26 15:46:52 2015 +0100 - 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. + Fix checkapi warnings - 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. + Fix some (mostly spurious) checkapi warnings by renaming the + offending variables. - 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: I7a43ac89f5ed35053a6526fa838fbad67669a49a + Reviewed-on: https://code.wireshark.org/review/10655 + Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> + +commit 13d2869 +Author: Stig Bjørlykke <stig@bjorlykke.org> +Date: Tue Sep 15 08:46:43 2015 +0200 + + Qt: Use "" for empty QString const reference. - Change-Id: I19b2c3227a3ca1e93ec653f279136aa18687581f - Reviewed-on: https://code.wireshark.org/review/10116 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I686eadc865ae38433c3795450aeca8582a74d2c8 + Reviewed-on: https://code.wireshark.org/review/10535 + Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> + Petri-Dish: Michael Mann <mmann78@netscape.net> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit ea7cf08 -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Aug 18 11:51:36 2015 -0700 +commit c068bf5 +Author: Gerald Combs <gerald@wireshark.org> +Date: Fri Sep 25 10:00:14 2015 -0700 - Cast away 64 -> 32 narrowing complaints. + Qt: Update packet detail selection behavior. - "secs" in an nstime_t is a time_t; cast the calculated seconds portion - to time_t. + Some menu items always need to be enabled or disabled when we call + setMenusForSelectedTreeRow. Do so. - Change-Id: Ieaad4c18bb21384a5781f50eadd3a537b414a369 - Reviewed-on: https://code.wireshark.org/review/10113 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Add some NULL checks. + + Change-Id: I5de3df2ceb1dfe19e1cea548b0299004fbea2ec7 + Reviewed-on: https://code.wireshark.org/review/10651 + Petri-Dish: Gerald Combs <gerald@wireshark.org> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 7a096c3 -Author: Dario Lombardo <lomato@gmail.com> -Date: Tue Aug 18 15:58:34 2015 +0200 +commit 657b930 +Author: Gerald Combs <gerald@wireshark.org> +Date: Fri Sep 25 09:11:23 2015 -0700 - Init values set (found by American Fuzzy Lop). + Help dialog shortcut list updates. - Change-Id: Iddd2b4a0ceb409db1afb1a412339134634de631c - Reviewed-on: https://code.wireshark.org/review/10104 - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> + Make it clear that the shortcuts are for the main window. Add and update + a few tooltips. + + Change-Id: I9ee082a9ede95f4b727fb652437f9ed16c9ef2bf + Reviewed-on: https://code.wireshark.org/review/10650 + Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit f49eb37 -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Aug 18 10:32:16 2015 -0700 +commit 26ebfef +Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> +Date: Sat Sep 12 06:35:22 2015 +0100 - Update comment. + Don't display duplicate addresses without name resolution enabled - Change-Id: I51e14a280ba898a321455168ac8ded1853f55e64 - Reviewed-on: https://code.wireshark.org/review/10109 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: Ieb88e2632401cbf50c4ae51768a64df64d54a45d + Reviewed-on: https://code.wireshark.org/review/10497 + Petri-Dish: Michael Mann <mmann78@netscape.net> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 97f3c1b -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Tue Aug 18 19:18:07 2015 +0200 +commit 3b04a89 +Author: Michael Mann <mmann78@netscape.net> +Date: Fri Sep 25 10:09:07 2015 -0400 - Qt: Reload widgets using prefs when reloading Lua plugins + ncp2222: Use BASE_CUSTOM for date and time fields. - Widgets using prefs must be closed because the prefs may have - been free'd when reloading Lua plugins. + This simplifies some of the logic required for field formatting. - Change-Id: I4b79b7aff18d7923c77a9eb05acadc29b156edbf - Reviewed-on: https://code.wireshark.org/review/10108 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + Change-Id: I2f9a612b18e3e4ca01311683d9cf61cbad9950f4 + Reviewed-on: https://code.wireshark.org/review/10649 + Petri-Dish: Michael Mann <mmann78@netscape.net> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 8fcdcb9 -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Sun Aug 16 12:37:11 2015 -0400 +commit a4a453b +Author: Michael Mann <mmann78@netscape.net> +Date: Wed Sep 23 22:55:35 2015 -0400 - Improve file merging for mergecap and wireshark + Convert dissect_nds_request and dissect_nds_reply to use proto_tree_add_xxx directly instead of the homegrown nds_val. - 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: + Change-Id: Ie67892caec2cddee591631045233f8a3f1cc0bc6 + Reviewed-on: https://code.wireshark.org/review/10648 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Michael Mann <mmann78@netscape.net> + +commit ff1dbba +Author: Gerald Combs <gerald@wireshark.org> +Date: Thu Sep 24 10:42:46 2015 -0700 + + CMake: Add a hardening-check target. - * Removed the '-T' encap type option from mergecap, as it's illogical for - mergecap and would complicate common merge code. + On Windows, add a hardening-check target which checks for DYNAMICBASE + and NXCOMPAT using the PowerShell script Get-HardenFlags.ps1. + For a Visual Studio solution, run the check by calling: - * 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. + msbuild /m /p:Configuration=RelWithDebInfo hardening-check.vcxproj - * Added a '-I' IDB merge mode option for mergecap, to control how IDBs are merged. + using the config as appropriate for your build. - * Changed Wireshark's drag-and-drop merging to use PCAPNG instead of PCAP. + Otherwise if we find the Debian/Fedora hardening-check script add a + target which runs it for each of our executables. - Bug: 8795 - Bug: 7381 - Change-Id: Icc30d217e093d6f40114422204afd2e332834f71 - Reviewed-on: https://code.wireshark.org/review/10058 - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I62263e81d155c66e8c8edc751ffab535bf9f3b96 + Reviewed-on: https://code.wireshark.org/review/10641 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit a3c175a -Author: AndersBroman <anders.broman@ericsson.com> -Date: Tue Aug 18 16:47:08 2015 +0200 +commit 44d17c7 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Fri Sep 25 21:38:03 2015 +0200 - Add casts to passify buildboot. + airpdcap: fix WEP decryption - Change-Id: I8aa4695f1f8dfdfc5bfcd4fb4f36e1b332581d5a - Reviewed-on: https://code.wireshark.org/review/10106 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Using memcpy with overlapping buffers is not safe; use memmove instead + + Bug: 11549 + Change-Id: I8e15eb0af38d325a5e67e8748008126ac5994588 + Reviewed-on: https://code.wireshark.org/review/10652 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit db87e62 -Author: Dario Lombardo <lomato@gmail.com> -Date: Tue Aug 18 16:29:19 2015 +0200 +commit 9f171ee +Author: Michal Pazdera <michal.pazdera@gmail.com> +Date: Mon Sep 14 10:28:30 2015 +0200 - pcap: add init value. + Multiple SSL content in one packet fix - Found compiling with gcc version 4.8.4 (Ubuntu 4.8.4-2ubuntu1~14.04). + When SSL packet contains multiple encrypted contents the WS shows only the + last record due the wrong indexing of the structure where the decrypted + contents are stored. Should use tvb_raw_offset(tvb)+offset instead of + offset as I think was intended. - Change-Id: I21bd3a5ab3365f0065c919aba7d6bd00b878d041 - Reviewed-on: https://code.wireshark.org/review/10105 - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> + Added the same fix for DTLS. + + Bug: 11523 + Change-Id: I0a977a0e6ebe7c45e526fa5152b8614463abd4fa + Reviewed-on: https://code.wireshark.org/review/10528 + Petri-Dish: Peter Wu <peter@lekensteyn.nl> + Reviewed-by: Peter Wu <peter@lekensteyn.nl> + Tested-by: Peter Wu <peter@lekensteyn.nl> -commit da6f48d -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Tue Aug 18 15:34:53 2015 +0200 +commit 3fb1d68 +Author: Balint Reczey <balint@balintreczey.hu> +Date: Thu Sep 24 09:56:14 2015 +0200 - Fix typo in makefile - - Typo: - file.pcapng.c -> file-pcapng.c + cmake: Enable PIE when it is available by default - Change-Id: I72c40fd086f1b68b69e950c065877b2733279a04 - Reviewed-on: https://code.wireshark.org/review/10102 - Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I88930b8a9de596f93677052b2046c1b85cc34c6b + Reviewed-on: https://code.wireshark.org/review/10635 + Reviewed-by: Gerald Combs <gerald@wireshark.org> + Reviewed-by: Balint Reczey <balint@balintreczey.hu> -commit 22364bd -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Sat Feb 15 19:05:44 2014 +0100 +commit 86f22c2 +Author: Balint Reczey <balint@balintreczey.hu> +Date: Fri Sep 25 09:53:25 2015 +0200 - File-format: BTSNOOP: Add option to dissect next layers - - Show next layers of each packet. + Export all hardening options in .deb packages - Change-Id: I8c56eab969fef9a0a712b479dc2cdef6cc1578ae - Reviewed-on: https://code.wireshark.org/review/221 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I0448e564305ce78dee4ec364007e0162c6f74c09 + Reviewed-on: https://code.wireshark.org/review/10644 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Balint Reczey <balint@balintreczey.hu> -commit dd57c6b -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Fri Jun 26 15:40:22 2015 +0200 +commit 4eacb72 +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Fri Sep 25 11:24:07 2015 +0200 - File-format: Add PCAP and PCAPNG dissectors + ISAKMP(ikev2): Type Hash and URL of X.509 certificate is not decoded - 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. + Reported by Marius - Change-Id: I833b2464d11864f170923dc989a1925d3d217943 - Reviewed-on: https://code.wireshark.org/review/10089 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Bug:11543 + Change-Id: Ic9d3b6b26a917601356eb957fd8270f2482f6aee + Reviewed-on: https://code.wireshark.org/review/10645 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit c05df99 +commit ea2fcb5 Author: Michael Mann <mmann78@netscape.net> -Date: Mon Aug 17 20:34:47 2015 -0400 +Date: Wed Sep 23 20:56:50 2015 -0400 - Add udp_dissect_pdus. + Refactor NCP Python data so that INFO column can be generated on the fly (TAKE 2) - 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. + The "old" method of populating the INFO column was to dissect all fields of a function/subfunction, then do a search in the tree to find the hf_ values of interest to then format into something for the INFO column. This is very expensive and requires "low level" APIs (for tree manipulation) which really shouldn't be used in a dissector. - Used DNP3 as a guinea pig since "multiple PDU support" over UDP was just added. + The "new" method populates the INFO column at the same time a field is parsed, so nothing has to be revisited (and allows for more fields to be displayed on some malformed packets). - Change-Id: Ib7af8eaf7102c96b4f8b5c1b891ae2d8f0886f9d - Reviewed-on: https://code.wireshark.org/review/10083 - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - Reviewed-by: Dario Lombardo <lomato@gmail.com> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + There are still expert infos (and possibly column APIs) under if (tree)s, but I'm not sure how FAKE_TREE_IS_VISIBLE factors into that. Removing the FAKE_TREE_IS_VISIBLE seems to negatively affect dissection. + + Change-Id: Ie487e851c2f6558dd12f0c7010757b4a5f36226b + Reviewed-on: https://code.wireshark.org/review/10631 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit db5b786 -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Sat Jun 6 19:37:20 2015 +0200 +commit 40a43bd +Author: Juan Matias <jmrepetti@gmail.com> +Date: Wed Sep 23 23:49:27 2015 +0200 - Bluetooth: Update Assign Numbers + UI QT: fix unused variable 'show_delay_' error - +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 <a.broman58@gmail.com> + Change-Id: I966d839c755090679bb3fc79d2ba36645e561c19 + Reviewed-on: https://code.wireshark.org/review/10633 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit a50a49e -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Thu Jan 22 08:27:40 2015 +0100 +commit fd89ed9 +Author: Guy Harris <guy@alum.mit.edu> +Date: Thu Sep 24 10:42:59 2015 -0700 - Bluetooth: ATT: Add some remaining attributes + Comments based on MSDN Native 802.11 documentation. - 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 <a.broman58@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: Ica8ab4416f7ffd11bd71d3bd1e15098a9788c84e + Reviewed-on: https://code.wireshark.org/review/10640 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit df17ff3 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Mon Aug 17 13:18:30 2015 +0200 +commit df59df9 +Author: Guy Harris <guy@alum.mit.edu> +Date: Thu Sep 24 10:31:23 2015 -0700 - Qt: Fix use-after-free pattern + Additional Windows PHY types, from the NDIS documentation. - 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. + The PHY types in the NDIS documentation, not surprisingly, match the + ones for Network Monitor. Add support for the ones that didn't have it + already. - Change-Id: I8f54ede75577719008835038934e935cd5feba3f - Reviewed-on: https://code.wireshark.org/review/10067 - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: Ie135b7ea5634f0eb7950380d12473ac4b12c7a6d + Reviewed-on: https://code.wireshark.org/review/10639 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 9e72779 -Author: Pascal Artho <pascalartho@gmail.com> -Date: Tue Aug 18 08:43:06 2015 +0200 +commit f45733b +Author: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> +Date: Thu Sep 24 17:12:12 2015 +0200 - Preparation Host Flows: Dissector Packet ICMP and ICMPv6 + NGHTTP2: Fix warning this decimal constant is unsigned only in ISO C90 - see https://code.wireshark.org/review/#/c/9976/ + Backport patch from 1.3.4 (Available soon) - Change-Id: Ic301db4deea1a02b9e08c123b3e21e70817a2c85 - Reviewed-on: https://code.wireshark.org/review/10097 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I32565835a3be78a9eeea2cf4f4d7d4825de9aa40 + Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-on: https://code.wireshark.org/review/10638 -commit 318c3a5 -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Wed Jul 22 17:38:51 2015 +0200 +commit 0a05989 +Author: Gerald Combs <gerald@wireshark.org> +Date: Wed Sep 23 14:54:25 2015 -0700 - Qt: Add another C++ missing header: <algorithm> for std::sort() + Qt: Show keyboard shortcuts in the about box. - 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); + Add a "Keyboard Shortcuts" tab to the about box for lack of a better + place. Show every action in the main window which has an associated + shortcut except for recent items. - Change-Id: I3a577a268f6c12e8fd97b7b6fd2429989c28e2f5 - Reviewed-on: https://code.wireshark.org/review/10092 - Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + We might want to add a command-line option to dump the shortcuts in + addition to or instead of showing them here. + + Change-Id: I875043048a44930391fefcbbaf17c5b10a7bb8c6 + Reviewed-on: https://code.wireshark.org/review/10634 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 0375244 -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Sat Jul 18 18:25:36 2015 +0200 +commit af0e93c +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Thu Sep 24 10:56:23 2015 +0200 - Qt/Minimap: Fix for Qt < 4.8 + QUIC: Fix some issue (Malformed frame) with handshake heuristics - I hope it is quite right solution. + Need to check if there is data before get a value... - Change-Id: Ia9c883a832ddd03985eda37a9b344c4d7c8135e2 - Reviewed-on: https://code.wireshark.org/review/10091 + Change-Id: I45592e9a2c55a5bce57a40f7e3153e8f540ca316 + Reviewed-on: https://code.wireshark.org/review/10636 + Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit e25562b -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Mon Jul 20 11:09:06 2015 -0400 +commit fea2e4a +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Wed Sep 23 22:16:46 2015 +0200 - Pcapng: clean up Section Header Block handling + NGHTTP2: Update to 1.3.3 - Change-Id: I8516d0c561ed0b63e49a3594027c9c15bb789258 - Reviewed-on: https://code.wireshark.org/review/9726 - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> + Change-Id: Id52d04859d61ffc720791cf90294cac4b1915a28 + Reviewed-on: https://code.wireshark.org/review/10629 + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 4048ca0 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Thu Aug 13 23:00:29 2015 +0200 +commit c66233c +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Wed Sep 16 12:39:21 2015 +0200 - rewrite the H1 dissector + QUIC: Add Regular Frame Type... - * 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 + Add also heuristic to check if it is handstake - Change-Id: Ie0995e5fe6364605fd30020f171e51458844fa59 - Reviewed-on: https://code.wireshark.org/review/10080 - Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> + Ping-Bug: 11494 + Change-Id: I833d294a3a6fdc89cc6d6a5d72d388a3328bf802 + Reviewed-on: https://code.wireshark.org/review/10566 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> -commit acc0c14 -Author: Michael Mann <mmann78@netscape.net> -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 <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 8fd7197 -Author: Hadriel Kaplan <hadrielk@yahoo.com> -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 <hadrielk@yahoo.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> +commit 30ff173 +Author: Gerald Combs <gerald@wireshark.org> +Date: Tue Sep 22 17:18:33 2015 -0700 + + Qt: Always make the packet list row heights uniform. + + In tests here using GTK+ 2.24 and 3.10, GtkTreeView handles multi-line + items by adjusting the height for all rows, but only after the number of + multi-line items exceeds some sort of threshold. For a packet capture + which contains a few DNS packets and a lot of TCP packets, if I change + "Standard query" to "Standard\nquery" in packet-dns.c I get + single-height packet list items. If I change "[TCP segment of a + reassembled PDU]" to "[TCP segment of a\nreassembled PDU]" in + packet-tcp.c (which results in more multi-line column strings) I get + double-height packet list items. + + The current Qt code initially sets the uniformRowHeights property then + falls back to variable row heights if we run across a multi-line column + string. This adds a lot of logic which can impact other functionality + (e.g. column widths) and recalculating row heights is painfully slow for + large numbers of packets. + + Instead of trying to manage variable row heights, always enable + uniformRowHeights. Track the maximum newline count and trigger a row + height adjustment when it changes. This mimics the GTK+ UI behavior, + although it should be more reliable. + + Note that we need to adjust some numbers in RelatedPacketDelegate. + + Change-Id: I289e963b6f00338c4374e602fa3fc83d04554519 + Ping-Bug: 11515 + Ping-Bug: 10924 + Reviewed-on: https://code.wireshark.org/review/10628 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 300bb98 +commit 3ff5afd Author: Jeff Morriss <jeff.morriss.ws@gmail.com> -Date: Mon Aug 17 16:50:39 2015 -0400 +Date: Wed Sep 23 10:14:31 2015 -0400 - Install GTK3 too. + Add a test to verify we pre-allocated enough hf entries. - It was in the list of packages but not in the final command line. + This way we'll know as soon as we drop below the pre-allocated limit. As + suggested by Graham on https://code.wireshark.org/review/10601 - Change-Id: I361e660cc4ac91121314a3f8a7388b48fb2c61b7 - Reviewed-on: https://code.wireshark.org/review/10081 - Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> + Change-Id: Ieeb14bdcf991d7a67c30787c97ca24ebb35d1763 + Reviewed-on: https://code.wireshark.org/review/10627 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit c57f585 +commit 66de69a Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Aug 17 10:47:46 2015 -0700 +Date: Tue Sep 22 09:08:39 2015 -0700 - Fixup tap listener registration. + Use the Qt-provided media icons. - 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_. + Use Qt's standard pixmaps to build our media playback, stop, and pause + icons. Note that we probably don't want to do this for all of the + available standard pixmaps. - Change-Id: Idca382180f475db71e4d1965a70ae4cc2fa4f9d5 - Reviewed-on: https://code.wireshark.org/review/10074 + Change-Id: I78541a46a65583d7365cd601c578ebe8f197c060 + Reviewed-on: https://code.wireshark.org/review/10609 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 41cb3bd -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Thu Aug 13 22:44:29 2015 +0200 +commit 29be7bf +Author: Martin Mathieson <martin.r.mathieson@googlemail.com> +Date: Sun Sep 20 00:42:11 2015 -0700 - h1: remove if (tree) checks, indent according to the modelines + LTE MAC Statistics Dialog - Change-Id: I878aa23b5d718653b9039aeb94a0ece88c9c03cf - Reviewed-on: https://code.wireshark.org/review/10079 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> + Change-Id: I2463fdc0ac209e92d2f2c1abf9da22866d6e22e8 + Reviewed-on: https://code.wireshark.org/review/10578 + Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> -commit c78d7c8 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Thu Aug 13 22:32:43 2015 +0200 +commit d17745b +Author: Dario Lombardo <lomato@gmail.com> +Date: Mon Sep 21 16:06:36 2015 +0200 - h1: don't THROW() an exception from a dissector + androiddump: add memset in adb_connect() (CID 1293396) - 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 <wireshark@kaiser.cx> + Change-Id: If9d281cd95cf12351d6da5e75c6de149ec7adc06 + Reviewed-on: https://code.wireshark.org/review/10598 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit ec1d25d -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Mon Aug 17 22:00:57 2015 +0200 +commit 9f9fde3 +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Wed Sep 23 11:31:48 2015 +0200 - Qt: Avoid double call to toUtf8() + Bluetooth: ATT: Missing break in switch (CID 1324756) - Change-Id: I4d31063b4aa37e4b0a68b5dbc17be22ef2cd151a - Reviewed-on: https://code.wireshark.org/review/10077 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + Change-Id: Ibe49a59e8825397e776ab236fb59196d293a76c3 + Reviewed-on: https://code.wireshark.org/review/10623 + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> -commit 68c5172 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Mon Aug 17 21:39:41 2015 +0200 +commit 56ca658 +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Wed Sep 23 11:28:35 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. + QUIC: Missing break in switch (CID 1324757) - Change-Id: I4ed7345b3200e5af211695f1a6511ee229d5f13c - Reviewed-on: https://code.wireshark.org/review/10076 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + Change-Id: Ia05f5f5679873ee4e063ea74c33c321628747623 + Reviewed-on: https://code.wireshark.org/review/10622 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 0368b82 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Aug 12 15:11:39 2015 -0700 +commit ca49576 +Author: Guy Harris <guy@alum.mit.edu> +Date: Tue Sep 22 22:47:46 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. + $, not %, is used to introduce a variable reference in CMake. - Change-Id: I18b0597fd432e4cec8c388a3c7d2d18ac4da0fad - Reviewed-on: https://code.wireshark.org/review/10009 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: Ib4af3c5cee9bd2e1adb5758b9389611165e62b62 + Reviewed-on: https://code.wireshark.org/review/10619 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 821ea20 -Author: Selvamegala <sselvamegala@gmail.com> -Date: Sat Aug 8 20:35:30 2015 -0400 +commit 4abed38 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Tue Sep 22 18:32:03 2015 +0200 - Add Decryption support for Lwmesh + ETSI CAT: always initialize gsm_sms_data_t structure - Bug: 10783 - Change-Id: Id598838f036b1f312791d9dddbf3767dcbfd1aee - Reviewed-on: https://code.wireshark.org/review/9937 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit b660fd4 -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Mon Aug 17 11:12:12 2015 -0400 - - Pcapng: set interface description's tsprecision when reading file + Otherwise a 8-bit SMS-PP Data Download could be interpreted as requiring SMS packing - Bug: 11447 - Change-Id: I5fe14616ed6e86e0bfe02c58cc9fb31e43bc23ef - Reviewed-on: https://code.wireshark.org/review/10071 - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> + Change-Id: I50b5e59194acc3d69d0e247fc909d3f96207094a + Reviewed-on: https://code.wireshark.org/review/10610 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 2eec7fe -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Aug 17 13:35:40 2015 +0200 +commit afce5c1 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Tue Sep 22 17:31:44 2015 +0200 - BPDU: Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang + GSM RLC/MAC: fix dissection of variable length bitmaps - Change-Id: I91cc96f92ae2e6b07144120d70f8db5b7ad45fce - Reviewed-on: https://code.wireshark.org/review/10070 + Bug: 11534 + Change-Id: I857134f21ab6a8a135eba6e784807f3f3734bf6c + Reviewed-on: https://code.wireshark.org/review/10607 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 77193ef -Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Mon Aug 17 06:00:27 2015 +0100 +commit cd7387d +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Mon Sep 21 15:00:35 2015 -0400 - dissect_ip_heur(): Remove TODO (done) + Add a "fieldcount" report to tshark -G to let us easily see how many fields + are registered. - Change-Id: I0c36179b63f5d60037de80badfea352c903c2525 - Reviewed-on: https://code.wireshark.org/review/10065 + Change-Id: I06f10d96916640cb9a782cae87898a5dd6c9c6e3 + Reviewed-on: https://code.wireshark.org/review/10601 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 9a6e36d -Author: Michael Mann <mmann78@netscape.net> -Date: Sun Aug 16 20:06:50 2015 -0400 +commit e64c816 +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Mon Sep 21 11:39:11 2015 -0400 - Remove proto_tree_add_text from packet-xml.c + Increase the number of pre-allocated hfs (from 144k to 170k). - Required introducing packet_info* to xml_frame_t structure. + 169756 header fields are currently registered. Including the 5k expert info + field pre-allocation this gives us about 5k unused entries (until we should + increase this number again). - Change-Id: Ie777fe3bc8c7ea052d3441dd31e0631ce47324cb - Reviewed-on: https://code.wireshark.org/review/10063 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> + Change-Id: Id8ea979cbe9e80756c12b5b73e816bbe3e9856ad + Reviewed-on: https://code.wireshark.org/review/10599 + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit af62264 -Author: Dario Lombardo <lomato@gmail.com> -Date: Thu Aug 13 16:08:18 2015 +0200 +commit eefae1b +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Tue Sep 22 17:48:18 2015 +0200 - DNP3: add support for udp multi frame packets. + RLC: fix invalid RLC AM control type expert info - Bug: 11435 - Change-Id: I1f3006a4276e8a95d028294ebb9635f71be0f75e - Reviewed-on: https://code.wireshark.org/review/10013 - Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> - Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> + Change-Id: I43512e24a0f506b65521b7bc53acf00be58d6c2b + Reviewed-on: https://code.wireshark.org/review/10608 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 2ba0ea3 -Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Aug 16 12:33:31 2015 -0700 +commit 5f4bdda +Author: Roland Knall <roland.knall@br-automation.com> +Date: Mon Sep 21 10:33:24 2015 +0200 - Fix the conversion of milliseconds to seconds and nanoseconds. + openSAFETY: Handle SPDO message types differently - 1 millisecond = 1000000 nanoseconds, not 1000 nanoseconds, and - nstime->nsecs is nanoseconds, not microseconds. + SPDOs code the 0x04 bit differently, as it is not part + of the message type, but rather a flag for connection validation - Change-Id: I6925ff80f6443015f83ca00bad2a347d10eadd7c - Reviewed-on: https://code.wireshark.org/review/10060 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 8b8d378 -Author: Petr Gotthard <petr.gotthard@honeywell.com> -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 + I do not want to introduce a second message type, as this would break + compatibility with existing stored filters, also adding the bitmask + to the hf field, would alter the byte value, as it would shift + the value to the right. - Change-Id: Ic1c19edf10432dccb5fc4f3ea07defd45b9eef17 - Reviewed-on: https://code.wireshark.org/review/10054 - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - -commit 6f7811e -Author: ff <francesco.fondelli@gmail.com> -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 <francesco.fondelli@gmail.com> - Reviewed-on: https://code.wireshark.org/review/10057 - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> + Change-Id: I6b70bec29a55dfb556652d9dc940a896b864943b + Reviewed-on: https://code.wireshark.org/review/10595 + Reviewed-by: Roland Knall <rknall@gmail.com> + Reviewed-by: Michael Mann <mmann78@netscape.net> + Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 3755bc6 -Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Sun Aug 16 07:35:24 2015 +0100 +commit 961e0c0 +Author: Michael Mann <mmann78@netscape.net> +Date: Tue Sep 22 20:05:25 2015 +0000 - Fix IP Destinations stats tree + Revert "Refactor NCP Python data so that INFO column can be generated on the fly." + + This reverts commit 38b6f306a70905be8b29ffaeb75288d315ff9b04. - Change-Id: I875ecb05e0919e81e6d8d1d00f802c8d5df5b214 - Reviewed-on: https://code.wireshark.org/review/10053 + Change-Id: I6ec83b94811be7699880e9a741c68faaac175bd0 + Reviewed-on: https://code.wireshark.org/review/10613 Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> -commit c643cbf +commit 9a02bd0 Author: Gerald Combs <gerald@wireshark.org> -Date: Sat Aug 15 17:05:17 2015 -0700 +Date: Mon Sep 21 10:32:40 2015 -0700 - Run abicheck commands at compile time. + Make it possible to disable PercentBarDelegate. - 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. + Add a check to PercentBarDelegate to see if the caller set text for this + item or did not set a valid double value. If either case is true, just + draw the item normally and return. - Change-Id: I6e4d691e24c73ea05d638a0f897f570541c84e38 - Reviewed-on: https://code.wireshark.org/review/10052 + Change-Id: I028ee15d54f06f2cb16c6e5f1ef73c47b2886ccd + Reviewed-on: https://code.wireshark.org/review/10600 + Petri-Dish: Gerald Combs <gerald@wireshark.org> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 8d1a549 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Aug 16 08:10:40 2015 -0700 +commit 460ae03 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Mon Sep 21 14:46:38 2015 +0200 - [Automatic update for 2015-08-16] + IPv4: fix 'Decode As' when used with IPv4-in-IPv4 packets - Update manuf, services enterprise-numbers, translations, and other items. + Issue reported by João Valverde - Change-Id: Idb8a2cff075a1ffe5e3cd1d6f4d3fb1b6c357cdb - Reviewed-on: https://code.wireshark.org/review/10055 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I38c3148e87f85486efa2720833a7559c6eec964a + Reviewed-on: https://code.wireshark.org/review/10596 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: João Valverde <j@v6e.pt> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit b1d33db -Author: Petr Gotthard <petr.gotthard@honeywell.com> -Date: Sat Jul 4 01:19:02 2015 +0200 +commit 50ff8ae +Author: Gerald Combs <gerald@zing.org> +Date: Sun Sep 20 13:17:07 2015 -0700 - AMQP 1.0: Refactor to fix parsing of timestamps + Qt: Add idle dissection. - 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() + Features such as sorting and scroll bar colorization require + fully-dissected packets. We currently do dissection at the wrong time -- + *after* the user clicks on a packet list column header or moves the + scrollbar. - (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. + Add a timer + slot that dissects packets when the UI is idle so that our + packets are at least partially dissected when we need them. - 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. + Change-Id: I024c590af2250d67404a520f118e46ec0c49cd71 + Reviewed-on: https://code.wireshark.org/review/10593 + Petri-Dish: Gerald Combs <gerald@wireshark.org> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Gerald Combs <gerald@wireshark.org> + +commit 4680c8b +Author: Peter Wu <peter@lekensteyn.nl> +Date: Fri Jul 17 13:02:49 2015 +0000 + + Revert "Report an error if we fail to open the keylog file." - (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 + This reverts commit d1fcb7dd3482decd70bc3da6fbdef81800f0320f. - I propose to make this mechanism less table-driven (more explicit and more - flexible) and allow all alternates permitted by the standard. + Warning the user multiple times about an invalid ssl.keylog_file every + time a SSL stream is encountered is an annoyance (in tshark), but + crashing in GTK+/Qt during live captures is even worse. - Change-Id: Ib2cbda632d4c81ec3e6b81f539fe77bb913afc1c - Reviewed-on: https://code.wireshark.org/review/9528 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Disable the warning for now. Maybe detect it once at startup? That would + not cover removed files though. + + Bug: 11488 + Change-Id: I56b2eba1df0cff2309584a745b55ada238999fc4 + Reviewed-on: https://code.wireshark.org/review/9687 Reviewed-by: Michael Mann <mmann78@netscape.net> + Reviewed-by: Peter Wu <peter@lekensteyn.nl> -commit 8fa4016 -Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Sat Aug 15 18:07:10 2015 +0100 +commit 5e635ad +Author: Alex Badea <abadea@ixiacom.com> +Date: Wed Sep 16 17:34:20 2015 +0300 - make-taps.pl: Remove duplicate slash in pathname + ssl: determine DTLS by positively checking for UDP - Change-Id: Id5e13df24409267c405cdd05479610a8ba898289 - Reviewed-on: https://code.wireshark.org/review/10047 - Reviewed-by: Michael Mann <mmann78@netscape.net> + TLS can be tunnelled over other protocols (e.g. TLS over EAP + over 802.1x), which are neither TCP nor UDP. In this case, + we would assume DTLS, which is typically wrong. Assume TLS + instead. + + Change-Id: I45d70789f7fa793861297fc2e7a5f2be311bbbb1 + Reviewed-on: https://code.wireshark.org/review/10416 + Reviewed-by: Peter Wu <peter@lekensteyn.nl> + Petri-Dish: Peter Wu <peter@lekensteyn.nl> -commit 2e2129a +commit e2735ec Author: Michael Mann <mmann78@netscape.net> -Date: Sat Aug 15 09:39:05 2015 -0400 +Date: Sun Sep 20 22:20:40 2015 -0400 - Conversion of random proto_tree_add_text calls. + Remove proto_tree_add_text API. + + Its time has finally come. - Change-Id: I6505ce34de84bfe46d5bc7b4d6a3c6044f3fb4b5 - Reviewed-on: https://code.wireshark.org/review/10041 + Technically I just renamed it to proto_tree_add_text_internal and removed the WS_DLL_PUBLIC (so it shouldn't link outside of epan). It's still (legitimately) used by expert.c otherwise I would have made it static within proto.c (and the rename wouldn't have been necessary). + + Change-Id: I9bdf888d5e92bc7b70a3f5461b9297a66d994b80 + Reviewed-on: https://code.wireshark.org/review/10594 + Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> + Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> + Reviewed-by: Evan Huus <eapache@gmail.com> -commit 8b45727 -Author: Guy Harris <guy@alum.mit.edu> -Date: Sat Aug 15 11:34:46 2015 -0700 +commit 3b09a9e +Author: Tom Haynes <loghyr@primarydata.com> +Date: Thu Sep 17 14:40:23 2015 -0700 - Un-reference actions after adding them to an action group. + nfs: Register CB program statically and not whilst parsing it - 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. + The existing code parsed the callback program number from + a packet and then registered the callback program number. + But since the RPC dissector checks for valid and known + program numbers, it never parses it out. - Also, rename "menu_item" to "menu_action", to indicate that it's an action. + Anyway, NFS4_CALLBACK is a well known number - use it! - Change-Id: I54543dcc2e6c3b341a9f584fe1b6099a134771b3 - Reviewed-on: https://code.wireshark.org/review/10049 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: Ia812359102bf6620e3b83109eb918032155cd8d3 + Signed-off-by: Tom Haynes <loghyr@primarydata.com> + Reviewed-on: https://code.wireshark.org/review/10558 + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 1b46738 +commit 741ee8c Author: Guy Harris <guy@alum.mit.edu> -Date: Sat Aug 15 11:20:36 2015 -0700 +Date: Sun Sep 20 12:09:38 2015 -0700 - Do the "plugin" menu stuff in one pass. - - Also, use g_strconcat() in other places where we prepend / to action - names. + Arguably, some sort of assert belongs there. - Hopefully, this will make it easier to find common code between all the - N different places where we add menus and menu items. + Passing a null pointer probably means there's really something else + wrong at a higher level. If we could arrange that the DISSECTOR_ASSERT + macros do something useful when *not* executed during a dissection, that + would work. - Change-Id: Iee876866730cada64428df17f1f3c4552cc3ac93 - Reviewed-on: https://code.wireshark.org/review/10048 + Change-Id: I2605d1e1f97d35370736852aaf29eeaf2c560279 + Reviewed-on: https://code.wireshark.org/review/10592 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit c222719 +commit 1d6710f Author: Guy Harris <guy@alum.mit.edu> -Date: Sat Aug 15 10:49:51 2015 -0700 +Date: Sun Sep 20 12:08:34 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). + Return NULL from routines that return pointers, for stylistic consistency. - Change-Id: Ic45412399078796359649cc876d2c8bfc9a790c6 - Reviewed-on: https://code.wireshark.org/review/10046 + Change-Id: Idfc236f712e288662bab618e72cd68263950fff4 + Reviewed-on: https://code.wireshark.org/review/10591 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 88f334b -Author: Stig Bjørlykke <stig@bjorlykke.org> -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 <stig@bjorlykke.org> - -commit 5f13933 -Author: Stig Bjørlykke <stig@bjorlykke.org> -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 <stig@bjorlykke.org> - -commit 0a16350 -Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -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 <alexis.lagoutte@gmail.com> - -commit 2bc6f01 +commit 821ebb8 Author: Guy Harris <guy@alum.mit.edu> -Date: Sat Aug 15 09:26:45 2015 -0700 +Date: Sun Sep 20 12:04:52 2015 -0700 - *More* issues. + Don't hand zero-length UUIDs to print_numeric_uuid(). + + It returns a null pointer if you do. - Change-Id: Ib415582f4bf2529c412bed329b3ee7daccde29b0 - Reviewed-on: https://code.wireshark.org/review/10042 + Change-Id: I3bc934a576dba261d1e71767978e3789a892e728 + Reviewed-on: https://code.wireshark.org/review/10590 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 7f38b65 +commit 8626bb4 Author: Michael Mann <mmann78@netscape.net> -Date: Sun Aug 9 08:03:21 2015 -0400 +Date: Sat Sep 5 09:55:03 2015 -0400 - Don't clear the tcp_analysis if a conversation is not provided to get_tcp_conversation_data(). + Make CSN.1 dissectors more filterable. - Callers may need to know information like retransmissions, etc which will be lost. + The intent here is to remove proto_tree_add_text from packet-csn1.c, but the macros setup means A LOT more hf fields needs to be created. - Change-Id: I3f8b6b0aeb308701eb34ae6f6f735af6995ed441 - Reviewed-on: https://code.wireshark.org/review/9940 + Many of those new hf fields were created with a perl script + + Bug: 11504 + Change-Id: If12c7677185f18a7f684fd3746397be92b56b36d + Reviewed-on: https://code.wireshark.org/review/10391 + Petri-Dish: Michael Mann <mmann78@netscape.net> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 85e2018 -Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Sat Aug 15 08:29:51 2015 +0100 +commit 4ec8a06 +Author: Gerald Combs <gerald@wireshark.org> +Date: Sun Sep 20 08:11:25 2015 -0700 - udp: fix minimum jumbo length + [Automatic update for 2015-09-20] - Change-Id: I5ab4974cc60cdec0c3571bdec815c8cb9e8f7255 - Reviewed-on: https://code.wireshark.org/review/10040 - Reviewed-by: Michael Mann <mmann78@netscape.net> + Update manuf, services enterprise-numbers, translations, and other items. + + Change-Id: Ifcdb1c02406189085bda58bc7db10829e3fae2c0 + Reviewed-on: https://code.wireshark.org/review/10580 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 85d2eef -Author: Evan Huus <eapache@gmail.com> -Date: Tue Aug 11 18:35:45 2015 -0400 +commit 3a351b6 +Author: Gerald Combs <gerald@wireshark.org> +Date: Fri Sep 18 11:31:16 2015 -0700 - btatt: guard against incomplete reassembly + Call cf_cb_file_rescan_* callbacks in rescan_packets. - 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. + We call cf_cb_file_rescan_{started,finished} in rescan_file. Do the same + in rescan_packets. In the Qt UI this ensures that flushVisibleRows gets + called so that packet_list_select_row_from_data works as expected. - Bug: 11436 - Change-Id: I4cd05c1a9ac4404bf70a3945f80b12f7bf5f74ee - Reviewed-on: https://code.wireshark.org/review/9983 - Reviewed-by: Evan Huus <eapache@gmail.com> - Petri-Dish: Evan Huus <eapache@gmail.com> + Change-Id: I425b7beb0f97a7d5b84c979fca65b877673b4722 + Reviewed-on: https://code.wireshark.org/review/10569 + Reviewed-by: Gerald Combs <gerald@wireshark.org> + Petri-Dish: Gerald Combs <gerald@wireshark.org> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 677d4d6 -Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Sun Aug 9 23:13:06 2015 +0100 +commit 587e93a +Author: Gerald Combs <gerald@wireshark.org> +Date: Fri Sep 18 15:13:29 2015 -0700 - Add IPv6 Jumbogram support (RFC 2675) + Start moving RTP decoding routines to the ui directory. - Change-Id: Icea1659395d7bc16e367b74a695586926b33149b - Reviewed-on: https://code.wireshark.org/review/9968 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Move decode_rtp_packet to ui/rtp_media.[ch]. + + Change-Id: Ib138781c37ac17b807bf75f9d772351aadf72071 + Reviewed-on: https://code.wireshark.org/review/10575 + Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 8282540 -Author: Michael Mann <mmann78@netscape.net> -Date: Wed Aug 12 09:01:45 2015 -0400 +commit 723bae5 +Author: Guillaume Autran <gautran@clearpathrobotics.com> +Date: Mon Jul 27 11:17:46 2015 -0400 - Eliminate proto_tree_add_text from GSM dissectors. + TCPROS - Initial implementation for the Robot Operating System TCP protocol - Change-Id: I36a3d15a4fa86847a83d1dbea40111d36d7cfd61 - Reviewed-on: https://code.wireshark.org/review/10036 - Reviewed-by: Michael Mann <mmann78@netscape.net> + TCPROS is a transport layer for ROS Messages and Services. + It uses standard TCP/IP sockets for transporting message data. + Inbound connections are received via a TCP Server Socket with a header containing message data type and routing information. + For more information, see: http://wiki.ros.org/ROS/TCPROS + + Bug: 11404 + Change-Id: If8810dbb2cb6d6522eb035fd0fa1cf49933bad3d + Reviewed-on: https://code.wireshark.org/review/9807 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 8368f3b -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Aug 14 20:54:22 2015 -0700 +commit d295515 +Author: Dhananjay Patki <dhpatki@cisco.com> +Date: Fri Sep 18 17:38:38 2015 +0530 - Update the previously-added comment. + MIPv6: Added support for RFC 7148 - 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. + - Added support for Delegated Mobile Network Prefix as + defined in RFC 7148. + - Corrected the issue where GRE Key option with no key + was not displayed properly. + - Also added append-text for the HNP option to also + display the HNP value. - 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 <guy@alum.mit.edu> + Change-Id: I42a4bc1627e9e764f10d96aa3988c1f430f00ceb + Reviewed-on: https://code.wireshark.org/review/10565 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 463caf8 -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Aug 14 18:49:17 2015 -0700 +commit 1d7bcb2 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Wed Sep 16 23:58:49 2015 +0200 - Discuss alternatives to polling all the recent files every 2 seconds. - - Somebody asked about repeated SMB traffic when running the Qt Wireshark: + Fix 'Decode As' when used with IPv6-in-IPv6 packets - https://ask.wireshark.org/questions/45036/permanent-smb2-traffic-with-1997 + Add the ability to identify an instance of the dissector table to be modified by 'Decode As' thanks to pinfo->curr_layer_num + For now only IPv6 makes use of it but it could be extended to any other protocol + Also get rid of ipv6.nxt protocol: it is not required for 'Decode As' functionality and was colliding with ipv6.nxt field - 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 <guy@alum.mit.edu> + Change-Id: I3c7403c77328ad7170e13af028d178f962a2b508 + Reviewed-on: https://code.wireshark.org/review/10552 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: João Valverde <j@v6e.pt> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 6137197 -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Aug 14 17:19:37 2015 -0700 +commit 608029b +Author: Gerald Combs <gerald@zing.org> +Date: Fri Sep 18 18:04:19 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". + Fix more signal+slot mismatches. - Change-Id: I4e59026b5c4f26d02e4a96686e339f8d54bdcd1e - Reviewed-on: https://code.wireshark.org/review/10035 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I347509d3a7765387c48e5aaeaab417617320cf13 + Reviewed-on: https://code.wireshark.org/review/10576 + Petri-Dish: Gerald Combs <gerald@wireshark.org> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 0ddae1b -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Aug 14 16:19:13 2015 -0700 +commit b0eee2e +Author: Petr Gotthard <petr.gotthard@honeywell.com> +Date: Fri Sep 18 22:15:20 2015 +0200 - Put it in the Qt category, not the GTK category. + AMQP 0-9-1: More expert information - The default binary, "wireshark", is now a Qt binary; "wireshark-gtk" is - the GTK+ one. + A little usability improvement: Warn user on connection and channel + errors and when a message is undeliverable. - Change-Id: Ibfec5d796a9796c2588c4305b18dc4506a435228 - Reviewed-on: https://code.wireshark.org/review/10034 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I6106a63472b1fb5cbbabcf82a90af0f489030458 + Reviewed-on: https://code.wireshark.org/review/10573 + Reviewed-by: Michael Mann <mmann78@netscape.net> + Petri-Dish: Michael Mann <mmann78@netscape.net> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 4c6da64 -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Fri Aug 14 10:44:11 2015 -0400 +commit 38b6f30 +Author: Michael Mann <mmann78@netscape.net> +Date: Fri Sep 18 15:39:37 2015 -0400 - Ident the merge.c/h files by 4 spaces + Refactor NCP Python data so that INFO column can be generated on the fly. - Using 2 spaces for indent is way past its prime. + The "old" method of populating the INFO column was to dissect all fields of a function/subfunction, then do a search in the tree to find the hf_ values of interest to then format into something for the INFO column. This is very expensive and requires "low level" APIs (for tree manipulation) which really shouldn't be used in a dissector. - Change-Id: I80caf89f15e576f9aeb25754576a9f18215ccb3c - Reviewed-on: https://code.wireshark.org/review/10032 - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - -commit 46d6e8c -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Fri Aug 14 14:48:49 2015 +0200 - - Added some missing breaks + The "new" method populates the INFO column at the same time a field is parsed, so nothing has to be revisited. - Change-Id: I3b2f25832ca878ec3e7f9e4dcce258dc870fc5ad - Reviewed-on: https://code.wireshark.org/review/10031 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - -commit 7833b93 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Fri Aug 14 13:46:01 2015 +0200 - - Free all hfi->strings in free_deregister_field + There are still expert infos (and possibly column APIs) under if (tree)s, but with the FAKE_TREE_IS_VISIBLE "hacks" removed, there should be less fear in removing the tree checks. - Change-Id: I6fe78266a2e881fa80e1e3a3423b685d3c1764de - Reviewed-on: https://code.wireshark.org/review/10029 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + Change-Id: I847827395fc28704f468df8bc8b47b297dde8479 + Reviewed-on: https://code.wireshark.org/review/10572 + Petri-Dish: Michael Mann <mmann78@netscape.net> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 12ff69d -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Fri Aug 14 11:02:10 2015 +0200 +commit 2758114 +Author: Michael Mann <mmann78@netscape.net> +Date: Wed Sep 16 17:55:43 2015 -0400 - Qt: Fixed funnel text dialog append and prepend + Some more ncp2222 improvements - Append to end and prepend to start, not the opposite. + Including: + 1. Using ENC_BIG_ENDIAN and ENC_LITTLE_ENDIAN instead of self made macros - Change-Id: Ic0e2a7f04a0d9ff18a6fd7063d0550ad35eece1a - Reviewed-on: https://code.wireshark.org/review/10027 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + 2. Creating an "expert info hook" so that fields can be parsed "in real time" and added as expert info instead of searching by field name and manually getting values. Most of the expert info is still under if (tree)s, but this is another step closer to removing all of the "manual labor" done that requires "special handling" of all tree functionality. Once the "manual labor" is removed, this dissector can behave like every other dissector and the if (tree)s can be removed with more abandon. + + Change-Id: If2c6a4c723e12e070e68d6df2d492d4b5ac35123 + Reviewed-on: https://code.wireshark.org/review/10555 + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 28b5206 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Fri Aug 14 09:26:50 2015 +0200 +commit 7b7a7f1 +Author: Gerald Combs <gerald@wireshark.org> +Date: Fri Sep 18 14:33:41 2015 -0700 - Free protocol in proto_free_deregistered_fields + Fix a VoipCallsDialog signal+slot mismatch. - 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 <stig@bjorlykke.org> + Change-Id: I9c16cc138b55572aa19b6e02ca059ebde294bdbd + Reviewed-on: https://code.wireshark.org/review/10574 + Petri-Dish: Gerald Combs <gerald@wireshark.org> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 8426225 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Fri Aug 14 07:54:51 2015 +0200 +commit d547385 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Fri Sep 18 21:16:57 2015 +0200 - Qt: Avoid redissect twice when changing fields + Qt: set default current protocol in 'Decode As' window to none instead of HTTP - 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. + It makes more sense (not trying to decode UDP/TCP ports as HTTP) and is consistent across dissectors tables (while currently we have an empty field for tables other than UDP/TCP) - 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 <stig@bjorlykke.org> + Change-Id: I794529f0f46b4197437a1d258f808991ae2338ad + Reviewed-on: https://code.wireshark.org/review/10571 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 6cc1c8d -Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Aug 13 20:05:43 2015 -0700 +commit e2487f3 +Author: Gerald Combs <gerald@wireshark.org> +Date: Fri Sep 18 12:08:57 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 WLAN statistics header behavior. - Fix an hf_ variable name to match the field name, and put the tvbuff - value fields in the order of their types. + Connect itemSelectionChanged to header label updates instead of + currentItemChanged, which seems to be more reliable. - 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 <guy@alum.mit.edu> + Change-Id: I29f8f2144ad6584e0612d43ec3aac5b258f08ebd + Reviewed-on: https://code.wireshark.org/review/10570 + Petri-Dish: Gerald Combs <gerald@wireshark.org> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 3c5fd58 -Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Aug 13 16:36:03 2015 -0700 +commit 093563b +Author: Gerald Combs <gerald@wireshark.org> +Date: Fri Sep 18 09:09:38 2015 -0700 - Get rid of trailing whitespace. + Sync GTK+ and Qt progress timer logic. - Change-Id: I035fad79dd8d01aa3121732f2a9b07d20cc4384f - Reviewed-on: https://code.wireshark.org/review/10023 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + The GTK+ update_progress_dlg() initially forces a UI update. Do so in + the Qt version as well. + + Change-Id: I05d9e61a0d0e4e05af448039bbb81785ac00908c + Reviewed-on: https://code.wireshark.org/review/10568 + Petri-Dish: Gerald Combs <gerald@wireshark.org> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 814f617 -Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Aug 13 16:30:51 2015 -0700 +commit cdc1b1e +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Fri Sep 18 18:48:09 2015 +0200 - Update to reflect reality. - - The Ixia trailer is a variable-length sequence of TLVs followed by some - fixed-length fields. Describe it as such. + Qt: flush visible rows before trying to select one - Realign some #defines while we're at it. + Otherwise you end up with a 'End of capture exceeded' popup when calling rescan_packets() with only a few packets in the capture - Change-Id: I5fc45a1d44978f1dc1f13e7098c3f797838db7b3 - Reviewed-on: https://code.wireshark.org/review/10022 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 5931da9 -Author: Ionut Ceausu <ionut.ceausu@gmail.com> -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 <martin.r.mathieson@googlemail.com> - Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> + Change-Id: Idb387ce95f1d22b934e735c350ea0c117763d89a + Reviewed-on: https://code.wireshark.org/review/10567 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 66f784a -Author: Bill Meier <wmeier@newsguy.com> -Date: Thu Aug 13 12:02:33 2015 -0400 +commit bb7f7d3 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Mon Sep 14 00:33:27 2015 +0200 - [config.nmake] Add minor comment about /Zo option for MSVC-2015 + spdy: do not overwrite HTTPS registration - Change-Id: Ia4ffc543965160aaf6c39dc19764e62e9e82faa8 - Reviewed-on: https://code.wireshark.org/review/10020 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit cd76cf6 -Author: Dario Lombardo <lomato@gmail.com> -Date: Thu Aug 13 17:27:10 2015 +0200 - - ieee802.11: changed blurb to stop checkAPI complains. + Setting a zero port still allows it for selection in the UAT dialog + while not breaking HTTPS dissection. + + (In theory the UAT setting would work. In practice it would still call + ssl_dissector_add and take over the SSL registration for all tcp/443 + traffic. On removal with ssl_dissector_remove, the HTTPS port is not + added back again until a restart (or until the HTTPS ports list is + changed from the default) because the spdy registration overwrites the + HTTP one...) + + Also note that NPN detection for SPDY is not implemented, only ALPN + detection is supported. - Change-Id: I9ec74a7af229a1af3ca946acc5af94ede1913c29 - Reviewed-on: https://code.wireshark.org/review/10016 + Bug: 10984 + Change-Id: I6e84aa6408abf40bb860abee4845731ce55ce254 + Reviewed-on: https://code.wireshark.org/review/10517 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 7661bb2 +commit a5cbe4a Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Thu Aug 13 17:38:09 2015 +0200 +Date: Fri Sep 18 12:41:05 2015 +0200 - Qt: fix copy of newer files when building with qmake + NAS EPS: do not try to decode Message Elements when the end of the message is reached - Change-Id: I8ea5e2770a0c5be3d981d986fa96fe30445db167 - Reviewed-on: https://code.wireshark.org/review/10018 + Change-Id: Iaa05c3b4268c5c618134810c49f65d63995eccfb + Reviewed-on: https://code.wireshark.org/review/10564 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 2d5f2ae -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Thu Aug 13 16:16:03 2015 +0200 +commit 7e70a44 +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Thu Apr 23 08:30:45 2015 +0200 - GVCP: fix dissection of Stream Channel Packet Size register + QUIC: Fix Num Timestamp dissection - Bug: 11442 - Change-Id: I1c187bdf7ffd14b2a4f66d29883a4b112486bd35 - Reviewed-on: https://code.wireshark.org/review/10014 - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: I75ba3807daadf95d135bc73083b6ff37528b2068 + Reviewed-on: https://code.wireshark.org/review/10561 + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 738cf42 -Author: Anders <anders.broman@ericsson.com> -Date: Fri May 29 10:33:58 2015 +0200 +commit 0deb7f8 +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Fri Sep 18 09:15:42 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 + main_toolbar (GTK): Fix no previous prototype for ‘plugin_if_maintoolbar_goto_frame’ [-Wmissing-prototypes] - Change-Id: I1658077931b89b9a22ee32e5ed7de38e07fb6a55 - Reviewed-on: https://code.wireshark.org/review/8683 - Petri-Dish: Anders Broman <a.broman58@gmail.com> + Change-Id: Ibb58694e730389b1e8ef3790595ed16d8699d37c + Reviewed-on: https://code.wireshark.org/review/10563 + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 6087f2a -Author: Dario Lombardo <lomato@gmail.com> -Date: Thu Aug 13 10:13:52 2015 +0200 +commit a470f34 +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Fri Sep 18 08:50:46 2015 +0200 - fuzz-test.sh: added missing option in help. + DHCP (bootp): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - Change-Id: I7651e18ec6e8338cddc82be90257c5f183804c7c - Reviewed-on: https://code.wireshark.org/review/10011 + Change-Id: Ie67b4fd7a3d8655f0b33c3a37b0cf08e7f248a76 + Reviewed-on: https://code.wireshark.org/review/10562 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit beb5c0b -Author: Michael Mann <mmann78@netscape.net> -Date: Tue Aug 11 19:50:43 2015 -0400 +commit 22bc307 +Author: Hadriel Kaplan <hadrielk@yahoo.com> +Date: Wed Aug 5 09:24:50 2015 -0400 - Eliminate proto_tree_add_text from some dissectors. + RTP: handle payload reassembly for multiple fragments - Change-Id: I1e6bf52fad1b1fffefc174a557ff836f400e8fd7 - Reviewed-on: https://code.wireshark.org/review/9996 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> + If an RTP payload spans more than two packets, the dissector needs to + save the previous fragment info. + + Bug: 11413 + Change-Id: I62558f40136881d70bf2a9597eabd3697966ac4a + Reviewed-on: https://code.wireshark.org/review/9875 + Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 61d1ea4 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Aug 12 15:19:25 2015 -0700 +commit f5bf04e +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Thu Apr 23 08:30:45 2015 +0200 - Initialize another variable. + QUIC: Add Client/Server handshake (CHLO / SHLO / REJ) - Change-Id: Ie53a16dc482a9c38538077f6d6a2717cfaddbaa4 - Reviewed-on: https://code.wireshark.org/review/10010 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 0b7d161 -Author: Dario Lombardo <lomato@gmail.com> -Date: Tue Aug 11 23:58:54 2015 +0200 - - editcap: add change offset. + Support decode of tag/value - This option skips some bytes when fuzzing, that prevents some headers from being changed. This focuses fuzzer to a smaller part of the packet. + Only try to decode handshake when sequence number = 1 - Change-Id: I1db83235e93f2774a9991e3af70f633487b816fa - Reviewed-on: https://code.wireshark.org/review/9982 - Petri-Dish: Anders Broman <a.broman58@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + (Working on function to check if the packet is handshake..) + There is sometimes issue for decode ACK Special Frame Type... + + Bug: 11494 + Change-Id: If1f4051fc9c11d343acb7f15f94a325d4243a070 + Reviewed-on: https://code.wireshark.org/review/8171 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 99e3244 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Aug 12 14:12:24 2015 -0700 +commit 9162177 +Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> +Date: Wed Sep 2 01:28:18 2015 +0100 - Initialize a couple of variables. + Make IPv4/IPv6 DiffServ fields uniform - Change-Id: I10471b770356ad46a10740198156055e1480eeb3 - Reviewed-on: https://code.wireshark.org/review/10008 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit db2692c -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Aug 12 20:58:14 2015 +0200 - - Qt (main_window) fix no previous prototype for '...' [-Wmissing-prototypes] + Replace DSCP/ECT/CE with DSCP/ECN for IPv6. + Introduce short descriptions for DSCP/ECN values. - Change-Id: I43901d37817f9b79d508336253e766d740939e70 - Reviewed-on: https://code.wireshark.org/review/10003 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Formating changes: + + - Make IPv4 and IPv6 as similar as possible. + + - Display short abbreviations only for "Differentiated Services Field". + + - Display DiffServ field as hex for IPv4. + + - Elide leading zeros from hex representation from DiffServ field for IPv6. + + - Display DSCP/ECN as decimal in subtree (same as "IP DSCP" column format). + + Change-Id: Ia69d11dc9c1d752eb2e269314287c885506b5353 + Reviewed-on: https://code.wireshark.org/review/10360 + Reviewed-by: Michael Mann <mmann78@netscape.net> + Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 2449c7a -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Aug 12 21:06:08 2015 +0200 +commit 69d2d58 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Wed Sep 16 12:34:46 2015 +0200 - GTP: fix indent (use 4 spaces) + pkcs1: remove unused RSAPrivateKey definition - Change-Id: I2f0645adee2aff32122a8ccb60843e1bfd0897e1 - Reviewed-on: https://code.wireshark.org/review/10004 + RSA private keys are typically not found in network captures, so let's + just remove it. This removal avoids overloading the pkcs1.modulus + field with the same meaning from two different contexts (RSAPrivateKey + and RSAPublicKey). + + Change-Id: I65239718e6fc801fc53fa46c467dc86620aa3b29 + Reviewed-on: https://code.wireshark.org/review/10546 + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: ronnie sahlberg <ronniesahlberg@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 451dd05 -Author: Bill Meier <wmeier@newsguy.com> -Date: Wed Aug 12 16:47:36 2015 -0400 +commit 7e17b58 +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Thu Sep 17 20:41:50 2015 -0400 - [lwres] Fix (32 bit ?) MSVC-2015 warning: "conversion from 'size_t' to 'guint16', possible loss of data" + When we're updating the progress bar, ask that it be updated (redrawn) too. - Change-Id: Ifc71d1c2afc3ff16f950f2f1c3c9e7142d62fc16 - Reviewed-on: https://code.wireshark.org/review/10007 - Reviewed-by: Bill Meier <wmeier@newsguy.com> + At least on Linux/X11 with Qt5 this appears to be necessary so the progress + bar updates more than once every 2 seconds or so (when loading a large file). + + Change-Id: I7eea9c0d97d24bc14ad75f082a3531dcf1a3b6ae + Reviewed-on: https://code.wireshark.org/review/10559 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit d20f2b6 -Author: Bill Meier <wmeier@newsguy.com> -Date: Wed Aug 12 16:24:03 2015 -0400 +commit cf0d762 +Author: Jeroen Roovers <jer@gentoo.org> +Date: Sun Sep 13 19:10:55 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). + do not clobber user CFLAGS - Change-Id: I4879b39729ba5bd6b1c478ac43c107cb9fb445b3 - Reviewed-on: https://code.wireshark.org/review/10006 - Reviewed-by: Bill Meier <wmeier@newsguy.com> + Bug: 10791 + Change-Id: I58c35c757039e69111a39100f5ccb306e098d591 + Reviewed-on: https://code.wireshark.org/review/10519 + Petri-Dish: Michael Mann <mmann78@netscape.net> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Guy Harris <guy@alum.mit.edu> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 6ae8df4 -Author: Bill Meier <wmeier@newsguy.com> -Date: Wed Aug 12 16:15:05 2015 -0400 +commit 72f3b9f +Author: Gerald Combs <gerald@wireshark.org> +Date: Thu Sep 17 12:32:28 2015 -0700 - [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. + Fix some signal → slot mismatches. - (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 + Update some signal definitions to match gb4e972b. - 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 <wmeier@newsguy.com> + Bug: 11524 + Change-Id: I0d98a4e83c791221962943c3dec8f0d4296d3027 + Reviewed-on: https://code.wireshark.org/review/10557 + Petri-Dish: Gerald Combs <gerald@wireshark.org> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 5c80f08 +commit 43b77ae Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Aug 11 11:48:07 2015 -0700 +Date: Thu Sep 17 10:32:55 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. + Qt: Add an event processing timer. - Allow program names on the command line in place of numbers or UUIDs. Make - matches case-insensitive. E.g. the following are equivalent: + When updating the progress dialog (which happens each time we read a + packet) the GTK+ UI processes application events every 100ms. Do the + same in the Qt UI. - -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 + Ping-Bug: 11515 + Change-Id: Ic53eade05c0b82bf436c08618f28506c5fcdbc94 + Reviewed-on: https://code.wireshark.org/review/10554 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 412f5b3 +commit ae4d99b Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Aug 12 10:49:34 2015 -0700 +Date: Wed Sep 16 10:46:45 2015 -0700 - Expert information dialog performance improvements. + Packet list speedups. - 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. + beginInsertRows + endInsertRows is expensive. Instead of calling them + each time we add a packet to the list, queue up a list of visible packets + and flush it during the next UI update. - While we're here, make sure we show the dialog before tapping packets. + Assume that none of our column data has newlines. Enable + uniformRowHeights and only disable it when we need to. Note that this + requires further work. - Bug: 11439 - Change-Id: I8a182f4158d078cae5f42b8d1355414197f423e1 - Reviewed-on: https://code.wireshark.org/review/10000 + Ping-Bug: 11515 + Ping-Bug: 10924 + + Change-Id: Ifbdd2964b174247a4745d4889ebda5bf3b886ba4 + Reviewed-on: https://code.wireshark.org/review/10553 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit bde416a -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Wed Aug 12 15:21:46 2015 +0200 +commit dabdc30 +Author: Gerald Combs <gerald@wireshark.org> +Date: Thu Sep 17 12:21:54 2015 -0700 - Lua: Moved deregister out of wslua_cleanup + IAX2: Initialize a variable. - Change-Id: Ia43aa0e5f09400ef9923288b362256094a1241b8 - Reviewed-on: https://code.wireshark.org/review/9998 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + Change-Id: I0981fd93969e2f0168c83688b691f51407f4119e + Reviewed-on: https://code.wireshark.org/review/10556 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 5a92694 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Wed Aug 12 14:51:29 2015 +0200 +commit 6646b00 +Author: Michael Mann <mmann78@netscape.net> +Date: Wed Sep 16 13:09:12 2015 -0400 - Initialize is_reloading_lua at startup + ncp2222 - Convert process_bitfield -> proto_tree_add_bitmask and other cleanup. - Change-Id: I211e0f4b86cff1c311d4ae67cbb47de14846144f - Reviewed-on: https://code.wireshark.org/review/9997 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + The dissector is doing a lot of unnecessary "manual" operations. Start the process of simplifying that to encourage use of general APIs and put control of the "field name" in the hands of the hf_ entry it belongs with. + + Change-Id: I5b048c04858ac4a846a276ba12d61c665deb66f8 + Reviewed-on: https://code.wireshark.org/review/10547 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit dc7443f -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Wed Aug 12 14:07:24 2015 +0200 +commit a4c2a29 +Author: Martin Kaiser <wireshark@kaiser.cx> +Date: Wed Sep 16 22:25:17 2015 +0200 - Added guards for deregistered fields + [iax2] don't THROW() an exception from a dissector - This is functions used when redissecting after a Lua plugins reload. + in this case, it's enough to exit the switch block and try to continue + with the next element - Change-Id: Ida14526faec1992006938a6732ee894ac83c2d12 - Reviewed-on: https://code.wireshark.org/review/9995 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - -commit a3e3d60 -Author: AndersBroman <anders.broman@ericsson.com> -Date: Wed Aug 12 13:24:06 2015 +0200 - - Align comments + we might now end up with ie_item==NULL after the switch, so replace the + assertion with a check - Change-Id: Iab59ba51700b018337552018c76e30dcbd41f3f6 - Reviewed-on: https://code.wireshark.org/review/9993 + Change-Id: Id54346077eb8aa12b22575f3ab6fa80087f240ce + Reviewed-on: https://code.wireshark.org/review/10549 + Petri-Dish: Anders Broman <a.broman58@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit cd16301 -Author: AndersBroman <anders.broman@ericsson.com> -Date: Wed Aug 12 10:00:01 2015 +0200 +commit 5fa0bb2 +Author: Martin Kaiser <wireshark@kaiser.cx> +Date: Tue Sep 15 19:33:32 2015 +0200 - [GTP] Direct Tunnel Flags 7.7.81 is currently specified with one data - octet. + change the representation of an empty byte array in a display filter - Change-Id: Iab7917b23e6be03f63a92ef0aaf0814c9cbea2c3 - Reviewed-on: https://code.wireshark.org/review/9992 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + by default, an empty byte array (FT_BYTES) is represented as an empty string + + thus, using "Apply as Filter / Selected" on such an item creates an + invalid display filter expression, e.g. dvb-ci.mmi.char_tbl== + + represent an empty byte array as "" if we're compiling a display filter + expression + + Bug: 11526 + + Change-Id: Ie94507a24a496e0c25bcdadfab72fdf9fb35958a + Reviewed-on: https://code.wireshark.org/review/10540 + Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> -commit bfdc2cb -Author: Michael Mann <mmann78@netscape.net> -Date: Mon Aug 10 19:28:54 2015 -0400 +commit fade468 +Author: Martin Kaiser <wireshark@kaiser.cx> +Date: Wed Sep 16 22:29:18 2015 +0200 - Eliminate proto_tree_add_text from some dissectors. + [iax2] minor cleanup - Change-Id: I7a7778802c442b254626a7676cb74ca2855fa65e - Reviewed-on: https://code.wireshark.org/review/9977 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + replace switch-case with if + remove an initial value that's overwritten immediately + + Change-Id: I98487ed08f91416179fcbbbaf80bf1b126a8d1c2 + Reviewed-on: https://code.wireshark.org/review/10548 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 50b51a6 -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Aug 11 22:42:26 2015 -0700 +commit e036ec0 +Author: Gerald Combs <gerald@wireshark.org> +Date: Wed Sep 16 13:51:08 2015 -0700 - Some further questions, asked in comments. + As far as I can tell the name is "Git" and not "GIT". - Change-Id: I41c7918b7396934c651fb957d3b61db0c7a19527 - Reviewed-on: https://code.wireshark.org/review/9990 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 260ae6a -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Aug 11 19:00:26 2015 -0700 - - Clean up the file header description. + Update the Git protocol dissector strings accordingly. - Change-Id: I4928f99cdc2b8fc2a3aef648b613ce0b93ed3563 - Reviewed-on: https://code.wireshark.org/review/9989 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: If9a8f04dcd31e9ad930d328654b1c6479472e48c + Reviewed-on: https://code.wireshark.org/review/10550 + Petri-Dish: Gerald Combs <gerald@wireshark.org> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 1100ba9 -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Aug 11 18:38:08 2015 -0700 +commit 038f3dd +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Mon Sep 14 17:22:47 2015 -0400 - Update comments. + Don't force Lua support in RPMs (some distros don't ship a compatible Lua + anymore). - Change-Id: I4b0b4bb31901208e09a535ef922e134116309531 - Reviewed-on: https://code.wireshark.org/review/9988 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 36c50fe -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Aug 11 18:32:18 2015 -0700 - - Document Colasoft Capsa file support. + Also make the RPM follow configure's qt4-vs-qt5 choice. - Change-Id: I89374413f3e08e2a35923b8bd4c128b3c659158a - Reviewed-on: https://code.wireshark.org/review/9987 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I832af99e055d42b92f3a7c8e4378c7a9d5d628b9 + Reviewed-on: https://code.wireshark.org/review/10532 + Reviewed-by: Jeffrey Smith <whydoubt@gmail.com> + Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> -commit 7b39eac -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Aug 11 18:27:10 2015 -0700 +commit 6f84c7b +Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> +Date: Thu Sep 10 18:55:57 2015 +0100 - It looks as if the origin of the time stamps is the UN*X epoch. + IPv6: Make "ip.version" field hidden - 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 <guy@alum.mit.edu> + Change-Id: Ib9a29205c36b3a50989ffeddb28e349ede16efd3 + Reviewed-on: https://code.wireshark.org/review/10474 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 14c7525 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Tue Aug 11 21:57:11 2015 +0200 +commit d67e20a +Author: Peter Wu <peter@lekensteyn.nl> +Date: Wed Sep 16 11:06:00 2015 +0200 - [Qt Expert Info dialogue] remove our tap listener when the dialogue is destroyed + http: preserve desegmentation functionality for http2 - 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 + When the HTTP dissector passes data to a subdissector, it should also + propagate the desegmentation ability. Otherwise subdissectors (such as + HTTP2) will not be able to handle large DATA frames. - 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 + Reported by Alexis, verified with his capture. - Bug: 11432 - Change-Id: I8fc13351666c875e1a3641f31bada8e80d167ab2 - Reviewed-on: https://code.wireshark.org/review/9979 - Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I831a78e8d1ad08536e3d0d870012e427ce289b1b + Reviewed-on: https://code.wireshark.org/review/10544 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit f1a4db3 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Tue Aug 11 22:04:58 2015 +0200 +commit a825476 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Wed Sep 16 10:49:43 2015 +0200 - Lua: Remove unneeded call in wslua_cleanup + NFS: add a missing return when the IO hints bitmap is too large - Change-Id: I0cda00001b40e5951d680d72dbc8043cbe8b9309 - Reviewed-on: https://code.wireshark.org/review/9980 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + Bug: 11528 + Change-Id: I9f92a2b38e9c094609b960eb1e105cc57ea66de3 + Reviewed-on: https://code.wireshark.org/review/10543 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 58ec64c -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Tue Aug 11 21:52:32 2015 +0200 +commit 2c7c705 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Wed Sep 16 00:29:00 2015 +0200 - wmem: Fix wmem_tree_remove_string + http2: fix dissection when using Upgrade - Always set is_removed when insert data in a node. + The fix for bug 11331 has as side-effect that the HTTP part of a + conversation is not dissected on the second pass. - Change-Id: I8fb50932a369e3f4fe8a1f743462683fff705cc2 - Reviewed-on: https://code.wireshark.org/review/9978 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - -commit 4309b96 -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Aug 11 12:16:23 2015 -0700 - - Sort dump_open_table_base[] in the right order. + Fix it by calling the HTTP2 dissector only when it was detected via + heuristics, and not via Upgrade (since that would be handled by the + http loop). - 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. + While at it, remove the use of tvb_new_subset_remaining since the + original tvb is not touched and move the comment about the proxy to the + right place. - Change-Id: I06afe7bb98cb36c54ddc831113bb632598ab2eb0 - Reviewed-on: https://code.wireshark.org/review/9975 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Tested with the capture from Alexis (plain HTTP2 via Upgrade), the one + from bug 11331 (plain HTTP2 via heuristics) and a HTTP2 in SSL capture + (via heuristics). + + Change-Id: Iead7682aa8d5114e4edcfd54eabcd0d659056cc1 + Reviewed-on: https://code.wireshark.org/review/10541 + Petri-Dish: Peter Wu <peter@lekensteyn.nl> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit de70d2a -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Aug 8 19:11:20 2015 +0200 +commit c36ed56 +Author: Bill Meier <wmeier@newsguy.com> +Date: Sat Sep 5 18:31:11 2015 -0400 - H225: fix indent (use 2 spaces) and add modelines info + [tcp] Fix case of incorrect "[TCP ACKed unseen segment]" - Change-Id: Ibe4cf8d004c6c94f745e5c620100af9483fa6a31 - Reviewed-on: https://code.wireshark.org/review/9934 + The invalid message occurred for an ack of a TCP segment + which included both retransmitted data and additional new data. + + Bug: 11506 + Change-Id: Id981d04c91b9e69b6ee1e0dea85aed142bf32594 + Reviewed-on: https://code.wireshark.org/review/10395 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit d6c6b08 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Tue Aug 11 16:11:46 2015 +0200 +commit bec65ab +Author: Peter Wu <peter@lekensteyn.nl> +Date: Tue Sep 15 18:46:36 2015 +0200 - wmem: Mark removed strings with is_removed + x509,ber: fix header field of large integers - This will allow integer value 0 again. + In the past large integers would be displayed as text, later on this + was changed into a "proper" header field. In most cases you do not want + to see "ber.64bit_uint_as_bytes" though, but the original field name. - Change-Id: Ibfa4249ea8b887971d3b3214ad9e4d095d20d155 - Reviewed-on: https://code.wireshark.org/review/9973 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + This patch allows fields that are marked as FT_BYTES to be displayed + with their original header field details (name, description, etc.). + + Change-Id: I4ab1a4cce649a225c73298fbf4dcf1692c693a03 + Reviewed-on: https://code.wireshark.org/review/10539 + Reviewed-by: Peter Wu <peter@lekensteyn.nl> + Petri-Dish: Peter Wu <peter@lekensteyn.nl> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit ecc4f75 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Tue Aug 11 14:08:08 2015 +0200 +commit 0472d1e +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Tue Sep 15 10:53:58 2015 -0400 - Added Reload Lua plugins. + mate.released_time is added as a float so register it as such. - This is initial support for reloading Lua plugins without - restarting the application. + As noted in: + https://ask.wireshark.org/questions/45835/wireshark-mate-correlation-multiple-gops - 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 + Realistically all MATE's times should probably be converted to + FT_RELATIVE_TIMEs but that's a project for another day. - Change-Id: I48870d8741251705ca15ffe1068613fcb0cb18c1 - Reviewed-on: https://code.wireshark.org/review/5028 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + Change-Id: I11f640be769d16ccfd787ae2d7f3837fa03ad379 + Reviewed-on: https://code.wireshark.org/review/10537 + Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 70d06de -Author: AndersBroman <anders.broman@ericsson.com> -Date: Tue Aug 11 13:52:34 2015 +0200 +commit 864e9a9 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Tue Sep 15 18:37:09 2015 +0200 - [SMCR] Minimum 4 bytes is required to perform the heuristic check. + asni_tcap: actually regenerate dissector after cleanup - Change-Id: I29426147cb1443af3c9cc9dc1b60beabe9a94277 - Reviewed-on: https://code.wireshark.org/review/9972 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Rane make -C asn1 and found this missing change. + + Somehow the unnecessary initialization was not included with the + dissector regeneration in 3243b6f964c96f0137fc3fffd66a74dd9f7910fd + ("asn1: split off cleanup routines"). + + Change-Id: I26d6f0ca4e7fa0b791108f016c684556da5d06e8 + Reviewed-on: https://code.wireshark.org/review/10538 + Reviewed-by: Peter Wu <peter@lekensteyn.nl> -commit f233824 -Author: AndersBroman <anders.broman@ericsson.com> -Date: Tue Aug 11 13:32:41 2015 +0200 +commit 5f695d2 +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Tue Sep 15 14:48:19 2015 +0200 - [Diameter] Add expert info to subdissection of 3GPP AVP:s + MTP3 Summary: fix no previous prototype for ‘register_tap_listener_gtk_mtp3_summary’ [-Wmissing-prototypes] - Change-Id: Ic2ec0696f1f6b8bb918dd04aa898dccdb8b90ece - Reviewed-on: https://code.wireshark.org/review/9971 + Change-Id: Iee26ba47802f3091f7e7264d2d7ce4b5e22db53c + Reviewed-on: https://code.wireshark.org/review/10536 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 2579607 -Author: AndersBroman <anders.broman@ericsson.com> -Date: Tue Aug 11 13:06:40 2015 +0200 +commit 8a80dd6 +Author: Michael Mann <mmann78@netscape.net> +Date: Sat Sep 12 09:37:05 2015 -0400 - [ENEA LINX over TCP] Make the TCP port registration a preference defalted - to 0. + Apply fix-encoding-args.pl "manually" and other cleanup. - Change-Id: I837bf8ac9d5724dd485f0bc62f3fe32bedd3eb0e - Reviewed-on: https://code.wireshark.org/review/9970 + I'm guessing fix-encoding-args.pl doesn't work on packet-ncp2222.inc because the hf_ declarations/definitions aren't in the file itself, so it can't figure out endianness or field type. So to bring the file up to modern coding standards, I did it "manually". In general I think this file has escaped critique because of the "generated" nature of the dissector. + + Also removed tvb_ensure_bytes_exist and tvb_get_ptr use as both were superfluous. + + Change-Id: I224f0ce15f8eb93c48ecb8eea66d161d98468f23 + Reviewed-on: https://code.wireshark.org/review/10502 + Petri-Dish: Michael Mann <mmann78@netscape.net> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit c262bf2 -Author: AndersBroman <anders.broman@ericsson.com> -Date: Tue Aug 11 11:08:20 2015 +0200 +commit 5395a42 +Author: gmor1207@gmail.com <gmor1207@gmail.com> +Date: Thu Aug 13 10:28:18 2015 -0500 - [GIOP] A GIOP message can have size = 0 (CloseConnection) + ncp2222 Updates - Change-Id: I1feb6135c79191aa3ac7f36bbc969e6b36314107 - Reviewed-on: https://code.wireshark.org/review/9969 + Modifications to ncp2222.py + + Add absolute time values eptime for file/volume info + Add support for 64 bit File Transfer NCP's (22/54, 22/55, 22/56, 22/57, 22/58, 87/70, 87/71, 87/72, 87/73, 89/41, 123/35) + Fix numerous dissection errors in NWInfo and ExtNWInfo structures + Fix some indention (white space) in source + + Modifications to packet-ncp2222.inc + Change seq count rollover value to 16 instead of 255 to make it more robust + Add ncp 87,72 reply + Add ncp 8x20 request + Fix ncp 8x20 reply + + Change-Id: I80bdcc5854c02edd4ea51c74aa0bbc9c0e062bc1 + Reviewed-on: https://code.wireshark.org/review/10017 + Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 56a9b53 -Author: Martin Kaiser <wireshark@kaiser.cx> -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 <wireshark@kaiser.cx> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit b1be6bc -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Mon Aug 10 22:41:13 2015 +0200 +commit a0a3cd6 +Author: Michael Mann <mmann78@netscape.net> +Date: Sun Sep 13 18:38:35 2015 -0400 - zigbee: remove some more if (tree) checks + Make fchdr "packet" scoped. - Change-Id: I81b46ec7d9d919ff2779d1005063e9ef6c92e097 - Reviewed-on: https://code.wireshark.org/review/9966 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - -commit 52a7b79 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Mon Aug 10 22:27:58 2015 +0200 - - remove some unnecessary if (tree) checks + Broken in ge450b9b, when it stopped being static (which fixed other bugs). Conversations still need the fchdr "address" data to remain in scope. - Change-Id: Ib0f4cc47ede7b840cba38ecad04bd17bb6bccd55 - Reviewed-on: https://code.wireshark.org/review/9965 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> + Bug:11457 + Change-Id: I17a3814bf76d2940124a2700fb6b12c6d7d834c1 + Reviewed-on: https://code.wireshark.org/review/10518 + Petri-Dish: Michael Mann <mmann78@netscape.net> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 94bb276 -Author: AndersBroman <anders.broman@ericsson.com> -Date: Mon Aug 10 13:19:25 2015 +0200 +commit 51360b5 +Author: Michael Mann <mmann78@netscape.net> +Date: Fri Sep 11 17:41:13 2015 -0400 - Try to fix the build bou by copying tha cast made in glib. + Eliminate proto_tree_add_text from odds and ends. - Change-Id: I6da06b8e6ae272b940ef4ee47ce6b253bf9f3699 - Reviewed-on: https://code.wireshark.org/review/9961 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + A few calls in the epan directory and comments in the ui directory + + Change-Id: Ia8f8830ac6909ab94d3a03283bfd173456bc9718 + Reviewed-on: https://code.wireshark.org/review/10492 + Petri-Dish: Michael Mann <mmann78@netscape.net> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit e1003ee -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Fri Aug 7 16:29:50 2015 +0200 +commit aebc99a +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Mon Sep 7 16:03:11 2015 +0200 - editcap: fix -T <encapsulation type> option when output format is pcapng + IAP: Enhance Aruba IAP dissector - Right now the output encapsulation type is ignored if the output (default) format is set to pcapng. + After some analysis, update the dissector + Display only VC IP when type = 3, 4, 5 or 7 - Change-Id: Ibffaaed5979bf63ed4e3fa3b1f859a82b401d80b - Reviewed-on: https://code.wireshark.org/review/9911 - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: I53214125eebe978f67f6503072638ce3521cd155 + Reviewed-on: https://code.wireshark.org/review/10441 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 7fb514f -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Aug 8 16:52:38 2015 +0200 +commit a1491c7 +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Thu Sep 10 13:41:16 2015 -0400 - GSM (a_common): fix indent (replace tab by 8 spaces) + MPEG-PES: tell the user (in COL_INFO) when the stream or frame type is unknown. - Change-Id: Id1d6bfcb04ac75d767fe6f09454dc8235de7bc75 - Reviewed-on: https://code.wireshark.org/review/9928 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Inspired by: https://www.wireshark.org/lists/wireshark-users/201508/msg00023.html + + Change-Id: Ib632b79aef5cbb4c83965a276ec955be43493455 + Reviewed-on: https://code.wireshark.org/review/10472 + Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> -commit 76d4b80 -Author: AndersBroman <anders.broman@ericsson.com> -Date: Mon Aug 10 10:26:16 2015 +0200 +commit 50893c9 +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Mon Sep 14 15:43:53 2015 +0200 - g_slist_free_full () does not exist until GLIB 2.28 + SCSI: Fix typo on modelines - Change-Id: I81df5b4dbe1916eca51cdb72199de7a90471bd07 - Reviewed-on: https://code.wireshark.org/review/9960 + Change-Id: Id3613adbb69a4d02e752504a93bf13aa233ad00c + Reviewed-on: https://code.wireshark.org/review/10530 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 75d46fe -Author: Guy Harris <guy@alum.mit.edu> -Date: Mon Aug 10 00:53:34 2015 -0700 +commit e5f0cb9 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Mon Sep 14 16:02:43 2015 +0200 - Get rid of trailing white space. + Qt: align display of packets statistics in status bar with GTK UI - Change-Id: I3c0091612bdd518f749abbfbefbd0e2097b8c18b - Reviewed-on: https://code.wireshark.org/review/9958 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Bug: 11517 + Change-Id: Ie47b7eebe58e8a9ac485ddd04fe074c94a0c6741 + Reviewed-on: https://code.wireshark.org/review/10531 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Christopher Maynard <Christopher.Maynard@gtech.com> -commit 43c2e57 -Author: Guy Harris <guy@alum.mit.edu> -Date: Mon Aug 10 00:30:33 2015 -0700 +commit 72767a6 +Author: Jeffrey Smith <whydoubt@gmail.com> +Date: Wed Aug 26 09:09:06 2015 -0500 - Don't try to decrypt the payload if it was cut short by the snapshot length. + Begin support for Qt5 in RPM packaging - 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...). + The spec file for building RPM's is not currently set up to handle + using Qt5 rather than Qt4. - Bug: 11389 - Change-Id: Ie863ddc5c4aa7fbf6cde317823a413d226a41c0d - Reviewed-on: https://code.wireshark.org/review/9954 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + This change adds Qt5 support to the spec file. + + Change-Id: Ie726603377953bec41692a21148325829a26ba9a + Reviewed-on: https://code.wireshark.org/review/10276 + Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> -commit 3157114 -Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Aug 9 23:55:55 2015 -0700 +commit 3f85d73 +Author: Michal Labedzki <michal.labedzki@tieto.com> +Date: Sun Jun 7 11:48:12 2015 +0200 + + Bluetooth: ATT: Add remaining attributes + + Add 34 attributes. + All attributes for this day should be supported now. + Expect 3: + 0x2906 - Valid Range + 0x2A2A - IEEE 11073-20601 Regulatory Certification Data List + 0x2A4D - Report + The first is hard to implement now, the second needs to buy + specification, the last one will be implemented later - when USB HID + implementation will be full. + Please note that FLOAT/SFLOAT types are now supported right now. + + Change-Id: I0499e17257aa8cb831fbd0cf1524d8e59c98cac7 + Reviewed-on: https://code.wireshark.org/review/10526 + Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> + +commit 3d4ee5e +Author: Michal Labedzki <michal.labedzki@tieto.com> +Date: Sun Sep 6 18:15:04 2015 +0200 - Use the reported length where appropriate. + Use FT_UINT40 in two places - 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. + Finally we have FT_UINT40, so used it in Bluetooth ATT and + HDP dissectors. - Bug: 11389 - Change-Id: I4395c5a48c16110fcf31b611b99749c61000d489 - Reviewed-on: https://code.wireshark.org/review/9953 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: Iab0e71345f031bca972b1eee20d7e95e193b2aef + Reviewed-on: https://code.wireshark.org/review/10527 + Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit d108f28 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sun Aug 9 18:06:47 2015 +0200 +commit fb80cbd +Author: Michal Labedzki <michal.labedzki@tieto.com> +Date: Wed Aug 26 18:39:15 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) + Bluetooth: Add "PAN" prefix to three UUIDs - ==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) + "GN" does not seems to be really useful, but "PAN GN" is reasonable. - 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 <wireshark@kaiser.cx> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: Ia04aa20e4b95743c7db46e87606e3843a124d7e4 + Reviewed-on: https://code.wireshark.org/review/10524 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit c462f1b -Author: Michael Mann <mmann78@netscape.net> -Date: Sun Aug 9 18:33:30 2015 -0400 +commit 9ff68f3 +Author: Michal Labedzki <michal.labedzki@tieto.com> +Date: Tue Aug 25 14:01:43 2015 +0200 - Eliminate proto_tree_add_text from packet-wbxml.c + Bluetooth: AVDTP: Add missing error codes - While I was at it, some (mostly) duplicate functionality allowed rearranging of functions to eliminate most forward declarations. + Add error codes from AVDTP, GAVDTP and A2DP 1.3.1. - Change-Id: I2d7027d336c391d81dfe81c7a1ebf0d56c0826b2 - Reviewed-on: https://code.wireshark.org/review/9951 + Change-Id: Ida7c8041bafcd954d9939c165808347f16c542a8 + Reviewed-on: https://code.wireshark.org/review/10523 Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 6d8b4af -Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> -Date: Thu Aug 6 22:35:23 2015 +0100 +commit ac158c1 +Author: Michal Labedzki <michal.labedzki@tieto.com> +Date: Tue Aug 25 14:00:59 2015 +0200 - Cleanup variable name in dissect_frag6() + Bluetooth: HCI_EVT: Use correct name for Window field - Change-Id: Ib6bdea5dbc95b5221e41ca30c11288ff8c1dbb7f - Reviewed-on: https://code.wireshark.org/review/9952 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: Ia5dc9478f5dfcd52e872020904cd8efb0cc08a8c + Reviewed-on: https://code.wireshark.org/review/10522 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 655b0dc -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Mon Aug 10 00:00:21 2015 +0200 +commit 1345722 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Mon Sep 14 12:03:24 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 + dtls: remove unneeded private key file lookup - 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 + The comment was valid, the private key is already looked during the + ClientHello message (using ssl_find_private_key) and since the key is + only used during the key exchange, it is not needed to look it up that + early. - also, tvb_reported_length_remaining() does not return values < 0 any - more, remove the check for this + Verified with the test suite (DTLS Decryption). - Bug: 11389 - Change-Id: I42cb4526483160416b51e3cb72442148b5fac4f3 - Reviewed-on: https://code.wireshark.org/review/9950 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: Ia084a40d98cd74c77e9f1659ac57eeb8d44e59b6 + Reviewed-on: https://code.wireshark.org/review/10529 + Reviewed-by: Peter Wu <peter@lekensteyn.nl> -commit aafc7ff +commit a0cfeab Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Aug 8 16:55:15 2015 +0200 +Date: Sun Sep 13 11:12:49 2015 +0200 - H225: fix no previous prototype for 'h225_stat_init' [-Wmissing-prototypes] + SSL: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - Change-Id: I945bbbb3b10258f22c60b04b19cf55671fc6ed94 - Reviewed-on: https://code.wireshark.org/review/9933 - Reviewed-by: Bill Meier <wmeier@newsguy.com> + Change-Id: Ice4523786238f17250961a85988a195f2df8e888 + Reviewed-on: https://code.wireshark.org/review/10507 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Olaf Bergmann <bergmann@tzi.org> + Reviewed-by: Peter Wu <peter@lekensteyn.nl> -commit a051961 -Author: Bill Meier <wmeier@newsguy.com> -Date: Sun Aug 9 14:55:27 2015 -0400 +commit 908efe0 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Sun Sep 13 12:21:28 2015 +0200 - [wiretap/nettrace_3gpp_32_423] Add editor modelines + Qt: add displayed packets percentage to status bar - Change-Id: Ie2b9da2b3a08d18fc913a00cf076aa881a583552 - Reviewed-on: https://code.wireshark.org/review/9949 - Reviewed-by: Bill Meier <wmeier@newsguy.com> + Bug: 11517 + Change-Id: Ic8195e4bc3874eb527ce9afa850ab8cba74ddcfe + Reviewed-on: https://code.wireshark.org/review/10512 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit a29f513 -Author: Bill Meier <wmeier@newsguy.com> -Date: Sun Aug 9 14:16:22 2015 -0400 +commit f50ff01 +Author: Guy Harris <guy@alum.mit.edu> +Date: Sun Sep 13 13:27:03 2015 -0700 - [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. + Squelch 64-bit-to-32-bit warnings by just casting to int. - 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. + Those lengths had better fit in an int if they're added to packet offsets. - packet-skinny.c regenerated using 'cog' + (BTW, gsize is the spawn of Satan; it should never be used except when + you're dealing with GLib. It *should* have just been another name for + size_t, but it's 32 bits on 64-bit Windows, which means it's narrower + than size_t, which causes us some pain with g_snprintf().) - Change-Id: Ib3510c257e0b98bb7da8fae9aa010e134ec381cb - Reviewed-on: https://code.wireshark.org/review/9948 - Reviewed-by: Bill Meier <wmeier@newsguy.com> + Change-Id: Icd8f0632242303dbea0d80e0dad45b317097daaa + Reviewed-on: https://code.wireshark.org/review/10516 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 2ef3cda +commit eed56ee Author: Evan Huus <eapache@gmail.com> -Date: Sun Aug 9 10:36:18 2015 -0400 +Date: Sat Sep 12 23:22:47 2015 -0400 - t124: kill evil global variables + bootp: simplify avaya parameter parsing + + Only make one pass through the parameter list, adding fields as we go. Use a + wmem_strbuf to simplify string construction. Extract the "add a param" switch + into its own function so it can be called from two different places. - Bug: 11430 - Change-Id: Ia4196ff693806dc1e20eae4075dda7dfe272c5b6 - Reviewed-on: https://code.wireshark.org/review/9941 + Should be far easier to reason about, and much more efficient. + + Change-Id: I0818e0b98cbc6d2025c776bce82e56fb72e8753a + Reviewed-on: https://code.wireshark.org/review/10505 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Reviewed-by: Uli Heilmeier <openid@heilmeier.eu> Reviewed-by: Evan Huus <eapache@gmail.com> -commit b3207c0 -Author: Martin Kaiser <wireshark@kaiser.cx> -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 <wireshark@kaiser.cx> - -commit c5af152 -Author: Bill Meier <wmeier@newsguy.com> -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 <wmeier@newsguy.com> - -commit dbf314a -Author: Bill Meier <wmeier@newsguy.com> -Date: Sun Aug 9 12:14:39 2015 -0400 +commit 0a86b65 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Sun Sep 13 11:09:28 2015 +0200 - Trivial: Change editor-modelines tab-width specification from 4 to 8. + Qt: remove unused variables in IAX2 analysis code - [There were no actual indentation changes since since none of the files - contained tabs]. + Spotted by Coverity - Change-Id: I92ff551e70274f459c466e1c1d449905e0e7dc92 - Reviewed-on: https://code.wireshark.org/review/9945 - Reviewed-by: Bill Meier <wmeier@newsguy.com> + Change-Id: I4877eb282890415fbd24cbc6e48ababa46109b12 + Reviewed-on: https://code.wireshark.org/review/10510 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 394773c -Author: Gerald Combs <gerald@zing.org> -Date: Sun Aug 9 08:57:29 2015 -0700 +commit cf49f71 +Author: Diederik de Groot <ddegroot@talon.nl> +Date: Sun Sep 13 12:26:23 2015 +0200 - Switch the guides back to html output. + dissector-skinny: Update skinny dissector to fix ServerRes Message - DocBook's xhtml5 stylesheet output didn't render correctly in Firefox. + ServerRes message does not follow other message when it comes to + provinding the list of ip-addresses. The type of ip-address (IPv4 + or IPv6 does not depend on the protocol version but the length of + the message. - This reverts commit dc09d18e8ecdc55de2361d8ff6d2b0bf36345a70. - This reverts commit 62e56ad92a50c7dd58e83447207b8be0cc0bbb76. - This reverts commit 53a80334bcb3ca40a5aaef504e2aca0f04bcc9f3. + Fix: ipv4 address displayed as ip-address - Change-Id: Iafcf18cfce25772146fc2e155728401fd105a44b - Reviewed-on: https://code.wireshark.org/review/9944 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: Ie16f81c9482b30a80da37b9327b09e933d7808f8 + Reviewed-on: https://code.wireshark.org/review/10513 + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit a8af51d -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Aug 9 08:10:47 2015 -0700 +commit f2c5dee +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Sat Sep 12 14:06:12 2015 +0200 - [Automatic update for 2015-08-09] + Qt: refresh column content after editing it - Update manuf, services enterprise-numbers, translations, and other items. + Also save the new value in preferences - Change-Id: I14806e32e93b7f189ccc68834afa4645bda3e1aa - Reviewed-on: https://code.wireshark.org/review/9942 + Change-Id: Ie1a942669ebc2824c999621ecd948425b3b49574 + Reviewed-on: https://code.wireshark.org/review/10500 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 4bba83b -Author: Gerald Combs <gerald@zing.org> -Date: Sat Aug 8 16:29:24 2015 -0700 +commit 565a953 +Author: Gerald Combs <gerald@wireshark.org> +Date: Fri Sep 11 14:20:06 2015 -0700 - Reset the splash timer after processing events. + Don't invalidate the column cache when we filter packets. - Change-Id: Id71a3ac5e8f04df6a19e92021e47ea64728c2595 - Reviewed-on: https://code.wireshark.org/review/9936 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit de872cb -Author: Gerald Combs <gerald@zing.org> -Date: Sat Aug 8 15:44:02 2015 -0700 - - Generate DocBook conditionally. + Limit PacketListModel::recreateVisibleRows to checking for packets that + passed the display filter. Remove the call to resetColumns, which + invalidates the column string cache. - Add back a check when generating DocBook. + Call PacketListModel::resetColumns from PacketList::columnsChanged. + Along with invalidating the column string cache, this triggers a widget + update which means we shouldn't need to call recreateVisibleRows or + redrawVisiblePackets. Remove them. - Change-Id: I00679853d537f543db6f37a60ae4c46b3cce76e6 - Reviewed-on: https://code.wireshark.org/review/9935 + Change-Id: Ic25f139e2c2f8cdebb2a868ccda7eb4127a3013c + Ping-Bug: 11324 + Ping-Bug: 11514 + Reviewed-on: https://code.wireshark.org/review/10491 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 0626e76 -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Aug 7 18:17:04 2015 -0700 +commit fccfbf2 +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Sun Sep 13 11:14:07 2015 +0200 - CMake: Try to fix generated docbook dependencies. + Stock icon (Qt): Missing break in switch (CID 1323928) - 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. + Add a "// Fall through" comment to squelch a Coverity warning. Hopefully + the regex described at - Change-Id: I73b0db50ae92f62eb08ae284d498cdf2d697ac00 - Reviewed-on: https://code.wireshark.org/review/9920 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + http://security.coverity.com/blog/2013/Sep/gimme-a-break.html + + is case-insensitive. + + Change-Id: I10be63a77ed1e5e0c8000bad0c1b8d08db8b0951 + Reviewed-on: https://code.wireshark.org/review/10509 Reviewed-by: Gerald Combs <gerald@wireshark.org> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 11e5422 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Aug 8 16:50:17 2015 +0200 +commit 2d466c0 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Sun Sep 13 10:37:47 2015 +0200 - GSM (a_common): fix no previous prototype for 'gsm_a_*_init' [-Wmissing-prototypes] + androiddump: fix memory leaks reported by Coverity - Change-Id: I2990cb3432ad377cbed7039ad8fe15019eb7e7f5 - Reviewed-on: https://code.wireshark.org/review/9927 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I55951d29c85f3e461b4028cfcadbc83745b1ebe7 + Reviewed-on: https://code.wireshark.org/review/10506 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 524db99 +commit 7f191c7 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Aug 8 16:46:45 2015 +0200 +Date: Sun Sep 13 11:13:17 2015 +0200 - GSM (a_common): fix comma at end of enumerator list [-Wpedantic] + help_url: fix typo found by Coverity (CID 1323927) and Clang analyzer - Change-Id: I0ea06451861412b642d033a70e0a639aae753beb - Reviewed-on: https://code.wireshark.org/review/9926 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I26fda5d118d55f26f449ed858e9e57d477709bcb + Reviewed-on: https://code.wireshark.org/review/10508 Reviewed-by: Michael Mann <mmann78@netscape.net> -commit f6fb630 -Author: Guy Harris <guy@alum.mit.edu> -Date: Sat Aug 8 10:04:47 2015 -0700 +commit 66e9115 +Author: Gerald Combs <gerald@wireshark.org> +Date: Sun Sep 13 08:15:11 2015 -0700 - Fix another typo. + [Automatic update for 2015-09-13] - Change-Id: I1fee679b4b0f582806b0e9302c3e404c0222cd6d - Reviewed-on: https://code.wireshark.org/review/9930 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Update manuf, services enterprise-numbers, translations, and other items. + + Change-Id: I0c7a8d1ad41d5509c35f110aa50b7b86aa5a73c4 + Reviewed-on: https://code.wireshark.org/review/10514 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit c60c1b9 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Aug 8 16:37:58 2015 +0200 +commit 1565157 +Author: Uli Heilmeier <uh@heilmeier.eu> +Date: Sun Feb 22 12:00:58 2015 +0100 - IEEE802.11: Fix typo + Bootp/DHCP: Add option 242 (Avaya IP Telephone) - Pseduo -> Pseudo + This commit adds handling for option 242 to bootp. + The value of the Avaya option 242 is a string containing a list of + several suboptions seperated by a ",". + However some suboptions may have multiple values also seperated by + a comma. The values may be enclosed in quotes. - Change-Id: I34700b3392bfd7e47e79cb2cad0f65a1046a26a2 - Reviewed-on: https://code.wireshark.org/review/9925 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + A real-life string e.g. looks like: + MCIPADD=10.1.1.2,10.1.1.3,TLSSRVR=10.1.1.5,VLANTEST=60,L2Q=1,L2QVLAN=77 + + Documentation can be found here: + https://downloads.avaya.com/elmodocs2/one-X_Deskphone_Edition/R1.5/output/16_300698_4/admn054.html and + http://downloads.avaya.com/css/P8/documents/100068659 + + A set of crafted packets is attached to the bug. + + Bug: 11021 + Change-Id: I99b557a952fd34c0fcab6d0a5311440969316973 + Reviewed-on: https://code.wireshark.org/review/7443 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Evan Huus <eapache@gmail.com> -commit 454f08d -Author: Michael Mann <mmann78@netscape.net> -Date: Sat Aug 8 09:57:14 2015 -0400 +commit 33570f8 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Tue Sep 8 11:11:19 2015 +0200 - If SOCKS server doesnt't require authentication, then client should be ready for commands. + Fix misaligned read and buffer overrun - Bug: 11417 - Change-Id: I62c6d94923dcda2ef8297086faac7d7c4b85a3fb - Reviewed-on: https://code.wireshark.org/review/9923 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Ethernet addresses are only 6 bytes in size, reading it as a 64-bit + integer is invalid. Use unsigned 8-bit integers instead. + + Caught by UBSAN and Address Sanitizer. Trigger via the Statistics menu + Resolved Addresses (Qt) or Show address resolution (GTK). + + Change-Id: I628ff7cce0ea4f4e378c7968cd79a0ae34cdd20b + Reviewed-on: https://code.wireshark.org/review/10443 + Reviewed-by: ronnie sahlberg <ronniesahlberg@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Evan Huus <eapache@gmail.com> -commit 9a16a69 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Aug 8 16:10:48 2015 +0200 +commit 648cf99 +Author: Michael Mann <mmann78@netscape.net> +Date: Fri Sep 11 19:38:05 2015 -0400 - NCP2222.py : fix generate indent (use 4 spaces) + Make other_decode_bitfield_value private to proto.c. + + This is further encouragement to not try to manually create a bitstring while formatting a field. - Change-Id: Ibe55260e837f0a839649675c08e1bf66d8bcdb52 - Reviewed-on: https://code.wireshark.org/review/9924 + Change-Id: I4efbeb39a210cf1fd26203cd8560859276b333b0 + Reviewed-on: https://code.wireshark.org/review/10494 + Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 39ad1bf -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Aug 8 13:20:52 2015 +0200 +commit e4c0e51 +Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> +Date: Sat Sep 12 15:16:31 2015 +0100 - NCP2222(.inc): fix indent (use 4 spaces) + IPv4: Add missing space to format string - Change-Id: I8161423ae270f685c28003eac36adf15be83c5fd - Reviewed-on: https://code.wireshark.org/review/9922 + Change-Id: Iac602d9417a5af8f762043e5d743713fbeb8e339 + Reviewed-on: https://code.wireshark.org/review/10503 Reviewed-by: Michael Mann <mmann78@netscape.net> -commit b703f47 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Aug 8 13:08:57 2015 +0200 +commit 68dd2c8 +Author: Matthieu Coudron <mattator@gmail.com> +Date: Sat Sep 12 17:40:55 2015 +0200 - GTPv2: fix indent (use 4 spaces) + Display the name of the invalid field when tshark is run with -T fields + -e invalidfield - Change-Id: I7836360ae4fe67098776911a496ecc969d3e093d - Reviewed-on: https://code.wireshark.org/review/9921 - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: Iaf8733096d9e1d15510a38363397b1dcd972ff59 + Reviewed-on: https://code.wireshark.org/review/10504 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 5cf66db -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Aug 7 15:38:34 2015 -0700 +commit 7221743 +Author: Michael Mann <mmann78@netscape.net> +Date: Sat Sep 12 08:38:50 2015 -0400 - Add a missing dependency. + Eliminate proto_tree_add_text from packet-ncp2222.inc - Change-Id: I2c9814419882f9bee30e70697d6f284393f275a9 - Reviewed-on: https://code.wireshark.org/review/9919 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I551204d7546c05ab277bbb299a44b4625475d1a0 + Reviewed-on: https://code.wireshark.org/review/10501 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 7cb2b11 -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Aug 7 15:08:22 2015 -0700 +commit 03f2fbb +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Sat Sep 12 11:29:35 2015 +0200 - Rework CMake dependendencies in the docbook directory. + SCSI: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - 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 <gerald@wireshark.org> + Change-Id: I2e3acabfc8415c1230aad01f8112d46c2cf2b57f + Reviewed-on: https://code.wireshark.org/review/10499 + Reviewed-by: ronnie sahlberg <ronniesahlberg@gmail.com> -commit a001ed6 -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Aug 7 15:27:11 2015 -0700 +commit 9e9506e +Author: Diederik de Groot <ddegroot@talon.nl> +Date: Fri Sep 11 16:27:03 2015 +0200 - Avoid (unlikely) NRB record size overflows. + dissector-skinny: Update skinny dissector to include new messages and enums - 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. + Some new firmware has come out for sccp devices which contains the use of + 1 new message and some extended enums - 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). + Fix: UserToDeviceData was reusing the hf_skinny_data flag which had a side effect of showing the label as 'Statistics' which was incorrect. - 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 <guy@alum.mit.edu> + Change-Id: I84f31f5f170dee075df64b5e7187f8742b6768af + Reviewed-on: https://code.wireshark.org/review/10483 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 817d9bd -Author: Timothy Geiser <slimshady007@inbox.lv> -Date: Wed Aug 5 15:19:48 2015 -0400 +commit f5bd19e +Author: Guy Harris <guy@alum.mit.edu> +Date: Fri Sep 11 19:28:29 2015 -0700 - Add SHA2 algos to certificate dissection in SSL + Add casts to reassure the compiler that we know what we're doing. - Change-Id: If1315496d231e5c8efc44b9235ec8ffb3ce9d8a9 - Reviewed-on: https://code.wireshark.org/review/9880 - Petri-Dish: Anders Broman <a.broman58@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + I.e., the calculations (thanks to the masking etc.) will result in + values that fit into a guint, so there's no loss of data in converting + to a guint. + + Change-Id: I3dacce93ab87c625a45d22090b27774b9a63ba21 + Reviewed-on: https://code.wireshark.org/review/10496 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 240105e -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Aug 7 12:37:33 2015 -0700 +commit 500f196 +Author: Guy Harris <guy@alum.mit.edu> +Date: Fri Sep 11 19:05:28 2015 -0700 - Fixup the Qt splash overlay progress calculations. - - Fix a couple of issues in the way we calculate the splash overlay - progress. + Conversions of void * to some other type require explicit casts. - Avoid unnecessary repaints. + Not in C, but in C++, and we check to make sure our C code can be + compiled by a C++ compiler. - Change-Id: I1f4800b2c2836b67ca9ff3d6d24af150f4379ba9 - Reviewed-on: https://code.wireshark.org/review/9916 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: Ib77fac1abf1c583ebbf4465e4bd681b9db71123c + Reviewed-on: https://code.wireshark.org/review/10495 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 0a1d1bd -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Aug 7 10:19:22 2015 -0700 +commit 0a3d0c5 +Author: cturney <cturney@charter.net> +Date: Thu Sep 10 20:17:54 2015 -0400 - More casting issues with older versions of GLib. - - Try to fix + NFS file handle crc32_ccitt hashes are incorrect - 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 + tvb_get_string_enc() treats the FH as an an ASCII string and thus stops + reading at the first zero (0) it encounters. - packet-btrfcomm.c: In function 'btrfcomm_directed_channel_value': - packet-btrfcomm.c:287: warning: cast to pointer from integer of different size + Replace 'tvb_get_string_enc()' with 'tvb_memdup()' in dissect_fhandle_data(). - 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 <gerald@wireshark.org> + Change-Id: Ifc30ec41590e9cab5666d0988fab1f66040ce0c7 + Reviewed-on: https://code.wireshark.org/review/10493 + Reviewed-by: Cal Turney <cturney@charter.net> + Reviewed-by: ronnie sahlberg <ronniesahlberg@gmail.com> -commit 147ab19 -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Aug 7 08:39:09 2015 -0700 +commit 46b50b4 +Author: Ronnie Sahlberg <ronniesahlberg@gmail.com> +Date: Fri Sep 11 08:15:01 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. + SCSI: Fix decode of DeviceIdentification VPD page it was completely bogus - Change-Id: I113b44fb944a883cde016b7a8961597658be4c0a - Reviewed-on: https://code.wireshark.org/review/9912 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> + Change-Id: I0046525fdd574471533d3674343222fe88de1a06 + Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com> + Reviewed-on: https://code.wireshark.org/review/10484 + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> -commit c90fcba -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Fri Aug 7 14:55:50 2015 +0200 +commit 7a76e36 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Fri Sep 11 21:46:36 2015 +0200 - Lua: Count Lua plugins in splash screen + LTE RRC: add a top level function for SBCCH SL BCH messages - 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 <stig@bjorlykke.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + Change-Id: I91c66f81d245b4398fecbd4c6b655baad5431b53 + Reviewed-on: https://code.wireshark.org/review/10489 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit c8ca0ae +commit b4e972b Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Aug 7 09:10:39 2015 -0700 +Date: Fri Sep 11 11:13:23 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. + Fix a bunch of leaks found by Valgrind. - Change-Id: I02884c02e7f7f5f7b50da122127fa96c41c3603a - Reviewed-on: https://code.wireshark.org/review/9913 + Change-Id: I8862ed15d354aee487bacd80ab5fb4918423287e + Reviewed-on: https://code.wireshark.org/review/10487 + Petri-Dish: Gerald Combs <gerald@wireshark.org> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 7171ee5 -Author: Bill Meier <wmeier@newsguy.com> -Date: Thu Aug 6 17:44:42 2015 -0400 +commit eca15bf +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Fri Sep 11 19:31:14 2015 +0200 - [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. + androiddump: fix compilation on Windows and OSX - Change-Id: Id89780dfe60b2e4c63332bdb946cc29c67b5127a - Reviewed-on: https://code.wireshark.org/review/9903 - Petri-Dish: Bill Meier <wmeier@newsguy.com> + Change-Id: Ie724367b7dacb2a237c02451e14c70442e5be773 + Reviewed-on: https://code.wireshark.org/review/10486 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Bill Meier <wmeier@newsguy.com> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit f657e6a -Author: AndersBroman <anders.broman@ericsson.com> -Date: Fri Aug 7 14:50:02 2015 +0200 +commit b11e9a6 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Fri Sep 11 21:21:44 2015 +0200 - [GTPv2] Mark a parameter as unused. + LTE RRC: remove tree tests before decoding top level messages - Change-Id: I37c983d756f23469e4cf1abd31b9c591f5612542 - Reviewed-on: https://code.wireshark.org/review/9909 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 5bbb6ff -Author: AndersBroman <anders.broman@ericsson.com> -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 + It prevents proper update of Info column, and various other things - Change-Id: I8962f93662047d01ef71ba9689b338d095f31300 - Reviewed-on: https://code.wireshark.org/review/9908 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 99873f7 -Author: AndersBroman <anders.broman@ericsson.com> -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 <a.broman58@gmail.com> + Change-Id: I355c46e6f6b3f923250d6b5bf720ea052ef3b646 + Reviewed-on: https://code.wireshark.org/review/10488 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit fd19aaf +commit 2931dc1 Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Aug 6 10:56:22 2015 -0700 +Date: Thu Sep 10 23:06:12 2015 +0000 - Add ONC RPC program stats. + Try using GStringChunks in PacketListRecord. - Convert ONC RPC program stats to the stat_tap API. + This saves a fair amount of memory in tests here. Loading a large + capture file and sorting on a custom column (tcp.window_size) uses 676 + MB before the change and 634 after. - Add a "user_data" member to the stat_tap_table_item_type struct. + Add notes about possble further improvements: - Change-Id: I5cbf000a447ff93d30fa7f098124bdcbc34f2935 - Reviewed-on: https://code.wireshark.org/review/9904 - Petri-Dish: Gerald Combs <gerald@wireshark.org> + Roll our own replacement for GStringChunks using wmem_tree. + + Have PacketListRecord::columnString return a const char * instead of a + const QByteArray. + + Change-Id: Icb36194f5ad290828d7106ccc3bf494d07d76d08 + Reviewed-on: https://code.wireshark.org/review/10476 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 0c9998d -Author: Jan-Hendrik Bolte <jabolte@uos.de> -Date: Mon Jul 20 14:37:49 2015 +0200 +commit c088135 +Author: Gerald Combs <gerald@wireshark.org> +Date: Fri Sep 11 09:42:10 2015 -0700 - Add dissector for MQTT-SN v1.2 + Make sure we delete our PacketListRecords. - Bug: 11388 - Change-Id: I5d961b19132a9904080e9494467826d15659c54e - Reviewed-on: https://code.wireshark.org/review/9711 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + This fixes a serious (and obvious) memory leak in the packet list. + + Change-Id: Ie3d21e1a1d09a3481c9649954c25b9ae73b8e32a + Reviewed-on: https://code.wireshark.org/review/10485 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 4557c17 -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Wed Aug 5 17:30:47 2015 +0200 +commit ea8109e +Author: Michal Pazdera <michal.pazdera@gmail.com> +Date: Tue Sep 8 08:34:41 2015 +0200 - androiddump: Try to make MVS14.0 happy - - I guess using glib's gssize instead of ssize_t should be enough for: + Bug fix of missing "RTP arrow" in the Flow graph of VoIP calls. - 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 + This commit fixes bug that I have encountred in the Flow graphs of VoIP calls. + Where the RTP communication is shown only in one direction. This happens + because the packet-sip.c dissector is unable to find SIP/SDP setup frame from + the recivers side and sets the setup frame to 0. Now if no frame is found the + number of current frame is used. I have checked the previous versions and in + ver 1.8.12 it worked properly (same as after this change). - Change-Id: I1030694aed61d413be1aad54531f99db45e99c9d - Reviewed-on: https://code.wireshark.org/review/9876 - Petri-Dish: Anders Broman <a.broman58@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit dc33bba -Author: Bill Meier <wmeier@newsguy.com> -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. + Note: I am not sure if the 1.8.12 is the last version where this was working + properly. - Change-Id: I4b0fcfe5d970877d7f8453e6c6f8c48ee69c2e38 - Reviewed-on: https://code.wireshark.org/review/9905 - Reviewed-by: Bill Meier <wmeier@newsguy.com> + Change-Id: Ibb3cf85cbce03f80a2492eeae6cf64acddc439f5 + Reviewed-on: https://code.wireshark.org/review/10440 + Reviewed-by: Tomáš Kukosa <tomas.kukosa@unify.com> + Reviewed-by: ronnie sahlberg <ronniesahlberg@gmail.com> -commit ff24ecc +commit 12176f4 Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Aug 6 11:23:55 2015 -0700 +Date: Thu Sep 10 17:31:19 2015 -0700 - Fixup stat_tap table freeing. + Export captured packets correctly. - 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. + Make sure we set and unset the "process_filtered" field of our range in + PacketRangeGroupBox. Otherwise we only export displayed packets. Make + sure we set "remove_ignored" as well. - Change-Id: Ic1c81388eac8f47f74caea0169c79685a83aaff9 - Reviewed-on: https://code.wireshark.org/review/9901 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 9fd3bcc -Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Aug 6 12:31:21 2015 -0700 - - Add an elide mode preference for the Qt packet list. + Ignore the cf_cb_file_export_specified_packets_* callbacks in + CaptureFile so that we don't print spurious warnings. - Change-Id: I081cc1e9b2a0eea7f0a3ef1157561c50beb4c4db - Reviewed-on: https://code.wireshark.org/review/9902 + Bug: 11473 + Bug: 11428 + Change-Id: Ica551addd3af2de79f7cd47a2cc361043d2982e5 + Reviewed-on: https://code.wireshark.org/review/10477 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit fda29e1 +commit b55ae49 Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Aug 6 08:39:22 2015 -0700 +Date: Thu Sep 10 14:42:07 2015 -0700 - Use int_to_qstring in a few more places. + Make StockIconToolButton independent. + + A recent set of changes replaced the "dfilter_erase_" images with an + "x-filter-clear" stock icon set. + + Move StockIconToolButton to its own compilation unit. Use it in + CaptureFilterEdit and ProgressFrame to load the "x-filter-clear" icon. - Change-Id: Id324fe21f436a233088d106553db2ed6f6e410ac - Reviewed-on: https://code.wireshark.org/review/9899 + Bug: 11516 + Change-Id: I5d5864d089fb56827d130d493d53e7de6a7c03b5 + Reviewed-on: https://code.wireshark.org/review/10475 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 5fa57ec -Author: AndersBroman <anders.broman@ericsson.com> -Date: Thu Aug 6 13:30:59 2015 +0200 +commit 5a3ad8f +Author: Aditya Jain <aditya.jain@samsung.com> +Date: Mon Sep 7 15:07:20 2015 +0530 - [MSVC 2015]Once agin revert tho original, now as a separate patch. + Support for Wifi packet capture for android devices. - Change-Id: If25a1e4ced74d88c87def010b9d8032b5d870307 - Reviewed-on: https://code.wireshark.org/review/9898 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 544bca7 -Author: AndersBroman <anders.broman@ericsson.com> -Date: Thu Aug 6 13:21:26 2015 +0200 - - include <stdlib.h> to make windows build boot happy. + Added the wifi capturing feature in the Androiddump. + Wifi packet capturing is done by making use of tcpdump in android devices. + Android wifi will appear as a capture interface in the interface window. - Change-Id: I7a8b259698fdca0707464929a77c0b320f6a19f1 - Reviewed-on: https://code.wireshark.org/review/9897 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit aa2184f -Author: AndersBroman <anders.broman@ericsson.com> -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 + This will be an added support for android devices for device network bandwidth analysis. - Change-Id: Ie796cee755470bea0416b46ff8ff6a94cd8d93d3 - Reviewed-on: https://code.wireshark.org/review/9896 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 8906e93 -Author: Michal Labedzki <michal.labedzki@tieto.com> -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 <michal.labedzki@tieto.com> + Change-Id: I71d24ae5d1764d3ee7e50f09cd0b530ee9654844 + Reviewed-on: https://code.wireshark.org/review/10414 + Reviewed-by: ronnie sahlberg <ronniesahlberg@gmail.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com> -commit b4dea54 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Aug 5 20:44:09 2015 -0700 +commit 5b3cdfb +Author: Ronnie Sahlberg <ronniesahlberg@gmail.com> +Date: Fri Sep 11 05:54:41 2015 -0700 - Try to fix dist. + SCSI: Update block limits VPD decode to SBC-4 - Change-Id: I04c4a06f8d2db4d9ac1a09fea25d4f587c1f1fc1 - Reviewed-on: https://code.wireshark.org/review/9893 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 910438b -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Mon Jul 20 10:35:06 2015 -0400 - - Pcapng: support Name Resolution Block options + SBC-4 Adds three new fields to the block limits VPD page related to the new + opcode WITE_ATOMIC_16 that we need to decode: - 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). + Max atomic transfer length + Atomic Alignment + Atomic Transfer Length Granularity - Change-Id: I81863ef8d85cb1c8b5ba6673ba0e562efe77714f - Reviewed-on: https://code.wireshark.org/review/9723 - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> + Change-Id: Ia75793972535f3c8f524eaba037b3297743d1853 + Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com> + Reviewed-on: https://code.wireshark.org/review/10481 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 1420f3d -Author: Guy Harris <guy@alum.mit.edu> -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 <guy@alum.mit.edu> - -commit c6889d8 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Aug 5 19:45:12 2015 -0700 +commit fd342f7 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Fri Sep 4 23:38:46 2015 +0200 - Fix some encoding arguments. + qt: Fix crash when stopping an empty live capture - 802.11 is overwhelmingly little-endian; change all 1-byte fields that - were ENC_BIG_ENDIAN to ENC_LITTLE_ENDIAN. + When the capture process has not yet received any packets (not even the + libpcap header), Wireshark-Qt would crash because no valid capture file + was found. Reproducer: - Change one ENC_BIG_ENDIAN MAC address to ENC_NA; byte order doesn't - apply to them. + ssh otherhost sleep 10000 | wireshark -k -i - - The remaining ENC_BIG_ENDIANs should be checked. + GTK displays "Waiting for capture input data" in the status bar until + the capture file format is determined. After this patch, both versions + will just display an "Interrupted system call" message. - Change-Id: I3dc51a5555b99c25dce0d3b7f3be4c441b13d1a3 - Reviewed-on: https://code.wireshark.org/review/9890 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I146f00c0f4fcab04cddcd4f29b56e97b807a9c40 + Reviewed-on: https://code.wireshark.org/review/10388 + Reviewed-by: Peter Wu <peter@lekensteyn.nl> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Peter Wu <peter@lekensteyn.nl> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: ronnie sahlberg <ronniesahlberg@gmail.com> -commit f30ac4a -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Aug 5 19:08:36 2015 -0700 +commit df3fd2d +Author: Ronnie Sahlberg <ronniesahlberg@gmail.com> +Date: Thu Sep 10 13:26:08 2015 -0700 - Fix a bunch of typoes in variable and field names. - - Fix spelling, get rid of period at end of some field names. + initial write atomic - Change-Id: I1963cdc92657dca8708133796f8835bdffee0c47 - Reviewed-on: https://code.wireshark.org/review/9888 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I77be80c015945e495573003d461783a0380ded09 + Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com> + Reviewed-on: https://code.wireshark.org/review/10479 -commit b7f5eaa -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Aug 4 17:42:53 2015 -0700 +commit b040bda +Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> +Date: Thu Sep 10 16:22:33 2015 +0100 - Convert the GSM MAP stats to new "generic stat API". + IPv6: Introduce more consistent nomenclature for options extension headers - Convert both the MAP statistics and summary. As with the GSM A stats - this are mostly untested. + Replace use of "IPv6 option" or *_opt_* to describe extension header. - Change-Id: Ibd3a7346b09d1401e78724c0197ec2a38deb97a3 - Reviewed-on: https://code.wireshark.org/review/9883 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I84fec8e1b89a22a15c1843de1c86c39417d872ad + Reviewed-on: https://code.wireshark.org/review/10466 + Reviewed-by: Michael Mann <mmann78@netscape.net> + Petri-Dish: Michael Mann <mmann78@netscape.net> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 05eb9b6 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Aug 5 17:03:03 2015 -0700 +commit 80322d8 +Author: Jeffrey Smith <whydoubt@gmail.com> +Date: Tue Aug 18 22:03:41 2015 -0500 - Add proper base prefixes in display filter expressions. + dfilter: Add membership operator - When the user selects an enum in the display filter expression dialog - make sure we add the proper base prefix + Added a new relational test: 'x in {a b c}'. The only LHS entity + supported at this time is a field. The generated DFVM operations are + equivalent to an OR'ed series of =='s, but with the redundant existence + tests removed. - 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 <gerald@wireshark.org> + Change-Id: Iddc89b81cf7ad6319aef1a2a94f93314cb721a8a + Reviewed-on: https://code.wireshark.org/review/10246 + Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> + Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit ef0bdbc -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Aug 5 18:23:53 2015 -0700 +commit 86d8b8d +Author: Dario Lombardo <lomato@gmail.com> +Date: Thu Sep 10 17:43:46 2015 +0200 - 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. + usb: fix 'index' var name - Fix a typo ("pseduo" -> "pseudo"). + As pointed out by checkAPI.pl - 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 <guy@alum.mit.edu> + Change-Id: I1599a420cee168997102bf9c06d36a230fdd3c9e + Reviewed-on: https://code.wireshark.org/review/10467 + Reviewed-by: Michael Mann <mmann78@netscape.net> + Petri-Dish: Michael Mann <mmann78@netscape.net> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit dc09d18 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Aug 5 16:19:24 2015 -0700 +commit 4c16eff +Author: Dario Lombardo <lomato@gmail.com> +Date: Thu Sep 10 17:39:07 2015 +0200 - Output xhtml guides everywhere. + snmp: fix 'time' var name. - Update Autotools / Nmake to generate xhtml5 user and developer guides. + As pointed out by checkAPI.pl - Change-Id: I5024151aecaee62ea6d8469807fabda552d3f663 - Reviewed-on: https://code.wireshark.org/review/9884 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I603465614236ec41d1050e6e3452dbf9021bf1d5 + Reviewed-on: https://code.wireshark.org/review/10468 + Reviewed-by: Michael Mann <mmann78@netscape.net> + Petri-Dish: Michael Mann <mmann78@netscape.net> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 6aabad5 -Author: Roland Knall <roland.knall@br-automation.com> -Date: Wed Aug 5 09:36:20 2015 +0200 +commit 942eb73 +Author: Dario Lombardo <lomato@gmail.com> +Date: Thu Sep 10 17:06:27 2015 +0200 - epl: Fix Payload sub-dissection + lte/ui: fix 'time' var name. - 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 + As pointed out by checkAPI.pl. - Change-Id: I5343bf61431a7b5507b51f53f0de8c6e3dc72cf1 - Reviewed-on: https://code.wireshark.org/review/9870 - Reviewed-by: Roland Knall <rknall@gmail.com> - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: Ibab9b2720f3ef666b06b2b61ffc54aa23cbb01fc + Reviewed-on: https://code.wireshark.org/review/10469 + Reviewed-by: Michael Mann <mmann78@netscape.net> + Petri-Dish: Michael Mann <mmann78@netscape.net> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 504f5b3 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Aug 5 13:00:38 2015 -0700 +commit b9001b0 +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Thu Sep 10 13:27:45 2015 -0400 - Clean up some fields. + Tell the user (via COL_INFO) when a frame is a fragment (reassembled later). - 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". + See: - Rename it to "docsis.len", as it's always LEN, not SID; there's a - separate field for the SID. + https://www.wireshark.org/lists/wireshark-users/201508/msg00023.html - 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. + (Also set a fence on COL_INFO so we can see each packet's contribution to + the column.) - Update some comments while we're at it. - - Change-Id: Ib7c4a0cda65cef25dcaf0051b3de89758ef4c29c - Reviewed-on: https://code.wireshark.org/review/9881 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit f0beaa1 -Author: Roland Knall <roland.knall@br-automation.com> -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 <rknall@gmail.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> + Change-Id: I9a4b1f60c5ad7065c2f025bbcca1dd2d09fec9de + Reviewed-on: https://code.wireshark.org/review/10471 + Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 62e56ad -Author: Gerald Combs <gerald@wireshark.org> -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 <gerald@wireshark.org> - -commit 3b2e6d9 -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Wed Aug 5 16:25:16 2015 +0000 +commit e13576f +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Thu Sep 10 15:42:21 2015 +0200 - 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. + LTE RRC: catch bounds errors triggered by subdissectors - This reverts commit 2221153a9cc083a50248a72a4b4009908d84e38b. + Report the exception and continue dissection of the end of RRC message + This is useful when there is an invalid NAS EPS message like in bug 11513 - Change-Id: Idb91747b986f110fffa3444f8c52d800c128e141 - Reviewed-on: https://code.wireshark.org/review/9877 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I74154892fe8125df57ef5a6966273d6df777977a + Reviewed-on: https://code.wireshark.org/review/10463 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 53a8033 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Aug 5 09:30:40 2015 -0700 +commit e1ba449 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Thu Sep 10 16:34:57 2015 +0200 - Generate XHTML5 documentation. + InfiniBand: fix dissection of MCMemberRecord JoinState field - 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 <gerald@wireshark.org> + Bug: 11512 + Change-Id: Ie13bcfd0daa72ce2090e3cc538dd7bf601e3e177 + Reviewed-on: https://code.wireshark.org/review/10464 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 2221153 -Author: AndersBroman <anders.broman@ericsson.com> -Date: Wed Aug 5 14:37:20 2015 +0200 +commit d7420d0 +Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> +Date: Thu Sep 10 16:15:46 2015 +0100 - [MSVC 2015] Fix errors seen with the released version by reverting the - code to what failed on the RC version *sigh* + IPv6: Add new line for readability - Change-Id: I1b7f6d57da4cb71473a074291da7e5a0d5242c95 - Reviewed-on: https://code.wireshark.org/review/9874 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: Ia963b1c12a8e852e75318fc054aa8caf7c63833c + Reviewed-on: https://code.wireshark.org/review/10465 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 5de487a +commit 61f07f1 Author: AndersBroman <anders.broman@ericsson.com> -Date: Wed Aug 5 14:30:27 2015 +0200 +Date: Thu Sep 10 13:01:06 2015 +0200 - [MSVC 2015] Compiler and visual studio version are off by 5 not 6 in MSVC - 2015. + [GTPv2] Dissect F-Cause for FORWARD_RELOCATION_RESP in case of S1AP. - Change-Id: I5476656789893af2c8aeb5dfe5cf06972fd8bd4b - Reviewed-on: https://code.wireshark.org/review/9873 + Change-Id: I245daad739c7f181d4f57cbc50416096199f682a + Reviewed-on: https://code.wireshark.org/review/10462 + Petri-Dish: Anders Broman <a.broman58@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 8bf1237 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Mon Aug 3 22:21:24 2015 +0200 +commit a2fec21 +Author: Jeffrey Smith <whydoubt@gmail.com> +Date: Fri Aug 28 00:21:01 2015 -0500 - MAC CTRL: fix dissection of PAUSE frame + Check if -fPIC is needed for Qt5 code to compile - 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 + On many systems, Qt5 requires that code compiled against it must compile + with -fPIC. The preferred place to determine whether this is necessary + is at configure time. This change adds the auto-tool code to make that + happen and removes the hack put in place as an interim solution. - Bug: 11403 - Change-Id: Iaadc2b801e86523e962b4eb319541bc74de22071 - Reviewed-on: https://code.wireshark.org/review/9857 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Bug: 11230 + Change-Id: I6e583c67bb67d168a30c0af05a8cd0a070522ba0 + Reviewed-on: https://code.wireshark.org/review/10281 + Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> -commit ad4ab2a -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Aug 4 14:56:46 2015 -0700 +commit 5eee0b9 +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Wed Sep 9 16:46:34 2015 -0400 - Convert the GSM A stats to new "generic stat API". + Don't use any -fsanitize options unless we're using ASAN. - 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. + This lets cmake users configure without installing libusan. - Change-Id: I19a5b5fe3476b49d1dd0b684cbb7f367c6ebd4b4 - Reviewed-on: https://code.wireshark.org/review/9869 - Petri-Dish: Gerald Combs <gerald@wireshark.org> + A better or more final fix awaits a decision in bug 11009. + + Change-Id: Iea6c4e2ce31817c17931a448f0c72da2a31a2e6d + Ping-Bug: 11009 + Reviewed-on: https://code.wireshark.org/review/10454 + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 4d673b2 -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Aug 4 08:56:28 2015 -0700 +commit 37bee87 +Author: Tom Haynes <loghyr@primarydata.com> +Date: Thu Sep 10 00:02:39 2015 -0700 - Convert Camel tap stats to new "generic stat API". + nfs: Fix compilation break - Migrate the Camel stats similar to the recent BOOTP and H.225 - migrations. + Initialize layout_type. - Change-Id: If82617068ff4b8fa186899f66dc34a08585f66cb - Reviewed-on: https://code.wireshark.org/review/9865 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: Ied6cf61045cbee4f45b802c99ba06c2a07cc7613 + Signed-off-by: Tom Haynes <loghyr@primarydata.com> + Reviewed-on: https://code.wireshark.org/review/10461 + Reviewed-by: Roland Knall <rknall@gmail.com> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 3e6b527 -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Aug 4 10:16:23 2015 -0700 +commit e9b1291 +Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> +Date: Thu Sep 10 04:00:52 2015 +0100 - Remove the CLI H.225 counter. + IPv6: Rename 'dstopt_tree' variable in dissect_opts() - Stats were moved to the dissector in g03802cc. + dissect_opts() is used to dissect both hop-by-hop options and + destination options. - Change-Id: I1aaf43789695ba3aae54cfaf201263cd0aed74ea - Reviewed-on: https://code.wireshark.org/review/9867 - Petri-Dish: Gerald Combs <gerald@wireshark.org> + Change-Id: I2cb8716a30cf521772d9128155c87c0f92598ef6 + Reviewed-on: https://code.wireshark.org/review/10459 + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 4e14a26 +commit cd9f163 Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Aug 4 11:45:24 2015 -0700 +Date: Thu Sep 3 11:18:13 2015 -0700 - Don't zero stat tap elements. + Add the IAX2 Analysis dialog. - Let the reset callback take care of resetting our rows. + Copied from the RTP Analysis dialog, just like the GTK+ version. - Change-Id: I59b0e9d36a9a1cedc5a5893664c875b7416a5229 - Reviewed-on: https://code.wireshark.org/review/9868 + Change-Id: I111020bc4073a3a3ba583bdace51a91ee5fef300 + Reviewed-on: https://code.wireshark.org/review/10447 + Petri-Dish: Gerald Combs <gerald@wireshark.org> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit d51d83b -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Aug 4 10:00:23 2015 -0700 +commit 302b03a +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Wed Sep 9 17:03:44 2015 +0200 - Fix the selected packet indicator width. + GIOP: increase the maximum message size allowed to 10MB - Change-Id: Ic792c232524b4124bb4607cbe1979cdce8fd7e23 - Reviewed-on: https://code.wireshark.org/review/9866 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Also make it configurable through preferences + + Bug: 11508 + Change-Id: Ic2cc085376d61892996b33ed45f906e4b3ff19da + Reviewed-on: https://code.wireshark.org/review/10449 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 03802cc +commit 2ec5e54 Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Aug 3 10:30:04 2015 -0700 +Date: Wed Sep 9 11:50:24 2015 -0700 - Convert H.225 tap stats to new "generic stat API". + Add the Telephony→LTE menu. - Migrate the H.225 stats similar to the recent BOOTP migration. + Add an empty (for now) Telephony→LTE menu ahead of upcoming changes. - Change-Id: I70ff7ab6cf3e9796f257412ba7d65ec9fe7f77ad - Reviewed-on: https://code.wireshark.org/review/9859 + Change-Id: Ic6686b653d2fa51f1eb6854ab0952f92d679bccc + Reviewed-on: https://code.wireshark.org/review/10452 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 632b402 -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Aug 3 21:25:00 2015 -0700 +commit b6be1c2 +Author: Ben Fox-Moore <ben.foxmoore@accelleran.com> +Date: Wed Sep 9 17:30:32 2015 +0200 - Zero stat table elements instead of freeing them. + Fix Flow Graph never using Standard Addresses when requested - Stat table element arrays are allocated once at startup. Reset each - element in free_stat_table() instead of freeing them. + Bug: 10966 + Change-Id: I5ccc78b8c39f623a4e157572d1caa228c9bb3713 + Reviewed-on: https://code.wireshark.org/review/10450 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + +commit ecc62d8 +Author: Dario Lombardo <lomato@gmail.com> +Date: Fri Sep 4 17:12:25 2015 +0200 + + codecs/gtk: fix int to size_t - Change-Id: Ia63af93c76a1348bbb809137a521eead58a52dd1 - Reviewed-on: https://code.wireshark.org/review/9860 - Petri-Dish: Gerald Combs <gerald@wireshark.org> + Change-Id: I8f467f09375c8227c4b70aef47ff3a590a0c00d7 + Reviewed-on: https://code.wireshark.org/review/10413 + Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 3413ddf -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Jul 25 20:07:59 2015 +0200 +commit 8a8a82d +Author: Tom Haynes <loghyr@primarydata.com> +Date: Mon Sep 7 23:18:23 2015 -0700 - EPL: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + nfs: Add NFSv4.2 op LAYOUTERROR - Change-Id: Id8fac193a2f3521986c0f91df84950ff581d4b6b - Reviewed-on: https://code.wireshark.org/review/9790 - Reviewed-by: Roland Knall <rknall@gmail.com> - Petri-Dish: Anders Broman <a.broman58@gmail.com> + Change-Id: I748166ebcad1fa704b3d99770cf0c6296bdae3dd + Signed-off-by: Tom Haynes <loghyr@primarydata.com> + Reviewed-on: https://code.wireshark.org/review/10434 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 992c892 -Author: AndersBroman <anders.broman@ericsson.com> -Date: Tue Aug 4 16:48:06 2015 +0200 +commit 0c6b54e +Author: Tom Haynes <loghyr@primarydata.com> +Date: Tue Sep 8 14:38:11 2015 -0700 - 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. + nfs: Add support for the Flex File Layout Type in LAYOUTRETURN - Change-Id: Ie05fb42d59556aec300d4e007b1db5cc79d8d6f1 - Reviewed-on: https://code.wireshark.org/review/9864 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I40462f2acf20b99b5691a5efe1f6bfa563163bee + Signed-off-by: Tom Haynes <loghyr@primarydata.com> + Reviewed-on: https://code.wireshark.org/review/10429 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 8421af3 -Author: Luke Mewburn <luke@mewburn.net> -Date: Tue Aug 4 19:42:19 2015 +1000 +commit 0f89e42 +Author: Tom Haynes <loghyr@primarydata.com> +Date: Tue Sep 8 14:30:48 2015 -0700 - Rename nettrace3gpp324423 to 3gpp32423 + nfs: Add NFSv4.2 op LAYOUTSTATS - 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: I29429373b4a50d9580560b4f0759e31dd8cbf0c3 + Signed-off-by: Tom Haynes <loghyr@primarydata.com> + Reviewed-on: https://code.wireshark.org/review/10427 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + +commit 6b59566 +Author: Tom Haynes <loghyr@primarydata.com> +Date: Tue Sep 8 14:28:30 2015 -0700 + + nfs: Add NFSv4.2 op WRITE_SAME - Change-Id: Ic981d0351a3014fb79702955ebef7b13f6ce4a2e - Reviewed-on: https://code.wireshark.org/review/9863 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I6a170f7e38a712c4ea0bc83ff4b1baf616a47253 + Signed-off-by: Tom Haynes <loghyr@primarydata.com> + Reviewed-on: https://code.wireshark.org/review/10436 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 4908c75 -Author: AndersBroman <anders.broman@ericsson.com> -Date: Tue Aug 4 10:58:45 2015 +0200 +commit 0fdd702 +Author: Tom Haynes <loghyr@primarydata.com> +Date: Tue Sep 8 14:19:58 2015 -0700 - [ISUP] Read the country code at offset + nfs: Add NFSv4.2 op READ_PLUS - Change-Id: I5a03fdbdf7079c354bc9b63acba3d205f82a4e8a - Reviewed-on: https://code.wireshark.org/review/9862 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I10fd5c28c57c467c854ce3658887b2d0ce6f51b8 + Signed-off-by: Tom Haynes <loghyr@primarydata.com> + Reviewed-on: https://code.wireshark.org/review/10435 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 6e87802 -Author: AndersBroman <anders.broman@ericsson.com> -Date: Tue Aug 4 10:46:48 2015 +0200 +commit 720a759 +Author: Tom Haynes <loghyr@primarydata.com> +Date: Fri Sep 4 16:41:35 2015 -0700 - tvb_new_octet_aligned() should return both the captured and reported - length set to datalen in the returned tvb. + nfs: Add NFSv4.2 cb op CB_OFFLOAD - Change-Id: Ie6649a285a9fa4a0564e29ce18ec9459b8da2541 - Reviewed-on: https://code.wireshark.org/review/9861 + Change-Id: Idfd27f382e78813b067b99fbe2e7934ddb72b6da + Signed-off-by: Tom Haynes <loghyr@primarydata.com> + Reviewed-on: https://code.wireshark.org/review/10433 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 2964c28 -Author: Guy Harris <guy@alum.mit.edu> -Date: Mon Aug 3 14:14:50 2015 -0700 +commit 9e07406 +Author: Tom Haynes <loghyr@primarydata.com> +Date: Tue Sep 8 14:16:06 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. + nfs: Add NFSv4.2 op IO_ADVISE - Change-Id: Ie7f61e48cb2a343a7c83e0747a6eee46964fc335 - Reviewed-on: https://code.wireshark.org/review/9858 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: Ie2cc621fa928a541810e67a2444408572e0d8d4d + Signed-off-by: Tom Haynes <loghyr@primarydata.com> + Reviewed-on: https://code.wireshark.org/review/10432 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit ae05f77 -Author: Guy Harris <guy@alum.mit.edu> -Date: Mon Aug 3 11:58:36 2015 -0700 +commit b5aa0ff +Author: Tom Haynes <loghyr@primarydata.com> +Date: Tue Sep 8 13:37:49 2015 -0700 - Give an I-D reference for this. + nfs: Add NFSv4.2 ops OFFLOAD_CANCEL and OFFLOAD_STATUS - Change-Id: I5bbc1b390215e11cba86af9b325ae94d3708ae93 - Reviewed-on: https://code.wireshark.org/review/9855 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: Ic5ff60f559e1651b206cac4612b3cbc64ca67306 + Signed-off-by: Tom Haynes <loghyr@primarydata.com> + Reviewed-on: https://code.wireshark.org/review/10431 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 56ee4b1 -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Mon Aug 3 12:02:37 2015 +0100 +commit c782824 +Author: Tom Haynes <loghyr@primarydata.com> +Date: Tue Sep 8 13:34:29 2015 -0700 - TFTP: strengthen heuristic used over STUN/TURN + nfs: Add NFSv4.2 op CLONE - Change-Id: I133199abda100a89e219804c3003dee76389c43a - Reviewed-on: https://code.wireshark.org/review/9839 - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> + Change-Id: I38eab48dcc27c813fc134881b359d8033bc00771 + Signed-off-by: Tom Haynes <loghyr@primarydata.com> + Reviewed-on: https://code.wireshark.org/review/10430 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 9557c73 -Author: Gerald Combs <gerald@zing.org> -Date: Sun Aug 2 15:33:07 2015 -0700 +commit 2160e9c +Author: Tom Haynes <loghyr@primarydata.com> +Date: Tue Sep 8 13:32:29 2015 -0700 - Make sure per-packet tap callbacks return gbooleans. + nfs: Add NFSv4.2 ops COPY and COPY_NOTIFY - 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: I780b7519be5b8a8aadac7141363ff138cae4e583 + Signed-off-by: Tom Haynes <loghyr@primarydata.com> + Reviewed-on: https://code.wireshark.org/review/10428 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + +commit 79b88aa +Author: Tom Haynes <loghyr@primarydata.com> +Date: Tue Sep 8 13:12:22 2015 -0700 + + nfs: Cleanup of FlexFiles Layout Type - Change-Id: I79affe65db975caed3cc296a7e2985b7b9cdf4cc - Reviewed-on: https://code.wireshark.org/review/9853 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I178b166ee682693e6e3c17759573899ba13ca6f5 + Signed-off-by: Tom Haynes <loghyr@primarydata.com> + Reviewed-on: https://code.wireshark.org/review/10426 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 08e80b1 -Author: Evan Huus <eapache@gmail.com> -Date: Sun Aug 2 08:41:27 2015 -0400 +commit 6e82854 +Author: Tom Haynes <loghyr@primarydata.com> +Date: Fri Sep 4 10:54:51 2015 -0700 - Skip files larger than 8MB in valgrind fuzzing + nfs: Add new attributes for NFSv4.2 - 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. + Change-Id: Ib6f0c723dc7a5f031cdc52fd339a8fb29362370b + Signed-off-by: Tom Haynes <loghyr@primarydata.com> + Reviewed-on: https://code.wireshark.org/review/10425 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + +commit a79967f +Author: Tom Haynes <loghyr@primarydata.com> +Date: Tue Sep 8 12:59:05 2015 -0700 + + nfs: Add new error codes for NFSv4.2 - Based on a quick scan of the menagerie this only excludes another dozen or so - files so we won't lose much coverage. + Change-Id: I9a4cbb3b43c2695ca576eea7263c561a9d0f3783 + Signed-off-by: Tom Haynes <loghyr@primarydata.com> + Reviewed-on: https://code.wireshark.org/review/10424 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + +commit 322e096 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Tue Sep 8 22:44:34 2015 +0200 + + Fix some memory leaks when extracting a string from TVB - Ping-Bug: 11395 - Change-Id: I8d684bebad553408c68b125330f2878deedc3bff - Reviewed-on: https://code.wireshark.org/review/9849 - Reviewed-by: Evan Huus <eapache@gmail.com> + Change-Id: If3970a20045d84200924f89ac467c4eb0206cb11 + Reviewed-on: https://code.wireshark.org/review/10446 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> + Tested-by: Michal Labedzki <michal.labedzki@tieto.com> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 7c46b25 -Author: Evan Huus <eapache@gmail.com> -Date: Sun Aug 2 09:12:23 2015 -0400 +commit 61ea02b +Author: Roland Knall <roland.knall@br-automation.com> +Date: Tue Sep 8 15:58:15 2015 +0200 - qt: fix scrollbar crash applying conv. filter + PluginIF: Fix GTK PluginIF interface - 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. + - Move the apply-filter code to main_menubar, + because there already the code of the preference + pop-ups is handled - Change-Id: I5fa0cac3e67f50a6c603a6fa10b117de5540d444 - Reviewed-on: https://code.wireshark.org/review/9850 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + - Fix the apply-filter callback, which was not working + at all + + Change-Id: I25d5a161d8b78695c15b3100653be36786129408 + Reviewed-on: https://code.wireshark.org/review/10444 + Reviewed-by: Roland Knall <rknall@gmail.com> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 78ca0af -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Aug 1 11:38:03 2015 +0200 +commit b0aec6d +Author: John <optommp@gmail.com> +Date: Wed Sep 2 10:43:51 2015 -0700 - HTTP2: remove weak part of the heuristic + packet-optommp.c add dest_ID support. - 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. + OptoMMP sets destination_ID to 0x0000 if MSB not set + Else makes subtree with full dest_ID and boot_ID - Change-Id: I0236609665c57c6f3961cb9596c47b54da777641 - Reviewed-on: https://code.wireshark.org/review/9842 + Change-Id: I459a8428eacd71846344b5e9f95ef471c3bb049a + Reviewed-on: https://code.wireshark.org/review/10361 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit d12283b -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Aug 1 18:38:15 2015 +0200 +commit ee729df +Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> +Date: Mon Sep 7 04:12:48 2015 +0100 - proto.c: exclude hf_text_only from proto_registrar_is_protocol() + Add the IPv6 DSCP value to the IP DSCP column - 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. + Bug: 7030 - Change-Id: I3b1cc2e6c7e71a71898f2ee9a02e9158eccf6fac - Reviewed-on: https://code.wireshark.org/review/9845 + Change-Id: If4dac85d1406023829220fa9d58a6e642dbcec67 + Reviewed-on: https://code.wireshark.org/review/10409 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 37a1bb8 -Author: Hauke Mehrtens <hauke@hauke-m.de> -Date: Mon Jul 20 23:31:43 2015 +0200 +commit d57bfce +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Tue Sep 8 11:38:00 2015 -0400 - CoAP: add media type number for application/cbor + Update documentation to reflect new heur_dissector_add() arguments. - application/cbor got the number 60 by the IANA, see - https://www.iana.org/assignments/core-parameters/core-parameters.xml#content-formats + Change-Id: I791071644f591bd8f526a077ecdeb7e68d2fea6e + Reviewed-on: https://code.wireshark.org/review/10445 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + +commit bc4bc72 +Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> +Date: Sun Sep 6 22:47:05 2015 +0100 + + Detect mismatched ethertype protocol ID (IPv4) and encapsulated IP packet (IPv6) - Change-Id: I4dbfd9eff8bacb46e815140c4640359f9a951869 - Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> - Reviewed-on: https://code.wireshark.org/review/9847 + Bug: 11458 + Change-Id: I66b51654d268196da366b0e9aea6ced0076d4737 + Reviewed-on: https://code.wireshark.org/review/10407 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit b1ce653 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Aug 2 08:10:45 2015 -0700 +commit 2de799f +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Wed Sep 2 07:56:40 2015 +0200 - [Automatic update for 2015-08-02] + BGP: Update BGP Capability List - Update manuf, services enterprise-numbers, translations, and other items. + from IANA capability-codes 2015-07-23 + * draft-ietf-idr-bgp-enhanced-route-refresh => RFC7313 + * Add CP-ORF (RFC7543) + * Add FQDN draft-walton-bgp-hostname-capability - Change-Id: I1c6b1044870e93459bcf4743f00be68ff8ce8ff6 - Reviewed-on: https://code.wireshark.org/review/9851 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I9de73be9eca1ed2456d4a15150b040454eb01add + Reviewed-on: https://code.wireshark.org/review/10442 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 711edcf -Author: Guy Harris <guy@alum.mit.edu> -Date: Sat Aug 1 11:27:09 2015 -0700 +commit 6f1c9fd +Author: Roland Knall <rknall@gmail.com> +Date: Sun Aug 9 14:36:53 2015 +0200 - Set the reported length of chunk data correctly. + PluginIF: Parent menu and goto frame - The reported length should be the size of the chunk, not the remaining - size of dechunked data. + The developer may provide a given menu as parent menu for the + sub menu. If the menu does not exist, the main menu will be used. - Update some comments while we're at it. + Has been implemented for Qt as well as GTK. - Change-Id: Ia71948fb5ecebdaae3e171c53fd88cf72dcf76a3 - Reviewed-on: https://code.wireshark.org/review/9846 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I3f26684862fd0b08f59eeb4d6f4a24ce7dc3d428 + Reviewed-on: https://code.wireshark.org/review/9939 + Reviewed-by: Roland Knall <rknall@gmail.com> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Anders Broman <a.broman58@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> -commit 86a8b9c -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Aug 1 13:28:01 2015 +0200 +commit 28128ca +Author: Peter Wu <peter@lekensteyn.nl> +Date: Thu Jun 25 11:49:16 2015 -0700 - MS-WSP: fix some Coverity warnings + tools/pre-commit: compare files instead of mtime - - 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 + Instead of unconditionally checking for the file mtime, compare file + contents instead. Perform this check only for invocations via a hook. - Change-Id: If4efd5bb055c7806107ec9646e9864c7e345246d - Reviewed-on: https://code.wireshark.org/review/9843 - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + While at it, simplify setting defaults for the git directory and the + commit identifier. Support executions via relative paths and update the + help messages on top of the file. + + Change-Id: I89c015fe6553ad52e07795683dd88cb219a26ed2 + Reviewed-on: https://code.wireshark.org/review/8923 + Reviewed-by: Peter Wu <peter@lekensteyn.nl> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + +commit 47f5d41 +Author: Stig Bjørlykke <stig@bjorlykke.org> +Date: Fri Sep 4 12:22:30 2015 +0200 + + Qt: Fixed a resource leak in getFilterFromRowAndColumn + + Found by coverity CID 1314608 and Apple Instruments. + + Change-Id: I264ce335bd8985946a097bb8f99f7c41c0eb027d + Reviewed-on: https://code.wireshark.org/review/10378 + Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> -commit f8cac8e -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Aug 1 16:41:52 2015 +0200 +commit e438374 +Author: Stig Bjørlykke <stig@bjorlykke.org> +Date: Sat Sep 5 19:53:04 2015 +0200 - PNRP: add support for message reassembly + Qt: Fixed a resource leak in updateSelectionStatus - Bug: 11412 - Change-Id: I2e8ca62e1babbca20654e8907e8a0b04991bb18f - Reviewed-on: https://code.wireshark.org/review/9844 - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Avoid passing a reference to a allocated QString, which will + never be deleted. + + This fixes a 16 Bytes leak each time an element is selected or + deselected in the packet tree. + + Change-Id: If0d7482bf505fda8802dd58e8d1841b7da6b6294 + Reviewed-on: https://code.wireshark.org/review/10393 + Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> -commit 1afe288 -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Jul 31 16:52:37 2015 -0700 +commit 91d863c +Author: Stig Bjørlykke <stig@bjorlykke.org> +Date: Sat Sep 5 19:39:51 2015 +0200 - More packet detail context menu items. + Qt: Fix use-after-free pattern - 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. + This fixes crashes due to use of deallocated memory in: + - Export Packet Dissections + - Merge Capture Files + - Edit Packet Comment - Change-Id: I66c40f71738f0996690f4818a546520ea0747088 - Reviewed-on: https://code.wireshark.org/review/9841 - Petri-Dish: Gerald Combs <gerald@wireshark.org> + Change-Id: I3dab8c0735eb5e642d6a4580d20bc3c81cf1345b + Reviewed-on: https://code.wireshark.org/review/10392 + Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> -commit c8fec28 +commit f25b8c6 Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Jul 31 15:37:49 2015 -0700 +Date: Mon Sep 7 22:03:22 2015 -0700 - Print times with the resolution from the capture file. + Move some stuff into the only code path where it's used. - 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. + AirPDCapPacketProcess() really does two different things; some of the + stuff it does in both code paths only needs to be done in one code path. + Make it so. - Change-Id: I111fbbf91b5957e63dca650b85f182c5f103c5fd - Reviewed-on: https://code.wireshark.org/review/9840 + Change-Id: Idb231d729150781f323e88ed375c983a3afd2577 + Reviewed-on: https://code.wireshark.org/review/10439 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 2e3be54 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Fri Jul 31 22:20:34 2015 +0200 +commit bcba9ba +Author: Michael Mann <mmann78@netscape.net> +Date: Mon Sep 7 15:00:11 2015 -0400 - RRC: upgrade dissector to v12.6.0 + Add API to expose "expert info" summary. - Change-Id: Ied56f90a8689a25d4093795bfd97d57d40e382c6 - Reviewed-on: https://code.wireshark.org/review/9838 - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + This is intended for use in expert_add_info_format or proto_tree_add_expert_format to get the "base" string to then append additional information, but I'm sure other uses can be found. + Similar to some of the proto_get_xxx APIs, but still only "create as needed". + + Change-Id: Ib76e6ed557c2ae41e0a40957a9efa4bf485909da + Reviewed-on: https://code.wireshark.org/review/10420 + Reviewed-by: Michael Mann <mmann78@netscape.net> + Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 26c933b -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Jul 31 13:44:42 2015 -0700 +commit 44a0baf +Author: Guy Harris <guy@alum.mit.edu> +Date: Mon Sep 7 17:46:03 2015 -0700 - Fix binary data copying. + Don't try to decrypt with an AES key shorter than 128 bits. - As the QClipboard::setMimeData documentation says, "Ownership of the - data is transferred to the clipboard." Allocate the mime data object - accordingly. + AES keys must be at least 128 bits; AES_unwrap returns a null pointer if + handed a too-short key, and we then just dereference that null pointer + and crash. Just give up with a too-short key. - 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 <gerald@wireshark.org> + Bug: 11507 + Change-Id: Id1cf0a43c608597a11ff9df40f3654e6ff30619d + Reviewed-on: https://code.wireshark.org/review/10422 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 5336c9a -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Jul 31 12:21:28 2015 -0700 +commit f6d0e09 +Author: Guy Harris <guy@alum.mit.edu> +Date: Mon Sep 7 16:44:56 2015 -0700 - More spacing fixups. + Add a new expert info type for decryption problems. - Make spacing more consistent. + This is what should be used if, for some reason, decryption can't be + performed. (And if there's a known reason why decryption can't be + performed, it should be used, so the user knows why their + 802.11/SSL/whatever traffic isn't decrypted, and either doesn't have to + ask why or, at least, can give more details when they do ask why.) - Change-Id: I8980a84ca70660057016985299b0f95761076893 - Reviewed-on: https://code.wireshark.org/review/9835 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 787fa27 -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Jul 31 12:08:30 2015 -0700 - - Remove spaces. + (Yes, I plan to use this for the 802.11 decryption code. Work in + progress.) - Change-Id: Iabf5f7610ea5205ad4500502e2b531a8ee130484 - Reviewed-on: https://code.wireshark.org/review/9834 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I812e61c2a4613d2e85f9ced1f5ed6ae91ac5f7ae + Reviewed-on: https://code.wireshark.org/review/10421 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit d8d3c52 -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Jul 31 10:34:43 2015 -0700 +commit a6360b6 +Author: Olaf Bergmann <bergmann@tzi.org> +Date: Wed Aug 26 21:20:49 2015 +0200 - Use an ellipsis character instead of three dots. + SSL: bugfix for raw public keys in certificate message - The OS X Human Interface Guidelines at + RFC 7250 has changed the format of the Certificate structure from + RFC 5246 to the following: - https://developer.apple.com/library/mac/documentation/UserExperience/Conceptual/OSXHIGuidelines/TerminologyWording.html#//apple_ref/doc/uid/20000957-CH15-SW3 + opaque ASN.1Cert<1..2^24-1>; - says: + struct { + select(certificate_type) { - "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." + // certificate type defined in RFC 7250 + case RawPublicKey: + opaque ASN.1_subjectPublicKeyInfo<1..2^24-1>; - The Windows desktop applications guidelines has a section on ellipses: + // X.509 certificate defined in RFC 5246 + case X.509: + ASN.1Cert certificate_list<0..2^24-1>; + }; + } Certificate; - https://msdn.microsoft.com/en-us/library/windows/desktop/dn742478.aspx + Thus, ssl_dissect_hnd_cert() must parse subjectPublicKeyInfo + immediately when the message's certificate type is + SSL_HND_CERT_TYPE_RAW_PUBLIC_KEY. Otherwise, the message will + contain a certificate_list. - but doesn't specify the a single glyph vs three dots. + This modification first determines the certificate type and then + handles both cases independently. For raw public keys, no subtree + is created to reflect the flat structure of the certificate + message. - 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. + Bug: 11480 + Change-Id: I1c55eca361c4e40fcbff5bc32bfc8de3576bdfbf + Reviewed-on: https://code.wireshark.org/review/10272 + Petri-Dish: Peter Wu <peter@lekensteyn.nl> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Peter Wu <peter@lekensteyn.nl> + +commit 4496fde +Author: Gerald Combs <gerald@zing.org> +Date: Mon Sep 7 09:08:39 2015 -0700 + + Enable the display filter arrow tooltip. - Remove the ellipsis from "Find Next" and "Find Previous". Neither - requires user interaction. + Add an event handler which ensures that the tooltip displays only when + we're over the arrow subcontrol. - Change-Id: I0e6c28bb8b3a84b242731e2ca96f1a6f6f42c303 - Reviewed-on: https://code.wireshark.org/review/9833 + Change-Id: I14d308344d9dd4d4ffbc7b0fe568c95f21f9a641 + Reviewed-on: https://code.wireshark.org/review/10417 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit c768087 -Author: Noel Power <noel.power@suse.com> -Date: Thu Jul 30 14:27:01 2015 +0100 +commit 912921b +Author: Gerald Combs <gerald@zing.org> +Date: Mon Sep 7 10:09:01 2015 -0700 - MSWSP: Fix clang warnings and handle gracefully needed missing messages + Add a URL for the tooltip bug. - 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. + It should be fixed in Qt 5.5.1. - Change-Id: Ia6fd70d204d279799bc02209865c7f1da35d8191 - Signed-off-by: Noel Power <noel.power@suse.com> - Reviewed-on: https://code.wireshark.org/review/9824 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit c321171 -Author: Gerald Combs <gerald@wireshark.org> -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 + Change-Id: I32fa11accdd6bea953341dd6b4914686cacda98e + Reviewed-on: https://code.wireshark.org/review/10419 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit da07c62 -Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Jul 30 13:55:46 2015 -0700 +commit 393c4bc +Author: Gerald Combs <gerald@zing.org> +Date: Sun Sep 6 16:47:50 2015 -0700 - More context menu updates. + Re-enable display filter editor tooltips. - Add "Follow" and "Export Packet Bytes" to the packet detail context - menu. Remove duplicate SCTP menu. Remove redunant action text. + Enforce correct "leave" behavior using a timer. - Change-Id: If69815dc774806e267fbd71aa390b0af6f3b0d14 - Reviewed-on: https://code.wireshark.org/review/9829 + Change-Id: I59b8fd08c27fd463363bdda090fb9c24f664d9eb + Reviewed-on: https://code.wireshark.org/review/10408 + Petri-Dish: Gerald Combs <gerald@wireshark.org> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 9603db4 -Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Jul 30 12:34:53 2015 -0700 +commit 8491be3 +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Fri Sep 4 12:43:35 2015 +0200 - Make copy menu item names more consistent. + WIMAX (msg_ucd): fix will never be executed [-Wunreachable-code] - Change-Id: Ia7b2a87ba9ad843dfa9200d69eeb94275a3dc0bb - Reviewed-on: https://code.wireshark.org/review/9827 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 549b8f0 -Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Jul 30 12:23:03 2015 -0700 - - Add a missing menu item. + Move declaration for avoid https://llvm.org/bugs/show_bug.cgi?id=19020 - Add "Copy as Filter" to the packet list context menu. Remove completed - item comments. + Found by Clang 3.7 - Change-Id: I1e2d9ebcff2fb36918d3e7525690cfb105cb1b13 - Reviewed-on: https://code.wireshark.org/review/9826 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: Ibb14b00d7af2cb0d24eb153d40640a2f9ee4f887 + Reviewed-on: https://code.wireshark.org/review/10379 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 16b048d -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Jul 29 16:24:39 2015 -0700 +commit 84a3c85 +Author: Gerald Combs <gerald@zing.org> +Date: Sun Sep 6 10:37:15 2015 -0700 - Packet list and detail context menu updates. + Disable display filter tooltips for now. - 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. + Comment out the setToolTip call in DisplayFilterCombo. The function + applies to the entire control, but the text only makes sense for the + drop-down arrow. - 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. + Remove the tooltip for the clear button in DisplayFilterEdit. If the + purpose of the "X" symbol isn't obvious then we aren't doing our job + properly. - Enable and disable packet detail context menu items from a set of - booleans similar to the packet list. + Comment out the other setToolTip calls in DisplayFilterEdit for now + since they interfere with leaveEvents. Add a note about a possible + workaround. - Change-Id: Iaa931c766aa476c33f27de089e5c4dbaf9ce74d6 - Ping-Bug: 9320 - Bug: 10831 - Reviewed-on: https://code.wireshark.org/review/9825 + Change-Id: I055a30b6a5b5e07cebf1fa36e217654d390d34d0 + Reviewed-on: https://code.wireshark.org/review/10405 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit e482786 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -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 <mmann78@netscape.net> - -commit e4f418c -Author: Bill Meier <wmeier@newsguy.com> -Date: Wed Jul 29 18:48:14 2015 -0400 +commit 628f65a +Author: Gerald Combs <gerald@zing.org> +Date: Sun Sep 6 12:00:48 2015 -0700 - [ieee80211] Don't call expert_...() under 'if (tree)' + Keep focus rects from showing through the welcome screen. - Change-Id: Idcda58191ca664412ef874a69f40eb09a5b38234 - Reviewed-on: https://code.wireshark.org/review/9820 - Reviewed-by: Bill Meier <wmeier@newsguy.com> + Change-Id: I5785890c70f3a3f6f4ccb0c7b609a19e5d2b88c9 + Reviewed-on: https://code.wireshark.org/review/10406 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit d6f59cd +commit 4cb3737 Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Jul 29 12:09:28 2015 -0700 +Date: Sun Sep 6 08:10:49 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. + [Automatic update for 2015-09-06] - 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. + Update manuf, services enterprise-numbers, translations, and other items. - Change-Id: I69b878b45334bf88014694b1bf016278fa55a94b - Reviewed-on: https://code.wireshark.org/review/9819 + Change-Id: If1cc31f1cd036c536a8a8bb9d9094bdb7c9f6f07 + Reviewed-on: https://code.wireshark.org/review/10403 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit a03a43b -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Jul 29 10:36:46 2015 -0700 +commit b979389 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Sun Sep 6 11:56:36 2015 +0200 - 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. + SV: add an option to dissect seqData as PhsMeas - This *might* fix a crash found when following large streams from the - Conversations dialog. + When set, this brings back the dissection code that was removed in g84a8c1d (bug 5696) - Change-Id: If1b87491621ab7efcc0519f95891d34dcd9d18c1 - Reviewed-on: https://code.wireshark.org/review/9818 - Petri-Dish: Gerald Combs <gerald@wireshark.org> + Bug: 11475 + Change-Id: Iba6b0ec6490e2971a3670d13cb3b84351b69f126 + Reviewed-on: https://code.wireshark.org/review/10399 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 5b85613 -Author: Luca Melette <luca@srlabs.de> -Date: Fri Jul 10 22:55:27 2015 +0200 +commit 09e92f0 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Sun Sep 6 12:21:24 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). + OCSP: get rid of an evil global variable - Change-Id: Ibe05e6a99f3f95ac66740b5d319a7200fdb3e54b - Reviewed-on: https://code.wireshark.org/review/9594 - Petri-Dish: Anders Broman <a.broman58@gmail.com> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Bug: 11505 + Change-Id: I87cc676426dceed05a9a95bb515c4fb2535ac9c5 + Reviewed-on: https://code.wireshark.org/review/10400 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit b467f1c -Author: Noel Power <noel.power@suse.com> -Date: Mon Jul 27 12:44:56 2015 +0100 +commit 48c3f7a +Author: Guy Harris <guy@alum.mit.edu> +Date: Sat Sep 5 23:54:27 2015 -0700 - SMB2: only move ssi for request if request is really complete - - MS-SMB2 section '3.2.5.1.5 Handling Asynchronous Responses' states + Add image files not already here. - "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 <noel.power@suse.com> - Reviewed-on: https://code.wireshark.org/review/9805 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I429ae4c418f8fb574407ed6038b411c54b672f0a + Reviewed-on: https://code.wireshark.org/review/10398 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 254dd6b -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Jul 27 16:06:32 2015 +0200 +commit 94f657f +Author: Guy Harris <guy@alum.mit.edu> +Date: Sat Sep 5 20:07:34 2015 -0700 - 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 - * ... + Another removed display filter-related image. - Change-Id: I007dc2a92e8c8f8a9a921c2c091e6c9276f1873b - Reviewed-on: https://code.wireshark.org/review/9806 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I3a49a8f1d13b9ba54ca71eea855f36a7c1aaec1c + Reviewed-on: https://code.wireshark.org/review/10397 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 65a1f60 -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Jul 27 16:17:44 2015 -0700 +commit 5b468c4 +Author: Guy Harris <guy@alum.mit.edu> +Date: Sat Sep 5 19:37:36 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. + Reflect the removal of some display filter-related images. - Change-Id: I396e2476509db9df895826f8817b191893bcb14a - Reviewed-on: https://code.wireshark.org/review/9812 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: Iac635122a125a0a5cbadfaaf3d39b4c16b2a17f1 + Reviewed-on: https://code.wireshark.org/review/10396 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 01bc31c +commit 0e9389b Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Jul 27 15:28:50 2015 -0700 +Date: Wed Sep 2 14:51:33 2015 -0700 - Fixup packet list context menu behavior. + Display filter edit updates. - 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. + Have the bookmark button operate on saved display filters, similar to + the "Filter:" button in the GTK+ UI. Expose the saved display filter + list via a popup menu. - Exit out of setMenusForSelectedTreeRow if the packet list has focus so - that we don't clobber the enabled states of various actions. + Update the display filter icons. Make the "Apply" button wider. Remove + the old icon assets. - Take the "Apply As" and "Prepare A" context menu titles from their main - window counterparts. Remove actionApply_as_Filter and - actionPrepare_a_Filter. + Add a StockIconToolButton class along with note explaining why it's + necessary. - Remove completed to-do items. + Rename the "Filter Bookmarks" preference to "Filter Shortcuts". + Suggestion for a better name are welcome. - Change-Id: I8f6f538bb7786d8df02a999f3b449dfde640e847 - Reviewed-on: https://code.wireshark.org/review/9810 + Change-Id: I0082d3f01b017253fa75e51cbff9beb17c41a209 + Reviewed-on: https://code.wireshark.org/review/10390 + Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 2c79830 -Author: Evan Huus <eapache@gmail.com> -Date: Sun Jul 26 22:29:58 2015 -0400 +commit 4f5937a +Author: Stig Bjørlykke <stig@bjorlykke.org> +Date: Sat Sep 5 20:30:17 2015 +0200 - tcp: only reset dupACK counter when ACk# changes + Qt: Fixed a QString memory leak - Otherwise things like window changes will reset the dup-ack counter incorrectly - and confusingly. + Change-Id: I93f439b7eb8d915f23ee456205d202d599f8cd99 + Reviewed-on: https://code.wireshark.org/review/10394 + Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> + +commit 90062a3 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Fri Sep 4 21:49:11 2015 +0200 + + Qt: fix applying UINT preferences in base 8 or 16 - Bug: 11397 - Change-Id: I80b63cf989a952547bec48562a92078c8ab29081 - Reviewed-on: https://code.wireshark.org/review/9802 - Petri-Dish: Evan Huus <eapache@gmail.com> + While we are at it: + - fix a crash when clicking on the cancel button from the preference modification context menu + - redissect the packet list when modifying a preference from the context menu + + Bug: 11502 + Change-Id: I7269f7093f1f38c46ec7744fd619ab67f31eb4e7 + Reviewed-on: https://code.wireshark.org/review/10386 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Evan Huus <eapache@gmail.com> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 1732017 -Author: Gerald Combs <gerald@zing.org> -Date: Sun Jul 26 13:21:40 2015 -0700 +commit a35311d +Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> +Date: Sat Sep 5 03:17:31 2015 +0100 - Add an application-wide style sheet. + Fix comments in dissect_6lowpan_iphc_nhc() - Use it to work around poorly drawn splitters on OS X. + Change-Id: I9c02b8f2a64127200c9cfe2f389f773ac198ed21 + Reviewed-on: https://code.wireshark.org/review/10389 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + +commit f189cb8 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Fri Sep 4 22:35:02 2015 +0200 + + Qt: fix Decode As dialog when using octal or hexadecimal types - Change-Id: Ic8e7331b1ba37fe783312b4460961f361297c7f0 - Reviewed-on: https://code.wireshark.org/review/9798 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: Ie022573f6a7b11a0f74abfa47b2667f5b2844cc3 + Reviewed-on: https://code.wireshark.org/review/10387 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 000ce64 -Author: Luke Mewburn <luke@mewburn.net> -Date: Sun Jul 26 21:54:12 2015 +1000 +commit 9defa0f +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Fri Sep 4 18:56:10 2015 +0200 - nettrace3gpp324423: fix name consistency + GTK/Qt: fix crash when closing SIP Flows dialog - 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". + Bug: 11500 + Change-Id: Ifc3826c9743b0fab338cc85c9210231320feddf2 + Reviewed-on: https://code.wireshark.org/review/10384 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + +commit f7a3700 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Fri Sep 4 18:23:51 2015 +0200 + + Qt: fix crash when selecting Telephony > VoIP Calls or SIP Flows menu entries - Change-Id: If9994b9c6de69b6e1bdfc6679fbaabe698971949 - Reviewed-on: https://code.wireshark.org/review/9795 + Bug: 11499 + Change-Id: I8785907013c38c5ac6f9624afdfbf8e02f2bf68d + Reviewed-on: https://code.wireshark.org/review/10383 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 8b316ff -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Sun Jul 26 17:31:26 2015 -0400 +commit 0a68c9d +Author: Stig Bjørlykke <stig@bjorlykke.org> +Date: Thu Sep 3 14:29:06 2015 +0200 - Tshark doesn't display column text as field in 2-pass mode + Qt: Destruct FunnelStringDialog when done. - Bug: 11401 - Change-Id: I6aa43d5cdd996aaf0980ab59b690212e41046acc - Reviewed-on: https://code.wireshark.org/review/9800 - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> + To be able to close all open dialogs (emit a close signal) from a C function + this change introduces a FunnelStringDialogHelper class to handle this. + + Change-Id: Id50e949e5e2b56401ce9228f8fa9ba17dddbd7fb + Reviewed-on: https://code.wireshark.org/review/10372 + Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> + Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> -commit 179da0f +commit a69a515 Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jul 26 08:10:01 2015 -0700 +Date: Fri Sep 4 09:22:41 2015 -0700 - [Automatic update for 2015-07-26] + Add a version check to our splitter styling. - Update manuf, services enterprise-numbers, translations, and other items. + According to https://bugreports.qt.io/browse/QTBUG-43425 the OS X + splitter rendering issue will be fixed in Qt 5.6. - Change-Id: I3ddd31b2ebded50dcbe974ce99ef9b417b39aa2f - Reviewed-on: https://code.wireshark.org/review/9796 + Change-Id: I99e000d96f8f61cd654be3808fd79577bac11d88 + Reviewed-on: https://code.wireshark.org/review/10381 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 29f2f09 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sun Jul 26 10:53:02 2015 +0200 +commit f5ac9f5 +Author: Cody Doucette <doucette@bu.edu> +Date: Sat Aug 29 14:05:14 2015 -0400 - MSWSP: Remove usage of stdbool.h - - For fix build on Solaris - "/usr/include/stdbool.h", line 42: #error: "Use of <stdbool.h> is valid only in a c99 compilation environment." + xip-serval: add support for XIP Serval packets - Replace bool -> gboolean - Replace true -> TRUE, false -> FALSE (for fix Wcompat error..) + Serval is a service-centric architecture that has been ported to XIA to + allow applications to communicate using service names. This change adds + a dissector for XIP Serval, which sits between layers 3 and 4, and + also amends the XIP dissector to be able to invoke it. - Change-Id: Ia3f39bfbbaf7cf35a916eb37edfc6745ea50ad36 - Reviewed-on: https://code.wireshark.org/review/9793 + Bug: 11491 + Change-Id: I11299ddbd0fb9eaf8728f8b3fde2a63656963114 + Reviewed-on: https://code.wireshark.org/review/10315 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit cc134b1 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sun Jul 26 11:17:04 2015 +0200 +commit 3ca6bde +Author: João Valverde <joao.valverde@tecnico.ulisboa.pt> +Date: Wed Sep 2 02:49:23 2015 +0100 - MSWSP: Try to fix Mac OS X Buildbot + Capitalize IPv6 extension headers ipprotostr() - Change-Id: I0c7bd3ea3900630ce4516cb00e6400cca353b672 - Reviewed-on: https://code.wireshark.org/review/9794 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I36f0ceb0c44414e6b98f580757eec226facae9ae + Reviewed-on: https://code.wireshark.org/review/10353 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 0795931 +commit ad8f859 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sun Jul 26 10:32:41 2015 +0200 +Date: Fri Sep 4 13:55:33 2015 +0200 - VoIP Call: fix Ubuntu Buildbot + expert_comp_table (GTK): fix will never be executed [-Wunreachable-code] - Missing init of new sip_frame_num variable... + use #if 0 /#endif for disable code - 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] - ^ + Found by Clang 3.7 - Change-Id: Ib76dec02d03f66d365ef18926bc4507a6f70556d - Reviewed-on: https://code.wireshark.org/review/9792 + Change-Id: Ie1b6b0936df0ae422baa9b3bb9692f136eb177b1 + Reviewed-on: https://code.wireshark.org/review/10380 + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit c711a63 -Author: Michal Pazdera <michal.pazdera@gmail.com> -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 <a.broman58@gmail.com> -commit 19578ba -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Jul 24 09:53:09 2015 -0700 +commit ecc51f3 +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Mon Aug 31 13:54:53 2015 +0200 - Minor Enabled Protocols tweaks. + H223: fix will never be executed [-Wunreachable-code] - Try to keep long protocol names from widening the first column too much. - - Expand all tree items. + Found by Clang 3.7 - Change-Id: I4f09aa2a895aa0ee5a6faab8242768b62b1208bc - Reviewed-on: https://code.wireshark.org/review/9771 + Change-Id: I3a7c41eba2ee636bb74326598a3de47f5a23126a + Reviewed-on: https://code.wireshark.org/review/10325 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit fe7a35a -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Jul 23 22:38:41 2015 +0200 +commit f526468 +Author: Hadriel Kaplan <hadrielk@yahoo.com> +Date: Thu Sep 3 16:26:02 2015 -0400 - ISAKMP: Remove uneeded space before HF name and HF filter + Coverity CID 1167971-1167974: constant expressions in wslua_int64 - Change-Id: I5669277b9a03cba17067d52e6a9f9df933c3eb5d - Reviewed-on: https://code.wireshark.org/review/9767 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 3ea89e6 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Jul 6 09:51:11 2015 +0200 - - lemon (tools): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + Get rid of false-positive coverity issues by using a macro instead + of source code if-statement. - Change-Id: Ibfa0bfd589e77a58b7b242c7c2fe25ef052a874e - Reviewed-on: https://code.wireshark.org/review/9516 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> + Bug: 11501 + Change-Id: I07f478ed334931f05bdfb87cb8f614b16bbf8fa8 + Reviewed-on: https://code.wireshark.org/review/10376 + Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> -commit 47c1753 -Author: Richard Sharpe <rsharpe@samba.org> -Date: Fri Jul 24 20:41:31 2015 -0700 +commit 7c4f622 +Author: Kevin Bracey <kevin.bracey@arm.com> +Date: Fri Sep 4 12:45:29 2015 +0300 - Fix an error where we expect the tagged parameters field to be present even - though the spec (802.11ad-2012) says they are optional. + Insert correct padding in RFC 6282 IPHC headers - Communicated to me by the WiFi Alliance. I have captures. Not sure if I can - share them. + IPv6 Extension Headers compressed using IPHC should have a single Pad1 + or PadN inserted at the end if necessary - the previous code just left + any padding zero-initialised (equivalent to multiple Pad1s). - Change-Id: Id5998594214ac4b6a1d3baf3cb2f0d4fe6227b40 - Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com> - Reviewed-on: https://code.wireshark.org/review/9785 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + This guarantees correctly-compressed packets are accurately + decompressed, including the specific option padding pattern. (The type of + padding could matter, eg for IPSec authentication - padding options are + authenticated.) + + Print a warning note if a non-option header needs padding - this is + invalid. + + Bug: 10523 + Change-Id: I66c98370862800a8fccbe02ed6a851961e2f7d1d + Reviewed-on: https://code.wireshark.org/review/10230 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 92fa272 -Author: Andrei Cipu <acipu@ixiacom.com> -Date: Thu Jul 23 17:25:57 2015 +0300 +commit ad46641 +Author: guydavies <aguydavies@gmail.com> +Date: Fri Sep 4 12:10:19 2015 +0200 - ISAKMP: Add 3GPP IMS Options for IKEv2 - - Bug:11392 + BGP: Fix typo - Change-Id: I53045f25cf9f3daf910e9fd5240033ffcd1941a2 - Reviewed-on: https://code.wireshark.org/review/9757 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Change-Id: I2d33af7da22fee543d08624d06ca8880472f3586 + Reviewed-on: https://code.wireshark.org/review/10377 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 2874334 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Jul 23 22:31:09 2015 +0200 +commit e4d9ce1 +Author: Gerald Combs <gerald@wireshark.org> +Date: Thu Sep 3 11:46:20 2015 -0700 - 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]." + Move IAX2 analysis to the ui directory. - 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. + Rename ui/gtk/iax2_analysis.h to ui/tap-iax2-analysis.h. Move + iax2_packet_analyse to ui/tap-iax2-analysis.c. - Issue reported by Andrei Cipu + Rename rtp_analysis.h to tap-rtp-analysis.h to match IAX2. - Bug: 11393 - Ping-Bug: 11392 - Change-Id: I8dbc268e71fd6239dffa5469652345a68e0adc86 - Reviewed-on: https://code.wireshark.org/review/9761 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: Ice7e9ad0d7bf62d631850089c880ec09a3e101dd + Reviewed-on: https://code.wireshark.org/review/10375 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 38a2385 +commit 0491377 Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Jul 25 17:10:31 2015 +0200 +Date: Thu Sep 3 16:55:39 2015 +0200 - MAC LTE: fix dissection of Long DRX Command Control Element + Declare col_get_text() as WS_DLL_PUBLIC - Change-Id: I2d122a9ad8cd768499bff8e1af8754d2eb504594 - Reviewed-on: https://code.wireshark.org/review/9788 + Bug: 11498 + Change-Id: I5204bd27cee044a57913e48c4da00628f3f58bf8 + Reviewed-on: https://code.wireshark.org/review/10374 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 8c4b831 -Author: Pascal Quantin <pascal.quantin@gmail.com> -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 <pascal.quantin@gmail.com> - -commit 190e313 -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Sat Jul 25 09:24:48 2015 -0400 +commit 759e618 +Author: Gerald Combs <gerald@wireshark.org> +Date: Tue Sep 1 08:28:34 2015 -0700 - DNS: move DNS name resolution pref to Name Resolution prefs + GTK packet list string chunk fixups. - 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. + Call g_string_chunk_clear when we clear the packet list. Allocate 1 MiB + chunks instead of 32 byte chunks. This doesn't do much in practice locally + but appears more correct according to the GStringChunk documentation + and source code. - Bug: 10337 - Change-Id: Ie4d47bab0100db3360cc447cd3e446b2e39aa917 - Reviewed-on: https://code.wireshark.org/review/9786 - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> + Change-Id: I143b6e1b48d376ba826cb342ade71085a2d82d96 + Reviewed-on: https://code.wireshark.org/review/10344 + Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 3fc4a83 -Author: Jeff Morriss <jeff.morriss.ws@gmail.com> -Date: Fri Jul 24 14:51:37 2015 -0400 +commit 0818347 +Author: Gerald Combs <gerald@wireshark.org> +Date: Thu Sep 3 09:51:16 2015 -0700 - 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. + Remove the GTK+ IAX2 analysis circuit check. - Problem introduced by Idfd258c734e7a946300b2564bebf6e4cb374c8d1 . + The IAX2 dissector stopped setting pinfo->circuit_id last October in + g3d359da. Remove the corresponding check from the IAX2 Analysis dialog, + otherwise it won't open. - Change-Id: I0421539bde6e8eb7b5aa3e22dbb0ca8098e88d6f - Reviewed-on: https://code.wireshark.org/review/9779 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit c425334 -Author: Gregor Beck <gbeck@sernet.de> -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 <noel.power@suse.com> - Reviewed-on: https://code.wireshark.org/review/9440 - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I538fffb2ec9950c796d01e64db5890f4e9d22b64 + Reviewed-on: https://code.wireshark.org/review/10373 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 23ca456 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Jul 25 00:08:52 2015 +0200 +commit 68fa739 +Author: Stig Bjørlykke <stig@bjorlykke.org> +Date: Thu Sep 3 14:10:40 2015 +0200 - MAC LTE: fix dump of last SDU + Lua: Check if having listeners before remove - Change-Id: Ice39b71fab564cde0688c451bdf46c7e426475ce - Reviewed-on: https://code.wireshark.org/review/9782 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + This avoids a warning when trying to remove a listener twice. + g_ptr_array_remove: assertion 'array' failed + + Change-Id: I0bcbbbe3b3393a8455b51fad80c5716fc38ac50e + Reviewed-on: https://code.wireshark.org/review/10370 + Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> + Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> -commit 7be155e -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Jul 24 10:24:15 2015 -0700 +commit 2be3820 +Author: Michael Mann <mmann78@netscape.net> +Date: Wed Sep 2 22:53:05 2015 -0400 - Try deleting WiresharkDialog when we close it. + Address "shadow" warnings found by checkAPI script. - 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. + These aren't "true" shadow issues, but the script doesn't completely understand C syntax (for things like struct member names "time" and "index"). But fixing them creates less noise. - Change-Id: Ie0b848a7deeeee4667925b0d886e498f13a86bfc - Reviewed-on: https://code.wireshark.org/review/9781 - Petri-Dish: Gerald Combs <gerald@wireshark.org> + Change-Id: I5a2db1549095824530428529e86cab453c031a04 + Reviewed-on: https://code.wireshark.org/review/10368 + Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit d24614c -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Fri Jul 24 19:50:29 2015 +0200 +commit 32e785f +Author: Guy Harris <guy@alum.mit.edu> +Date: Wed Sep 2 14:35:37 2015 -0700 - MAC LTE: fix dissection when only header is captured but full PDU length is reported + The official #define for 32-bit and 64-bit Windows is _WIN32. - Change-Id: I66ccfc26b3a0e948fdcf8dfe4ec8e87e6ed756da - Reviewed-on: https://code.wireshark.org/review/9778 - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit bb7e657 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Fri Jul 24 19:13:31 2015 +0200 - - RLC: fix dissection when only header is captured but full PDU length is reported + It's _WIN32, with a leading underscore, not WIN32. See, for example: - Change-Id: I06e7bed71a42c6cbe500d7f1994a625b37d6586c - Reviewed-on: https://code.wireshark.org/review/9777 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + https://sourceforge.net/p/predef/wiki/OperatingSystems/ + + and + + https://msdn.microsoft.com/en-us/library/b0084kay.aspx + + *Some* environments may also define WIN32, but we shouldn't depend on + that. + + Replace all-caps "WIN32" referring to Windows in comments and other text + with "Windows" or "Win32". (The two are pretty much equivalent, these + days; nobody much cares about Win16, not that we ever ran on it, and + 64-bit Windows is just a 64-bitified Win32.) + + Change-Id: Id327bcd4b1e9baa4f27055eff08c2d9e594d6f70 + Reviewed-on: https://code.wireshark.org/review/10367 + Petri-Dish: Guy Harris <guy@alum.mit.edu> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit b962fdd +commit c4538de Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Fri Jul 24 19:12:45 2015 +0200 +Date: Wed Sep 2 23:00:53 2015 +0200 - RLC LTE: fix dissection when only header is captured but full PDU length is reported + UNISTIM: fix dissection of some audio commands - Change-Id: I67654bb0ca30d9bb56c9a4b3be179161ecd0de3a - Reviewed-on: https://code.wireshark.org/review/9776 + Bug: 11497 + Change-Id: Ifb7aeed83f9ac091349387bc425925d2441d1c06 + Reviewed-on: https://code.wireshark.org/review/10365 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit b9a4bab -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Fri Jul 24 19:10:30 2015 +0200 +commit 7abd842 +Author: Bill Meier <wmeier@newsguy.com> +Date: Wed Sep 2 15:03:39 2015 -0400 - PDCP LTE: fix dissection when only header is captured but full PDU length is reported + Update comment about use of "/Zo" with MSVC2015 - Change-Id: I62c89a49f3cf2ed566e16a978b2ed237f09d466e - Reviewed-on: https://code.wireshark.org/review/9775 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: Ifb20e62a5e0719e1df2f7f6aba7a3935c7212c5b + Reviewed-on: https://code.wireshark.org/review/10364 + Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit 1ea2565 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Fri Jul 24 18:32:26 2015 +0200 +commit e154118 +Author: Bill Meier <wmeier@newsguy.com> +Date: Wed Sep 2 14:09:34 2015 -0400 - SIP: heuristic dissectors should use the captured length, not the reported one + Fix one more MSVC2015 issue: "[...]ignoring unknown option '/Zd'" - Otherwise it triggers a "packet size limited during capture" exception - preventing following heuristic dissectors to be called + Remove some old cruft which compiled packet-rrc.c with '/Zd' + option for certain very old Microsoft C compilers which we no + longer support (e.g., MSVC6!). - Change-Id: Ifc97e84b4e40a1c7dc0b0c63b7b9e015bd99d178 - Reviewed-on: https://code.wireshark.org/review/9774 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: I47f7ab8c92b9e495acedfe76260d607a01c2a40f + Reviewed-on: https://code.wireshark.org/review/10362 + Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit efefdbb +commit c8bdb95 Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Jul 24 12:04:27 2015 -0700 +Date: Wed Sep 2 11:27:12 2015 -0700 - 1.99.8 → 1.99.9. + 1.99.9 → 1.99.10. - Change-Id: I014399c332136a10b1c560d4c68be5b8bab97552 - Reviewed-on: https://code.wireshark.org/review/9780 + Change-Id: I924be5b0e3c73a0bb8ae1361fa518ec10139e13d + Reviewed-on: https://code.wireshark.org/review/10363 Reviewed-by: Gerald Combs <gerald@wireshark.org> @@ -1,7 +1,6 @@ - Wireshark 1.99.9 Release Notes + Wireshark 2.0.0 Release Notes - This is a semi-experimental release intended to test new features for - Wireshark 2.0. + This is the first release candidate for Wireshark 2.0. __________________________________________________________________ What is Wireshark? @@ -12,9 +11,27 @@ What is Wireshark? What's New + Wireshark 2.0 features a new user interface which should provide a + smoother, faster user experience. + New and Updated Features The following features are new (or have been significantly updated) + since version 1.99.9: + * Qt port: + + The LTE RLC Graph dialog has been added. + + The LTE MAC Statistics dialog has been added. + + The LTE RLC Statistics dialog has been added. + + The IAX2 Analysis dialog has been added. + + The Conversation Hash Tables dialog has been added. + + The Dissector Tables dialog has been added. + + The Supported Protocols dialog has been added. + + You can now zoom the I/O and TCP Stream graph X and Y axes + independently. + + The RTP Player dialog has been added. + + Several memory leaks have been fixed. + + The following features are new (or have been significantly updated) since version 1.99.8: * Qt port: + The MTP3 statistics and summary dialogs have been added. @@ -166,28 +183,42 @@ What's New New Protocol Support - (LISP) TCP Control Message, Aeron, AllJoyn Reliable Datagram Protocol, - Android ADB, Android Logcat text, Apache Tribes Heartbeat, BGP - Monitoring Prototol (BMP), C15 Call History Protocol dissection - (C15ch), ceph, Concise Binary Object Representation (CBOR) (RFC 7049), - corosync/totemnet corosync cluster engine ( lowest - levelencryption/decryption protocol), corosync/totemsrp corosync - cluster engine ( totem single ring protocol), Couchbase, CP "Cooper" - 2179, DJI UAV Drone Control Protocol, Dynamic Source Routing (RFC - 4728), Elasticsearch, ETSI Card Application Toolkit - Transport - Protocol, eXpressive Internet Protocol (XIP), Generic Network - Virtualization Encapsulation (Geneve), Geospatial and Imagery Access - Service (GIAS), GVSP GigE Vision (TM) Streaming Protocol, HCrt, HiQnet, - IP Detail Record (IPDR), IPMI Trace, iSER, KNXnetIP, MACsec Key + Aeron, AllJoyn Reliable Datagram Protocol, Android Debug Bridge, + Android Debug Bridge Service, Android Logcat text, Apache Tribes + Heartbeat, APT-X Codec, B.A.T.M.A.N. GW, B.A.T.M.A.N. Vis, BGP + Monitoring Prototol (BMP), Bluetooth Broadcom HCI, Bluetooth GATT + Attributes (many), Bluetooth OBEX Applications (many), BSSAP2, C15 Call + History Protocol (C15ch) and others, Celerra VNX, Ceph, Chargen, + Classical IP, Concise Binary Object Representation (CBOR) (RFC 7049), + Corosync Totem Single Ring Protocol, Corosync Totemnet, Couchbase, CP + "Cooper" 2179, CSN.1, dCache, DJI UAV Drone Control Protocol, Dynamic + Source Routing (RFC 4728), Elasticsearch, ETSI Card Application Toolkit + - Transport Protocol, eXpressive Internet Protocol (XIP), GDB Remote + Serial Protocol, Generic Network Virtualization Encapsulation (Geneve), + Geospatial and Imagery Access Service (GIAS), Gias Dissector Using GIOP + API, GPRS Tunneling Protocol Prim, GVSP GigE Vision (TM) Streaming + Protocol, H.225 RAS, Harman HiQnet, HCrt, Hotline Command-Response + Transaction Protocol, IEEE 802.11 radio information, IP Detail Record + (IPDR), IPMI Trace, iSER, KNXnetIP, Link Aggregation Control Protocol, + Link Aggregation Marker Protocol, Link Layer Topology Discovery, + Link-local Multicast Name Resolution, LISP TCP Control Message, + Locator/ID Separation Protocol (Reliable Transport), MACsec Key Agreement - EAPoL-MKA, MCPE (Minecraft Pocket Edition), Message Queuing - Telemetry Transport For Sensor Networks (MQTT-SN), Network File System - over Remote Direct Memory Access (NFSoRDMA), OCFS2, OptoMMP, - Performance Co-Pilot Proxy, QNEX6 (QNET), RakNet games library, Remote - Shared Virtual Disk - RSVD, Riemann, S7 Communication, Secure Socket - Tunnel Protocol (SSTP), Shared Memory Communications - RDMA, Stateless - Transport Tunneling, Thrift, Time Division Multiplexing over Packet - Network (TDMoP), Video Services over IP (VSIP), Windows Search Protocol - (MS-WSP), and ZVT Kassenschnittstelle + Telemetry Transport For Sensor Networks (MQTT-SN), Minecraft Pocket + Edition, MQ Telemetry Transport Protocol for Sensor Networks, Multicast + Domain Name Service (mDNS), Neighborhood Watch Protocol (NWP), Network + File System over Remote Direct Memory Access (NFSoRDMA), OAMPDU, OCFS2, + OptoMMP, Organization Specific Slow Protocol (OSSP), Packet Cable + Lawful Intercept (8 byte CCCID), Packet Cable Lawful Intercept + (timestamp), Packet Cable Lawful Intercept (timestamp case ID), + PacketCable MTA FQDN, Performance Co-Pilot Proxy, QNEX6 (QNET), RakNet + games library, Remote Shared Virtual Disk (RSVD), Riemann, RPC over + RDMA (RPCoRDMA), S7 Communication, Secure Socket Tunnel Protocol + (SSTP), Shared Memory Communications - RDMA (SMCR), Stateless Transport + Tunneling, TCP based Robot Operating System protocol (TCPROS), Thrift, + Time Division Multiplexing over Packet Network (TDMoP), Video Services + over IP (VSIP), Windows Search Protocol (MS-WSP), XIP Serval, ZigBee + ZCL (many), and ZVT Kassenschnittstelle Updated Protocol Support @@ -196,13 +227,15 @@ What's New New and Updated Capture File Support 3GPP TS 32.423 Trace, Android Logcat text files, Colasoft Capsa files, - Netscaler 3.5, and Wireshark now supports nanosecond timestamp - resolution in PCAP-NG files. + Netscaler 3.5, and Symbian OS BTSNOOP File Format + + Additionally, Wireshark now supports nanosecond timestamp resolution in + PCAP-NG files. New and Updated Capture Interfaces support - and Androiddump - provide interfaces to capture (Logcat and Bluetooth) - from connected Android devices + Androiddump support now provides interfaces to capture (Logcat, + Bluetooth and WiFi) from connected Android devices. Major API Changes @@ -216,6 +249,7 @@ What's New * Heuristic dissectors can now be globally enabled/disabled so heur_dissector_add() has a few more parameters to make that possible + * proto_tree_add_text has been removed. __________________________________________________________________ Getting Wireshark @@ -285,7 +319,7 @@ Frequently Asked Questions A complete FAQ is available on the [19]Wireshark web site. __________________________________________________________________ - Last updated 2015-09-01 18:01:23 UTC + Last updated 2015-10-13 21:32:36 UTC References diff --git a/version.conf b/version.conf index 6dedd7c96a..21fa4937b9 100644 --- a/version.conf +++ b/version.conf @@ -1,6 +1,11 @@ # Interim releases: Enable packaging, add a "rc" to the version. +#enable: 1 +#pkg_format: rc0-%# +#pkg_enable: 1 + +# Release candidates enable: 1 -pkg_format: rc0-%# +pkg_format: rc1 pkg_enable: 1 # Final release: Disable package version stamps. |