From dd7746e6f1b034048cd986ca6f44291e712cc1fc Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Tue, 7 Jun 2016 10:00:01 -0700 Subject: Build 2.0.4. Change-Id: Ia422680f27fb947b1f735b7240be6150768f5cf4 Reviewed-on: https://code.wireshark.org/review/15767 Reviewed-by: Gerald Combs --- ChangeLog | 2008 ++++++++++++++++++++++++++++++++++++++++ NEWS | 432 ++++----- docbook/release-notes.asciidoc | 6 +- epan/CMakeLists.txt | 2 +- ui/qt/wireshark_de.qm | Bin 334957 -> 335049 bytes ui/qt/wireshark_de.ts | 90 +- ui/qt/wireshark_en.ts | 84 +- ui/qt/wireshark_fr.ts | 84 +- ui/qt/wireshark_it.qm | Bin 339719 -> 339833 bytes ui/qt/wireshark_it.ts | 90 +- ui/qt/wireshark_ja_JP.ts | 84 +- ui/qt/wireshark_pl.qm | Bin 325679 -> 325765 bytes ui/qt/wireshark_pl.ts | 94 +- ui/qt/wireshark_zh_CN.qm | Bin 246090 -> 246092 bytes ui/qt/wireshark_zh_CN.ts | 86 +- version.conf | 12 +- 16 files changed, 2505 insertions(+), 567 deletions(-) diff --git a/ChangeLog b/ChangeLog index e69de29bb2..37695c68d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -0,0 +1,2008 @@ +commit e9e189d +Author: Gerald Combs +Date: Tue Jun 7 10:00:01 2016 -0700 + + Release 2.0.4. + + Change-Id: Ia422680f27fb947b1f735b7240be6150768f5cf4 + +commit 9d69a1e +Author: Jens Kilian +Date: Mon Jun 6 15:38:22 2016 +0200 + + Don't sign extend unsigned integer fields larger than 32 bits. + + Fix a bug in proto_tree_set_uint64() which caused fields to be sign extended. + (This only showed up when a non-zero bitmask was present.) + + Change-Id: Ibcc986e3d42f97348966ea66c2ae9fca73b09992 + Reviewed-on: https://code.wireshark.org/review/15764 + Reviewed-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Jaap Keuter + (cherry picked from commit 767a59e54e6df17f7d8e2c6806ce16062d17e6d7) + Reviewed-on: https://code.wireshark.org/review/15765 + +commit 1d6dd6a +Author: Mark Vitale +Date: Mon Jun 6 13:53:14 2016 -0400 + + afs: eliminate "malformed packet" false alarms + + Many AFS packets have empty payloads, and Wireshark marks these as + "Malformed Packet" even though they are normal. + + Eliminate these false alarms by using tvb_reported_length_remaining when + adding items to the tree. + + Change-Id: I4f134fef36b8bb7f99224f02fea9cf29117fb36a + Reviewed-on: https://code.wireshark.org/review/15754 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + (cherry picked from commit 528edba87ae6a6ffd951bdd137421910ea88d964) + Reviewed-on: https://code.wireshark.org/review/15758 + Petri-Dish: Michael Mann + Reviewed-by: Mark Vitale + +commit 77548a9 +Author: Gerald Combs +Date: Mon Jun 6 14:55:10 2016 -0700 + + Qt: RTP audio stream fixups. + + Make sure audio_stream_ is non-NULL before we try to use it. Delete + audio_stream_ more gracefully and add a note about mutexes on OS X and + Windows. + + Bug: 12166 + Change-Id: I12e76c49e631bc1de813c5c7d82c7d928c71237e + Reviewed-on: https://code.wireshark.org/review/15760 + Reviewed-by: Gerald Combs + +commit 24f0f89 +Author: Gerald Combs +Date: Mon Jun 6 13:03:39 2016 -0700 + + Prep for 2.0.4. + + Change-Id: I3665964caceea94dada8b3df7973d8f07bf3fece + Reviewed-on: https://code.wireshark.org/review/15755 + Reviewed-by: Gerald Combs + +commit 9a5e5b2 +Author: Stig Bjørlykke +Date: Sun Jun 5 20:22:32 2016 +0200 + + Qt: Improved ImportTextDialog layout + + Put direction indication label and checkbox in a HBox to align vertical. + + Change-Id: I2aa7846aef25e9f080349e9dfef5c191b8d323e3 + Reviewed-on: https://code.wireshark.org/review/15742 + Petri-Dish: Stig Bjørlykke + Tested-by: Petri Dish Buildbot + Reviewed-by: Stig Bjørlykke + (cherry picked from commit 88c914755c33fea06b2414cec6243929ec908c95) + Reviewed-on: https://code.wireshark.org/review/15752 + +commit 1ec869f +Author: Pascal Quantin +Date: Sun Jun 5 16:27:37 2016 +0200 + + Initialize all header_field_info members + + Change-Id: Id86d17f1e321b8cc73fb732aaf674e1420a0a745 + Reviewed-on: https://code.wireshark.org/review/15737 + Reviewed-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + (cherry picked from commit 86f91643656e0b8f82f7d66903cec089d5ed4208) + Reviewed-on: https://code.wireshark.org/review/15745 + +commit 4e42bd4 +Author: Gerald Combs +Date: Sun Jun 5 08:19:35 2016 -0700 + + [Automatic update for 2016-06-05] + + Update manuf, services enterprise-numbers, translations, and other items. + + Change-Id: Iacbaf7e46089bb31ef5e91c0ab65e5e7c4ec5819 + Reviewed-on: https://code.wireshark.org/review/15735 + Reviewed-by: Gerald Combs + +commit cc68de1 +Author: Michael Mann +Date: Sun Jun 5 00:05:23 2016 -0400 + + Don't copy details of hidden columns. + + Bug: 11788 + Change-Id: I3f4df884d98903222de8a340de6a08e680687b0a + Reviewed-on: https://code.wireshark.org/review/15727 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + (cherry picked from commit 887b2030836167f92cf72a9cf7b1694d5a783624) + Reviewed-on: https://code.wireshark.org/review/15731 + Reviewed-by: Michael Mann + +commit ff27d85 +Author: Evan Huus +Date: Sat Jun 4 13:56:57 2016 -0400 + + UMTS_FP: fix handling reserved C/T value + + The spec puts the reserved value at 0xf but our internal table has 'unknown' at + 0; since all the other values seem to be offset-by-one, just take the modulus + 0xf to avoid running off the end of the table. + + Bug: 12191 + Change-Id: I83c8fb66797bbdee52a2246fb1eea6e37cbc7eb0 + Reviewed-on: https://code.wireshark.org/review/15722 + Reviewed-by: Evan Huus + Petri-Dish: Evan Huus + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + (cherry picked from commit 7d7190695ce2ff269fdffb04e87139995cde21f4) + Reviewed-on: https://code.wireshark.org/review/15725 + Petri-Dish: Michael Mann + +commit bfb1d6d +Author: Zdeněk Žamberský +Date: Sat Jun 4 21:17:46 2016 +0200 + + Qt ui code: fix qreal type problems on ARM platform + + fixing problems in qt ui code comming from the fact that qreal type is float on + ARM platform and double on other platforms, which causes build errors on ARM + (not all casts are probably strictly necessary) + + Bug: 12483 + Change-Id: Ife5e6d3649a7ee1ad4e7eadffe9f4484ff2718de + Reviewed-on: https://code.wireshark.org/review/15723 + Reviewed-by: Guy Harris + (cherry picked from commit b84b3f9f1d8577255a9d83c81277ebc53bcac68d) + Reviewed-on: https://code.wireshark.org/review/15724 + +commit 4139555 +Author: Pascal Quantin +Date: Fri Jun 3 20:36:46 2016 +0200 + + Remove an ellipsis UTF-8 character in gsignal.h + + Change-Id: Ic31dab513fc2ff5f2f182ae98c1b665ea4b8916b + Reviewed-on: https://code.wireshark.org/review/15713 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + (cherry picked from commit 018765f41af15855df87b183e337f0371cfa8a17) + Reviewed-on: https://code.wireshark.org/review/15719 + +commit 1bdef75 +Author: Michael Mann +Date: Fri May 27 22:46:58 2016 -0400 + + Create a FieldFilterEdit class and apply it to custom column preference field. + + DisplayFilterEdit deals with entire filters and some edit boxes just need a + single protocol field. This control will do the trick. + + # Conflicts: + # ui/qt/Makefile.common + # ui/qt/column_preferences_frame.cpp + + Bug: 12321 + Change-Id: I8e5837ea9a6955ada29b7e516ea022ab1dd46f0d + Reviewed-on: https://code.wireshark.org/review/15691 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 8421ca2 +Author: Jens Kilian +Date: Wed Jun 1 16:05:01 2016 +0200 + + Fix a compile error occurring on RedHat Enterprise Linux Workstation release 7.0 (Maipo). + + This fixes a compile error with Qt version 4.8.5-8 as installed in RHEL 7.0: + + sequence_dialog.cpp: In member function 'void SequenceDialog::mouseMoved(QMouseEvent*)': + sequence_dialog.cpp:306:35: error: 'escape' is not a member of 'Qt' + QString raw_comment = Qt::escape(sai->comment); + ^ + + Change-Id: Ibbf62123441645471d66aa329f0d63d0ee198017 + Reviewed-on: https://code.wireshark.org/review/15682 + Reviewed-by: Gerald Combs + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + (cherry picked from commit 76ef2d2a3dff61f523cacc0ac868f5cc2b8f5a5f) + Reviewed-on: https://code.wireshark.org/review/15690 + Reviewed-by: Guy Harris + +commit bb71afd +Author: Vincent Helfre +Date: Wed Jun 1 11:37:00 2016 +0200 + + CSN1: fix dissection of variable bitmaps + + Change-Id: I3dbb2a4f8f7ea125e4f96e302ea33ff03706eb1b + Reviewed-on: https://code.wireshark.org/review/15674 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Reviewed-by: Pascal Quantin + (cherry picked from commit b079151c6fe0a1c5ac25fc636f96b694eefb50c5) + Reviewed-on: https://code.wireshark.org/review/15679 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + +commit 3944876 +Author: Jeff Morriss +Date: Tue May 31 21:23:22 2016 -0400 + + tshark man page: the first TCP stream is stream 0, not 1. + + This fixes the example of the -z follow option. + + Also fix up some formatting in the same section. + + Bug: 12383 + Change-Id: Ic9b2ef5e63ab31d70f2750f9cfdcbab76cf204b6 + Reviewed-on: https://code.wireshark.org/review/15667 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + (cherry picked from commit b2845a6ac885d49aa1ea5d3865cd377d812eb4c7) + Reviewed-on: https://code.wireshark.org/review/15668 + Reviewed-by: Alexis La Goutte + +commit d003e6d +Author: Michael Mann +Date: Sat May 28 14:59:00 2016 -0400 + + Restore a preference column type if fields are empty. + + The column type is automatically changed to Custom if user clicks + on the "Fields" or "Field Occurrences" column. This can be + accidental and cause the user grief if he doesn't realize it. + If there is no text in the field, restore the type to its + original value. + + # Conflicts: + # ui/qt/column_preferences_frame.cpp + + Bug: 12465 + Change-Id: I0453f43be13077aba58cca61011eeff9ca9b83b2 + Reviewed-on: https://code.wireshark.org/review/15600 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + Reviewed-on: https://code.wireshark.org/review/15658 + Reviewed-by: Michael Mann + +commit 1a3e001 +Author: Jeff Morriss +Date: Wed Apr 27 20:27:41 2016 -0400 + + If we've seen HTTP in this conversation mark the frame as being HTTP. + + ... Even if it doesn't look like HTTP. When TCP desegmentation is turned off + the dissector will be called with frames that don't look like HTTP--but it's + (almost certainly) still HTTP. + + This adjusts the changes I9f1c736baaeb86f9fab61601d79e79b4e3a16c38 and + I2617d1e49030bd5ad85b0e818c48c01dc6fae075--hopefully without breaking the + intent of either. + + Bug: 10335 + Change-Id: I925d53d4f82a01aeffa5d129e53100cc4f488561 + Reviewed-on: https://code.wireshark.org/review/15136 + Petri-Dish: Jeff Morriss + Tested-by: Petri Dish Buildbot + Reviewed-by: Jeff Morriss + (cherry picked from commit 5e9b5d94c148572edf047eb715fbee5cca47ef2d) + Reviewed-on: https://code.wireshark.org/review/15641 + Reviewed-by: Anders Broman + +commit 8ada61c +Author: Pascal Quantin +Date: Tue May 31 16:09:03 2016 +0200 + + LTE-RRC: fix dissection of GPRS container + + Payload embedded in LTE message does not include the first byte identifying the message type. + Let's prepend a fake one before calling the gsm_rlcmac dissector + + Change-Id: Ibcf9b52902474a556b55e9b0a076d09d341f868c + Reviewed-on: https://code.wireshark.org/review/15642 + Reviewed-by: Pascal Quantin + (cherry picked from commit d77b8318e82c113b2f7852f950b9269b57e5da40) + Conflicts: + epan/dissectors/asn1/lte-rrc/lte-rrc.cnf + epan/dissectors/packet-lte-rrc.c + Reviewed-on: https://code.wireshark.org/review/15655 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + +commit b1358c0 +Author: Pascal Quantin +Date: Tue May 31 16:11:41 2016 +0200 + + Fix display of composite tvbs in GUI + + a composite tvb is the top-level data source tvb + + Change-Id: Ibab58801a754fd88fb86b9a13804bccf2ad51c7a + Reviewed-on: https://code.wireshark.org/review/15643 + Reviewed-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + (cherry picked from commit 35feab8a4a43013f1a06374194ec93d4e64959b6) + Reviewed-on: https://code.wireshark.org/review/15654 + +commit a9b2605 +Author: Dario Lombardo +Date: Mon May 30 16:34:03 2016 +0200 + + qt: fix crash when saving RTP audio + + The UI crashes when saving a RTP due to a division by zero. + To reproduce: open a RTP capture file, Telephony->RTP->RTP Streams, + then choose a stream, ANALYZE, SAVE, AUDIO, choose a path. + + Bug: 12211 + Change-Id: I51d61eb6797fc82c1b03254abaec839d3a1e281d + Reviewed-on: https://code.wireshark.org/review/15621 + Reviewed-by: Michael Mann + Reviewed-by: Anders Broman + (cherry picked from commit 057d8a80f0a3d91c1346ff77e079539cad7887d6) + Reviewed-on: https://code.wireshark.org/review/15650 + Reviewed-by: Pascal Quantin + +commit 895b293 +Author: Gerald Combs +Date: Tue May 31 08:24:12 2016 -0700 + + Qt: Fix compilation for Qt 4. + + QString::toHtmlEscaped was introduced in Qt 5. + + Change-Id: I50b2df2f6ef441ec95972173a852d7950aedc028 + Reviewed-on: https://code.wireshark.org/review/15644 + Reviewed-by: Gerald Combs + (cherry picked from commit f786c7a3838f75c7363d5a6f5a3ebb1c4e3daa85) + Reviewed-on: https://code.wireshark.org/review/15647 + +commit cd00960 +Author: Gerald Combs +Date: Sun May 29 08:19:11 2016 -0700 + + [Automatic update for 2016-05-29] + + Update manuf, services enterprise-numbers, translations, and other items. + + Change-Id: I2ce3339ffe5594c0997f923f76827de373547bdb + Reviewed-on: https://code.wireshark.org/review/15606 + Reviewed-by: Gerald Combs + +commit ec08682 +Author: Gerald Combs +Date: Wed Jan 13 14:11:00 2016 -0800 + + Fix capture output options. + + Remove the "permanent file" checkbox. We weren't properly checking its + value and it was extraneous. Add placeholder text about temporary files. + + Move the filename above the other options. That's where it is in the + GTK+ UI and it's arguably the most important. + + When capturing to multiple files the size and duration settings aren't + mutually exclusive. + + # Conflicts: + # ui/qt/capture_interfaces_dialog.cpp + # ui/qt/capture_interfaces_dialog.ui + + Bug: 12388 + Change-Id: I1da1d3524e3c2de2361050913281472a172faa3a + Reviewed-on: https://code.wireshark.org/review/13269 + Reviewed-by: Gerald Combs + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + Reviewed-on: https://code.wireshark.org/review/15604 + Petri-Dish: Michael Mann + +commit de78e5e +Author: Guy Harris +Date: Sat May 28 11:04:06 2016 -0700 + + If we're "[Saving] the file and [closing] it", actually *close* it. + + Otherwise, if you've modified the file (added, removed, or changed + comments), and you try to close the file or quit, and answer "Save" to + the "save your work?" question, Wireshark tries to clean up the wmem + scopes, but the file scope hasn't been left, and wmem crashes with an + assertion error. + + (The GTK+ version does the close, so it doesn't have the bug.) + + Change-Id: I87e4bab5017d8cbe693f21b61a19a9fca4625337 + Reviewed-on: https://code.wireshark.org/review/15599 + Reviewed-by: Guy Harris + +commit d56cf90 +Author: Michael Mann +Date: Fri May 27 08:25:55 2016 -0400 + + Create a "placeholder" NFS CB protocol for ONC-RPC stats. + + In GTK GUI, "NFS" shows up twice in the ONC-RPC Service Response Time + Programs list. That's probably confusing enough to users. In Qt + the "second" NFS wasn't showing up at all (or getting overwritten) + because it was hashing on program name. + Make NFS programs unique with a "stubbed" protocol. + + Bug: 12478 + Change-Id: Ic4ebdab8ba8b70e6026e1fb0f8e8defd4532b0f2 + Reviewed-on: https://code.wireshark.org/review/15588 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 1e121f3 +Author: Gordon Ross +Date: Wed May 25 21:54:20 2016 -0400 + + SMB NtCreate andX with extended response sometimes incorrect + + Bug: 12473 + Change-Id: Id513a89c5674e7288c7e0b12a06076eec18ff830 + Reviewed-on: https://code.wireshark.org/review/15568 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + (cherry picked from commit 32c1a2a3150113451240f7ec6699e17a08678506) + Reviewed-on: https://code.wireshark.org/review/15569 + Petri-Dish: Michael Mann + +commit 1bb5152 +Author: Gordon Ross +Date: Wed May 25 18:56:33 2016 -0400 + + SMB Open andX extended response decoded incorrectly + + Bug: 12472 + Change-Id: I94740078631e96980f14ade5df8ae9694c9d73b1 + Reviewed-on: https://code.wireshark.org/review/15565 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + (cherry picked from commit 931465257e1b18dc3480451dda0ada1f65945df4) + Reviewed-on: https://code.wireshark.org/review/15570 + Petri-Dish: Michael Mann + +commit 8c876c0 +Author: Jeff Morriss +Date: Wed May 25 17:35:43 2016 -0400 + + Fix dissection of JXTA over UDP. + + Prior to this change all JXTA-over-UDP frames throw an exception after setting + COL_PROTOCOL. + + The offset used when adding the protocol to the tree had already been + incremented to point to the end of the TVB; use tree_offset (which is the + current offset) instead. + + This code has been here since r17282 (2006) so presumably the change is that + proto_tree_add_protocol_format() started throwing an exception when offset + points to the end of the TVB sometime between then and now. + + Change-Id: Iadbcada29cd235e8abe5662b825a2d97ff6f7308 + Reviewed-on: https://code.wireshark.org/review/15560 + Petri-Dish: Jeff Morriss + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + (cherry picked from commit 0bc1cdd9f3692e953bae2ce47fe58e5a0ab7ffd2) + Reviewed-on: https://code.wireshark.org/review/15566 + Reviewed-by: Anders Broman + +commit 3f36fdd +Author: Gerald Combs +Date: Wed May 25 14:39:20 2016 -0700 + + Qt: Escape sequence dialog hint text. + + Escape HTML markup before showing hint text. Otherwise things like SIP + addresses won't be displayed correctly. + + Change-Id: I5ceae978af0ff9e253dae4d3ec8ad9da20948de0 + Reviewed-on: https://code.wireshark.org/review/15561 + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs + (cherry picked from commit b9487a7fac74daa89346f44c1d8b800a436ddb15) + Reviewed-on: https://code.wireshark.org/review/15564 + +commit 788d23e +Author: João Valverde +Date: Sun May 22 03:24:56 2016 +0100 + + Fix warnings using GCC and -Wpragmas + + Cherry-picked from: + Change-Id: I7e02ca86122e3fe8a1c2db9d53b718e6e23c4e98 + Change-Id: Ifb92244423fcb2cc267f8fcefb7a2700a7b7c0ea + Change-Id: Ia6c5d2c19d991ee3ca3b1525b93121ee7cf15b1e + + Change-Id: Iac649bb8d6712a16358fd82d645469374d6b3669 + Reviewed-on: https://code.wireshark.org/review/15535 + Petri-Dish: João Valverde + Tested-by: Petri Dish Buildbot + Reviewed-by: Jaap Keuter + +commit 3456d09 +Author: Michael Mann +Date: Sun May 22 20:21:17 2016 -0400 + + Make sure EAPOL body is big enough for a EAPOL_RSN_KEY. + + A pointer to a EAPOL_RSN_KEY is set on the packet presuming the + whole EAPOL_RSN_KEY is there. That's not always the case for + fuzzed/malicious captures. + + Bug: 11585 + Change-Id: Ib94b8aceef444c7820e43b969596efdb8dbecccd + Reviewed-on: https://code.wireshark.org/review/15540 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + (cherry picked from commit 9b0b20b8d5f8c9f7839d58ff6c5900f7e19283b4) + Reviewed-on: https://code.wireshark.org/review/15543 + Reviewed-by: Jeff Morriss + +commit 576d42d +Author: Gerald Combs +Date: Sun May 22 08:18:54 2016 -0700 + + [Automatic update for 2016-05-22] + + Update manuf, services enterprise-numbers, translations, and other items. + + Change-Id: Icaa99c2c726c949abaeccda02f7dc4f65fa4476e + Reviewed-on: https://code.wireshark.org/review/15528 + Reviewed-by: Gerald Combs + +commit d7e045b +Author: Jaap Keuter +Date: Sat May 21 10:07:59 2016 +0200 + + Add mentioning of support of Server 2012 R2 in the users guide + + Bug: 12455 + Change-Id: I1c1fc4b2bff0e446d3eb8e1b3be4ea7669cec923 + Reviewed-on: https://code.wireshark.org/review/15511 + Reviewed-by: Michael Mann + (cherry picked from commit beca560ffb9718a49aad7c45abf7cb6c224b5c86) + Reviewed-on: https://code.wireshark.org/review/15513 + +commit 07d953a +Author: Graham Bloice +Date: Fri Apr 8 14:25:05 2016 +0100 + + Fix CMake VC Redist message + + The usage message was using the wrong variable + + Change-Id: I5ca261240db49134f3d48a5e322d9272f8af7adf + Reviewed-on: https://code.wireshark.org/review/14865 + Reviewed-by: Graham Bloice + (cherry picked from commit 434bbd67a06803ce6bb9a8e0adc6d596246bc458) + Reviewed-on: https://code.wireshark.org/review/15510 + Reviewed-by: Anders Broman + +commit adace2b +Author: AndersBroman +Date: Fri Apr 8 09:56:28 2016 +0200 + + Fix a typo + + Change-Id: I32c551fc39ef496e8bbaba288c4ad4dafa2412c9 + Reviewed-on: https://code.wireshark.org/review/14862 + Reviewed-by: Anders Broman + (cherry picked from commit 8a6cb4267ff498ab6ae6af4d1e7164e8264c6234) + Reviewed-on: https://code.wireshark.org/review/15508 + +commit 32b2810 +Author: AndersBroman +Date: Wed Apr 6 17:25:18 2016 +0200 + + [MSVC2015] Fix finding of vcredist when using MSVC2015. + + Change-Id: I23ddc8c7601e61c7c092a258e4e540bc475e020a + Reviewed-on: https://code.wireshark.org/review/14831 + Reviewed-by: Graham Bloice + Petri-Dish: Graham Bloice + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + (cherry picked from commit 5601d6057b9717cd415bfda75b58cc0aa1248cbc) + Reviewed-on: https://code.wireshark.org/review/15507 + +commit 25dfe95 +Author: Anthony Coddington +Date: Mon Apr 18 13:44:35 2016 +1200 + + pcap-common: Account for padding in ENCAP_ERF len and caplen + + Set len and caplen in pcap_read_post_process to actual wlen/payload length like for native ERF. + This fixes padding incorrectly showing as an Ethernet trailer or equivalent as + well as packet length calculations being incorrect. + + Fix up rlen when writing ENCAP_ERF so it isn't longer than the actual record + length. This differs from native ERF behaviour which pads the record instead + but there is currently no non-hackish way to do this for pcap/pcap-ng. + + Note: This means records captured from a DAG card in Wireshark (or old + PCAP(-NG) files opened) will have padding stripped when saved as PCAP(-NG) and + thus cannot be transmitted when converted to native ERF without aligning first. + However, if the file is saved as native ERF originally the padding will be + preserved (and zeroed). Given that extension header write support was very + broken and transmission of PCAP(-NG) is not supported without conversion this + is not expected to have been common. + + Ping-Bug: 3606 + Change-Id: I49dce03984d7f07431b6eb7e16a993aeb571f288 + Reviewed-on: https://code.wireshark.org/review/15359 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + (cherry picked from commit c38f4e1391cc914271e168606cc1e8adcc973bd8) + Reviewed-on: https://code.wireshark.org/review/15428 + Reviewed-by: Anders Broman + +commit e7af5c5 +Author: Pascal Quantin +Date: Tue May 17 23:09:39 2016 +0200 + + Qt: make RTP stream analysis columns sortable + + While we are at it, let's sort the rows in ascending order also in + RTP stream dialog + + Bug: 12405 + Change-Id: Icf96fa071d5d49bcd1c3673c2a5e55b51b359eaa + Reviewed-on: https://code.wireshark.org/review/15493 + Reviewed-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + (cherry picked from commit c564715db1c54375f877d208efc11e7a9480e26b) + Reviewed-on: https://code.wireshark.org/review/15494 + Petri-Dish: Michael Mann + Reviewed-by: Anders Broman + +commit 7b360ce +Author: Gerald Combs +Date: Fri May 13 11:13:07 2016 -0700 + + Qt: Fix a recent files infinite loop. + + QListWidget::takeItem does nothing if the row is invalid. This is the + case when we pass it ::count(). Make sure that we remove a valid row and + that our loop will terminate. + + Follow-up to g174dc98. + + Change-Id: I7e695cc04b2f3b5c28a8cc70af0579d787ff8737 + Reviewed-on: https://code.wireshark.org/review/15417 + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs + (cherry picked from commit 43776d4b7391874a69a706661a71f2020c05230b) + Reviewed-on: https://code.wireshark.org/review/15475 + +commit 8f8a2d0 +Author: Alexis La Goutte +Date: Mon May 16 16:26:34 2016 +0200 + + ethertype: Add old non-standard 802.1ad (QinQ) + + Issue reported by boaz + Bug:12441 + + Change-Id: I8652f165d782039f0a01f3c10bd67b34c33eacc5 + Reviewed-on: https://code.wireshark.org/review/15462 + Reviewed-by: Guy Harris + +commit 2794061 +Author: AndersBroman +Date: Fri Mar 11 13:36:36 2016 +0100 + + [SGsAP] Wrong tag used for IE Erroneous message, dissect the failing + message too. + + Change-Id: I6d10d41366795e59396c238cf620c43a3d96217b + Reviewed-on: https://code.wireshark.org/review/14420 + Reviewed-by: Anders Broman + Petri-Dish: Anders Broman + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + (cherry picked from commit 2c668216f96997cfa2150649d916f9e02502b47d) + Reviewed-on: https://code.wireshark.org/review/15459 + +commit faa7745 +Author: Pascal Quantin +Date: Wed May 11 15:16:44 2016 +0200 + + Qt: add some cleanup function calls missing when leaving application + + Change-Id: I8f22d321e84daa36d4a40856b61d0844d3489cc2 + Reviewed-on: https://code.wireshark.org/review/15374 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + (cherry picked from commit f3e120816c1e74eda131f95a74e61777995c2c7b) + Reviewed-on: https://code.wireshark.org/review/15435 + +commit c598281 +Author: Pascal Quantin +Date: Sun May 15 18:24:34 2016 +0200 + + tshark: fix double memory free when analyzing several RTP streams + + Bug: 12430 + Change-Id: I4f77aee4102edb9d5d8d450de962ca1f4b33bb71 + Reviewed-on: https://code.wireshark.org/review/15434 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + (cherry picked from commit 72bba57deb6d99db4558ae17d0e842ec1c505e91) + Reviewed-on: https://code.wireshark.org/review/15436 + +commit 2015153 +Author: Gerald Combs +Date: Sun May 15 08:17:32 2016 -0700 + + [Automatic update for 2016-05-15] + + Update manuf, services enterprise-numbers, translations, and other items. + + Change-Id: Ib1d3e322d4783bf16dfe5e455d30ef9c9d33a75d + Reviewed-on: https://code.wireshark.org/review/15430 + Reviewed-by: Gerald Combs + +commit 2c13e97 +Author: Guy Harris +Date: Sat May 14 01:15:56 2016 -0700 + + The WTAP_ENCAP_ETHERNET dissector needs to be passed a struct eth_phdr. + + We now require that. Make it so. + + Bug: 12440 + Change-Id: Iffee520976b013800699bde3c6092a3e86be0d76 + Reviewed-on: https://code.wireshark.org/review/15424 + Reviewed-by: Guy Harris + +commit 7d8c723 +Author: Lori Tribble +Date: Thu May 12 21:08:35 2016 -0400 + + BACAPP: event-time-stamps decode fix + + event-time-stamps decode when array-index is 0. + + Bug: 12422 + Change-Id: I9f1f90e269352a49a8fc8a2ba2f64211f3cf7961 + Reviewed-on: https://code.wireshark.org/review/15409 + Reviewed-by: Michael Mann + (cherry picked from commit de61fb1cfbba8683c93672f38824202da13dad26) + Reviewed-on: https://code.wireshark.org/review/15412 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + +commit 8018acf +Author: Anthony Coddington +Date: Thu May 12 19:10:37 2016 +1200 + + ERF: In packet-eth register ERF_TYPE_ETH variants. + + Register for: + ERF_TYPE_COLOR_ETH + ERF_TYPE_DSM_COLOR_ETH + ERF_TYPE_COLOR_HASH_ETH + + Change-Id: I5877ca5721abaa269f937cca0414df4f6b1a5eef + Reviewed-on: https://code.wireshark.org/review/15398 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + (cherry picked from commit 7623aed62a37d7281faeffcb173585dbe87e8e0c) + Reviewed-on: https://code.wireshark.org/review/15402 + Reviewed-by: Anders Broman + +commit 9c1d284 +Author: Tigran Mkrtchyan +Date: Thu May 12 15:40:20 2016 +0200 + + packet-nfs: add decoding and displaying of exclusive create attributes + + NFSv4.1 defines FATTR4_SUPPATTR_EXCLCREAT attribute which tells the client + a bitmap of attributes which can be set during exclusive create. Wireshark did + show that FATTR4_SUPPATTR_EXCLCREAT is provided, but doesn't show supported + attributes. + + Bug: 12435 + Change-Id: I29fc6beb2e75e9c78d68b1ca73a714bab2ad10a2 + Signed-off-by: Tigran Mkrtchyan + Reviewed-on: https://code.wireshark.org/review/15401 + Reviewed-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + (cherry picked from commit 1fca7767d003bb4fa601a7205d154171fe796f2b) + Reviewed-on: https://code.wireshark.org/review/15406 + +commit a716916 +Author: Anthony Coddington +Date: Tue Apr 5 18:19:59 2016 +1200 + + pcap-common: Fix several serious ENCAP_ERF extension header writing issues + + Write ERF subheader after extension headers, especially important for Ethernet + (other types predate extension headers for the most part). + Add missing ERF_TYPE_MC_AAL2 and ERF_TYPE_COLOR_HASH_ETH. + + Truncate final ERF extension header when too many. Rlen is not currently + adjusted so may be incorrect (see followup patch). Existing tools generally + check against PCAP incl_len anyway as there are other scenarios where this can + happen like naive snapping or Wireshark ERF-to-PCAP. + Properly fixing this will involve getting rid of the ERF pseudoheader. + Consistent with the ERF wiretap (except for different padding behaviour). + + Bug: 3606 + Change-Id: I9373ef5234dcf6c0165e0a92fef42aae6d9f175a + Reviewed-on: https://code.wireshark.org/review/15393 + Reviewed-by: Guy Harris + +commit e9cb583 +Author: Guy Harris +Date: Wed May 11 17:20:30 2016 -0700 + + Fix signature of dissect_eth_maybefcs(). + + Change-Id: I1d4f2eb9f840c9d4894b417d9134f5c2fc5f1624 + Reviewed-on: https://code.wireshark.org/review/15390 + Reviewed-by: Guy Harris + +commit dec1b55 +Author: Anthony Coddington +Date: Wed May 11 17:18:33 2016 -0700 + + ERF: Fix Ethernet FCS detection and remove preference + + Use eth_maybefcs instead of eth_withoutfcs. + ERF_TYPE_ETH records almost always have FCS, but using maybe means the "Assume + packets have FCS" is respected. + Mark the erf_ethfcs preference as obsolete. It was being ignored. + This was broken by Change 3670 which changed the ERF dissector to use + a dissector table. + + Change-Id: Ie0043441511c4a4fa5974747af31f88105a974bf + Reviewed-on: https://code.wireshark.org/review/15389 + Reviewed-by: Guy Harris + +commit 7c0edd8 +Author: Guy Harris +Date: Wed Jan 20 01:46:34 2016 -0800 + + Separate "Ethernet in capture file" and "Ethernet maybe with FCS" dissectors. + + Have a dissector that is passed a "struct eth_phdr" pointer, indicating + whether there is an FCS, there is no FCS, or there's maybe an FCS, and + an "eth_maybefcs" dissector, to be called from other dissectors. The + latter takes no data argument. + + That obviates the need for callers of the latter to fill in an + "eth_phdr" structure. + + Note in a comment that setting the "assume an FCS" preference overrides + a file format handler in Wiretap saying "we have no FCS". I seem to + remember that this might be intentional. + + Change-Id: Ied48a3c0ae2b2ff1010032aa5a4a97fe394d48f6 + Ping-Bug: 9933 + Reviewed-on: https://code.wireshark.org/review/15388 + Reviewed-by: Guy Harris + +commit 72f1bfe +Author: Guy Harris +Date: Sun Jan 17 16:45:38 2016 -0800 + + Handle frames where the type field is a length field. + + The BNEP Version 1.0 spec says, for BNEP_GENERAL_ETHERNET packets, + "Note: Networking Protocol Types as used in this specification SHALL be + taken to include values in the range 0x0000-0x05dc, used to represent + the IEEE802.3 length interpretation of the IEEE802.3 length/type + field.", although it says that it's not mandatory to process those + packets. + + We'll process them. + + We don't need an Ethernet dissector handle, so don't fetch one. + + Change-Id: I10b1fce62688fc0643435d0a01bdb969577df97e + Reviewed-on: https://code.wireshark.org/review/13376 + Reviewed-by: Guy Harris + (cherry picked from commit a5cc29b245e2509d5451caa653e0cf83bee56782) + Reviewed-on: https://code.wireshark.org/review/15387 + +commit 46945f4 +Author: Guy Harris +Date: Sun Jan 17 13:05:22 2016 -0800 + + Fix comment. + + Change-Id: Icea9d23bb979ae6b57c65e0178a3634689992e78 + Reviewed-on: https://code.wireshark.org/review/13369 + Reviewed-by: Guy Harris + (cherry picked from commit 439d1c966532bce145c2ce70b66e1e9fc1d7efd0) + Reviewed-on: https://code.wireshark.org/review/15386 + +commit 1f1367c +Author: Guy Harris +Date: Sun Jan 17 12:56:04 2016 -0800 + + More comments. + + Including a URL for a Cisco page with diagrams of the encapsulation. + + Change-Id: I4fb4356ea6071ca7efb596a8d35f982478bf4896 + Reviewed-on: https://code.wireshark.org/review/13367 + Reviewed-by: Guy Harris + Reviewed-on: https://code.wireshark.org/review/15385 + +commit 47c3683 +Author: Guy Harris +Date: Tue Jan 19 20:58:06 2016 -0800 + + Call the dissectors for types in TZSP packets individually. + + That way, we know we're passing them the dissector data they expect. + + Change-Id: I43aa1b751705eae77e082c537e8ffd6a4edc1a5f + Reviewed-on: https://code.wireshark.org/review/13430 + Reviewed-by: Guy Harris + (cherry picked from commit aeeb2a99420f90121ffccaab817a51096e078c70) + Reviewed-on: https://code.wireshark.org/review/15381 + +commit 9f6e607 +Author: Guy Harris +Date: Sat Jan 16 19:30:41 2016 -0800 + + Call the "no FCS present" version of the Ethernet dissector. + + The I-D doesn't explicity indicate that the FCS isn't present in the + tunneled Ethernet frames, but it is missing from the captures attached + to bug 10282. + + Update the I-D number while we're at it. + + Bug: 9933 + Change-Id: I6e78b20cb858e6c8c4d7380b17b88382db013d56 + Reviewed-on: https://code.wireshark.org/review/13350 + Reviewed-by: Guy Harris + (cherry picked from commit fe82323df04e5fb2aaa3875d69e4e1ffe122b1ef) + Reviewed-on: https://code.wireshark.org/review/15384 + +commit f3878c6 +Author: Guy Harris +Date: Sun Jan 17 20:08:17 2016 -0800 + + Have the "maybe an FCS" version of the Ethernet dissector take a data argument. + + It's called from some places other than packet-frame.c, at least one of + which currently can't call anything else (the ATM dissector, for + VC-multiplexed bridged frames, where you don't know whether the frames + include the FCS or not), so the frame's pseudo-data doesn't necessarily + have the appropriate "FCS length" value. Have it explicitly check the + data argument, and explicitly pass the appropriate value to it. + + Change-Id: I0c94e1355e6a0d462c8225bf3831500409984a08 + Ping-Bug: 9933 + Reviewed-on: https://code.wireshark.org/review/15382 + Reviewed-by: Guy Harris + +commit 057798f +Author: Pascal Quantin +Date: Wed May 11 14:31:59 2016 +0200 + + Qt: fix loading of profile by command line + + recent_read_static() must be called before processing the -C option + as it will select the last profile used. + While we are at it, add a missing profile_store_persconffiles(FALSE) call + to match what is done in GTK based UI + + Bug: 12425 + Change-Id: I9cfdca3ed25f0ed97535178973e3f0427b9ad2b1 + Reviewed-on: https://code.wireshark.org/review/15371 + Reviewed-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + (cherry picked from commit 95f47187c7381e47883b5c095ca38d8fcecd1269) + Reviewed-on: https://code.wireshark.org/review/15376 + Petri-Dish: Michael Mann + +commit ed96054 +Author: Rustam Safargalin +Date: Wed May 11 09:57:05 2016 +0300 + + Fix warnings for good ISUP messages + + Bug: 12423 + Change-Id: Ie4bd0507677850317fda69b991d167948b241397 + Reviewed-on: https://code.wireshark.org/review/15356 + Reviewed-by: Alexis La Goutte + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + (cherry picked from commit aba9a5a299a07379ba6a6c42e84bfd3c4b8260ca) + Reviewed-on: https://code.wireshark.org/review/15372 + Reviewed-by: Jeff Morriss + +commit 6442a26 +Author: Marius Paliga +Date: Wed May 11 14:41:25 2016 +0200 + + Fixed value for experimental result code 5142 + + Bug: 12428 + Change-Id: Idc46b4bc881fb2c5e83af7ac55b5cfd060d9b185 + Reviewed-on: https://code.wireshark.org/review/15370 + Reviewed-by: Jeff Morriss + (cherry picked from commit 62ccbc994d6111489e0eddf77bf5dd189ebdcd10) + Reviewed-on: https://code.wireshark.org/review/15373 + +commit b4a7edf +Author: Pascal Quantin +Date: Wed May 11 11:55:18 2016 +0200 + + MRCPv2: do not update info column under tree check + + Bug: 12426 + Change-Id: I1921e6d409af3290862f41f07e95c2c5036bee80 + Reviewed-on: https://code.wireshark.org/review/15364 + Reviewed-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + (cherry picked from commit 6bfa7a8b41e2d60bcd5ae3f2e5bf272e18c501d2) + Reviewed-on: https://code.wireshark.org/review/15367 + +commit 253d4ca +Author: Christian Ambach +Date: Wed May 11 11:36:17 2016 +0200 + + correctly decode EA Data Length in CIFS + + This field is little endian, not big. + The SMB2 dissector already does it right. + + Change-Id: I859f581424be861fdcc1a586d085ba3bfe70a2f0 + Signed-off-by: Christian Ambach + Reviewed-on: https://code.wireshark.org/review/15365 + Reviewed-by: Alexis La Goutte + (cherry picked from commit 70fb7a83991e8a90b3d79658e5ba5ad509aa8b5c) + Reviewed-on: https://code.wireshark.org/review/15366 + +commit 6689765 +Author: Pascal Quantin +Date: Tue May 10 22:18:34 2016 +0200 + + Upgrade c-ares Windows library from 1.9.1 to 1.11.0 + + Bug: 12412 + Change-Id: I5e5f8f86293e391ec425a6e3e314573711947bce + Reviewed-on: https://code.wireshark.org/review/15345 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + Tested-by: Michael Mann + Reviewed-by: Pascal Quantin + (cherry picked from commit 6d0e5bbf02e9d0a97205041d35ee1ca1eb6fcdbb) + Reviewed-on: https://code.wireshark.org/review/15353 + +commit f39d93c +Author: Michael Mann +Date: Mon May 9 20:41:45 2016 -0400 + + Sanity check eapol_len in AirPDcapDecryptWPABroadcastKey + + Bug: 12175 + Change-Id: Iaf977ba48f8668bf8095800a115ff9a3472dd893 + Reviewed-on: https://code.wireshark.org/review/15326 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + Reviewed-by: Peter Wu + Tested-by: Peter Wu + (cherry picked from commit b6d838eebf4456192360654092e5587c5207f185) + Reviewed-on: https://code.wireshark.org/review/15333 + +commit 6c46684 +Author: Pascal Quantin +Date: Mon May 9 23:21:28 2016 +0200 + + Qt: activate RTP/IAX2 analysis widget when analyzing packets with a snaplen + + Only the payload save should be deactivated + + Bug: 12406 + Change-Id: I8dd53c0b0c1ea4568f0ff292806656bfb65a6566 + Reviewed-on: https://code.wireshark.org/review/15322 + Reviewed-by: Pascal Quantin + Reviewed-by: Alexis La Goutte + (cherry picked from commit bd030c166ffe21e113255de3fb108b70d843b4ff) + Reviewed-on: https://code.wireshark.org/review/15330 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + +commit 0580a40 +Author: Guy Harris +Date: Mon May 9 13:21:44 2016 -0700 + + Shuffle some routines to put absolute-time and relative-time code together. + + Put the routines that handle absolute time ("relative to the Epoch") + together and the routines that handle relative time together. + + Change-Id: I15256921091ab67a1d92026385bf1b27aa52b404 + Reviewed-on: https://code.wireshark.org/review/15316 + Reviewed-by: Guy Harris + (cherry picked from commit 1b1614913f63b75b2565e02d05598c7b5ca5464f) + Reviewed-on: https://code.wireshark.org/review/15317 + +commit 504c7d0 +Author: Peter Wu +Date: Mon May 9 21:54:10 2016 +0200 + + cmake: fix GTK3 detection via pkg-config + + Put QUIET before the module name, otherwise FindPkgConfig tries to + locate a module named QUIET. This fixes a build failure that complains + about missing pango/pango.h. + + Tested with GTK 3.20, CMake 3.5.2 on Arch Linux. + + Change-Id: I76e487d0f4b7f9fbac4105521c349b392b680923 + Reviewed-on: https://code.wireshark.org/review/15314 + Reviewed-by: Peter Wu + (cherry picked from commit 27646e1cb4a6bc1348921dbff2a2590fcdfeba6e) + Reviewed-on: https://code.wireshark.org/review/15315 + +commit 557f902 +Author: alpartis +Date: Fri May 6 07:57:42 2016 -0400 + + format DIS header timestamp as mm:ss.nnnnnn + + Older versions of this dissector displayed the header timestamp formatted to show + minutes, seconds, and milliseconds past the hour (the DIS spec actually defines the + timestamp in terms of microseconds). This commit fulfills a feature request to + return to that format. + + Bug: 12402 + Change-Id: Ide4adf8f80306f2458e48e8b2f78c911782669e5 + Reviewed-on: https://code.wireshark.org/review/15276 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + (cherry picked from commit cb2627c77fad1e6f1f89d8ca1d0e216861d34dfa) + Reviewed-on: https://code.wireshark.org/review/15311 + +commit 581d9c4 +Author: Pascal Quantin +Date: Sat May 7 19:25:38 2016 +0200 + + LPADm: fixes for reassembly + + - do not packets in error in reassembly table + - filter retransmissions based on N(S) value + + See https://www.wireshark.org/lists/wireshark-users/201605/msg00000.html + + Change-Id: I0c2ab36acd5927529d40f8fa7fd2eed17a6fc486 + Reviewed-on: https://code.wireshark.org/review/15281 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + (cherry picked from commit dfdeb54ae2a55dadd4f2fdec2b450dfd24e7b7f7) + Conflicts: + epan/dissectors/packet-lapdm.c + Reviewed-on: https://code.wireshark.org/review/15307 + +commit e2fa12e +Author: Pascal Quantin +Date: Sun May 8 21:22:16 2016 +0200 + + GSM A RR: fix dissection of GPRS Cell Options IE + + As seen in the capture given in https://www.wireshark.org/lists/wireshark-users/201605/msg00007.html + The extension length is not always equal to ll the options defined for a given release + + Change-Id: I68ba57dd384122eed1f1ff36cc8acc7ef029fcd0 + Reviewed-on: https://code.wireshark.org/review/15290 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + (cherry picked from commit b9368fcdb8226ff55365e85a71b0a581faf8c6c6) + Reviewed-on: https://code.wireshark.org/review/15297 + +commit 2a44bd8 +Author: Pascal Quantin +Date: Sun May 8 22:39:20 2016 +0200 + + LAPSat: fix reported length for tvb subset + + It seems like LAPSat can have have padding bytes as seen in the capture found + here: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=9005 + + Change-Id: Ia2c7230c4c9fdae0bbe456585ab164f04eda0eb8 + Reviewed-on: https://code.wireshark.org/review/15293 + Reviewed-by: Pascal Quantin + (cherry picked from commit 65efca4ec1c22e38419b0f8da766291bce82585c) + Reviewed-on: https://code.wireshark.org/review/15295 + +commit f96b401 +Author: Guy Harris +Date: Sun May 8 11:06:21 2016 -0700 + + The tabulation is specified by the stuff at the end. + + I'm not sure what "4-space tabulation means", but: + + if it's "a tab character means 4 spaces", that's just *wrong* in + a UN*X environment (Apple's mistaken use of "tab is 4 spaces" as + the default in Xcode nonwithstanding - Xcode is just *wrong* + there); + + if it's "use 4-space *indentation*", then the code should be + reformatted and the editor hints updated. + + Change-Id: Ie8249b483fe9d6fcd8db29b72167eb854eec863e + Reviewed-on: https://code.wireshark.org/review/15288 + Reviewed-by: Guy Harris + (cherry picked from commit ac2169623e22a5281afa4ede84cec1167bbe6363) + Reviewed-on: https://code.wireshark.org/review/15289 + +commit 652a1e2 +Author: Guy Harris +Date: Sun May 8 11:03:51 2016 -0700 + + Show the string table a bit better. + + Show, for each item, the offset and the string value; the offset is + what's used in tokens. + + While we're at it, print a 32-bit unsigned length field as unsigned + rather than signed. + + Change-Id: I167e1683bab6a8ed1dba4c53c1c9050d5c25c754 + Reviewed-on: https://code.wireshark.org/review/15286 + Reviewed-by: Guy Harris + (cherry picked from commit 35ec71ba870eda64eea496092b356bad3045f0f8) + Reviewed-on: https://code.wireshark.org/review/15287 + +commit 56f2a43 +Author: Gerald Combs +Date: Sun May 8 08:16:06 2016 -0700 + + [Automatic update for 2016-05-08] + + Update manuf, services enterprise-numbers, translations, and other items. + + Change-Id: I3da686a3e2791f32e5939a8933dfa125daabd963 + Reviewed-on: https://code.wireshark.org/review/15284 + Reviewed-by: Gerald Combs + +commit 85cc4f0 +Author: Michael Mann +Date: Mon May 2 21:44:48 2016 -0400 + + Convert ftype-tvbuff.c to ftype-protocol.c + + As noted in https://www.wireshark.org/lists/wireshark-dev/201604/msg00103.html + a protocol field isn't really a tv_buff, so allow for the possibility + of a NULL tv_buff in a "protocol type". If the tvb is NULL, use the + string of the protocol field for comparison + + # Conflicts: + # epan/ftypes/.editorconfig + # epan/ftypes/CMakeLists.txt + # epan/ftypes/ftype-ieee-11073-float.c + # epan/ftypes/ftypes.h + + Bug: 12335 + Change-Id: Ie12a5f7b31c7293c61006b0f70135d100a97c4e0 + Reviewed-on: https://code.wireshark.org/review/15261 + Petri-Dish: Michael Mann + Reviewed-by: Alexis La Goutte + Reviewed-by: Michael Mann + Reviewed-on: https://code.wireshark.org/review/15274 + +commit d141d31 +Author: Gerald Combs +Date: Thu May 5 10:46:12 2016 -0700 + + Git: Add .vscode to .gitignore. + + Change-Id: Ib4bb2d03eb493f83e18c507b1675feefd1f27384 + Reviewed-on: https://code.wireshark.org/review/15271 + Reviewed-by: Gerald Combs + (cherry picked from commit f54ef6f8a0ebbf538a8765bc715741014b18aacb) + Reviewed-on: https://code.wireshark.org/review/15272 + +commit c25ae7e +Author: João Valverde +Date: Sat Apr 30 21:19:24 2016 +0100 + + ICMPv6: Observe "Redirected Header" option length + + Bug: 12400 + Change-Id: Ic4116082b0f6c119172b222aadefab821f1b0971 + Reviewed-on: https://code.wireshark.org/review/15226 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 9753ea8 +Author: Gerald Combs +Date: Mon Mar 28 15:46:33 2016 -0700 + + SPOOLSS: Try to avoid an infinite loop. + + Use tvb_reported_length_remaining in dissect_spoolss_uint16uni. Make + sure our offset always increments in dissect_spoolss_keybuffer. + + Change-Id: I7017c9685bb2fa27161d80a03b8fca4ef630e793 + Reviewed-on: https://code.wireshark.org/review/14687 + Reviewed-by: Gerald Combs + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + (cherry picked from commit b4d16b4495b732888e12baf5b8a7e9bf2665e22b) + Reviewed-on: https://code.wireshark.org/review/15248 + +commit fa22308 +Author: Guy Harris +Date: Sun May 1 17:52:45 2016 -0700 + + Don't assume packets will be no larger than ISERIES_MAX_PACKET_LEN. + + We don't check against it. Insteead, use phdr->caplen as the buffer + size; that's based on the number of hex digits we've found. + + While we're at it, also get rid of ISERIES_PKT_ALLOC_SIZE - it makes it + less obvious that it's based on the packet length from the packet + header. + + Change-Id: I8ad6306c62e7bc4cf896b335f39a5a77780fb2ea + Reviewed-on: https://code.wireshark.org/review/15236 + Reviewed-by: Guy Harris + (cherry picked from commit 6332c2f45e5f0b23893a41def45384911f28109a) + Reviewed-on: https://code.wireshark.org/review/15237 + +commit 0a2a956 +Author: Guy Harris +Date: Sun May 1 17:02:12 2016 -0700 + + Make sure the packet length isn't > WTAP_MAX_PACKET_SIZE. + + Change-Id: I65c1e87e2fcff93b3db998666ff51f19ecd71b55 + Reviewed-on: https://code.wireshark.org/review/15233 + Reviewed-by: Guy Harris + (cherry picked from commit 7666361bf968057e400d3e73ccc12723707e3646) + Reviewed-on: https://code.wireshark.org/review/15234 + +commit f5e7e03 +Author: Guy Harris +Date: Sun May 1 16:29:41 2016 -0700 + + Don't treat the packet length as unsigned. + + The scanf family of functions are as annoyingly bad at handling unsigned + numbers as strtoul() is - both of them are perfectly willing to accept a + value beginning with a negative sign as an unsigned value. When using + strtoul(), you can compensate for this by explicitly checking for a '-' + as the first character of the string, but you can't do that with + sscanf(). + + So revert to having pkt_len be signed, and scanning it with %d, but + check for a negative value and fail if we see a negative value. + + Bug: 12394 + Change-Id: I4b19b95f2e1ffc96dac5c91bff6698c246f52007 + Reviewed-on: https://code.wireshark.org/review/15230 + Reviewed-by: Guy Harris + (cherry picked from commit 3270dfac43da861c714df76513456b46765ff47f) + Reviewed-on: https://code.wireshark.org/review/15231 + +commit 45fc804 +Author: Guy Harris +Date: Sun May 1 16:22:40 2016 -0700 + + Don't treat the packet length as unsigned. + + The scanf family of functions are as annoyingly bad at handling unsigned + numbers as strtoul() is - both of them are perfectly willing to accept a + value beginning with a negative sign as an unsigned value. When using + strtoul(), you can compensate for this by explicitly checking for a '-' + as the first character of the string, but you can't do that with + sscanf(). + + So revert to having pkt_len be signed, and scanning it with %d, but + check for a negative value and fail if we see a negative value. + + Bug: 12395 + Change-Id: I43b458a73b0934e9a5c2c89d34eac5a8f21a7455 + Reviewed-on: https://code.wireshark.org/review/15223 + Reviewed-by: Guy Harris + (cherry picked from commit a66628e425db725df1ac52a3c573a03357060ddd) + Reviewed-on: https://code.wireshark.org/review/15224 + +commit 2916518 +Author: Guy Harris +Date: Sun May 1 16:13:31 2016 -0700 + + Don't treat the packet length as unsigned. + + The scanf family of functions are as annoyingly bad at handling unsigned + numbers as strtoul() is - both of them are perfectly willing to accept a + value beginning with a negative sign as an unsigned value. When using + strtoul(), you can compensate for this by explicitly checking for a '-' + as the first character of the string, but you can't do that with + sscanf(). + + So revert to having pkt_len be signed, and scanning it with %d, but + check for a negative value and fail if we see a negative value. + + Bug: 12396 + Change-Id: I54fe8f61f42c32b5ef33da633ece51bbcda8c95f + Reviewed-on: https://code.wireshark.org/review/15220 + Reviewed-by: Guy Harris + (cherry picked from commit 11edc83b98a61e890d7bb01855389d40e984ea82) + Reviewed-on: https://code.wireshark.org/review/15221 + +commit e499daa +Author: Guy Harris +Date: Sun May 1 16:02:40 2016 -0700 + + Don't treat the packet length as unsigned. + + The scanf family of functions are as annoyingly bad at handling unsigned + numbers as strtoul() is - both of them are perfectly willing to accept a + value beginning with a negative sign as an unsigned value. When using + strtoul(), you can compensate for this by explicitly checking for a '-' + as the first character of the string, but you can't do that with + sscanf(). + + So revert to having pkt_len be signed, and scanning it with %d, but + check for a negative value and fail if we see a negative value. + + Change-Id: I6450d468504e942df72342176a0e145e5ac3db5f + Reviewed-on: https://code.wireshark.org/review/15216 + Reviewed-by: Guy Harris + (cherry picked from commit 29c78db2a80a93653f32e4fd2f00b9b550432c43) + Reviewed-on: https://code.wireshark.org/review/15217 + +commit 20e7875 +Author: Michael Mann +Date: Sun May 1 12:55:23 2016 -0400 + + Make class "type" for USB conversations. + + USB dissectors can't assume that only their class type has been passed around in the conversation. Make explicit check that class type expected matches the dissector and stop/prevent dissection if there isn't a match. + + # Conflicts: + # epan/dissectors/packet-u3v.c + + Bug: 12356 + Change-Id: Ib23973a4ebd0fbb51952ffc118daf95e3389a209 + Reviewed-on: https://code.wireshark.org/review/15212 + Petri-Dish: Michael Mann + Reviewed-by: Martin Kaiser + Petri-Dish: Martin Kaiser + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + Reviewed-on: https://code.wireshark.org/review/15213 + +commit da4c096 +Author: Gerald Combs +Date: Sun May 1 08:15:54 2016 -0700 + + [Automatic update for 2016-05-01] + + Update manuf, services enterprise-numbers, translations, and other items. + + Change-Id: Id548b0dbc9eceb85f7f0e71c52a3b6a7d7354ad0 + Reviewed-on: https://code.wireshark.org/review/15207 + Reviewed-by: Gerald Combs + +commit d2024f2 +Author: Guy Harris +Date: Sat Apr 30 11:30:07 2016 -0700 + + Clean up packet length handling. + + Treat the packet length as unsigned - it shouldn't be negative in the + file. If it is, that'll probably cause the sscanf to fail, so we'll + report the file as bad. + + A normal packet should be Ethernet-sized; initially make the buffer big + enough for a maximum-sized Ethernet packet. + + Once we know the payload length, check to make sure the packet length + won't be > WTAP_MAX_PACKET_SIZE and fail if it will. Then boost the + buffer size to be large enough for the packet, even if it's bigger than + a maximum-sized Ethernet packet. + + Change-Id: I75b2108dd68f5bc5cd436bf5b82990089a7116bf + Reviewed-on: https://code.wireshark.org/review/15200 + Reviewed-by: Guy Harris + (cherry picked from commit 0bffb1663ecb4229699ba7263f4ed7f9824c5fc0) + Reviewed-on: https://code.wireshark.org/review/15201 + +commit dac16c5 +Author: Pascal Quantin +Date: Fri Apr 29 16:25:03 2016 +0200 + + IPv4: use calculated value for Header Length display filter + + Bug: 12387 + Change-Id: I63370ea884b6fb75a0743fecc06af2e213700645 + Reviewed-on: https://code.wireshark.org/review/15163 + Petri-Dish: Alexis La Goutte + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + Reviewed-by: João Valverde + Reviewed-by: Anders Broman + (cherry picked from commit f29d1da0fbc86d84bceccda13cf226bce63f226f) + Reviewed-on: https://code.wireshark.org/review/15194 + +commit f90e0ac +Author: Guy Harris +Date: Fri Apr 29 19:35:10 2016 -0700 + + Check for packets bigger than WTAP_MAX_PACKET_SIZE. + + Change-Id: Iaa4865393e711633312e44eaba4985c75668746a + Reviewed-on: https://code.wireshark.org/review/15190 + Reviewed-by: Guy Harris + (cherry picked from commit 43cf41a356e41588dff1959ddfef83e5a6785fe1) + Reviewed-on: https://code.wireshark.org/review/15191 + +commit d58df37 +Author: Guy Harris +Date: Fri Apr 29 19:10:01 2016 -0700 + + Check for packets bigger than WTAP_MAX_PACKET_SIZE. + + Change-Id: Ia932f3e5aeaca7a566ea9f00ce1dca1a2071a1a4 + Reviewed-on: https://code.wireshark.org/review/15187 + Reviewed-by: Guy Harris + (cherry picked from commit bc62c096d058c6db3ea45fcb8f0d041d4cb9580d) + Reviewed-on: https://code.wireshark.org/review/15188 + +commit 9533b5f +Author: Guy Harris +Date: Fri Apr 29 18:59:44 2016 -0700 + + Check for packets bigger than WTAP_MAX_PACKET_SIZE. + + Change-Id: If7cd6ae60b805121c3f54dcaa48d730b6cd9b648 + Reviewed-on: https://code.wireshark.org/review/15183 + Reviewed-by: Guy Harris + (cherry picked from commit 44f72a90eaffc8a0322b377c4a66c11bf63340dc) + Reviewed-on: https://code.wireshark.org/review/15184 + +commit 606fc45 +Author: Guy Harris +Date: Fri Apr 29 18:55:07 2016 -0700 + + Check for packets bigger than WTAP_MAX_PACKET_SIZE. + + And note the cases where we don't have to check, as the length in the + file is 2 bytes long, and 65535 + the metadata length is < + WTAP_MAX_PACKET_SIZE. + + Change-Id: I1e690eeee900b9aa7484dc0bd0c106dc38c77269 + Reviewed-on: https://code.wireshark.org/review/15180 + Reviewed-by: Guy Harris + (cherry picked from commit 5635d9a02dff05dded9c40e34520a7e309789af6) + Reviewed-on: https://code.wireshark.org/review/15181 + +commit 4a098bb +Author: Guy Harris +Date: Fri Apr 29 17:08:11 2016 -0700 + + Fix packet length handling. + + Treat the packet length as unsigned - it shouldn't be negative in the + file. If it is, that'll probably cause the sscanf to fail, so we'll + report the file as bad. + + Check it against WTAP_MAX_PACKET_SIZE to make sure we don't try to + allocate a huge amount of memory, just as we do in other file readers. + + Use the now-validated packet size as the length in + ws_buffer_assure_space(), so we are certain to have enough space, and + don't allocate too much space. + + Merge the header and packet data parsing routines while we're at it. + + Bug: 12396 + Change-Id: I7f981f9cdcbea7ecdeb88bfff2f12d875de2244f + Reviewed-on: https://code.wireshark.org/review/15176 + Reviewed-by: Guy Harris + (cherry picked from commit 6a140eca7b78b230f1f90a739a32257476513c78) + Reviewed-on: https://code.wireshark.org/review/15177 + +commit 8d0d897 +Author: Gerald Combs +Date: Fri Apr 29 14:33:44 2016 -0700 + + Qt: Make sure we pass along a resizeEvent. + + Change-Id: I6bf07058b0a5b53fe862f4ca414602c658cf50dd + Reviewed-on: https://code.wireshark.org/review/15168 + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs + (cherry picked from commit c245be94c514079d144340bf7847f23545d76e24) + Reviewed-on: https://code.wireshark.org/review/15175 + +commit ffee94e +Author: Guy Harris +Date: Fri Apr 29 15:46:58 2016 -0700 + + Fix packet length handling. + + Treat the packet length as unsigned - it shouldn't be negative in the + file. If it is, that'll probably cause the sscanf to fail, so we'll + report the file as bad. + + Check it against WTAP_MAX_PACKET_SIZE to make sure we don't try to + allocate a huge amount of memory, just as we do in other file readers. + + Use the now-validated packet size as the length in + ws_buffer_assure_space(), so we are certain to have enough space, and + don't allocate too much space. + + Merge the header and packet data parsing routines while we're at it. + + Bug: 12395 + Change-Id: Ia70f33b71ff28451190fcf144c333fd1362646b2 + Reviewed-on: https://code.wireshark.org/review/15172 + Reviewed-by: Guy Harris + (cherry picked from commit f5ec0afb766f19519ea9623152cca3bbe2229500) + Reviewed-on: https://code.wireshark.org/review/15173 + +commit f94b8fe +Author: Guy Harris +Date: Fri Apr 29 15:19:49 2016 -0700 + + Fix packet length handling. + + Treat the packet length as unsigned - it shouldn't be negative in the + file. If it is, that'll probably cause the sscanf to fail, so we'll + report the file as bad. + + Check it against WTAP_MAX_PACKET_SIZE to make sure we don't try to + allocate a huge amount of memory, just as we do in other file readers. + + Use the now-validated packet size as the length in + ws_buffer_assure_space(), so we are certain to have enough space, and + don't allocate too much space. + + Bug: 12394 + Change-Id: Ifa023ce70f7a2697bf151009b035a6e6cf8d5d90 + Reviewed-on: https://code.wireshark.org/review/15169 + Reviewed-by: Guy Harris + (cherry picked from commit 5efb45231671baa2db2011d8f67f9d6e72bc455b) + Reviewed-on: https://code.wireshark.org/review/15170 + +commit 0313eda +Author: Pascal Quantin +Date: Fri Apr 29 00:14:30 2016 +0200 + + ANSI IS-637 A: fix display of reserved bits when using 7bits GSM encoding + + Change-Id: Ida59c339d174e8f9a3b8bf108374875d12c51b21 + Reviewed-on: https://code.wireshark.org/review/15153 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + (cherry picked from commit e65ab3cd946cb1df3156fa6f0e2bb6dd708584fa) + Reviewed-on: https://code.wireshark.org/review/15159 + +commit 503a589 +Author: Guy Harris +Date: Thu Apr 28 18:42:32 2016 -0700 + + Clean up check for getaddrinfo(). + + Have AC_WIRESHARK_SOCKET_LIB_CHECK first check whether it can find + connect() without -lsocket or -lnsl, and if that fails, check whether it + can find connect() with -lsocket, and, if *that* fails, check whether it + can find connect() with -lsocket and -lnsl, and give up if that fails, + otherwise set SOCKET_LIBS and NSL_LIBS appropriately. + + Have AC_WIRESHARK_GETADDRINFO_LIB_CHECK check for getaddrinfo() in + -lsocket, not -lnsl, as it's in -lsocket in Solaris 10 and 11, although + it links with -lnsl as well if AC_WIRESHARK_SOCKET_LIB_CHECK found it + was required. If it's in -lsocket, and SOCKET_LIBS hasn't already been + set, set SOCKET_LIBS. Set $found_getaddrinfo if it finds it anywhere. + + Have AC_WIRESHARK_GETHOSTBY_LIB_CHECK check for gethostbyname() in + -lnsl. If it's in -lnsl, and NSL_LIBS hasn't already been set, set + NSL_LIBS. Set $found_gethostbyname if it finds it anywhere. + + If we didn't find C-ARES, and didn't find getaddrinfo() anywhere, and + didn't find gethosbyname() anywhere, fail. Use the $found_ variables, + as there's no guarantee that the "find it in the system libraries" test + will succeed and set $ac_cv_func_XXX. + + Bug: 12391 + Change-Id: I8a8973ab79175f56b717970ef916feca29a10288 + Reviewed-on: https://code.wireshark.org/review/15158 + Reviewed-by: Guy Harris + +commit e2f06c1 +Author: Guy Harris +Date: Thu Apr 28 14:46:31 2016 -0700 + + Cleanups to issues found while investigating 12386. + + Get rid of the printable-IP-address member of a sub_net_hashipv4; it's + not used. + + Free hash buckets of those structures iteratively, not recursively. + + Change-Id: I8dcf5c9189c689998d48a47aa27a567e607b38fe + Reviewed-on: https://code.wireshark.org/review/15151 + Reviewed-by: Guy Harris + +commit 119e586 +Author: Guy Harris +Date: Thu Apr 28 12:33:28 2016 -0700 + + Use "system" for "use system language", and don't try to print a null string. + + Add a #define USE_SYSTEM_LANGUAGE for the language string meaning "use + the system setting", and use that instead of hardcoding "system" in + various places. + + If "language" is null, don't try to write it to the file with fprintf() + - on *most* systems, that prints "(null)", but on some systems, such as + Solaris, it *crashes*. Write USE_SYSTEM_LANGUAGE instead. Check for + "(null)" and treat it as meaning "use the system language". + + Map "auto" to "use the system language" as well, for backwards + compatibility. + + Change-Id: I2681906e1ec18b10669b0b287c6bbcfa2fa0ebb1 + Reviewed-on: https://code.wireshark.org/review/15148 + Reviewed-by: Guy Harris + +commit 42cca21 +Author: Gerald Combs +Date: Thu Apr 28 10:59:40 2016 -0700 + + Qt: Refresh the display filter toolbar layout. + + Force the display filter toolbar to update its layout when we recreate + our filter buttons. This ensures that we draw the overflow icon in + the right place. + + Change-Id: Ibfb34b77d565e8db15bb2576249e0e3016993083 + Reviewed-on: https://code.wireshark.org/review/15145 + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs + (cherry picked from commit 7150588d23d5ab844dd99507ec94831375a07b67) + Reviewed-on: https://code.wireshark.org/review/15146 + +commit 485bb27 +Author: Gerald Combs +Date: Wed Apr 27 16:53:03 2016 -0700 + + Qt: Display filter toolbar behavior tweaks. + + By default GtkToolbar shows overflow items in a menu. QToolBar shows + them in a bigger toolbar. This is a problem for users with lots of + display filter expressions because expanding the display filter toolbar + can make it very tall. + + QToolBar can optionally overflow into a menu, but as noted in + https://bugreports.qt.io/browse/QTBUG-2472 there isn't a way do so + directly, e.g. with a setter. Force an overflow menu in the display + filter toolbar by adding a child QToolBar and adding filter expression + actions to it. + + While we're here, set the minimum width of the display filter edit to + two-thirds of the width of the main window. + + Change-Id: I49cd58397e087f1aa79b5bbce471f827e9804148 + Reviewed-on: https://code.wireshark.org/review/15134 + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs + (cherry picked from commit 3c5a9b10b4dd6696861a62672b322807bb2bfdf6) + Reviewed-on: https://code.wireshark.org/review/15144 + +commit 971300c +Author: IWASE Yusuke +Date: Tue Apr 26 16:58:32 2016 +0900 + + OpenFlow: fix flow_monitor_request dissector + + This patch fixes: + - offset calculation + - monitor_id field description + + Change-Id: I9568b8897ca9ebbc6203db6640b88e1b1676448d + Reviewed-on: https://code.wireshark.org/review/15128 + Reviewed-by: Guy Harris + (cherry picked from commit e899c3eb610b4f546dfced6c41ae4e166b9c729e) + Reviewed-on: https://code.wireshark.org/review/15129 + +commit 4ba461c +Author: Uli Heilmeier +Date: Thu Apr 7 16:18:07 2016 +0200 + + QT translation: Remove shortcuts from *.ts files + + QT ships with a base set of translated terms (qt_xx.qm). Therefore + we don't need to add these terms (like "Ctrl" or "Down") used in + shortcuts to the wireshark_xx.ts files. + + The ts files are generated by running lupdate. + To get the new ts files (without the shortcut terms) it is necessary + to run lupdate with option "-no-obsolete". + + Change-Id: I6346a866ae9a1b58fa23ea089c43c90ec0dc0225 + Reviewed-on: https://code.wireshark.org/review/14848 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + Reviewed-by: Alexis La Goutte + (cherry picked from commit aaab918fd0e306f30a3f8ca98d4187e47c0ed282) + Reviewed-on: https://code.wireshark.org/review/15117 + +commit 23086b3 +Author: Michael Mann +Date: Mon Apr 25 11:39:06 2016 -0400 + + J1939 can have 0 bytes of "packet data" (i.e. just CAN ID), so use tvb_reported_length instead of -1. + + Bug: 12366 + Change-Id: Id702572b95c3500906ce12ee9658ded132611247 + Reviewed-on: https://code.wireshark.org/review/15108 + Petri-Dish: Michael Mann + Reviewed-by: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + (cherry picked from commit a4da88a3d0cc0b067c45fe8fc9c4b85a687ef6eb) + Reviewed-on: https://code.wireshark.org/review/15110 + +commit ff0ba0a +Author: Gerald Combs +Date: Sun Apr 24 14:18:44 2016 -0700 + + Qt: Speed up the Display Filter Expression dialog appearance. + + Copy over and adapt SupportedProtocolsDialog::fillTree, which fills in + the protocol tree after the dialog is shown processes display events + while the tree is being built. + + Change-Id: I25082fd94c511db6a94aaed1c463ba1c1e64855c + Reviewed-on: https://code.wireshark.org/review/15079 + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs + (cherry picked from commit 17e4998a47c72246063de98828599c4fa079a94e) + Reviewed-on: https://code.wireshark.org/review/15107 + +commit 71756bd +Author: Jeff Morriss +Date: Fri Apr 22 15:49:52 2016 -0400 + + Qt UAT: call the UAT update callback after each field is updated. + + This fixes a crash when changing the SCCP dissector's users table when + finishing the edit of a string column by clicking elsewhere (rather than + pressing Enter/Return) or when changing an enum column. + + (The SCCP dissector depends on that update callback being called before the + copy callback.) + + To do this: + 1) Use the editingFinished signal rather than looking for Enter/Return key + presses (so that a focus change is processed as the end of an edit). + 2) Call the update callback when an enum field changes. + + Bug: 12364 + Change-Id: I1884c67b6e873b46afe33703581d0b3dccbbdaf1 + Reviewed-on: https://code.wireshark.org/review/15059 + Petri-Dish: Jeff Morriss + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + (cherry picked from commit dc3aa26dd3acbe76d4dd91910d03927776db8eb1) + Reviewed-on: https://code.wireshark.org/review/15077 + Reviewed-by: Jeff Morriss + +commit 0710dbb +Author: Gerald Combs +Date: Sun Apr 24 08:13:16 2016 -0700 + + [Automatic update for 2016-04-24] + + Update manuf, services enterprise-numbers, translations, and other items. + + Change-Id: I6da0404d34a459e2b4d48a7821902fa779b4d81f + Reviewed-on: https://code.wireshark.org/review/15075 + Reviewed-by: Gerald Combs + +commit 6a2308a +Author: Guy Harris +Date: Fri Apr 22 18:43:44 2016 -0700 + + Get rid of unnecessary method override. + + The conversation dialog doesn't do anything different with the name + resolution checkbox than any other subclasses of the traffic table + dialog do, so leave it up to the parent class. + + Change-Id: I07f6c09b931ed10655f5921c0a4ab5d439dd6bcd + Reviewed-on: https://code.wireshark.org/review/15065 + Reviewed-by: Guy Harris + (cherry picked from commit 76ae74cea34c47e25e4e387ee3990ba7c1231e6e) + Reviewed-on: https://code.wireshark.org/review/15066 + +commit 846cfba +Author: Guy Harris +Date: Fri Apr 22 18:31:32 2016 -0700 + + Forcibly update all items if name resolution is turned on or off. + + This makes the display change if you turn the name resolution checkbox + on or off. + + Change-Id: I873832b103b61e1e566523a1ae1c4211937c7bae + Reviewed-on: https://code.wireshark.org/review/15063 + Reviewed-by: Guy Harris + (cherry picked from commit 948342a487999fcf24913c4a76983c3c6d4df1d9) + Reviewed-on: https://code.wireshark.org/review/15064 + +commit 699bc23 +Author: Gerald Combs +Date: Fri Apr 22 13:01:43 2016 -0700 + + 2.0.3 → 2.0.4. + + Change-Id: I27b4d6c2a9183672316c835bae5e0d3625e8d1a6 + Reviewed-on: https://code.wireshark.org/review/15057 + Reviewed-by: Gerald Combs diff --git a/NEWS b/NEWS index 9338ddc4a8..07b4991a6d 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ - Wireshark 2.0.2 Release Notes + Wireshark 2.0.4 Release Notes __________________________________________________________________ What is Wireshark? @@ -12,124 +12,90 @@ What's New Bug Fixes The following vulnerabilities have been fixed: - * [1]wnpa-sec-2016-01 - DLL hijacking vulnerability. [2]CVE-2016-2521 - * [3]wnpa-sec-2016-02 - ASN.1 BER dissector crash. ([4]Bug 11828) [5]CVE-2016-2522 - * [6]wnpa-sec-2016-03 - DNP dissector infinite loop. ([7]Bug 11938) [8]CVE-2016-2523 - * [9]wnpa-sec-2016-04 - X.509AF dissector crash. ([10]Bug 12002) [11]CVE-2016-2524 - * [12]wnpa-sec-2016-05 - HTTP/2 dissector crash. ([13]Bug 12077) [14]CVE-2016-2525 - * [15]wnpa-sec-2016-06 - HiQnet dissector crash. ([16]Bug 11983) [17]CVE-2016-2526 - * [18]wnpa-sec-2016-07 - 3GPP TS 32.423 Trace file parser crash. ([19]Bug 11982) - [20]CVE-2016-2527 - * [21]wnpa-sec-2016-08 - LBMC dissector crash. ([22]Bug 11984) [23]CVE-2016-2528 - * [24]wnpa-sec-2016-09 - iSeries file parser crash. ([25]Bug 11985) [26]CVE-2016-2529 - * [27]wnpa-sec-2016-10 - RSL dissector crash. ([28]Bug 11829) [29]CVE-2016-2530 - [30]CVE-2016-2531 - * [31]wnpa-sec-2016-11 - LLRP dissector crash. ([32]Bug 12048) [33]CVE-2016-2532 - * [34]wnpa-sec-2016-12 - Ixia IxVeriWave file parser crash. ([35]Bug 11795) - * [36]wnpa-sec-2016-13 - IEEE 802.11 dissector crash. ([37]Bug 11818) - * [38]wnpa-sec-2016-14 - GSM A-bis OML dissector crash. ([39]Bug 11825) - * [40]wnpa-sec-2016-15 - ASN.1 BER dissector crash. ([41]Bug 12106) - * [42]wnpa-sec-2016-16 - SPICE dissector large loop. ([43]Bug 12151) - * [44]wnpa-sec-2016-17 - NFS dissector crash. - * [45]wnpa-sec-2016-18 - ASN.1 BER dissector crash. ([46]Bug 11822) + * [1]wnpa-sec-2016-29 + The SPOOLS dissector could go into an infinite loop. Discovered by + the CESG. + * [2]wnpa-sec-2016-30 + The IEEE 802.11 dissector could crash. ([3]Bug 11585) + * [4]wnpa-sec-2016-31 + The IEEE 802.11 dissector could crash. Discovered by Mateusz + Jurczyk. ([5]Bug 12175) + * [6]wnpa-sec-2016-32 + The UMTS FP dissector could crash. ([7]Bug 12191) + * [8]wnpa-sec-2016-33 + Some USB dissectors could crash. Discovered by Mateusz Jurczyk. + ([9]Bug 12356) + * [10]wnpa-sec-2016-34 + The Toshiba file parser could crash. Discovered by iDefense Labs. + ([11]Bug 12394) + * [12]wnpa-sec-2016-35 + The CoSine file parser could crash. Discovered by iDefense Labs. + ([13]Bug 12395) + * [14]wnpa-sec-2016-36 + The NetScreen file parser could crash. Discovered by iDefense Labs. + ([15]Bug 12396) + * [16]wnpa-sec-2016-37 + The Ethernet dissector could crash. ([17]Bug 12440) The following bugs have been fixed: - * HTTP 302 decoded as TCP when "Allow subdissector to reassemble TCP - streams" option is enabled. ([47]Bug 9848) - * Questionable calling of ethernet dissector by encapsulating - protocol dissectors. ([48]Bug 9933) - * [Qt & Legacy & probably TShark too] Delta Time Conversation column - is empty. ([49]Bug 11559) - * extcap: abort when validating capture filter for DLT 147. ([50]Bug - 11656) - * Missing columns in Qt Flow Graph. ([51]Bug 11710) - * Interface list doesn't show well when the list is very long. - ([52]Bug 11733) - * Unable to use saved Capture Filters in Qt UI. ([53]Bug 11836) - * extcap: Capture interface options snaplen, buffer and promiscuous - not being used. ([54]Bug 11865) - * Improper RPC reassembly ([55]Bug 11913) - * GTPv1 Dual Stack with one static and one Dynamic IP. ([56]Bug - 11945) - * Wireshark 2.0.1 MPLS dissector not decoding payload when control - word is present in pseudowire. ([57]Bug 11949) - * "...using this filter" turns white (not green or red). Plus - dropdown arrow does nothing. ([58]Bug 11950) - * EIGRP field eigrp.ipv4.destination does not show the correct - destination. ([59]Bug 11953) - * tshark -z conv,type[,filter] swapped frame / byte values from / to - columns. ([60]Bug 11959) - * The field name nstrace.tcpdbg.tcpack should be - nstrace.tcpdbg.tcprtt. ([61]Bug 11964) - * 6LoWPAN IPHC traffic class not decompressed correctly. ([62]Bug - 11971) - * Crash with snooping NFS file handles. ([63]Bug 11972) - * 802.11 dissector fails to decrypt some broadcast messages. ([64]Bug - 11973) - * Wireshark hangs when adding a new profile. ([65]Bug 11979) - * Issues when closing the application with a running capture without - packets. ([66]Bug 11981) - * New Qt UI lacks ability to step through multiple TCP streams with - Analyze > Follow > TCP Stream. ([67]Bug 11987) - * GTK: plugin_if_goto_frame causes Access Violation if called before - capture file is loaded. ([68]Bug 11989) - * Wireshark 2.0.1 crash on start. ([69]Bug 11992) - * Wi-Fi 4-way handshake 4/4 is displayed as 2/4. ([70]Bug 11994) - * ACN: acn.dmx.data has incorrect type. ([71]Bug 11999) - * editcap packet comment won't add multiple comments. ([72]Bug 12007) - * DICOM Sequences no longer able to be expanded. ([73]Bug 12011) - * Wrong TCP stream when port numbers are reused. ([74]Bug 12022) - * SSL decryption fails in presence of a Client certificate. ([75]Bug - 12042) - * LUA: TVBs backing a data source is freed too early. ([76]Bug 12050) - * PIM: pim.group filter have the same name for IPv4 and IPv6. - ([77]Bug 12061) - * Failed to parse M3AP IE (TNL information). ([78]Bug 12070) - * Wrong interpretation of Instance ID value in OSPFv3 packet. - ([79]Bug 12072) - * MP2T Dissector does parse RTP properly in 2.0.1. ([80]Bug 12099) - * editcap does not adjust time for frames with absolute timestamp 0 < - t < 1 secs. ([81]Bug 12116) - * Guard Interval is not consistent between Radiotap & wlan_radio. - ([82]Bug 12123) - * Calling dumpcap -i- results in access violation. ([83]Bug 12143) - * Qt: Friendly Name and Interface Name columns should not be - editable. ([84]Bug 12146) - * PPTP GRE call ID not always decoded. ([85]Bug 12149) - * Interface list does not show device description anymore. ([86]Bug - 12156) - * Find Packet does not highlight the matching tree item or packet - bytes. ([87]Bug 12157) - * "total block length ... is too large" error when opening pcapng - file with multiple SHB sections. ([88]Bug 12167) - * http.request.full_uri is malformed if an HTTP Proxy is used. - ([89]Bug 12176) - * SNMP dissector fails at msgSecurityParameters with long length - encoding. ([90]Bug 12181) - - Windows installers and PortableApps packages are now dual signed using - SHA-1 and SHA-256 in order to comply with [91]Microsoft Authenticode + * Saving pcap capture file with ERF encapsulation creates an invalid + pcap file. ([18]Bug 3606) + * Questionable calling of Ethernet dissector by encapsulating + protocol dissectors. ([19]Bug 9933) + * Wireshark 1.12.0 does not dissect HTTP correctly. ([20]Bug 10335) + * Don't copy details of hidden columns. ([21]Bug 11788) + * RTP audio player crashes. ([22]Bug 12166) + * Crash when saving RTP audio Telephony->RTP->RTP + Streams->Analyze->Save->Audio. ([23]Bug 12211) + * Edit - preferences - add column field not showing dropdown for + choices. ([24]Bug 12321) + * Using _ws.expert in a filter can cause a crash. ([25]Bug 12335) + * Crash in SCCP dissector UAT (Qt UI only). ([26]Bug 12364) + * J1939 frame without data = malformed packet ? ([27]Bug 12366) + * The stream number in tshark's "-z follow,tcp," + option is 0-origin rather than 1-origin. ([28]Bug 12383) + * IP Header Length display filter should show calculated value. + ([29]Bug 12387) + * Multiple file radio buttons should be check boxes. ([30]Bug 12388) + * Wrong check for getaddrinfo and gethostbyname on Solaris 11. + ([31]Bug 12391) + * ICMPv6 dissector doesn't respect actual packet length. ([32]Bug + 12400) + * Format DIS header timestamp mm:ss.nnnnnn. ([33]Bug 12402) + * RTP Stream Analysis can no longer be sorted in 2.0.3. ([34]Bug + 12405) + * RTP Stream Analysis fails to complete in 2.0.3 when packets are + sliced. ([35]Bug 12406) + * Network-Layer Name Resolution uses first 32-bits of IPv6 DNS + address as IPv4 address in some circumstances. ([36]Bug 12412) + * BACnet decoder incorrectly flags a valid APDU as a "Malformed + Packet". ([37]Bug 12422) + * Valid ISUP messages marked with warnings. ([38]Bug 12423) + * Profile command line switch "-C" not working in Qt interface. + ([39]Bug 12425) + * MRCPv2: info column not showing info correctly. ([40]Bug 12426) + * Diameter: Experimental result code 5142. ([41]Bug 12428) + * Tshark crashes when analyzing RTP due to pointer being freed not + allocated. ([42]Bug 12430) + * NFS: missing information in getattr for supported exclusive create + attributes. ([43]Bug 12435) + * Ethernet type field with a value of 9100 is shown as "Unknown". + ([44]Bug 12441) + * Documentation does not include support for Windows Server 2012 R2. + ([45]Bug 12455) + * Column preferences ruined too easily. ([46]Bug 12465) + * SMB Open andX extended response decoded incorrectly. ([47]Bug + 12472) + * SMB NtCreate andX with extended response sometimes incorrect. + ([48]Bug 12473) + * Viewing NFSv3 Data, checking SRTs doesn't work. ([49]Bug 12478) + * Make wireshark with Qt enabled buildable on ARM. ([50]Bug 12483) + + Windows installers and PortableApps packages are dual signed using + SHA-1 and SHA-256 in order to comply with [51]Microsoft Authenticode policy. Windows 7 and Windows Server 2008 R2 users should ensure that - [92]update 3123479 is installed. Windows Vista and Windows Server 2008 - users should ensure that [93]hotfix 2763674 is installed. + [52]update 3123479 is installed. Windows Vista and Windows Server 2008 + users should ensure that [53]hotfix 2763674 is installed. New and Updated Features @@ -145,15 +111,15 @@ What's New Updated Protocol Support - 6LoWPAN, ACN, ASN.1 BER, BATADV, DICOM, DNP3, DOCSIS INT-RNG-REQ, E100, - EIGRP, GSM A DTAP, GSM SMS, GTP, HiQnet, HTTP, HTTP/2, IEEE 802.11, - IKEv2, InfiniBand, IPv4, IPv6, LBMC, LLRP, M3AP, MAC LTE, MP2T, MPLS, - NFS, NS Trace, OSPF, PIM, PPTP, RLC LTE, RoHC, RPC, RSL, SNMP, SPICE, - SSL, TCP, TRILL, VXLAN, WaveAgent, and X.509AF + AFS, ANSI IS-637 A, BACapp, BT BNEP, Cisco FabricPath MiM, CSN.1, + DCERPC SPOOLS, DIS, Ethernet, GSM A RR, ICMPv6, IEEE 802.11, IPv4, + ISUP, J1939, JXTA, LAPSat, LPADm, LTE-RRC, MRCPv2, NFS, OpenFlow, + SGsAP, SMB, STT, TZSP, UMTS FP, and USB New and Updated Capture File Support - 3GPP TS 32.423 Trace, iSeries, Ixia IxVeriWave, pcap, and pcapng + Aethra, Catapult DCT2000, CoSine, DBS Etherwatch, ERF, iSeries, Ixia + IxVeriWave, NetScreen, Toshiba, and VMS TCPIPtrace New and Updated Capture Interfaces support @@ -164,14 +130,14 @@ What's New Getting Wireshark Wireshark source code and installation packages are available from - [94]https://www.wireshark.org/download.html. + [54]https://www.wireshark.org/download.html. Vendor-supplied Packages Most Linux and Unix vendors supply their own Wireshark packages. You can usually install or upgrade Wireshark using the package management system specific to that platform. A list of third-party packages can be - found on the [95]download page on the Wireshark web site. + found on the [55]download page on the Wireshark web site. __________________________________________________________________ File Locations @@ -184,166 +150,126 @@ File Locations Known Problems - Dumpcap might not quit if Wireshark or TShark crashes. ([96]Bug 1419) + Dumpcap might not quit if Wireshark or TShark crashes. ([56]Bug 1419) - The BER dissector might infinitely loop. ([97]Bug 1516) + The BER dissector might infinitely loop. ([57]Bug 1516) Capture filters aren't applied when capturing from named pipes. - ([98]Bug 1814) + ([58]Bug 1814) Filtering tshark captures with read filters (-R) no longer works. - ([99]Bug 2234) + ([59]Bug 2234) - Resolving ([100]Bug 9044) reopens ([101]Bug 3528) so that Wireshark no + Resolving ([60]Bug 9044) reopens ([61]Bug 3528) so that Wireshark no longer automatically decodes gzip data when following a TCP stream. - Application crash when changing real-time option. ([102]Bug 4035) + Application crash when changing real-time option. ([62]Bug 4035) - Hex pane display issue after startup. ([103]Bug 4056) + Hex pane display issue after startup. ([63]Bug 4056) - Packet list rows are oversized. ([104]Bug 4357) + Packet list rows are oversized. ([64]Bug 4357) Wireshark and TShark will display incorrect delta times in some cases. - ([105]Bug 4985) + ([65]Bug 4985) The 64-bit version of Wireshark will leak memory on Windows when the - display depth is set to 16 bits ([106]Bug 9914) + display depth is set to 16 bits ([66]Bug 9914) - Wireshark should let you work with multiple capture files. ([107]Bug + Wireshark should let you work with multiple capture files. ([67]Bug 10488) Dell Backup and Recovery (DBAR) makes many Windows applications crash, - including Wireshark. ([108]Bug 12036) + including Wireshark. ([68]Bug 12036) __________________________________________________________________ Getting Help - Community support is available on [109]Wireshark's Q&A site and on the + Community support is available on [69]Wireshark's Q&A site and on the wireshark-users mailing list. Subscription information and archives for - all of Wireshark's mailing lists can be found on [110]the web site. + all of Wireshark's mailing lists can be found on [70]the web site. Official Wireshark training and certification are available from - [111]Wireshark University. + [71]Wireshark University. __________________________________________________________________ Frequently Asked Questions - A complete FAQ is available on the [112]Wireshark web site. + A complete FAQ is available on the [72]Wireshark web site. __________________________________________________________________ - Last updated 2016-02-26 19:42:12 UTC + Last updated 2016-06-07 17:08:47 UTC References - 1. https://www.wireshark.org/security/wnpa-sec-2016-01.html - 2. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2521 - 3. https://www.wireshark.org/security/wnpa-sec-2016-02.html - 4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11828 - 5. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2522 - 6. https://www.wireshark.org/security/wnpa-sec-2016-03.html - 7. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11938 - 8. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2523 - 9. https://www.wireshark.org/security/wnpa-sec-2016-04.html - 10. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12002 - 11. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2524 - 12. https://www.wireshark.org/security/wnpa-sec-2016-05.html - 13. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12077 - 14. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2525 - 15. https://www.wireshark.org/security/wnpa-sec-2016-06.html - 16. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11983 - 17. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2526 - 18. https://www.wireshark.org/security/wnpa-sec-2016-07.html - 19. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11982 - 20. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2527 - 21. https://www.wireshark.org/security/wnpa-sec-2016-08.html - 22. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11984 - 23. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2528 - 24. https://www.wireshark.org/security/wnpa-sec-2016-09.html - 25. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11985 - 26. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2529 - 27. https://www.wireshark.org/security/wnpa-sec-2016-10.html - 28. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11829 - 29. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2530 - 30. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2531 - 31. https://www.wireshark.org/security/wnpa-sec-2016-11.html - 32. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12048 - 33. http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2532 - 34. https://www.wireshark.org/security/wnpa-sec-2016-12.html - 35. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11795 - 36. https://www.wireshark.org/security/wnpa-sec-2016-13.html - 37. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11818 - 38. https://www.wireshark.org/security/wnpa-sec-2016-14.html - 39. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11825 - 40. https://www.wireshark.org/security/wnpa-sec-2016-15.html - 41. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12106 - 42. https://www.wireshark.org/security/wnpa-sec-2016-16.html - 43. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12151 - 44. https://www.wireshark.org/security/wnpa-sec-2016-17.html - 45. https://www.wireshark.org/security/wnpa-sec-2016-18.html - 46. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11822 - 47. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9848 - 48. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9933 - 49. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11559 - 50. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11656 - 51. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11710 - 52. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11733 - 53. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11836 - 54. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11865 - 55. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11913 - 56. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11945 - 57. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11949 - 58. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11950 - 59. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11953 - 60. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11959 - 61. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11964 - 62. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11971 - 63. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11972 - 64. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11973 - 65. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11979 - 66. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11981 - 67. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11987 - 68. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11989 - 69. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11992 - 70. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11994 - 71. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11999 - 72. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12007 - 73. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12011 - 74. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12022 - 75. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12042 - 76. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12050 - 77. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12061 - 78. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12070 - 79. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12072 - 80. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12099 - 81. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12116 - 82. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12123 - 83. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12143 - 84. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12146 - 85. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12149 - 86. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12156 - 87. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12157 - 88. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12167 - 89. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12176 - 90. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12181 - 91. http://social.technet.microsoft.com/wiki/contents/articles/32288.windows-enforcement-of-authenticode-code-signing-and-timestamping.aspx - 92. https://support.microsoft.com/en-us/kb/3123479 - 93. https://support.microsoft.com/en-us/kb/2763674 - 94. https://www.wireshark.org/download.html - 95. https://www.wireshark.org/download.html#thirdparty - 96. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1419 - 97. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1516 - 98. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1814 - 99. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2234 - 100. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9044 - 101. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528 - 102. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4035 - 103. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4056 - 104. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4357 - 105. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4985 - 106. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9914 - 107. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10488 - 108. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12036 - 109. https://ask.wireshark.org/ - 110. https://www.wireshark.org/lists/ - 111. http://www.wiresharktraining.com/ - 112. https://www.wireshark.org/faq.html + 1. https://www.wireshark.org/security/wnpa-sec-2016-29.html + 2. https://www.wireshark.org/security/wnpa-sec-2016-30.html + 3. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11585 + 4. https://www.wireshark.org/security/wnpa-sec-2016-31.html + 5. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12175 + 6. https://www.wireshark.org/security/wnpa-sec-2016-32.html + 7. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12191 + 8. https://www.wireshark.org/security/wnpa-sec-2016-33.html + 9. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12356 + 10. https://www.wireshark.org/security/wnpa-sec-2016-34.html + 11. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12394 + 12. https://www.wireshark.org/security/wnpa-sec-2016-35.html + 13. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12395 + 14. https://www.wireshark.org/security/wnpa-sec-2016-36.html + 15. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12396 + 16. https://www.wireshark.org/security/wnpa-sec-2016-37.html + 17. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12440 + 18. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3606 + 19. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9933 + 20. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10335 + 21. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11788 + 22. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12166 + 23. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12211 + 24. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12321 + 25. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12335 + 26. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12364 + 27. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12366 + 28. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12383 + 29. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12387 + 30. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12388 + 31. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12391 + 32. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12400 + 33. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12402 + 34. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12405 + 35. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12406 + 36. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12412 + 37. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12422 + 38. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12423 + 39. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12425 + 40. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12426 + 41. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12428 + 42. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12430 + 43. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12435 + 44. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12441 + 45. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12455 + 46. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12465 + 47. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12472 + 48. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12473 + 49. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12478 + 50. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12483 + 51. http://social.technet.microsoft.com/wiki/contents/articles/32288.windows-enforcement-of-authenticode-code-signing-and-timestamping.aspx + 52. https://support.microsoft.com/en-us/kb/3123479 + 53. https://support.microsoft.com/en-us/kb/2763674 + 54. https://www.wireshark.org/download.html + 55. https://www.wireshark.org/download.html#thirdparty + 56. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1419 + 57. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1516 + 58. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1814 + 59. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2234 + 60. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9044 + 61. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528 + 62. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4035 + 63. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4056 + 64. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4357 + 65. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4985 + 66. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9914 + 67. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10488 + 68. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=12036 + 69. https://ask.wireshark.org/ + 70. https://www.wireshark.org/lists/ + 71. http://www.wiresharktraining.com/ + 72. https://www.wireshark.org/faq.html diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc index 265d638751..394401871d 100644 --- a/docbook/release-notes.asciidoc +++ b/docbook/release-notes.asciidoc @@ -15,7 +15,8 @@ The following vulnerabilities have been fixed: * ws-salink:2016-29[] + The SPOOLS dissector could go into an infinite loop. -(ws-buglink:xxxxx[]) +Discovered by the CESG. +//(ws-buglink:xxxxx[]) //cve-idlink:2015-XXXX[] // Fixed in master: b4d16b4 // Fixed in master-2.0: 9753ea8 @@ -109,6 +110,8 @@ The following bugs have been fixed: * Don't copy details of hidden columns. (ws-buglink:11788[]) +* RTP audio player crashes. (ws-buglink:12166[]) + * Crash when saving RTP audio Telephony->RTP->RTP Streams->Analyze->Save->Audio. (ws-buglink:12211[]) * Edit - preferences - add column field not showing dropdown for choices. (ws-buglink:12321[]) @@ -191,6 +194,7 @@ There are no new protocols in this release. === Updated Protocol Support --sort-and-group-- +AFS ANSI IS-637 A BACapp BT BNEP diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index cf98da8dfc..c28115b8e2 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -1751,7 +1751,7 @@ add_library(epan ${LINK_MODE_LIB} ${CMAKE_BINARY_DIR}/image/libwireshark.rc ) -set(FULL_SO_VERSION "6.1.4") +set(FULL_SO_VERSION "7.1.4") set_target_properties(epan PROPERTIES COMPILE_DEFINITIONS "WS_BUILD_DLL") set_target_properties(epan PROPERTIES LINK_FLAGS "${WS_LINK_FLAGS}") diff --git a/ui/qt/wireshark_de.qm b/ui/qt/wireshark_de.qm index 5bf3a075b1..f4c38ef16d 100644 Binary files a/ui/qt/wireshark_de.qm and b/ui/qt/wireshark_de.qm differ diff --git a/ui/qt/wireshark_de.ts b/ui/qt/wireshark_de.ts index 5863bb59f9..593c1f5589 100644 --- a/ui/qt/wireshark_de.ts +++ b/ui/qt/wireshark_de.ts @@ -2490,17 +2490,17 @@ Achtung: Eine Option MUSS ausgewählt sein. Display filter entry - Anzeigefiltereintrag + Anzeigefiltereintrag Enter a field %1 - + Feld %1 eingeben Invalid filter: - Ungültiger Filter: + Ungültiger Filter: @@ -4174,168 +4174,168 @@ für die Filterdateien kann nicht erstellt werden: Zeitstempelformat: - - + + Whether or not the file contains information indicating the direction (inbound or outbound) of the packet. Aktivieren, wenn die Datei Indikatoren für die Richtung der Pakete (Ein- oder Ausgehend) enthält. - + Direction indication: Richtungsindikatoren: - + Maximum frame length: Maximale Framelänge: - + The maximum size of the frames to write to the import capture file (max 64000) Die maximale Framegröße beim schreiben in die Mitschnittdatei (max 64000) - + Encapsulation Kapselung - + Encapsulation Type: Datenkapselungstyp: - + Encapsulation type of the frames in the import capture file Protokoll in das die Frames der zu importiernden Datei eingebettet sind - + The UDP, TCP or SCTP source port for each frame Der UDP, TCP oder SCTP Quellport für jeden Frame - + The SCTP DATA payload protocol identifier for each frame Der SCTP Daten Payload Bezeichner für jeden Frame - + The UDP, TCP or SCTP destination port for each frame Der UDP, TCP oder SCTP Zielport für jeden Frame - + Prefix each frame with an Ethernet header Jedem Frame einen Ethernetheader voranstellen - + Ethernet Ethernet - + Prefix each frame with an Ethernet, IPv4 and SCTP header Jedem Frame einen Ethernet-, IPv4- und SCTP-Header voranstellen - + SCTP SCTP - + PPI: PPI: - + Protocol (dec): Protokoll (dez): - + Leave frames unchanged Frames unangetastet lassen - + No dummy header Kein Dummy Header - + Tag: Tag: - + Prefix each frame with an Ethernet, IPv4 and UDP header Jedem Frame einen Ethernet-, IPv4- und UDP-Header voranstellen - + UDP UDP - + Source port: Quellport: - + The Ethertype value of each frame Wert des Ethertype für jeden Frame - + Prefix each frame with an Ethernet, IPv4 and TCP header Jedem Frame einen Ethernet-, IPv4- und TCP-Header voranstellen - + TCP TCP - + The SCTP verification tag for each frame Der SCTP Verfication Tag für jeden Frame - + Destination port: Zielport: - + Ethertype (hex): Ethertype (Hex): - + The IPv4 protocol ID for each frame Die IPv4 Protokoll IP für jeden Frame - + Prefix each frame with an Ethernet, IPv4 and SCTP (DATA) header Jedem Frame einen Ethernet-, IPv4- und SCTP-(Daten) Header voranstellen - + SCTP (Data) SCTP (Daten) - + Prefix each frame with an Ethernet and IPv4 header Jedem Frame einen Ethernet- und IPv4-Header voranstellen - + IPv4 IPv4 @@ -11549,7 +11549,7 @@ text-decoration: underline; RtpPlayerDialog - + RTP Player RTP Player @@ -11860,37 +11860,37 @@ text-decoration: underline; Space - + Play Streams Streams abspielen - + Out of Sequence Ausserhalb der Reihe - + Jitter Drops Jitter Drops - + Wrong Timestamps Falscher Zeitstempel - + Inserted Silence Eingefügte Stille - + %1. Press "G" to go to packet %2 %1. "G" um zu Paket %2 zu gehen - + Unknown Unbekannt diff --git a/ui/qt/wireshark_en.ts b/ui/qt/wireshark_en.ts index 695cb8d568..09098086d4 100644 --- a/ui/qt/wireshark_en.ts +++ b/ui/qt/wireshark_en.ts @@ -4128,168 +4128,168 @@ for filter files: %2. - - + + Whether or not the file contains information indicating the direction (inbound or outbound) of the packet. - + Direction indication: - + Maximum frame length: - + The maximum size of the frames to write to the import capture file (max 64000) - + Encapsulation - + Encapsulation Type: - + Encapsulation type of the frames in the import capture file - + The UDP, TCP or SCTP source port for each frame - + The SCTP DATA payload protocol identifier for each frame - + The UDP, TCP or SCTP destination port for each frame - + Prefix each frame with an Ethernet header - + Ethernet - + Prefix each frame with an Ethernet, IPv4 and SCTP header - + SCTP - + PPI: - + Protocol (dec): - + Leave frames unchanged - + No dummy header - + Tag: - + Prefix each frame with an Ethernet, IPv4 and UDP header - + UDP - + Source port: - + The Ethertype value of each frame - + Prefix each frame with an Ethernet, IPv4 and TCP header - + TCP - + The SCTP verification tag for each frame - + Destination port: - + Ethertype (hex): - + The IPv4 protocol ID for each frame - + Prefix each frame with an Ethernet, IPv4 and SCTP (DATA) header - + SCTP (Data) - + Prefix each frame with an Ethernet and IPv4 header - + IPv4 @@ -11409,7 +11409,7 @@ a:hover { RtpPlayerDialog - + RTP Player @@ -11695,37 +11695,37 @@ a:hover { - + Play Streams - + Out of Sequence - + Jitter Drops - + Wrong Timestamps - + Inserted Silence - + %1. Press "G" to go to packet %2 - + Unknown diff --git a/ui/qt/wireshark_fr.ts b/ui/qt/wireshark_fr.ts index 7ea4c4178e..2f2a6a8920 100644 --- a/ui/qt/wireshark_fr.ts +++ b/ui/qt/wireshark_fr.ts @@ -4178,168 +4178,168 @@ pour fichiers de filtre : %2. Format horodatage : - - + + Whether or not the file contains information indicating the direction (inbound or outbound) of the packet. Que ce soit ou non le fichier contient des informations indiquant la direction (entrant ou sortant) du paquet. - + Direction indication: Indication de direction: - + Maximum frame length: Longueur maximale de la trame: - + The maximum size of the frames to write to the import capture file (max 64000) La taille maximale des trames'écrire dans le fichier de capture d'import (max 64000) - + Encapsulation Encapsulation - + Encapsulation Type: Type d'Encapsulation: - + Encapsulation type of the frames in the import capture file Type d'encapsulation des trames dans le fichier de capture d'import - + The UDP, TCP or SCTP source port for each frame Le port source (UDP, TCP ou SCTP) pour chaque trame - + The SCTP DATA payload protocol identifier for each frame L'identifiant SCTP DATA payload pour chaque trame - + The UDP, TCP or SCTP destination port for each frame Le port destination (UDP, TCP or SCTP) pour chaque trame - + Prefix each frame with an Ethernet header Préfixe pour chaque trame avec un entête Ethernet - + Ethernet Ethernet - + Prefix each frame with an Ethernet, IPv4 and SCTP header Préfixe pour chaque trame avec un entête Ethernet, IPv4 et SCTP - + SCTP SCTP - + PPI: PPI: - + Protocol (dec): Protocole (dec): - + Leave frames unchanged Laisser les trames inchangées - + No dummy header Aucune entête factice - + Tag: Balise: - + Prefix each frame with an Ethernet, IPv4 and UDP header Préfixe pour chaque trame avec un entête Ethernet, IPv4 et UDP - + UDP UDP - + Source port: Port source: - + The Ethertype value of each frame La valeur Ethertype de chaque trame - + Prefix each frame with an Ethernet, IPv4 and TCP header Préfixe pour chaque trame avec un entête Ehternet, IPv4 et TCP - + TCP TCP - + The SCTP verification tag for each frame La balise verification SCTP pour chaque trame - + Destination port: Port de destination: - + Ethertype (hex): Type ether (hex): - + The IPv4 protocol ID for each frame Le protocole ID IPv4 pour chaque trame - + Prefix each frame with an Ethernet, IPv4 and SCTP (DATA) header Préfixe pour chaque trame avec un entête Ethernet, IPV4 et SCTP (DATA) - + SCTP (Data) SCTP (Données) - + Prefix each frame with an Ethernet and IPv4 header Préfixe pour chaque trame avec un entête Ehternet, IPv4 - + IPv4 IPv4 @@ -11525,7 +11525,7 @@ Voulez-vous arrêter la capture et enregistrer les paquets capturésRtpPlayerDialog - + RTP Player Player RTP @@ -11832,37 +11832,37 @@ Voulez-vous arrêter la capture et enregistrer les paquets capturésEspace - + Play Streams Jouer Flux - + Out of Sequence Hors de Séquence - + Jitter Drops Chutes de Gigue - + Wrong Timestamps Mauvais Cachets - + Inserted Silence Silence Inséré - + %1. Press "G" to go to packet %2 %1. Appuyez sur "G" pour aller au paquet %2 - + Unknown Inconnu diff --git a/ui/qt/wireshark_it.qm b/ui/qt/wireshark_it.qm index 17c636c0b5..0d1548f332 100644 Binary files a/ui/qt/wireshark_it.qm and b/ui/qt/wireshark_it.qm differ diff --git a/ui/qt/wireshark_it.ts b/ui/qt/wireshark_it.ts index 0cba16e6e2..b761782c44 100644 --- a/ui/qt/wireshark_it.ts +++ b/ui/qt/wireshark_it.ts @@ -2490,17 +2490,17 @@ NOTA: un'opzione DEVE essere selezionata. Display filter entry - Mostra la voce del filtro + Voce del filtro di visualizzazione Enter a field %1 - + Digita un campo %1 Invalid filter: - Filtro non valido: + Filtro non valido: @@ -4172,168 +4172,168 @@ per i file di filtro: %2. Formato della marca temporale: - - + + Whether or not the file contains information indicating the direction (inbound or outbound) of the packet. Il file contiene o meno le informazioni che indicano la direzione (ingresso o uscita) del pacchetto. - + Direction indication: Indicazione della direzione: - + Maximum frame length: Lunghezza massima del frame: - + The maximum size of the frames to write to the import capture file (max 64000) Dimensione massima dei frame da scrivere sul file di importazione della cattura (max 64000) - + Encapsulation Incapsulamento - + Encapsulation Type: Tipo di incapsulamento: - + Encapsulation type of the frames in the import capture file Tipo di incapsulamento dei frame nel file di importazione della cattura - + The UDP, TCP or SCTP source port for each frame Porta sorgente UDP, TCP o SCTP per ogni frame - + The SCTP DATA payload protocol identifier for each frame Identificatore del protocollo del payload SCTP DATA per ogni frame - + The UDP, TCP or SCTP destination port for each frame Porta di destinazione UDP, TCP o SCTP per ogni frame - + Prefix each frame with an Ethernet header Anteponi un'intestazione ethernet a ogni frame - + Ethernet Ethernet - + Prefix each frame with an Ethernet, IPv4 and SCTP header Anteponi a ogni frame un'intestazione Ethernet, IPv4 e SCTP - + SCTP SCTP - + PPI: PPI: - + Protocol (dec): Protocollo (dec): - + Leave frames unchanged Lascia i frame inalterati - + No dummy header Nessuna intestazione fittizia - + Tag: Tag: - + Prefix each frame with an Ethernet, IPv4 and UDP header Anteponi a ogni frame un'intestazione Ethernet, IPv4 e UDP - + UDP UDP - + Source port: Porta sorgente: - + The Ethertype value of each frame Il valore di Ethertype per ogni frame - + Prefix each frame with an Ethernet, IPv4 and TCP header Anteponi a ogni frame un'intestazione Ethernet, IPv4 e TCP - + TCP TCP - + The SCTP verification tag for each frame Il tag di verifica SCTP per ogni frame - + Destination port: Porta di destinazione: - + Ethertype (hex): Ethertype (esa): - + The IPv4 protocol ID for each frame ID di protocollo IPv4 per ogni frame - + Prefix each frame with an Ethernet, IPv4 and SCTP (DATA) header Anteponi a ogni frame un'intestazione Ethernet, IPv4 e SCTP (DATA) - + SCTP (Data) SCTP (Dati) - + Prefix each frame with an Ethernet and IPv4 header Anteponi a ogni frame un'intestazione Ethernet e IPv4 - + IPv4 IPv4 @@ -11547,7 +11547,7 @@ a:hover { RtpPlayerDialog - + RTP Player Lettore RTP @@ -11858,37 +11858,37 @@ a:hover { Spazio - + Play Streams Riproduci flussi - + Out of Sequence Fuori sequenza - + Jitter Drops Scarti jitter - + Wrong Timestamps Marche temporali errate - + Inserted Silence Silenzio inserito - + %1. Press "G" to go to packet %2 %1. Premi "G" per andare al pacchetto %2 - + Unknown Sconosciuto diff --git a/ui/qt/wireshark_ja_JP.ts b/ui/qt/wireshark_ja_JP.ts index 61191596c8..adb19e5710 100644 --- a/ui/qt/wireshark_ja_JP.ts +++ b/ui/qt/wireshark_ja_JP.ts @@ -4146,168 +4146,168 @@ for filter files: %2. タイムスタンプ形式: - - + + Whether or not the file contains information indicating the direction (inbound or outbound) of the packet. ファイルにパケットの向き（入力や出力）を示す情報が含まれていてもいなくても - + Direction indication: 方向指示: - + Maximum frame length: 最大フレーム長: - + The maximum size of the frames to write to the import capture file (max 64000) インポートするキャプチャファイルへ書き込む最大のフレームサイズ（最大64000) - + Encapsulation カプセル化 - + Encapsulation Type: カプセル化種別: - + Encapsulation type of the frames in the import capture file インポートしたキャプチャファイルのフレームのカプセル化の種別 - + The UDP, TCP or SCTP source port for each frame フレーム毎のUDP/TCP/SCTP送信元ポート - + The SCTP DATA payload protocol identifier for each frame フレーム毎のSCTPデータペイロードのプロトコル識別子 - + The UDP, TCP or SCTP destination port for each frame フレーム毎のUDP/TCP/SCTP宛先ポート - + Prefix each frame with an Ethernet header 各フレームの前にEthernetヘッダを付加します - + Ethernet Ethernet - + Prefix each frame with an Ethernet, IPv4 and SCTP header 各フレームの前にEthernet/IPv4/SCTPヘッダを付加します - + SCTP SCTP - + PPI: PPI: - + Protocol (dec): プロトコル(10進数): - + Leave frames unchanged フレームを変更しない - + No dummy header ダミーヘッダなし - + Tag: タグ: - + Prefix each frame with an Ethernet, IPv4 and UDP header 各フレームの前にEthernet/IPv4/UDPヘッダを付加します - + UDP UDP - + Source port: 送信元ポート: - + The Ethertype value of each frame 各フレームのイーサタイプの値 - + Prefix each frame with an Ethernet, IPv4 and TCP header 各フレームの前にEthernet/IPv4/TCPヘッダを付加します - + TCP TCP - + The SCTP verification tag for each frame 各フレームのSCTP検証タグ - + Destination port: 宛先ポート: - + Ethertype (hex): イーサタイプ(16進数): - + The IPv4 protocol ID for each frame 各フレームのIPv4プロトコル識別子 - + Prefix each frame with an Ethernet, IPv4 and SCTP (DATA) header 各フレームの前にEthernet/IPv4/SCTP(DATA）ヘッダを付加します - + SCTP (Data) SCTP(データ) - + Prefix each frame with an Ethernet and IPv4 header 各フレームの前にEthernet/IPv4ヘッダを付加します - + IPv4 IPv4 @@ -11493,7 +11493,7 @@ a:hover { RtpPlayerDialog - + RTP Player RTPプレイヤー @@ -11804,37 +11804,37 @@ a:hover { スペース - + Play Streams ストリームを再生 - + Out of Sequence シーケンス外 - + Jitter Drops ジッタ欠落 - + Wrong Timestamps タイムスタンプが誤っている - + Inserted Silence 無音が挿入されている - + %1. Press "G" to go to packet %2 %1. "G" を押してパケット %2 へ移動 - + Unknown 不明 diff --git a/ui/qt/wireshark_pl.qm b/ui/qt/wireshark_pl.qm index 25d74bb2a9..7b3d5f60e3 100644 Binary files a/ui/qt/wireshark_pl.qm and b/ui/qt/wireshark_pl.qm differ diff --git a/ui/qt/wireshark_pl.ts b/ui/qt/wireshark_pl.ts index 70720b4cc6..0b8c573ad3 100644 --- a/ui/qt/wireshark_pl.ts +++ b/ui/qt/wireshark_pl.ts @@ -1943,7 +1943,7 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać Invalid filter: Invalid filter - Błądny filtr: + Błędny filtr: @@ -2489,17 +2489,17 @@ po którym zostanie użyty nowy plik przechwytywania jeśli zamierzasz używać Display filter entry - Wpis filtru wyświetlania + Wpis filtru wyświetlania Enter a field %1 - + Wpisz pole %1 Invalid filter: - Błądny filtr: + Błędny filtr: @@ -4170,168 +4170,168 @@ dla plików filtrów: %2. Format czasu: - - + + Whether or not the file contains information indicating the direction (inbound or outbound) of the packet. Czy plik zawiera informacje wskazujące kierunek przepływu pakietu (przychodzący lub wychodzący). - + Direction indication: Wskaźnik kierunku: - + Maximum frame length: Maksymalny rozmiar ramki: - + The maximum size of the frames to write to the import capture file (max 64000) Maksymalny rozmiar ramki do zapisu w importowanym pliku (max 64000) - + Encapsulation Enkapsulacja - + Encapsulation Type: Typ enkapsulacji: - + Encapsulation type of the frames in the import capture file Typ enkapsulacji ramek w importowanym pliku - + The UDP, TCP or SCTP source port for each frame Port źródłowy UDP, TCP lub SCTP dla każdej ramce - + The SCTP DATA payload protocol identifier for each frame Identyfiktor protokołu SCTP (dane) dla każdej ramce - + The UDP, TCP or SCTP destination port for each frame Port docelowy UDP, TCP lub SCTP dla każdej ramce - + Prefix each frame with an Ethernet header Poprzedź każdą ramkę nagłówkiem Ethernet - + Ethernet Ethernet - + Prefix each frame with an Ethernet, IPv4 and SCTP header Poprzedź każdą ramkę nagłówkami Ethernet, IPv4 i SCTP - + SCTP SCTP - + PPI: PPI: - + Protocol (dec): Protokół (dec): - + Leave frames unchanged Pozostaw ramki niezmienione - + No dummy header Brak pustego nagłówka - + Tag: Tag: - + Prefix each frame with an Ethernet, IPv4 and UDP header Poprzedź każdą ramkę nagłówkami Ethernet, IPv4 i UDP - + UDP UDP - + Source port: Port źródłowy: - + The Ethertype value of each frame Ethertype w każdej ramkce - + Prefix each frame with an Ethernet, IPv4 and TCP header Poprzedź każdą ramkę nagłówkami Ethernet, IPv4 i TCP - + TCP TCP - + The SCTP verification tag for each frame Tag weryfikacyjny SCTP w każdej ramce - + Destination port: Port docelowy: - + Ethertype (hex): Ethertype (hex): - + The IPv4 protocol ID for each frame IPv4 w każdej ramkce - + Prefix each frame with an Ethernet, IPv4 and SCTP (DATA) header Poprzedź każdą ramkę nagłówkami Ethernet, IPv4 i SCTP (dane) - + SCTP (Data) SCTP (dane) - + Prefix each frame with an Ethernet and IPv4 header Poprzedź każdą ramkę nagłówkami Ethernet i IPv4 - + IPv4 IPv4 @@ -11546,7 +11546,7 @@ text-decoration: underline; RtpPlayerDialog - + RTP Player Odtwarzacz RTP @@ -11857,37 +11857,37 @@ text-decoration: underline; Spacja - + Play Streams Odtwarzaj Strumienie - + Out of Sequence Poza kolejnością - + Jitter Drops Porzucenia Jitter - + Wrong Timestamps Błędny znacznik czasu - + Inserted Silence Wstawiono ciszę - + %1. Press "G" to go to packet %2 %1. Naciśnij "G" przejść do pakietu %2 - + Unknown Nieznany @@ -13104,7 +13104,7 @@ text-decoration: underline; Invalid filter. - Błądny filtr. + Błędny filtr. diff --git a/ui/qt/wireshark_zh_CN.qm b/ui/qt/wireshark_zh_CN.qm index c293af562f..2982381404 100644 Binary files a/ui/qt/wireshark_zh_CN.qm and b/ui/qt/wireshark_zh_CN.qm differ diff --git a/ui/qt/wireshark_zh_CN.ts b/ui/qt/wireshark_zh_CN.ts index 4d70d6a6ba..6edca5a09e 100644 --- a/ui/qt/wireshark_zh_CN.ts +++ b/ui/qt/wireshark_zh_CN.ts @@ -2489,7 +2489,7 @@ PLEASE NOTE: One option MUST be selected. Display filter entry - 显示过滤器 + 显示过滤器项 @@ -4165,168 +4165,168 @@ for filter files: %2. 时间戳格式: - - + + Whether or not the file contains information indicating the direction (inbound or outbound) of the packet. 文件是否包含信息来指示分组的方向（入或出方向）。 - + Direction indication: 方向指示: - + Maximum frame length: 最大帧长: - + The maximum size of the frames to write to the import capture file (max 64000) 写入导入捕获文件的最大帧长度 (最大 64000) - + Encapsulation 封装 - + Encapsulation Type: 封装类型: - + Encapsulation type of the frames in the import capture file 导入捕获文件中帧的封装类型 - + The UDP, TCP or SCTP source port for each frame 每一帧的 UDP、TCP 或 SCTP 源端口 - + The SCTP DATA payload protocol identifier for each frame 每一帧的 SCTP DATA 有效载荷协议标识符 - + The UDP, TCP or SCTP destination port for each frame 每一帧的 UDP、TCP 或 SCTP 目标端口 - + Prefix each frame with an Ethernet header 每一帧前添加以太网头部 - + Ethernet 以太网 - + Prefix each frame with an Ethernet, IPv4 and SCTP header 每一帧前添加以太网、IPv4 及 SCTP 头部 - + SCTP SCTP - + PPI: PPI: - + Protocol (dec): 协议 (十进制): - + Leave frames unchanged 保持帧不变化 - + No dummy header 无虚头部 - + Tag: 标签: - + Prefix each frame with an Ethernet, IPv4 and UDP header 每一帧前添加以太网、IPv4 及 UDP 头部 - + UDP UDP - + Source port: 源端口: - + The Ethertype value of each frame 每一帧的以太类型值 - + Prefix each frame with an Ethernet, IPv4 and TCP header 每一帧前添加以太网、IPv4 及 TCP 头部 - + TCP TCP - + The SCTP verification tag for each frame 每一帧的 SCTP 验证标签 - + Destination port: 目的端口: - + Ethertype (hex): 以太类型 (十六进制): - + The IPv4 protocol ID for each frame 每一帧的 IPv4 协议 ID - + Prefix each frame with an Ethernet, IPv4 and SCTP (DATA) header 每一帧前添加以太网、IPv4 及 SCTP (DATA) 头部 - + SCTP (Data) SCTP (Data) - + Prefix each frame with an Ethernet and IPv4 header 每一帧前添加以太网及 IPv4 头部 - + IPv4 IPv4 @@ -11537,7 +11537,7 @@ text-decoration: underline; RtpPlayerDialog - + RTP Player RTP 播放器 @@ -11848,37 +11848,37 @@ text-decoration: underline; 空格键 - + Play Streams 播放流 - + Out of Sequence 乱序 - + Jitter Drops 抖动过滤 - + Wrong Timestamps 错误的时间戳 - + Inserted Silence 插入的静默 - + %1. Press "G" to go to packet %2 %1. 按 "G" 去到数据包 %2 - + Unknown 未知 diff --git a/version.conf b/version.conf index 6dedd7c96a..9480b2f829 100644 --- a/version.conf +++ b/version.conf @@ -1,9 +1,9 @@ # Interim releases: Enable packaging, add a "rc" to the version. -enable: 1 -pkg_format: rc0-%# -pkg_enable: 1 +#enable: 1 +#pkg_format: rc0-%# +#pkg_enable: 1 # Final release: Disable package version stamps. -#enable: 1 -#pkg_format: -#pkg_enable: 0 +enable: 1 +pkg_format: +pkg_enable: 0 -- cgit v1.2.3