diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-03-05 10:12:07 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-03-05 18:12:27 +0000 |
| commit | 4f2c82741f91a7ba78e88c4a719a0dded5c4bcfd (patch) | |
| tree | 7c0335312a0a74b62c8902d237d2668d272d292a | |
| parent | 9076bf311924360bc0ab7cb098e47ec1afbd50d1 (diff) | |
Build 1.99.3.
Change-Id: Ibf1ee5a11adb907c0d749763117fe291d92c47c7
Reviewed-on: https://code.wireshark.org/review/7548
Reviewed-by: Gerald Combs <gerald@wireshark.org>
| -rw-r--r-- | ChangeLog | 14871 | ||||
| -rw-r--r-- | NEWS | 38 | ||||
| -rw-r--r-- | docbook/release-notes.asciidoc | 4 | ||||
| -rwxr-xr-x | make-version.pl | 8 |
4 files changed, 3864 insertions, 11057 deletions
@@ -1,13118 +1,5905 @@ -commit a748e83 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Feb 4 08:53:44 2015 -0800 - - Qt: Add "Copy As..." to the Protocol Hierarchy stats. - - This implementation is slightly different compared to other dialogs - since we have nested items. - - Tweak the bar highlight color look better on Windows while we're here. - - Change-Id: If0607c4624f304042fe3d6c8a941756b342e703d - Reviewed-on: https://code.wireshark.org/review/6953 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit a8cc331 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Feb 4 09:44:40 2015 -0800 +commit 9076bf3 +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Wed Mar 4 08:54:23 2015 +0100 - Update the release notes. + Qt: Display only filename on status bar and display full path and size on tooltip - Change-Id: Id4fc195e54dba19f697d20d2085f2e1f922c8ced - Reviewed-on: https://code.wireshark.org/review/6954 + Ping-Bug: 10949 + Change-Id: Ic735afdb7994a4c10b527217327831138362ffc9 + Reviewed-on: https://code.wireshark.org/review/7538 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit febc842 -Author: Evan Huus <eapache@gmail.com> -Date: Wed Feb 4 10:02:41 2015 -0500 - - Update README.wmem, release notes for emem removal - - Change-Id: Iac5066ff97d26de1660c38b9cd3f17781a521823 - Reviewed-on: https://code.wireshark.org/review/6949 - Reviewed-by: Evan Huus <eapache@gmail.com> - -commit 150dd22 -Author: AndersBroman <anders.broman@ericsson.com> -Date: Wed Feb 4 15:55:05 2015 +0100 +commit cdab442 +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Thu Mar 5 17:44:33 2015 +0100 - [INAP] Make INAP a new style dissector and add an OID dissector for - 0.4.0.1.1.1.0.0 cs1-ssp-to-scp. + Fix makedist (Add new packet-bgp.h) - Change-Id: Ib7261ef199d7a3aedaed14e7f869af8b64c21c92 - Reviewed-on: https://code.wireshark.org/review/6948 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit d9e82b7 -Author: AndersBroman <anders.broman@ericsson.com> -Date: Wed Feb 4 14:04:27 2015 +0100 - - [INAP] Add dissection of Cause - Ping-Bug:10910 - Change-Id: I131d81b0d6332cc72e7b32dc81cb7fec4ca3d407 - Reviewed-on: https://code.wireshark.org/review/6947 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I0dbe43d5faa241fed5eaa6459e384761c11851a8 + Reviewed-on: https://code.wireshark.org/review/7546 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 0a6d1f9 -Author: gal <graeme.lunt@smhs.co.uk> -Date: Tue Feb 3 15:55:05 2015 +0000 +commit f2b35a1 +Author: Gerald Combs <gerald@wireshark.org> +Date: Mon Feb 23 17:56:14 2015 -0800 - Support for P3 over RTSE. + Qt: Add extra related packet indicator types. - Resolve mixed space/tab issue in the RTSE and BER dissectors and included modelines in both templates. + Add the ability to set frame number types: none, request, or response. + Use the types to draw different related packet indicators in the packet + list. - Change-Id: I4b75bad94ed111d0faee205e026b2322b7dafbd1 - Reviewed-on: https://code.wireshark.org/review/6932 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 9875181 -Author: AndersBroman <anders.broman@ericsson.com> -Date: Wed Feb 4 13:24:57 2015 +0100 - - [CAMEL] Dissect additionalCallingPartyNumber. - Ping-Bug: 10914 - Change-Id: I28eb9d7b5192a02f82fe604d20e57aedd706f528 - Reviewed-on: https://code.wireshark.org/review/6946 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 94011c1 -Author: AndersBroman <anders.broman@ericsson.com> -Date: Wed Feb 4 09:52:54 2015 +0100 - - [QNET6] Try to fix solaris buildboot. - /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: warning: 'hf_index' may be used uninitialized in this function - /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: note: 'hf_index' was declared here - /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: warning: 'hf_index_off' may be used uninitialized in this function - /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: note: 'hf_index_off' was declared here - /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1500: warning: 'sstree' may be used uninitialized in this function - /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1500: note: 'sstree' was declared here - /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: warning: 'hf_index_len' may be used uninitialized in this function - /Users/buildslave/Documents/wireshark/osx105x86/build/epan/dissectors/packet-qnet6.c:1502: note: 'hf_index_len' was declared here - - Remove not needed includes. - - Change-Id: Iac91954b3d6c8f9799c6fe816af93376419d1b21 - Reviewed-on: https://code.wireshark.org/review/6945 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 9f78bf6 -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Feb 3 23:39:05 2015 -0800 - - Use QNX_PC_ for QNX's pathconf parameter values. + Track the conversation in PacketListRecord. Use it to draw dashed lines + for unrelated frames. - The numerical values are platform-specific, so call them QNX_PC_; that - also avoids collision with the values on the platform on which we're - building Wireshark (such a collision broke the Solaris build). + Set frame number types for DNS and ICMP. - Change-Id: I04291eccb818a290eb44eadb17a56ed684285a70 - Reviewed-on: https://code.wireshark.org/review/6944 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit f2cb59a -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Tue Jun 17 17:03:11 2014 +0200 - - Add QNX' QNET protocol + Instead of drawing a transparent QImage, alpha blend our foreground + color and draw directly in our painter. Blend more toward the foreground + color. - no ethertype 0x8203-0x8205 support in trunk. - 0x8204 is QNX OS VER 6's qnet ethernet protocol number. + Add FRAMENUM_TYPE to checkAPIs. - Bug:3934 - Change-Id: I52555b568c3a304f1512fe25f949330b46f49a93 - Reviewed-on: https://code.wireshark.org/review/6363 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I2495945bb436413e05d6ec697184a0b4fd5ad214 + Reviewed-on: https://code.wireshark.org/review/7436 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 0f353c9 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Jan 8 17:35:58 2015 +0100 +commit a065fef +Author: Dario Lombardo <lomato@gmail.com> +Date: Wed Mar 4 12:45:30 2015 +0100 - HTTP2: Add tap for HTTP2 dissector + icmp: more precise decoding for destination unreachable. - Change-Id: Ib13d9391b64dad19321a4399c95b95d7fb791284 - Reviewed-on: https://code.wireshark.org/review/6421 + Change-Id: Ie3b5ea8d6965dd39d8d7ad7c14026896fc4f973c + Reviewed-on: https://code.wireshark.org/review/7518 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit ef929ad -Author: Jeff Morriss <jeff.morriss.ws@gmail.com> -Date: Tue Feb 3 18:02:29 2015 -0500 - - TOS-specific forwarding blocks aren't actually required: don't warn when they - aren't present. Only warn if no forwarding blocks are present. - - Simplify the code a bit while also removing a proto_tree_add_text(). (There - are a number of similar proto_tree_add_texts()s here.) - - Hang the "no forwarding blocks" expert info off the LSA item rather than off - the Metric. The warning is about how much data is in the LSA--it has - nothing to do with the Metric. - - Ping-Bug: 6302 - Change-Id: I1903ba5ad78101ec4fa2602a1f21e8192f1d8d53 - Reviewed-on: https://code.wireshark.org/review/6943 - Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 8efe6b7 +commit ec4e7e0 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Jan 28 17:59:48 2015 +0100 +Date: Thu Feb 26 10:46:53 2015 +0100 - RADIUS: Sync with FreeRADIUS Master + ICMP: Add ICMP Original Datagram Length generated field - commit 852f15c72d41c637865776d5b80097e8ffbbb444 - Author: Alan T. DeKok <aland@freeradius.org> - Date: Mon Jan 26 13:08:21 2015 -0500 - - As found on the net - - commit 53bf263d6ca9010acdc004bada894b1bfe0ed676 - Author: Tobias Hachmer <tobias@hachmer.de> - Date: Mon Jan 26 13:45:04 2015 +0100 - - add perle dictionary - - Change-Id: I15dd8705277f3a0cedd2ea12a7cac9974dadf3c0 - Reviewed-on: https://code.wireshark.org/review/6835 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: Ib268512b56e90f09aad42a7b7a42573a119d5b6f + Ping-Bug: 10991 + Reviewed-on: https://code.wireshark.org/review/7406 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit bee4fb0 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Tue Feb 3 09:14:45 2015 +0100 +commit c4cab87 +Author: Anish Bhatt <anish@chelsio.com> +Date: Tue Feb 24 01:52:38 2015 -0800 - CAPWAP: Use proto_tree_add_bitmask(_with_flags) + [ICMP] icmp_original_dgram_length is being used incorrectly - Change-Id: I39ff2e15b91981111f8de091e6e5dfb7586b4599 - Reviewed-on: https://code.wireshark.org/review/6937 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 7ced085 -Author: Michael Mann <mmann78@netscape.net> -Date: Tue Feb 3 17:15:23 2015 -0500 - - emem is dead! Long live wmem! + icmp_original_dgram_length is of no use, we need to always account for + icmp_original_dgram_length + ip header, where icmp_original_dgram_length + is available - Change-Id: Iddd1200e62bf3200cb1a68408378dd9d47120b77 - Reviewed-on: https://code.wireshark.org/review/6939 + Bug: 10991 + Change-Id: Ibd0ce538eaf1a7851e4f3e928bad29310ebbcc81 + Reviewed-on: https://code.wireshark.org/review/7345 Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> - Reviewed-by: Evan Huus <eapache@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 90a76e0 -Author: Michael Mann <mmann78@netscape.net> -Date: Tue Feb 3 23:27:01 2015 -0500 +commit b679295 +Author: Anish Bhatt <anish@chelsio.com> +Date: Tue Feb 24 00:55:33 2015 -0800 - Convert val_to_str -> val_to_str_wmem. + [ICMP] Don't use icmp_original_dgram_length for redirect packet - This is mostly for GUI usage, but a few dissectors needed some "non-packet scope" conversions. + icmp_original_dgram_length was being incorrectly used to clamp tvb size for + ICMP redirect packet. This is a bogus value, use ip header len + 64 bits + instead - val_to_str officially now uses wmem_packet_scope() - - Change-Id: Ic9413eeb3406d7a7683222b86709f3675d628d81 - Reviewed-on: https://code.wireshark.org/review/6933 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> - Reviewed-by: Evan Huus <eapache@gmail.com> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 74547db -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Tue Feb 3 08:45:41 2015 +0100 - - MySQL: Add Server ext caps and Auth Plugin Length to Server Greeting - - Ping-Bug: 10346 - Change-Id: I1b2bd3e9b1dc01118c48c6e159c9a06d4daa061b - Reviewed-on: https://code.wireshark.org/review/6936 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Bug: 10992 + Change-Id: Iebd70d72df34185446a239280bb19c0268977490 + Reviewed-on: https://code.wireshark.org/review/7340 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit c256bbe -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Tue Feb 3 08:32:13 2015 +0100 +commit 23c6a0f +Author: Ebben Aries <exa@fb.com> +Date: Wed Mar 4 19:13:43 2015 -0800 - MySQL: Use proto_tree_add_bitmask(with_flags) + [bmp] Support for decoding of BGP Peer Distinguisher - Merge also mysql_dissect_caps_client and mysql_dissect_caps_server - and rename mysql_dissect_extcaps_client to mysql_dissect_extacps (it will be reused soon) + re-utilize decode_bgp_rd() logic from packet-bgp - Ping-Bug: 10346 - Change-Id: I6543363a337d7bbfddba6dd699697a257a2cbb49 - Reviewed-on: https://code.wireshark.org/review/6935 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I588a58e0b2f7da5d3c9b86b28abb9c5b29e0dc8f + Reviewed-on: https://code.wireshark.org/review/7537 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 18bc353 +commit 3948d82 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Feb 2 09:46:36 2015 +0100 +Date: Tue Mar 3 11:20:56 2015 +0100 - MySQL: Add support of AuthSwitchRequest/AuthSwitchResponse - - Bug: 10351 - - Ping-Bug: 10346 + TX: Update translations (Manual sync 2015-03-05) - Change-Id: I730080a0aef293c3c8119f6c762ee246227bd07a - Reviewed-on: https://code.wireshark.org/review/6915 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I7469fbfa799dae5857c6f0df710438f28d77f43a + Reviewed-on: https://code.wireshark.org/review/7505 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Daniël van Eeden <wireshark@myname.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 66fc81b -Author: cbontje <cbontje@gmail.com> -Date: Mon Feb 2 10:09:58 2015 -0700 - - SEL Protocol Maintenance (1/2) - - - Clean up naming conventions & variables - - 'SEL Protocol' is the entire protocol suite - - 'Fast SER' is a function code of 'Fast Message' sub-type - - 'selfm' will remain the protocol name in Wireshark so no major architecture naming changes are anticipated - - Change-Id: Idc5117dcede0b61c61c0c64d5cd20199535ed471 - Reviewed-on: https://code.wireshark.org/review/6919 + Reviewed-by: Uli Heilmeier <openid@heilmeier.eu> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 9e1ddb5 -Author: Jeff Morriss <jeff.morriss.ws@gmail.com> -Date: Tue Feb 3 21:12:07 2015 -0500 - - Only set HAVE_LUA if we, er, have Lua. - - Change-Id: Idb6f1dfa06c2b4e5d9e1f77743f13b4e0a6d8afe - Reviewed-on: https://code.wireshark.org/review/6942 - Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> - -commit 89e6f4c -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Feb 3 08:39:14 2015 -0800 - - Qt: Add the Protocol Hierarchy statistics dialog. - - Change-Id: I6872e323daca4798c638d764873f54c4c0dc0006 - Reviewed-on: https://code.wireshark.org/review/6934 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 342ba90 -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Feb 3 17:13:49 2015 -0800 - Minor WSDG updates. - - Change-Id: I847af9ef7f18b271a5a2dc8da6c5817735a8c856 - Reviewed-on: https://code.wireshark.org/review/6941 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 4fe8ca0 -Author: Jeff Morriss <jeff.morriss.ws@gmail.com> -Date: Fri Jan 23 07:36:50 2015 -0500 - - Simplify how we find Lua and expand the places we look. - - First, it appears some packagers actually ship a pkg-config file for Lua. - Try to use it. (Unfortunately the package name varies so we have to try - several package names.) - - If that fails, try to find Lua directly, accounting for the various naming - conventions we've seen. - - Bug: 10475 - Bug: 10572 - Change-Id: I82e789c466a488dc12431cdd90c49b4c1052414a - Reviewed-on: https://code.wireshark.org/review/6756 - Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> - -commit 0e74e8b -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Feb 3 16:25:01 2015 -0800 - - Decorate declarations with G_GNUC_PRINTF() as appropriate. - - Decorate val_to_qstring() and val_ext_to_qstring() similarly to - val_to_str_wmem(); this squelches some compiler warnings. - - Change-Id: I86e102e7c0a1a135be9492b7d605001c5d922031 - Reviewed-on: https://code.wireshark.org/review/6940 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit deabe64 -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Feb 3 16:02:52 2015 -0800 +commit fe578d6 +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Sun Feb 22 20:13:00 2015 +0100 - Don't build app_bundle by default. + Readme.qt: Add information about Transifex ! - As it turns out, building the app bundle makes wireshark-gtk unusable. - - Change-Id: Ic3608f0a485c3ec4ea21fbc2e7194553eda8c806 - Reviewed-on: https://code.wireshark.org/review/6938 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I22780721dcc32caee0eae782142e7dad31e0ed07 + Reviewed-on: https://code.wireshark.org/review/7313 + Reviewed-by: Michael Mann <mmann78@netscape.net> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit b8f040c -Author: Dario Lombardo <lomato@gmail.com> -Date: Mon Feb 2 10:37:17 2015 +0100 +commit 120ee7f +Author: Michal Labedzki <michal.labedzki@tieto.com> +Date: Thu Mar 5 11:05:07 2015 +0100 - Dumpcap: avoid collecting stats on nf* interfaces. + Logcat: Fix typo - On Linux nf* interfaces don't collect stats properly and don't allows multiple connections. + Fix funny "...replace all new characters by spaces" to + "replace all new line characters by spaces" - Change-Id: I69d8f343017d77bda313de7d2c501fab542f2e9b - Bug: 10886 - Reviewed-on: https://code.wireshark.org/review/6796 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I8322ccd9f01220d300a0ba2982b2a61252b51242 + Reviewed-on: https://code.wireshark.org/review/7540 + Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> -commit 9b22a2f +commit 9848b22 Author: Dario Lombardo <lomato@gmail.com> -Date: Thu Jan 8 09:44:15 2015 +0100 +Date: Tue Mar 3 14:39:00 2015 +0100 - Updates in it translation. - - This fixes also the "duplicate messages" error. + rtps: added magic - Change-Id: Iec93d82d4776c4f9805c5bfa2b2453c22b0e24e8 - Reviewed-on: https://code.wireshark.org/review/6929 - Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> + Change-Id: I52861b6893abf36b304ea58a12c7987e0f7bc5ba + Reviewed-on: https://code.wireshark.org/review/7512 + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 33bdb21c -Author: Bill Meier <wmeier@newsguy.com> -Date: Tue Feb 3 11:58:28 2015 -0500 - - xtp: Don't call col_...() under 'if (tree)' - - Change-Id: Ie80476e919b5ba0a2e5f036c654a5379b91ddd32 - Reviewed-on: https://code.wireshark.org/review/6931 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit a2eec54 -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Feb 3 08:56:42 2015 -0800 - - BT ATT: Fix what appears to be a value string mismatch. - - Change-Id: I440ed41c659bed9dcee43d8388ad780015971611 - Reviewed-on: https://code.wireshark.org/review/6930 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit b635997 -Author: Michael Mann <mmann78@netscape.net> -Date: Mon Feb 2 19:58:29 2015 -0500 - - Convert val_to_str_ext -> val_to_str_ext_wmem for calls that don't have valid packet scope (GUI). - val_to_str_ext now officially uses wmem_packet_scope(). - - Removed const from val_to_str[_ext]_wmem return value since it's not really constant. - - Created utility functions in qt_ui_utils.h to help with the new memory management for its GUI. - - Change-Id: Idf2ce4a4ce78d628b2269ad23a3a48fbfc9c077c - Reviewed-on: https://code.wireshark.org/review/6926 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit e942973 -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Wed Jan 28 17:14:48 2015 +0100 +commit aa9497b +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Wed Mar 4 14:31:55 2015 +0100 - Bluetooth/USB HID: Move boot form of reports from bthid to usbhid + USB: add support for alternate setting selection - Then call it as new dissectors from bthid and btatt. - In future they will be used in usbhid, because they are part of HID. + With this, the traffic of a device implementing both NCM and MBIM protocols is properly identified as MBIM when selected by the host - Change-Id: I9cb545f3079c27945b17bf8791ba4e3736c29e7c - Reviewed-on: https://code.wireshark.org/review/6912 - Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> + Bug: 11018 + Change-Id: I438ab1917945d9c5ba13329d515abc7e2cd13896 + Reviewed-on: https://code.wireshark.org/review/7519 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - -commit 8417fbf -Author: Guy Harris <guy@alum.mit.edu> -Date: Mon Feb 2 23:51:36 2015 -0800 - - Initialize the entire UUID. - - Squelches a compiler warning. - - Change-Id: I050710dd296f7fe7d315f881b0edf43699d2fa91 - Reviewed-on: https://code.wireshark.org/review/6928 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit ca3fe28 -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Wed Jan 7 12:16:15 2015 +0100 +commit 9312c2d +Author: Dario Lombardo <lomato@gmail.com> +Date: Wed Mar 4 10:27:52 2015 +0100 - Bluetooth: ATT: Dissect almost all attributes + bthci-evt: added reserved - Change-Id: Ia388c07150d9664327daf2d1990b4465b5f4ae28 - Reviewed-on: https://code.wireshark.org/review/6910 + Change-Id: I66b93fa35d14b4674fcd897dfb2b1f8810642977 + Reviewed-on: https://code.wireshark.org/review/7517 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> -commit 60b9be9 -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Tue Jan 6 18:42:38 2015 +0100 - - Bluetooth: ATT: Dissect Read Multiple Response - - Change-Id: Ifcbde05389901bd66355e42540f3850bfd55def5 - Reviewed-on: https://code.wireshark.org/review/6909 - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - -commit db068ff -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Tue Jan 6 14:06:18 2015 +0100 - - Bluetooth: ATT: Decode some HOGP attributes - - Change-Id: I169f767b699a2f95e5a1553f1380f0b88cd7c67d - Reviewed-on: https://code.wireshark.org/review/6908 - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - -commit 73579dd -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Mon Jan 5 13:36:45 2015 +0100 - - Bluetooth: ATT: Dissection stage 3: Assign UUID to Handle - - Add possibility to dissect attributes by UUID assigned to handle. - - Change-Id: I0e510bf902492f87e0eaee339d82609c37e12741 - Reviewed-on: https://code.wireshark.org/review/6905 - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - -commit 8ba3d6f -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Wed Dec 31 10:52:28 2014 +0100 - - Bluetooth: ATT: Dissect GATT level - - ATT dissector is now able to decode GATT level fields. - This is results of added request-response tracking/share information. - - Change-Id: I41ac622a38916a7a20f625fa30ac72d7812446c6 - Reviewed-on: https://code.wireshark.org/review/6904 - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - -commit 33f1256 -Author: Jeff Morriss <jeff.morriss.ws@gmail.com> -Date: Mon Feb 2 21:28:01 2015 -0500 - - Fix nameless application in NokiaSolutionsAndNetworks.xml (from - I4cd9bd7f7219e4d9ff1bb8a71fab32439a8a9a35). - - (The nameless application was causing known applications to be reported as - unknown.) - - Add code to the Diameter dissector to report such problems at startup (similar - code exists for other entities). - - Tweak the parser debug slightly. - - Change-Id: I6b28cda8660e6eb96648c7b3697d7fd85151ac96 - Reviewed-on: https://code.wireshark.org/review/6927 - Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 00f7bc4 -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Feb 2 16:22:31 2015 -0800 - - Qt: Fix IO Graph capture file closing. - - Make sure our IOGraphs remove their respective tap listeners before the - capture file closes, otherwise the graph data ends up getting cleared - via reset_tap_listeners. - - Bug: 10871 - Change-Id: I0ef2af2dc84be1921a930df8bb68f63626aa874a - Reviewed-on: https://code.wireshark.org/review/6925 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 9d7f5c7 +commit 51c3d27 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Feb 2 22:28:59 2015 +0100 +Date: Mon Feb 16 09:30:17 2015 +0100 - ISIS: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + Add Transifex Configuration - Change-Id: I58debb32cc7a4aa476961eda342f1cd90884c800 - Reviewed-on: https://code.wireshark.org/review/6921 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 383caa7 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Feb 2 22:28:25 2015 +0100 - - AMQP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - Change-Id: Ie55dd06b6c4d6f77012e8e13079279ded2997907 - Reviewed-on: https://code.wireshark.org/review/6920 + Change-Id: I7fa4593b086d285553eaa4334303dab019446a76 + Reviewed-on: https://code.wireshark.org/review/7156 + Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> + Reviewed-by: Gerald Combs <gerald@wireshark.org> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit ec618b5 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sun Feb 1 20:13:13 2015 +0100 +commit e2bf218 +Author: Luke Mewburn <luke@mewburn.net> +Date: Thu Mar 5 09:30:28 2015 +1100 - HTTP2: Fix offset for heuristic + Add SCCP SSN 0xf8 for CSS (MAP) - With >= draft-14, length is encoded in 3 octets (2 octets before) + 3GPP TS 23.003 11.9.0 adds subsystem number 0b 1111 1000 (0xF8) for CSS (MAP). - Bug: 10908 - Change-Id: I061570186206548fafcc39a8df0ba6bafe8576a0 - Reviewed-on: https://code.wireshark.org/review/6883 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: Iaa2b97f14f4f3c732aeff05419c0300c3a1fb121 + Reviewed-on: https://code.wireshark.org/review/7533 Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 71fd34d +commit ce3ec6a Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Feb 2 14:32:28 2015 -0800 +Date: Wed Mar 4 18:08:35 2015 -0800 - WSUG: Chocolatey updates. - - Move PowerShell and Chocolatey to the top of the quick setup since most - of the instructions now have a "Chocolatey" example. - - Use "choco install" instead of "cinst" to match the pages at - chocolatey.org/packages. + Qt: Redraw the packet list when a column is resized. - Show how to install Cygwin and Python using Chocolatey. + ...otherwise the packet list and header columns don't match until + the next redraw. - MAC = Media Access Control (among other things). Mac = Macintosh. - - Change-Id: Ic6aabacdd3a86b4e8ca556cc6f3daa62c3e5986b - Reviewed-on: https://code.wireshark.org/review/6924 + Change-Id: Ice9c17c93badec93839be7c100ca27d8dc493daa + Reviewed-on: https://code.wireshark.org/review/7536 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 37a2cd0 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Feb 2 22:58:41 2015 +0100 - - AMQP: fix declaration of 'index' shadows a global declaration - - St*** Mac OS X buildbot... - - Part 2 (Oups...) - - Change-Id: I082d73d4581365d7152aca764e4dfe599ce12c64 - Reviewed-on: https://code.wireshark.org/review/6923 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit 0b2c8b0 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Feb 2 22:46:08 2015 +0100 - - AMQP: fix declaration of 'index' shadows a global declaration - - St*** Mac OS X buildbot... - - Change-Id: I5efff34ce818f52fb6414191c58b5cabb388ba26 - Reviewed-on: https://code.wireshark.org/review/6922 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit c96b3ac -Author: Petr Gotthard <petr.gotthard@centrum.cz> -Date: Sat Jan 31 16:52:51 2015 +0100 +commit 0a4f93a +Author: Gerald Combs <gerald@wireshark.org> +Date: Wed Mar 4 08:12:58 2015 -0800 - AMQP 0-9-1: Fix dissection of field types. + Qt: Show the full file path in the status bar. - This patch resolves review comments I received from the AMQP 0-9-1 community. - Some field types were not implemented, other field types (introduced by my - earlier patch) were incorrectly parsed. - https://groups.google.com/forum/#!topic/rabbitmq-users/PR7P1bgonwo + Add file_size_to_qstring and use it to show the file size. Add a + "shrinkable" property to LabelStack. Make the info status shrinkable. + Elide text so that long file paths don't widen the main window. - I had to split the dissect_amqp_0_9_field_table() function into two parts - and put the field value dissectors in a separate function: - dissect_amqp_0_9_field_value(). - - Change-Id: I9aa7d73e426a790830ad260ca6892a7650791e6c - Reviewed-on: https://code.wireshark.org/review/6882 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: Ieb1caaf7e016384609d41fcabaa63d8f7a293eff + Bug: 10949 + Reviewed-on: https://code.wireshark.org/review/7534 + Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit 9f4bf6a -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Mon Feb 2 16:02:59 2015 +0100 - - LTE RRC: only display band mapping for the initial supportedBandListEUTRA IE - - Handling bands > 64 would require to store the mapping in file scope and current code is broken for the Carrier Aggregation band combination list - - Change-Id: I9f10022a50520ca9bc16a33f2c16361729f1b01b - Reviewed-on: https://code.wireshark.org/review/6917 - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit e102c34 -Author: Graham Bloice <graham.bloice@trihedral.com> -Date: Mon Feb 2 16:11:40 2015 +0000 +commit 9df502a +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Wed Mar 4 14:21:28 2015 -0500 - Minor doc changes for Windows build + Note that the Lua tests don't work in cmake. - Further removal of older style build environment. + (Also point out that we really want cross-compilation to work since people + do use it--with autotools.) - Change-Id: I499ba50f55620ad627de3dc4316051985d00a7f5 - Reviewed-on: https://code.wireshark.org/review/6918 + Change-Id: I0570e0d3e4063c53699233e950687d86aa34b651 + Reviewed-on: https://code.wireshark.org/review/7528 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> -commit 6db0a35 -Author: Michael Mann <mmann78@netscape.net> -Date: Sat Jan 31 08:06:05 2015 -0500 - - Create wmem versions of val_to_str and val_to_str_ext - - These will be used to replace cases where packet-scope isn't valid for val_to_str/val_to_str_ext calls - - Change-Id: Ie8a4c423a8608548c837c1ae7edde52c4d728340 - Reviewed-on: https://code.wireshark.org/review/6880 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit bdaef53 -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Mon Feb 2 13:37:50 2015 +0100 - - Try to fix builbot OSX 10.5 buildbot false-positive - - Change-Id: If62eba937326ac5119bde97d9a827e165825b377 - Reviewed-on: https://code.wireshark.org/review/6914 - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - -commit 003e337 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Feb 2 09:57:23 2015 +0100 +commit fb03d49 +Author: Gerald Combs <gerald@wireshark.org> +Date: Wed Mar 4 12:32:25 2015 -0800 - Fix some indent typo (after g2bf7878e) + Add CMake SOVERSIONs to make-version.pl. - Change-Id: I44769f127f32ffd8a97b1579f371501f4aa9832a - Reviewed-on: https://code.wireshark.org/review/6913 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: Ifd011288ca23263738ca50842d59a23cc25e7952 + Reviewed-on: https://code.wireshark.org/review/7532 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 6521771 -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Sun Jan 18 10:44:04 2015 +0100 +commit afc8589 +Author: Gerald Combs <gerald@wireshark.org> +Date: Wed Mar 4 12:20:56 2015 -0800 - Bluetooth: Simplify to "UnknownDirection" in Info column when direction is unknown + Add some items to the release notes. - Change-Id: Ibad679c0b6c95d65389ce087f65b8f31cf3acd68 - Reviewed-on: https://code.wireshark.org/review/6903 - Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> + Change-Id: I57e8bef7ff9370f4f1d1515d2a82dd65936ba259 + Reviewed-on: https://code.wireshark.org/review/7531 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 1786cfe +commit e4b8e9f Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Mon Jan 19 14:27:29 2015 +0100 +Date: Sun Mar 1 18:08:20 2015 +0100 - Bluetooth: Advertising Data: Fix Service Data entry + Logcat: Add preference for oneline info column - Service Data entry is defined as UUID (16, 32 or 128) and - rest of payload is specific service data. + In fact user may want to disable oneline info column what + changes view to multiple lines of log then increases readability. - Bug: 10859 - Change-Id: Ibaee075a66a144dfc52ed70614677c73a88d6a2c - Reviewed-on: https://code.wireshark.org/review/6902 + Change-Id: I8aeb1af10abfe8cd56e441d4ebf17cd1526efc89 + Reviewed-on: https://code.wireshark.org/review/7524 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> -commit 578c2be -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Sun Jan 11 11:34:17 2015 +0100 - - Bluetooth: btle_rf: Use proto_tree_add_bitmask - - Change-Id: I79143cb788a13bd67ce2bd515b2b90d427dbcfcb - Reviewed-on: https://code.wireshark.org/review/6901 - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - -commit ef6f6f0 -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Thu Jan 22 09:54:30 2015 +0100 - - Bluetooth: AVCTP: Improve IPID handling - - If profile is invalid (IPID=1) then add expert info. - - Change-Id: Id102e51eefe7e5e6314c3677468cb66573e5a893 - Reviewed-on: https://code.wireshark.org/review/6900 - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - -commit c4f08ec -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Sat Jan 17 15:07:47 2015 +0100 - - Bluetooth: HCI Vendor: Fix for "Enable WBS" command - - Codec value for mSBC is 0x02 (not 0x01), also "Codec" field - does not appear when Codec state in Disable. - - Change-Id: I4f0b27d0dc8659fdc054eaf18b54a42aad60275b - Reviewed-on: https://code.wireshark.org/review/6899 - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - -commit 359ff31 +commit 23b07cb Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Mon Dec 29 11:07:22 2014 +0100 +Date: Wed Mar 4 16:11:50 2015 +0100 - Bluetooth: HCI: Improve detecting of undecoded and unknown commands - - Undecoded command - command does exist in specification, - but not fully implemented in Wireshark yet - Unknown command - command does not exist in specification or - it is quite new and opcode number is not added yet - Unexpected parameter - is now working correctly that means if - there is known command but too many parameters - so user should know about this issue + Set packet encapsulation for HCIDUMP captures - Change-Id: If3ee24f617f7e6683049558f7a6d68e346e7c92f - Reviewed-on: https://code.wireshark.org/review/6898 + Change-Id: I2a523694a38b6fe296b6dbceb5a00e4202364e99 + Reviewed-on: https://code.wireshark.org/review/7523 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> -commit 2cae320 -Author: Gerald Combs <gerald@zing.org> -Date: Sun Feb 1 13:56:39 2015 -0800 - - CMake: Build a complete application bundle on OS X. - - Run osx-app.sh by default on OS X. Aside from giving us a fully portable - application bundle after building this should let us clear our library - path at startup should the need arise. Change the name of the osx-app - target to app_bundle. - - Search ../Frameworks before ../lib. Create PkgInfo at configure time - instead of compile time. Build our program list as we go. - - Change-Id: If5511ee921108b1c079cef67026eac9e47211be1 - Reviewed-on: https://code.wireshark.org/review/6896 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 3947091 -Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Feb 1 12:57:30 2015 -0800 - - Fix a typo. - - Change-Id: I2724340e41572fdaa56ebf75478297090563c522 - Reviewed-on: https://code.wireshark.org/review/6895 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 17b228b -Author: Bill Meier <wmeier@newsguy.com> -Date: Sun Feb 1 12:47:13 2015 -0500 - - dlm3: col_...() shouldn't be called under 'if (tree)' - - Change-Id: I577dbfacf13854c74a430d7abec20faca3f0985b - Reviewed-on: https://code.wireshark.org/review/6891 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit 50e8415 -Author: Bill Meier <wmeier@newsguy.com> -Date: Sun Feb 1 12:32:08 2015 -0500 - - rip: Fix "Dissector Bug": register 5 missing hfi_... fields - - [ Bug Introduced in gf8e24c9 ] - - Change-Id: I99207334e33b30bf622bbed366c2222113108230 - Reviewed-on: https://code.wireshark.org/review/6890 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit 351e7d5 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Feb 1 08:06:45 2015 -0800 - - [Automatic manuf, services and enterprise-numbers update for 2015-02-01] - - Change-Id: Iead3755cfba6c39c5da6398e356515337f2ecdd4 - Reviewed-on: https://code.wireshark.org/review/6887 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 70912c8 -Author: Graham Bloice <graham.bloice@trihedral.com> -Date: Sun Feb 1 11:07:57 2015 +0000 - - Minor doc update for Wwindows build - - Added comment about VS2013 being the preferred option. - Added instructions for Win32.Mak. - - Change-Id: Ic2cca5123c471d9a806d0f4a387f82ad30ace9f6 - Reviewed-on: https://code.wireshark.org/review/6886 - Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> - -commit ff16cfe -Author: Graham Bloice <graham.bloice@trihedral.com> -Date: Sun Feb 1 10:52:22 2015 +0000 - - Added nsis generated files to .gitignore - - Change-Id: Id2f1ff7ca5094a785274c41eca0c1f878a427f90 - Reviewed-on: https://code.wireshark.org/review/6885 - Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> - -commit a300227 -Author: Petr Gotthard <petr.gotthard@centrum.cz> -Date: Fri Jan 30 16:18:48 2015 +0100 - - AMQP 0-9-1: Add missing methods connection.block and connection.unblock. - - Change-Id: I11b32b876ec0f43b1faa2ab40ab66e7f18d981c2 - Reviewed-on: https://code.wireshark.org/review/6857 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit df468f5 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Jan 31 17:02:30 2015 +0100 - - jsmn: check superior token node value before using it - - Other uses are already checked but it looks like those ones were missing - - Bug: 10907 - Change-Id: I35c160657faba4371fedb96ab822bcd4fffa7dd8 - Reviewed-on: https://code.wireshark.org/review/6881 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Evan Huus <eapache@gmail.com> - -commit dc6482b -Author: Michael Mann <mmann78@netscape.net> -Date: Sat Jan 31 07:55:10 2015 -0500 - - Convert the value string APIs that only currently have packet-scope use to wmem. - - Change-Id: I36942493ce73b49e7257edea967eddf22f21f58e - Reviewed-on: https://code.wireshark.org/review/6879 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 6284040 -Author: Peter Wu <peter@lekensteyn.nl> -Date: Sat Jan 31 02:26:57 2015 +0100 - - README.dissector: fixed p_add_proto_data params - - frame_data has long been gone. struct _packet_info is the same as - packet_info, just use that for brevity. - - Change-Id: Ieb02bf6b642d728a7f80087f5cd750b9691e34e9 - Reviewed-on: https://code.wireshark.org/review/6865 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit c7717ae -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Jan 30 20:13:31 2015 -0800 - - Get rid of a trailing blank. - - Change-Id: I27e3ba1be4a9ee23d619d751ae1abdef963b7597 - Reviewed-on: https://code.wireshark.org/review/6871 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 4424d6a -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Jan 30 20:12:10 2015 -0800 - - Fix a comment to reflect reality. - - Change-Id: I90fce5376ca17648840c473afac7f9e962c14667 - Reviewed-on: https://code.wireshark.org/review/6870 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 90233ff -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Jan 30 20:06:49 2015 -0800 - - We need to get the pathname of the executable *before* running dumpcap. - - In order to find dumpcap, we need to get the pathname of the executable - image, and we support -D in the first argument parsing loop, and that - runs dumpcap to get the interface list, so we need to get the pathname - of the executable image before that. - - Change-Id: If789cf1ff4f5cf5d5c3b171a3d4eb90a6e2faf1d - Reviewed-on: https://code.wireshark.org/review/6869 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit cca2cde -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Jan 30 20:03:01 2015 -0800 - - No main window *to* update in the early argument list parsing. - - We haven't yet popped the main window up, so, when we call - capture_interface_list(), we shouldn't pass a pointer to the "update the - main window" routine. - - Change-Id: Id3e02199479e66bb9e9aff99b435bd03af45a1af - Reviewed-on: https://code.wireshark.org/review/6868 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit ee9d0f9 -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Jan 30 18:12:51 2015 -0800 - - This being C++, maybe we don't have to initialize ws_app until later. - - Try going back to haveing ws_app be an automatic variable, but don't - declare it until after we've done the first-pass argument parsing. - - Change-Id: Ia1f2a4819570bfadcba75d498e01dbe64991843c - Reviewed-on: https://code.wireshark.org/review/6867 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit a984dbf -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Jan 30 18:04:26 2015 -0800 - - Do the first-pass argument parsing before creating the WiresharkApplication. - - That way, *all* the don't-need-a-GUI options can be processed without - trying to pop up a GUI, just as is the case with the GTK+ version. - - Change-Id: Icbe47642eec45e887087f46c366322b8f23206cc - Reviewed-on: https://code.wireshark.org/review/6866 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit e76e140 -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Jan 30 23:34:18 2015 +0000 - - Qt: Fix library path reset. - - g9a3676a reset the Qt library path *after* wsApp was instantiated, which - is too late. Do so before QCoreApplication has a chance to do anything - we might regret. - - Change-Id: Ibbdb69d1b7c0ea4bf1042e98a5bb5deba13e954e - Reviewed-on: https://code.wireshark.org/review/6864 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 9a3676a -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Jan 30 11:36:10 2015 -0800 - - Qt: Clear our library path at startup on Windows. - - I recently rebuilt my Windows development VM and discovered that I could - no longer run Wireshark executables from wireshark.org. Trying to do so - failed with the following error: - - ---- - This application failed to start because it could not find or load the - Qt platform plugin "windows". - - Available platform plugins are: minimal, offscreen, windows, windows. - - Reinstalling the application may fix this problem. - ---- - - As it turns out there are two issues. According to - http://doc.qt.io/qt-5/windows-deployment.html The search path - for Qt plugins is hard-coded into the QtCore library. Dependency - Walker confirmed this, showing that Qt5Core.dll tried to load - C:\Qt\5.3\msvc2013_64_opengl\plugins\platforms\qwindows.dll instead of - C:\Program Files\Wireshark\platforms\qwindows.dll. - - The second issue is that the Qt online installer only uses the major - and minor version, e.g. C:\Qt\5.3. This means that you can end up with - Qt 5.3.0, .1, .2, or .3 depending on *when* you run the installer. - - The Windows builders have 5.3.1 installed while my development VM - has 5.3.2. Apparently qwindows.dll is not compatible between these two - versions, hence the startup error. (...so what happens if you can create - a malicious qwindows.dll which *is* compatible on someone's machine?) - - This change removes any entries from QCoreApplication::libraryPaths that - don't match our executable path. This shouldn't be an issue in our case - because both the NMake+QMake and CMake environments run windeployqt to - copy in any required DLLs. - - If it *is* an issue or if clearing the library path list causes other - problems I can reinstall Qt on the Windows builders into a unique and - obvious path, e.g. C:\Qt-check-your-path-before-you-wreck-your-path\5.3 - - Change-Id: I1918bc4e520aba32cfcf9f4ccd37bf9255058cbe - Reviewed-on: https://code.wireshark.org/review/6863 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit f61c969 -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Jan 30 10:54:12 2015 -0800 - - NMake: Add Chocolatey paths. - - Change-Id: I8ea53475a64052e945709a1f5878aa23eee65c74 - Reviewed-on: https://code.wireshark.org/review/6859 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit eda485e -Author: Bill Meier <wmeier@newsguy.com> -Date: Fri Jan 30 13:49:59 2015 -0500 - - Cleanup: - - Including: - tvb_length...() ==> tvb_reported_length...() - Remove some dead initializers; - Localize some variables; - Whitespace. - - Change-Id: Ide9490f248d558bb7e3af96a1fc17d8f911de4ef - Reviewed-on: https://code.wireshark.org/review/6862 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit 7b929e2 -Author: Bill Meier <wmeier@newsguy.com> -Date: Fri Jan 30 13:48:32 2015 -0500 +commit d63df87 +Author: Joerg Mayer <jmayer@loplof.de> +Date: Wed Mar 4 16:32:13 2015 +0100 - rtp: cleanup + Print the content of an unknown message type as hex. May help reverse + engineering type 11 (dec) messages. - - Remove dead initializers; - - Localize some vars; - - Whitespace - - Change-Id: Ie98667de736f2928ce1a2e4986917e4b0457866f - Reviewed-on: https://code.wireshark.org/review/6861 - Reviewed-by: Bill Meier <wmeier@newsguy.com> + Change-Id: I41df5f1cd433b04e9067228a2a7487b90f7e5bd1 + Reviewed-on: https://code.wireshark.org/review/7522 + Reviewed-by: Jörg Mayer <jmayer@loplof.de> -commit 1ec66f0 -Author: Bill Meier <wmeier@newsguy.com> -Date: Fri Jan 30 13:14:36 2015 -0500 +commit efd53ad +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Tue Feb 17 19:32:38 2015 +0100 - rtps: Cleanup + Fuzz test : Add -a(SAN) option to disable ulimit when fuzzing - - Remove dead initializers; - - Localize some variables; - - Whitespace. + from https://code.google.com/p/address-sanitizer/wiki/AddressSanitizer#ulimit_-v + The ulimit -v command makes little sense with ASan-ified binaries because ASan consumes 20 terabytes of virtual memory (plus a bit). - Change-Id: I876dfd88b2c3fe6a8056090f508c868f4a3cf653 - Reviewed-on: https://code.wireshark.org/review/6860 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit cc66f68 -Author: Evan Huus <eapache@gmail.com> -Date: Fri Jan 30 12:02:47 2015 -0500 - - kafka: fill in some expert info - - Change-Id: I94e655fc56fd1534d57f6917d9e5f4189e08838a - Reviewed-on: https://code.wireshark.org/review/6858 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Change-Id: I8c8c77dd51d5440fb2f9bd95f90873e59a64d409 + Reviewed-on: https://code.wireshark.org/review/7204 + Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Evan Huus <eapache@gmail.com> -commit 5e3936e +commit 763b6d3 Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Thu Jan 29 21:20:48 2015 +0100 +Date: Mon Mar 2 22:51:38 2015 +0100 - BSSGP: ensure that all Optional / Conditional Information Elements are treated as such + Added JSMN_STRICT that allow a more precise json parsing. - Bug: 10903 - Change-Id: I8f6b970a6988fd4e700203304586c8e53dd5696b - Reviewed-on: https://code.wireshark.org/review/6845 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 14a869c -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Fri Jan 30 00:02:20 2015 +0100 - - GSM MAP: display TBCD digits, USSD string and Location Number digits in a subtree - - Bug: 10900 - Change-Id: I01277633a1314e68363ef433f3b99b4138657330 - Reviewed-on: https://code.wireshark.org/review/6850 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit a614212 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Thu Jan 29 23:06:37 2015 +0100 - - SDP: add ability to display port as a string - - Bug: 10898 - Change-Id: Ib1b5698c85cd568b8874b44690cafe391eea28f3 - Reviewed-on: https://code.wireshark.org/review/6849 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Bug: 10977 + Change-Id: I725c10d895fdec4530d0761db3ac2659171f2f03 + Reviewed-on: https://code.wireshark.org/review/7249 + Reviewed-by: Peter Wu <peter@lekensteyn.nl> + Tested-by: Peter Wu <peter@lekensteyn.nl> -commit 78755c7 -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Thu Jan 29 18:55:15 2015 -0500 +commit d2720ec +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Tue Mar 3 13:16:52 2015 +0100 - Disable SSE4.2 _ws_mempbrk_sse42 only for older Apple compilers + Address types: fix no previous prototype for ... [-Wmissing-prototypes] - This is a longer term fix to disable _ws_mempbrk_sse42 in older - Apple compilers, which the buildbots currently use. This fix - is the longer-term fix for the temprorary one introduced in - g9a366b04/I2e438ff29. + address_types.c:230:14: warning: no previous prototype for 'ipv4_name_res_str' [-Wmissing-prototypes] + address_types.c:237:5: warning: no previous prototype for 'ipv4_name_res_len' [-Wmissing-prototypes] + address_types.c:386:14: warning: no previous prototype for 'ipv6_name_res_str' [-Wmissing-prototypes] + address_types.c:393:5: warning: no previous prototype for 'ipv6_name_res_len' [-Wmissing-prototypes] + address_types.c:509:14: warning: no previous prototype for 'fcwwn_name_res_str' [-Wmissing-prototypes] + address_types.c:538:5: warning: no previous prototype for 'fcwwn_name_res_len' [-Wmissing-prototypes] - Bug: 10798 - Change-Id: I051ca003610c07f7d75cc19b20ff823fe4c1ce05 - Reviewed-on: https://code.wireshark.org/review/6851 - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Change-Id: I6cf44b887d9e35fb76bd1840444074c9102b4d2b + Reviewed-on: https://code.wireshark.org/review/7508 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Michael Mann <mmann78@netscape.net> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 2bf7878 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Jan 14 17:25:56 2015 -0800 +commit a308aef +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Sat Feb 28 22:20:07 2015 -0500 - Qt: Add the RTP Streams dialog. - - Add keyboard shortcuts. Note that not all of the buttons made it from - GTK+. Add a "Go to setup frame" option. - - Move rtp_streams.c from ui/gtk to ui. + Look for and use gethostbyname() if we don't have getaddrinfo(). Fail to + configure if we can't find any name resolver (autotools only). - Add a help URL for RTP analysis (which needs to be split into streams + - analysis). + This puts back the gethostbyname()/gethostbyname2() code removed in + I3348179626e97daaddfbc89e3ed21e39915e3de4 and + If59ce8a038776eadd6cd1794ed0e2dad8bf8a22c but as a last-resort option (only + if we don't have a better or more modern name resolver). - Fix RTP stream packet marking. + As suggested/requested by Guy in https://code.wireshark.org/review/#/c/7423/ - Change-Id: Ifb8192ff701a933422509233d76461a46e459f4f - Reviewed-on: https://code.wireshark.org/review/6852 - Petri-Dish: Gerald Combs <gerald@wireshark.org> + Change-Id: I706dbbd65135f47c67d3d8d88a61ad7273914c47 + Reviewed-on: https://code.wireshark.org/review/7447 + Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> -commit 6824cee +commit 9070656 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Jan 29 12:09:34 2015 +0100 +Date: Tue Mar 3 13:13:29 2015 +0100 - CAPWAP: Add support of Cisco Vendor Specific Element + SSTP: fix no previous prototype for proto_register_sstp/proto_reg_handoff_sstp [-Wmissing-prototypes] - Change-Id: I62886bda3220d9aa3a5b3aee8b40063a8bb7745d - Reviewed-on: https://code.wireshark.org/review/6843 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit fd1bc6d -Author: Dario Lombardo <lomato@gmail.com> -Date: Thu Jan 29 10:22:17 2015 +0100 - - HCRT: udp port preference changed into range. - - Change-Id: I6201bec1c3226181d2e5df8f3bf47471136b0ef5 - Reviewed-on: https://code.wireshark.org/review/6839 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I65c6cf59ec9e7eb64a665ea3b253db5200d19f4b + Reviewed-on: https://code.wireshark.org/review/7507 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit aaa3d23 -Author: Dario Lombardo <lomato@gmail.com> -Date: Thu Jan 29 13:24:54 2015 +0100 - - When issued with -v wireshark-qt prints version and exits. - - Change-Id: I3993c502156d534f17baa409729e2dc763910ac8 - Bug: 10789 - Reviewed-on: https://code.wireshark.org/review/6840 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 67b069e -Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Jan 29 13:55:18 2015 -0800 - - Qt: Add address conversion convenience routines - - Add address_to_qstring and address_to_display_qstring, which wrap - address_to_string and address_to_display respectively and return - QStrings. Convert most of the instances in ui/qt to the new routines. - - Fix a some memory leaks in the process. - - Change-Id: Icda80bbfe0b2df723d54c8da84355255f819af89 - Reviewed-on: https://code.wireshark.org/review/6848 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> -commit 2edf8bb +commit 2780a30 Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Thu Jan 29 13:55:00 2015 +0100 +Date: Tue Mar 3 14:26:13 2015 +0100 - SDP: check that media format starts with a digit before trying to identify media type + GSM MAP: do not use a global variable to store OID - Bug: 10899 - Change-Id: I92319a668ae795247d4021f32d629f5000ceb395 - Reviewed-on: https://code.wireshark.org/review/6841 + Fixes an ASAN failure reported by Alexis + + Change-Id: I63b07ec4b6eb0698c4abf27f8fb0b1f11a19396d + Reviewed-on: https://code.wireshark.org/review/7510 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 0ba51cc -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Jan 17 16:11:06 2015 +0100 +commit 8933cbb +Author: Graham Bloice <graham.bloice@trihedral.com> +Date: Tue Mar 3 13:30:49 2015 +0000 - IS-IS: Add subTLV Bandwidth Constraints (22) used by IS Reachability + HTTP: Fix small typo in a field description - Change-Id: I7e1d29270aede25268bb75a2b5fc9448dbc1cc9b - Reviewed-on: https://code.wireshark.org/review/6585 + Change-Id: I31a676f5e514b32f891496230eb70cac571730f9 + Reviewed-on: https://code.wireshark.org/review/7511 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 9a366b0 -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Thu Jan 29 13:06:03 2015 -0500 +commit 4e32899 +Author: Petr Gotthard <petr.gotthard@centrum.cz> +Date: Mon Feb 9 17:18:15 2015 +0100 - Disable SSE4.2 _ws_mempbrk_sse42 due to bug 10798 + AMQP: Introduce support for AMQP over TLS/SSL (AMQPS). - This is a (possibly) temporary change to master to - disable _ws_mempbrk_sse42 to see if that fixes bug - 10798. + Modified dissect_amqp to the new-style dissector. + Added amqp.ssl.port to protocol preferences. + Registered the AMQP dissector with SSL. - Ping-Bug: 10798 - Change-Id: I2e438ff299f55709c66a37634d2a7e799c513ac9 - Reviewed-on: https://code.wireshark.org/review/6844 - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> - Reviewed-by: Evan Huus <eapache@gmail.com> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - Tested-by: Hadriel Kaplan <hadrielk@yahoo.com> - -commit 0137f92 -Author: Evan Huus <eapache@gmail.com> -Date: Thu Jan 29 10:01:38 2015 -0500 - - addr_resolv: correctly scope returned memory + Fixed an error in dissect_amqp that appeared when the first segment was smaller + than the minimum header size required to determine the protocol version (8b). - *_port_to_display functions take an allocator scope, so the memory they return - must be allocated from that scope, which means we must strdup the result of - serv_name_lookup. + ...plus enhanced the AMQP 0-9-1 to display also the protocol id, + so the packets list shows "0-9-1" instead "9-1". - Bug: 10901 - Change-Id: I337c8b6f9dfece966964c09023679b3e24648e48 - Reviewed-on: https://code.wireshark.org/review/6842 + Change-Id: Ia44e0791b6ee78ad594de342c4f2401bad9beb4e + Reviewed-on: https://code.wireshark.org/review/7044 Reviewed-by: Michael Mann <mmann78@netscape.net> - Reviewed-by: Evan Huus <eapache@gmail.com> + Reviewed-by: Petr Gotthard <petr.gotthard@centrum.cz> + Tested-by: Peter Wu <peter@lekensteyn.nl> + Reviewed-by: Peter Wu <peter@lekensteyn.nl> -commit 25f1df4 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Jan 28 13:04:14 2015 -0800 +commit 5c2810e +Author: Martin Kaiser <wireshark@kaiser.cx> +Date: Sun Mar 1 18:43:54 2015 +0100 - "%l[doux]" doesn't mean "64-bit integer". + build the list of .qm files from the list of .ts files - Use G_GINT64_MODIFIER as the format modifier to indicate that the value - being printed is 64-bit; there is no guarantee that long is 64-bit (it's - not 64-bit on ILP32 platforms such as 32-bit Windows and 32-bit UN*X, or - even on LLP64 platforms such as 64-bit Windows). + (2nd attempt: yesterday's builbot failure wasn't caused by this commit) - Change-Id: I0444f7f396969824f1040c06a67753718c32881b - Reviewed-on: https://code.wireshark.org/review/6838 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: If87d6b55cc733ff35a3677860b4559a7082a15b2 + Reviewed-on: https://code.wireshark.org/review/7502 + Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> + Tested-by: Martin Kaiser <wireshark@kaiser.cx> -commit 49a7e97 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Jan 28 12:56:19 2015 -0800 +commit 1864deb +Author: Mikhail Koreshkov <drkor@hotbox.ru> +Date: Tue Feb 24 11:38:47 2015 +0300 - Try dissecting some stuff even if we don't have conversation information. - - Fill in a local transaction information structure, so we can pass data - from the packet down. Skip stuff that depends on conversation - information if we don't have any. + GSM_A-GCC: dissector for GCC Protocol - Change-Id: I5a8bd21bdf632ada9013e616c5fc4e8bd14c9698 - Reviewed-on: https://code.wireshark.org/review/6837 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 9e647a9 -Author: Petr Gotthard <petr.gotthard@centrum.cz> -Date: Mon Jan 26 10:40:01 2015 +0100 - - Extended AMQP 0-9 dissector to support AMQP 0-9-1 methods and datatypes. Backward compatibility to AMQP 0-9 is maintained. + Added dissector for GSM-A GCC (Group Call Control) Protocol (GSM 04.68) - Change-Id: Ie39cb40dca3d9f778ef2c04cbef24c968a91ec6c - Reviewed-on: https://code.wireshark.org/review/6791 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I46fafc3fd3eba674202f2c34932edf83a6d1d096 + Reviewed-on: https://code.wireshark.org/review/7338 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit 6940a97 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Jan 28 11:39:04 2015 -0800 - - Go back to installing 5.2.3 for now. - - Change-Id: I1c798cd1a74aee559225fea1e4bc3694466de861 - Reviewed-on: https://code.wireshark.org/review/6836 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 83678a0 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Jan 28 10:58:32 2015 +0100 - - Proto dialog (GTK) : fix indent (use 2 spaces) and add modelines - - Change-Id: I36945843b8d544188a3ffe89f397e669f3944593 - Reviewed-on: https://code.wireshark.org/review/6831 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit f011af2 -Author: Anders <anders.broman@ericsson.com> -Date: Wed Jan 28 13:41:00 2015 +0100 - - Add files missing from the tarball. - - Change-Id: I126f40ac122a7b9236e8718a89d35ad12fc89c04 - Reviewed-on: https://code.wireshark.org/review/6834 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit d7538cb -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Tue Jan 27 18:51:05 2015 +0100 - - ANSI IS-637-A: prevent an out of bounds access - - Bug: 10897 - Change-Id: I8316ba40ec00b612e4edd490e3cd36e7277912a9 - Reviewed-on: https://code.wireshark.org/review/6824 - Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 15c895d +commit 499d959 Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Jan 28 01:47:31 2015 -0800 +Date: Tue Mar 3 02:47:53 2015 -0800 - Make the USB header information an enumerated type. + Eliminate e_uuid_t in favor of e_guid_t. - It's not really a bitset, it's a choice of one of four types of USB - pseudo-header. Make it an enum. + That eliminates a redundant and confusing data type, and avoids issues + with one piece of code using e_uuid_t but wanting to use routines + expecting an e_guid_t. - Change-Id: I4ea994e1606c23e0a0f08b1b61357eea40a2535e - Reviewed-on: https://code.wireshark.org/review/6830 + Change-Id: I95e172d46d342ab40f6254300ecbd2a0530cde60 + Reviewed-on: https://code.wireshark.org/review/7506 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 53a5e4f -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Tue Jan 27 16:59:30 2015 +0100 +commit a0ce286 +Author: Dario Lombardo <lomato@gmail.com> +Date: Tue Mar 3 11:03:31 2015 +0100 - win32: fix detection of Windows 10 Technical Preview - - The version number changed from 6.4 to 10.0 + sflow: added agent type - Change-Id: Ie749c97e8335f77d414d80edbd69373bd9a1cdad - Reviewed-on: https://code.wireshark.org/review/6820 - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: I01bb3dba0c27544539fdca75d655255ff25b12a3 + Reviewed-on: https://code.wireshark.org/review/7504 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 946856a -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Jan 28 01:17:04 2015 -0800 +commit b7ef891 +Author: Michael Mann <mmann78@netscape.net> +Date: Sun Mar 1 23:03:27 2015 -0500 - Move tests out of try_dissect_linux_usb_pseudo_header_ext(). + Replace tvb_get_ptr calls with a better API choice. - Do the tests in its callers; rename it to just - dissect_linux_usb_pseudo_header_ext() and don't bother passing it the - header_info flag. - - We can remove some of those tests as they're already done in the caller. - - Change-Id: I7c3cfefba833a84c834462307088f5c31612128e - Reviewed-on: https://code.wireshark.org/review/6829 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit f090ebb -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Jan 27 21:23:55 2015 -0800 - - Add documentation URLs for the Linux USB and USBPCAP pseudo-headers. + Just reduces the overall tvb_get_ptr usage count in the dissector directory. - Change-Id: If5cecfeb66b3caca6478206f2fcb2f617ef02b46 - Reviewed-on: https://code.wireshark.org/review/6828 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I455dc4cc9b082ecccdd254a2e5121f3353b5a812 + Reviewed-on: https://code.wireshark.org/review/7491 + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 3aab6fc -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Jan 27 09:25:29 2015 -0800 +commit 599dd4f +Author: Michael Oed <michael.oed@gmail.com> +Date: Sun Mar 1 13:56:34 2015 +0100 - Qt: Update packet list freeze/thaw behavior. + Qt: Do not close file while trying to open new one - Move the clear() calls in gee320ef a bit earlier in the code to - PacketList::freeze. No model means no packets. - - Bug: 10896 - Change-Id: Ie440e3da4c5fb601048f4e94c8712ecf2d864d4f - Reviewed-on: https://code.wireshark.org/review/6823 - Reviewed-by: Sean Stalley <seanstalley@gmail.com> - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 9976422 -Author: Dario Lombardo <lomato@gmail.com> -Date: Tue Jan 27 14:34:35 2015 +0100 - - Added json heuristic to Dropbox LAN sync Discovery Protocol. + Wireshark QT will close current opened file when popup open dialogue (File -> open), instead of keeping current file opened till new file is to be opened - Change-Id: I0d649ddc0f1539616eca0322ba54a7735338c738 - Reviewed-on: https://code.wireshark.org/review/6817 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Bug: 10962 + Change-Id: I2062514ae648c95492e0160953c80d5303b8aba2 + Reviewed-on: https://code.wireshark.org/review/7452 + Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> -commit d3261b2 -Author: Bill Meier <wmeier@newsguy.com> -Date: Tue Jan 27 12:55:05 2015 -0500 +commit 1a54112 +Author: Michael Mann <mmann78@netscape.net> +Date: Mon Mar 2 09:33:52 2015 -0500 - Comment out various 'if(tree)' + Add tvb_get_ether_name - col..._() and/or expert...() should not be called under 'if(tree)' + This is mostly to reduce tvb_get_ptr calls that were used to pass into get_ether_name. - Change-Id: I57efe44794977d3f93e4764642b091044a125c0c - Reviewed-on: https://code.wireshark.org/review/6826 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit 75858d7 -Author: Bill Meier <wmeier@newsguy.com> -Date: Tue Jan 27 12:01:43 2015 -0500 - - rtps: Remove various 'if(tree)' - - col_...() and expert_...() should not be called under 'if(tree)' + Some optimizations were made to packet-ieee80211.c in the process of conversion. - Change-Id: I2f1a8345ff18c0174bcd81b37179aa2d5ee74aca - Reviewed-on: https://code.wireshark.org/review/6825 - Reviewed-by: Bill Meier <wmeier@newsguy.com> + Change-Id: I81d3c65d4c09a15237fc287c2e989eb6e6936b1f + Reviewed-on: https://code.wireshark.org/review/7492 + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 678cf27 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Tue Jan 27 15:14:47 2015 +0100 +commit 43fd878 +Author: Michael Mann <mmann78@netscape.net> +Date: Sun Mar 1 10:46:31 2015 -0500 - NETROM: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + Add "seed" capabilities to crc16_x25_ccitt (now crc16_x25_ccitt_seed) so we can remove CRC algorithm calculation in packet-assa_r3.c. - Change-Id: Ie534cbd4fb592d18f27039c654ba08e1beb7edff - Reviewed-on: https://code.wireshark.org/review/6819 + Change-Id: I3143800f6ff922a309f5506d9acbc2c4293363b7 + Reviewed-on: https://code.wireshark.org/review/7490 + Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> + Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 2e10308 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Tue Jan 27 15:13:46 2015 +0100 +commit 091d2db +Author: Michael Mann <mmann78@netscape.net> +Date: Sun Mar 1 10:11:17 2015 -0500 - HCrt: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + Reduce the number tvb_get_ptr calls in packet-arp.c - Change-Id: I453c9b068a53292ab63cd3416569eea7d66361ba - Reviewed-on: https://code.wireshark.org/review/6818 + Change-Id: Ic91088c38833be2463f069a646fbfea6b87b33aa + Reviewed-on: https://code.wireshark.org/review/7489 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 7dfda88 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Jan 26 19:53:49 2015 +0100 +commit 48d376f +Author: Peter Wu <peter@lekensteyn.nl> +Date: Mon Mar 2 00:16:16 2015 +0100 - WIMAX: fix no previous prototype for ... [-Wmissing-prototypes] + plugins: fix dissector registration with CMake - Also comment the unused function wimax_decode_sub_dl_ul_map + Noticed when comparing output of `tshark -G fields` between autofoo and + cmake builds. With this change, I see no differences anymore. - Part 2... + While only WiMax needs this change, do a similar thing for consistency + with autofoo and between dissectors (actually, the contents of + ${PLUGIN_FILES} minus plugin.c was used). - Change-Id: I1836aa2851156e4f756c5697f86a142625d697c9 - Reviewed-on: https://code.wireshark.org/review/6810 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: Ib61f69dcc0b8eda713da931b6cc3e946848bea9d + Reviewed-on: https://code.wireshark.org/review/7462 + Reviewed-by: Evan Huus <eapache@gmail.com> + Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> -commit ceb8d95 -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Sun Jan 25 14:30:13 2015 -0500 +commit 963fbf3 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Mon Mar 2 19:11:42 2015 +0100 - Lua: Expose tcp_dissect_pdus() to Lua + MBIM: add it to "Decode As" menu - Provide a way for Lua-based dissectors to invoke tcp_dissect_pdus() - to make TCP-based dissection easier. - - Bug: 9851 - Change-Id: I91630ebf1f1fc1964118b6750cc34238e18a8ad3 - Reviewed-on: https://code.wireshark.org/review/6778 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - Tested-by: Hadriel Kaplan <hadrielk@yahoo.com> + Change-Id: If961ac8fcfa0d760e112036ea3e439c4e061af8b + Reviewed-on: https://code.wireshark.org/review/7498 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 9bbc337 +commit 21a0bc7 Author: Dario Lombardo <lomato@gmail.com> -Date: Tue Jan 13 15:13:27 2015 +0100 +Date: Mon Mar 2 17:11:17 2015 +0100 - Added HPFEEDS stats_tree. + cgmp: added reserved field - Change-Id: I256fd5395b062fa954ebd60598721323ea1d7ff1 - Bug: 10875 - Reviewed-on: https://code.wireshark.org/review/6713 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Change-Id: Iaf3c8c776507803e28b4372f7da1290a19dd5efd + Reviewed-on: https://code.wireshark.org/review/7497 Reviewed-by: Michael Mann <mmann78@netscape.net> -commit c80aa10 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Tue Jan 27 11:53:05 2015 +0100 +commit 342c55b +Author: Gerald Combs <gerald@wireshark.org> +Date: Mon Mar 2 11:50:36 2015 -0800 - HCrt fix no previous prototype for 'proto_register_hcrt' [-Wmissing-prototypes] + Qt: Add @2x images to the layout preferences. - Change-Id: Idca780885263c068ba31bbccb6009e75221b3adf - Reviewed-on: https://code.wireshark.org/review/6816 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 32cbf79 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Jan 26 08:15:35 2015 +0100 - - Qt: Add checkable for Find Packet icon + Run compress-pngs on the normal and @2x images. - Change-Id: Idd3c0b1893a9e0f8bc329e9157baaccd10de7378 - Reviewed-on: https://code.wireshark.org/review/6814 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: Ic5bc3c42273078f32511d986b299d8606c016f6d + Reviewed-on: https://code.wireshark.org/review/7499 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit b5a3907 +commit 6878122 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Jan 26 08:46:34 2015 +0100 +Date: Mon Mar 2 14:43:05 2015 +0100 - Packet List (Qt): fix extra ‘;’ [-Wpedantic] + Main window (Qt): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - Change-Id: I3ac80a13da91452de4c857abfd6f2661b00e2f5d - Reviewed-on: https://code.wireshark.org/review/6815 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: Ia8d37b33ee30f09cfe5e0cd00820d84e171deb1c + Reviewed-on: https://code.wireshark.org/review/7494 + Reviewed-by: Evan Huus <eapache@gmail.com> -commit 77227d4 +commit 0ebbb60 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Jan 26 08:00:43 2015 +0100 +Date: Mon Mar 2 16:01:17 2015 +0100 - GTK: Fix multispace on main title bar + Byte view text (Qt): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - Change-Id: I275a586c16621fdfabede23f6a1d03c8d8556b3f - Reviewed-on: https://code.wireshark.org/review/6813 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I507b27bbf3c2877517cc9613ada1b182becfa98f + Reviewed-on: https://code.wireshark.org/review/7495 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 5e309d6 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Jan 26 07:48:55 2015 +0100 +commit 768e37b +Author: Michal Labedzki <michal.labedzki@tieto.com> +Date: Thu Feb 26 14:38:57 2015 +0100 - CAPWAP: fix double space on AC Software version + Bluetooth: Fix tools/checkAPI issues - Change-Id: Ibe9715a1c2bf31e31ddda5ad2ad62fc0eda8164c - Reviewed-on: https://code.wireshark.org/review/6812 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I8ffbd4a0da800594d9888f6a30612d4fc5273119 + Reviewed-on: https://code.wireshark.org/review/7474 + Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> -commit ec7ff4e -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Jan 26 08:48:57 2015 +0100 +commit 77d2dc5 +Author: Michal Labedzki <michal.labedzki@tieto.com> +Date: Thu Sep 18 13:19:52 2014 +0200 - GTK: fix no previous prototype for ... [-Wmissing-prototypes] + Bluetooth: HFP: Temporary disable partial message dissection - Add by commit g43f09e67b (Remove unneeded includes from ui folder) + Maybe this case never happen, so disable broken feature. - Change-Id: I66eb113430bde97e18bb3d2b00f6bac46a01797e - Reviewed-on: https://code.wireshark.org/review/6809 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit a9aba94 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Jan 26 08:45:36 2015 +0100 - - GTK: fix no previous prototype for ... [-Wmissing-prototypes] - - Add by commit g43f09e67b (Remove unneeded includes from ui folder) + Also fix unexpected Data dissectors and command tree items. - Change-Id: I7c9d9e2bbd76d062f96422c74ee8eb8c6ecd328b - Reviewed-on: https://code.wireshark.org/review/6808 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Bug: 10460 + Change-Id: I4ea76f20db21c6c9b5dca912b94a0aff99c42160 + Reviewed-on: https://code.wireshark.org/review/7473 + Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> -commit 11d25fa +commit cb8876c Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Jan 26 08:17:06 2015 +0100 +Date: Mon Mar 2 16:12:55 2015 +0100 - CATTP: fix no previous prototype for 'proto_register_cattp' [-Wmissing-prototypes] + OPENSAFETY: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - Change-Id: Ifedb45d95d622c6df29f6917918015676f506831 - Reviewed-on: https://code.wireshark.org/review/6807 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit c0c2b45 -Author: Roland Knall <roland.knall@br-automation.com> -Date: Mon Jan 26 15:08:18 2015 +0100 - - epl: Add Manufacturer subdissector - - Allow manufacturer specific plugins, which will only - be called for certain service IDs which are manufacturer - specific as defined by the POWERLINK specification. - - As with e.g. udp.port, a plugin or subdissector may - register with epl.asnd and a given service ID to implement - a plugin for specific ASND Service IDs, which are part - of the manufacturer specific object range (0xA0-0xFE). - - Also, all values for the ID fields have been changed to - range_string - - Change-Id: Ibfb9c035c16bce5322b13c42f30daf14e096712a - Reviewed-on: https://code.wireshark.org/review/6793 + Change-Id: Ie566ae541d0d6cf5ac17150006de4f4498e790d6 + Reviewed-on: https://code.wireshark.org/review/7493 Reviewed-by: Roland Knall <rknall@gmail.com> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 4fb2ec0 -Author: Joe Fowler <fowlerja@us.ibm.com> -Date: Fri Jan 23 22:17:50 2015 -0500 +commit 52b4c61 +Author: Dario Lombardo <lomato@gmail.com> +Date: Mon Mar 2 14:27:09 2015 +0100 - SMC-R: fix incorrect dissection of non-SMCR packet. Failover - Validation bit definition is missing + [r,i]gmp: added reserved field - dissect_smcr_tcp_heur() passes incorrect length to tvb_memeql(), - resulting in incorrectly identifying a packet as SMC-R. - - Added Failover Validation bit. - - Bug: 10887 - Change-Id: I9f33389bd974b4c410a6b077d0d133221c77ee0d - Reviewed-on: https://code.wireshark.org/review/6765 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I628b1711e683d57ab5dcbf7ad615b1740399b65f + Reviewed-on: https://code.wireshark.org/review/7482 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit ee320ef -Author: Evan Huus <eapache@gmail.com> -Date: Mon Jan 26 22:35:12 2015 -0500 +commit e4018f2 +Author: Dario Lombardo <lomato@gmail.com> +Date: Mon Mar 2 15:29:53 2015 +0100 - qt: clear tree and bytes when no packet selected - - Otherwise trying to interact with them will cause all sorts of funny crashes. + fip: added reserved field - There's probably a better way to trigger these (having the widgets register for - a signal, and sending that signal, or something something something) but this - works and I don't feel like reading 20 pages of Qt documentation right this - instant. - - Change-Id: Ic52806ae5ba8d7776f835695590559b8c705d083 - Ping-Bug: 10896 - Reviewed-on: https://code.wireshark.org/review/6803 - Reviewed-by: Evan Huus <eapache@gmail.com> + Change-Id: I12878d91dfaf11c96a9d3df965fc659928b7f58a + Reviewed-on: https://code.wireshark.org/review/7488 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit a835c85 -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Jan 26 11:38:33 2015 -0800 +commit fe7b52c +Author: Dario Lombardo <lomato@gmail.com> +Date: Mon Mar 2 14:04:12 2015 +0100 - Pcapng: Don't fetch past the end of a GArray. + rmcp: added reserved field - Due to an off-by-one error an invalid ISB interface ID could make us - fetch past the end of a GArray. Found using American Fuzzy Lop. - - Bug: 10895 - Change-Id: I7d4049ad7a386ae7e8013b8e741d54a31f353f1f - Reviewed-on: https://code.wireshark.org/review/6798 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I6661494295b076d8762ea9502a7f9b23b70fc56e + Reviewed-on: https://code.wireshark.org/review/7481 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 5845f29 -Author: Bill Meier <wmeier@newsguy.com> -Date: Mon Jan 26 13:58:01 2015 -0500 +commit 077405f +Author: Dario Lombardo <lomato@gmail.com> +Date: Mon Mar 2 15:18:17 2015 +0100 - rtp: Don't call col_...() under 'if (tree)' + isl: added reserved field - Change-Id: I7d75e8d02aeaa67155ec52dd0167d1692286b951 - Reviewed-on: https://code.wireshark.org/review/6800 - Reviewed-by: Bill Meier <wmeier@newsguy.com> + Change-Id: I028ebe27a55ababf9d3557cff531332313c38535 + Reviewed-on: https://code.wireshark.org/review/7484 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 717b5a2 -Author: Bill Meier <wmeier@newsguy.com> -Date: Mon Jan 26 13:31:15 2015 -0500 +commit 3f62394 +Author: Dario Lombardo <lomato@gmail.com> +Date: Mon Mar 2 15:09:00 2015 +0100 - rtmpt: Remove 'if (tree)' - - Setting a var under 'if (tree)' and then using it later (not under 'if (tree)') to affect col_...()/expert_...() is not OK. + dvmrp: added reserved field - Change-Id: I144b5fa50b4550cd14c604970f5d84dbf13f3e90 - Reviewed-on: https://code.wireshark.org/review/6799 - Reviewed-by: Bill Meier <wmeier@newsguy.com> + Change-Id: Ic46acac05638bf59910e3cb0986ed14b2257ed55 + Reviewed-on: https://code.wireshark.org/review/7483 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit c9579d0 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Mon Jan 26 16:20:16 2015 +0100 +commit c35ca6c +Author: Evan Huus <eapache@gmail.com> +Date: Sun Mar 1 18:45:24 2015 -0500 - 3GPP: upgrade 2G/3G NAS dissector to v12.8.0 and NAS EPS dissector to v12.7.0 + scsi-osd: fix overflow leading to infinite loop - Change-Id: I770506762074b50d40b4f4742d8316368f14b4de - Reviewed-on: https://code.wireshark.org/review/6794 - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit d5f0f25 -Author: Anders <anders.broman@ericsson.com> -Date: Mon Jan 26 16:50:06 2015 +0100 - - Add Cmakefiles missing from the distribution. + Thanks to Vlad Tsyrklevich for the report. - Change-Id: I77333bb1ca4b0fdfa2db095aab2e4e663c029dd3 - Reviewed-on: https://code.wireshark.org/review/6797 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Bug: 11024 + Change-Id: I9defc6fc72339b2f6ba12b46172b776d798647cd + Reviewed-on: https://code.wireshark.org/review/7463 + Petri-Dish: Evan Huus <eapache@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Evan Huus <eapache@gmail.com> -commit d50b27f +commit 608cf32 Author: Evan Huus <eapache@gmail.com> -Date: Sun Jan 25 09:18:00 2015 -0500 +Date: Sun Mar 1 18:33:10 2015 -0500 - gsm-rlcmac: use wmem_new0 for a struct - - Fixes "Conditional jump or move depends on uninitialised value" from Valgrind. + tnef: fix overflow leading to infinite loop - I couldn't really figure out how this code was supposed to function, it seems to - initialize one member of the union and then expect *all* the others to just - magically work (which they apparently do in most cases, oddly). The real bug - could be in csnStreamDissector or who knows, but this at least turns "garbage - data" into "zeros" which makes valgrind happy and turns a potential vuln into - at worst a bad decoding. + Thanks to Vlad Tsyrklevich for the report, and Fabian Yamaguchi for the "joern" + tool which found the bug. - Bug: 10891 - Change-Id: Ia29dd625b46b3b76ff521b4203148fe8b0c59ec3 - Reviewed-on: https://code.wireshark.org/review/6769 + Bug: 11023 + Change-Id: I53bc998c9934736698e7db5eba09a14e79a7c633 + Reviewed-on: https://code.wireshark.org/review/7461 Petri-Dish: Evan Huus <eapache@gmail.com> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com> -commit abf5703 -Author: Michael Mann <mmann78@netscape.net> -Date: Sat Jan 24 18:34:53 2015 -0500 +commit 724c2ed +Author: Michal Labedzki <michal.labedzki@tieto.com> +Date: Mon Aug 12 10:59:33 2013 +0200 - Register EtherNet/IP dissector for "external" use (like SSL) + Bluetooth: HFP: Improve HFP dissector by dissecting all commands - Change-Id: Ic918c27f36569572523a17abb172b94cc32f2e3b - Reviewed-on: https://code.wireshark.org/review/6786 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit d465682 -Author: Michael Mann <mmann78@netscape.net> -Date: Sun Jan 25 17:32:40 2015 -0500 - - Roll functionality of h225-persistentdata module into packet-h225.c + Decode as far as possible AT commands according to + specifications: HFP 1.6 - Change-Id: I19b2a1b19e1e77a6456e2310daf64ddff572b0d2 - Reviewed-on: https://code.wireshark.org/review/6788 - Petri-Dish: Michael Mann <mmann78@netscape.net> + Change-Id: Ib2cee4df4d9338cc98f28e0fadd067378fba63a9 + Reviewed-on: https://code.wireshark.org/review/7472 + Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> + Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> -commit 155fc8f -Author: Michael Mann <mmann78@netscape.net> -Date: Sat Jan 24 18:55:55 2015 -0500 +commit d949b3c +Author: Michal Labedzki <michal.labedzki@tieto.com> +Date: Wed Feb 11 13:35:08 2015 +0100 - Move #defines of epan/greproto.h to packet-gre.h + Bluetooth: HCI: Fix "Host Number of Completed Packets" - Change-Id: I5de4c34e2acafbe47a8ca3f07040a774e72d0d3e - Reviewed-on: https://code.wireshark.org/review/6787 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit d015eff -Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 25 14:37:44 2015 -0800 - - Update another comment to reflect reality. + Update internal packet offset to avoid unexpect data expert warning. - Change-Id: I9747b746ed7c38ed3aa78f19ae20b61e142b94cc - Reviewed-on: https://code.wireshark.org/review/6785 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I9c0f7e8ec35365e8f8bcca6f37a26ed8da56e166 + Reviewed-on: https://code.wireshark.org/review/7471 + Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> + Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> -commit fcac03d -Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 25 14:34:07 2015 -0800 +commit 51e12e2 +Author: Michal Labedzki <michal.labedzki@tieto.com> +Date: Thu Feb 26 13:24:12 2015 +0100 - Update a comment to reflect reality. + Bluetooth: L2CAP: Add link to Connect and Disconnect frames - Change-Id: I6376ce5eab43443314e73116161a24111f8c46d7 - Reviewed-on: https://code.wireshark.org/review/6784 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Add ability to jumps to connect or disconnect frame from any frame + binded to specific PSM session, what should improves analyse by user. + + Change-Id: Icdf6634bf128ba83721d39cf8986cf16bfb4e7a4 + Reviewed-on: https://code.wireshark.org/review/7470 + Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> -commit 88e22bde -Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 25 14:31:39 2015 -0800 +commit 701be1f +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Sun Mar 1 21:15:27 2015 -0500 - Remove some references to SVN. + RTP player: don't crash when drawing channel graphs for very long calls. - Rename the --get-svn and --set-svn options to --get-vcs and --set-vcs; - continue to support --get-svn and --set-svn as aliases, for backwards - compatibility. Change variable names as well. + X11 can't handle pixmaps more than 32k pixels wide so don't try to feed it + one. This avoids crashes with the complaint "BadAlloc (insufficient + resources for operation)". Instead we simply truncate the graph (and tell the + user). Do this in a way that shows the user the empty portion of the graph. - Change-Id: If25d81dae747f9825f7e3e5e937749f078f63d27 - Reviewed-on: https://code.wireshark.org/review/6783 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit be798e1 -Author: Bill Meier <wmeier@newsguy.com> -Date: Sun Jan 25 15:51:01 2015 -0500 - - pana, gsm_abis_oml, rsl, netrom: Remove 'if (tree)' + Hopefully the Qt port can fix this properly. - Thou shalt call col_...() and/or a dissector under 'if(tree)' + Note: the bug report says that MacOS is not affected but it should be. So + apply this fix for all on-Windows systems. - Change-Id: Ibe62bc8229cb759d5f8b092aa7143d8e2f799037 - Reviewed-on: https://code.wireshark.org/review/6781 - Reviewed-by: Bill Meier <wmeier@newsguy.com> + Bug: 2630 + Change-Id: I71e1bd2f9a62792db06ce887e2bbe7a96d110e0a + Reviewed-on: https://code.wireshark.org/review/7464 + Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 065304c -Author: Bill Meier <wmeier@newsguy.com> -Date: Sun Jan 25 12:04:14 2015 -0500 +commit f9f7ff2 +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Sun Mar 1 21:59:49 2015 -0500 - applemidi: col_...() shouldn't be called under 'if(tree)' + Don't read aliases from the personal hosts file. - Change-Id: I6ae8e122f1d1e7200255b51d2017b4375045c797 - Reviewed-on: https://code.wireshark.org/review/6780 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit c107896 -Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 25 13:50:37 2015 -0800 - - Replace "GIT" with "VCS" in make-version.pl and files it manipulates. + We only store the last name added (i.e., the last alias) which is the + opposite of what the name resolver does (it returns the first name in the + hosts file). - That makes it more VCS-neutral - apparently some people maintain private - versions under VCSes other than Git, and make-version.pl still handles - those VCSes. + Just comment the code out for now with a comment explaining why. Maybe some + day we'll have a reason to store the aliases. - Change-Id: Ie4914b16fea8ce800582729260c5e9b9cf1111f4 - Reviewed-on: https://code.wireshark.org/review/6779 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I560ac05868a429d31e9d41f3a34af36c4fca1f6c + Reviewed-on: https://code.wireshark.org/review/7466 + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit a3f3d0b +commit 99ceab8 Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 25 12:50:05 2015 -0800 +Date: Sun Mar 1 20:01:17 2015 -0800 - Don't say "Git Rev" if the VCS being used isn't Git. + Don't create a packet dialog if we don't have a packet. - Change-Id: Ibd298b9665214e8af137a05ffb0c0aee67af91bf - Reviewed-on: https://code.wireshark.org/review/6777 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit bba51b6 -Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 25 12:14:58 2015 -0800 - - Get rid of unused is_release preference. + Move the "find the frame" stuff to openPacketDialog(), and don't even + bother creating a new PacketDialog if we don't find the frame. This + should squelch Coverity CID 1270934, by giving up quickly if fdata is + null. - Change-Id: I458f1d398b4eb566dd73e879ea3236a4de67da63 - Reviewed-on: https://code.wireshark.org/review/6776 + Change-Id: I4605ba7e271a55724f02cafed4122f9dd9b1b6f7 + Reviewed-on: https://code.wireshark.org/review/7467 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 2f713a6 +commit 3108bf8 Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 25 12:01:54 2015 -0800 - - Update some comments to reflect reality. - - Change-Id: I230e3914bcd902dd481b59637f5ea21afc496978 - Reviewed-on: https://code.wireshark.org/review/6775 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit aec1bcf -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Sat Jan 24 15:58:30 2015 -0500 +Date: Sun Mar 1 18:59:50 2015 -0800 - Lua can free tvbuffs too early + Fix typo caught by Coverity - wrong structure members being tested. - Lua-created tvbuffs should be kept around for the duration of pinfo's - lifetime, instead of only for the duration of frame dissection. So - instead of using the frame dissector's frame_end_routine, we'll register - a callback to wmem for pinfo pool's allocator. + CID 1271732 - Bug: 10888 - Change-Id: I3e9db671c3f2a7cab9e258aca17f3be8acaf2417 - Reviewed-on: https://code.wireshark.org/review/6768 - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Evan Huus <eapache@gmail.com> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - Tested-by: Hadriel Kaplan <hadrielk@yahoo.com> + Change-Id: I12b610a0a28fcc790ffb041ca88624e014f68ab5 + Reviewed-on: https://code.wireshark.org/review/7465 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 716f9a3 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jan 25 08:06:13 2015 -0800 +commit 51f45af +Author: Gerald Combs <gerald@zing.org> +Date: Sun Mar 1 09:18:34 2015 -0800 - [Automatic manuf, services and enterprise-numbers update for 2015-01-25] + Qt: Don't autoscroll if we're not capturing. - Change-Id: Ic9c4903a49473c40f66dcf650f59d6a498bb9c05 - Reviewed-on: https://code.wireshark.org/review/6772 + Change-Id: I3164d8a12981970f127cd68adb7e52f2a1fe5c39 + Reviewed-on: https://code.wireshark.org/review/7457 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 5003654 -Author: Bill Meier <wmeier@newsguy.com> -Date: Sun Jan 25 09:53:25 2015 -0500 - - Cleanup: - - Including: - Remove dead initializers; - Remove boilerplate comments; - Localize some variables; - tvb_length...() ==> tvb_reported_length...(); - Use TRUE/FALSE when assigning a value to a gboolean; - whitespace/indentaion. - - Change-Id: I09e1f15611011bbe393d23e1cb54568ddd3cebc6 - Reviewed-on: https://code.wireshark.org/review/6771 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit b91df34 -Author: Bill Meier <wmeier@newsguy.com> -Date: Sat Jan 24 17:09:36 2015 -0500 - - v52: Fix a minor bug introduced in gc71e88e; plus ... - - Create/use extended value strings - tvb_length...() --> tvb_reported_length...() - - Cleanup: - Remove some dead initializers; - Declare some vars as 'const' (initialized value is never changed); - localize some vars; - whitespace; - - Change-Id: Iee21bb67fb42b1160b8ba2b7c2b89b410cc22225 - Reviewed-on: https://code.wireshark.org/review/6770 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit 5280188 -Author: Dario Lombardo <lomato@gmail.com> -Date: Mon Jan 12 14:31:16 2015 +0100 - - Added HCrt (Hotline Command-Response Transaction) Dissector. - - Bug: 10853 - Change-Id: Ieddb98b16e47906ba187cf03669b02a3ad397d60 - Reviewed-on: https://code.wireshark.org/review/6533 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit b2a5f15 -Author: Evan Huus <eapache@gmail.com> -Date: Sat Jan 24 13:01:30 2015 -0500 - - RTPS: Memset entire buffer - - Apparently some compilers do sufficient inlining optimization to notice that - there's at least one caller of rtps_util_add_typecode which passes an - indent_level of 0. Such compilers are *also* picky enough to complain about - memset being called with a length of 0, leading to a warning which we turn into - a compile error. - - I thought about putting in an "if indent_level > 0" but I figure memsetting the - entire buffer (length >= 1) is simpler and more efficient in the common case. - - Change-Id: Ica21ba988eb0c1251e7b4ef2e110336d5ee32837 - Reviewed-on: https://code.wireshark.org/review/6766 - Reviewed-by: Evan Huus <eapache@gmail.com> - -commit cf142c6 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sat Jan 24 10:28:56 2015 -0800 +commit 85c589f +Author: Martin Kaiser <wireshark@kaiser.cx> +Date: Sun Mar 1 19:35:43 2015 +0100 - Get Wireshark to compile with afl-gcc. - - Fix errors found by American Fuzzy Lop's afl-gcc - (http://lcamtuf.coredump.cx/afl/): + Revert "build the list of .qm files from the list of .ts files" - peektagged.c: - error: 'fileVersion' may be used uninitialized in this function + This seems to break the build on OSX 10.5 (?) - packet-h223.c: - error: variable 'circuit_id' might be clobbered by 'longjmp' or 'vfork' + This reverts commit b46bd2c7798d1c9e808625250928b40adf11a8bb. - wslua_proto.c: - error: variable 'd' might be clobbered by 'longjmp' or 'vfork' - - wslua_proto.c: - error: variable 'dt' might be clobbered by 'longjmp' or 'vfork' - - Change-Id: Idd74a3ad7b236d3a8756c1e7e917b1c74143f381 - Reviewed-on: https://code.wireshark.org/review/6767 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I720de7182804c5c669934e3514e789f2da066867 + Reviewed-on: https://code.wireshark.org/review/7459 + Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> -commit 7ed097c -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Jan 23 13:29:52 2015 -0800 +commit a3c6003 +Author: Martin Kaiser <wireshark@kaiser.cx> +Date: Sun Mar 1 18:43:54 2015 +0100 - Fix an uninitialized variable warning. + build the list of .qm files from the list of .ts files - Change-Id: I3a5c211db767e1980a8c1f2fd706139c0bf6f943 - Reviewed-on: https://code.wireshark.org/review/6764 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: If87d6b55cc733ff35a3648860b4559a7082a19b0 + Reviewed-on: https://code.wireshark.org/review/7458 + Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> + Tested-by: Martin Kaiser <wireshark@kaiser.cx> -commit b714da2 +commit 5309591 Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Jan 23 12:09:51 2015 -0800 +Date: Sun Mar 1 08:05:59 2015 -0800 - CMake: Make sure DATAFILE_DIR exists. - - Create DATAFILE_DIR when we're building an application bundle. Hopefully - this will fix the build error on the OS X x86 builder. + [Automatic manuf, services and enterprise-numbers update for 2015-03-01] - Change-Id: I57414bcd87ab21958ae8131a8cd77951b29e02f7 - Reviewed-on: https://code.wireshark.org/review/6763 + Change-Id: I771a79940efcbf0fcd16ccf5894169d232bdaa9d + Reviewed-on: https://code.wireshark.org/review/7454 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 21dfda6 -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Jan 23 09:18:29 2015 -0800 +commit 9c55903 +Author: Michael Mann <mmann78@netscape.net> +Date: Thu Feb 26 22:03:12 2015 -0500 - Qt: Remove windowIcon property from our .ui files. - - Setting the windowIcon property in foo.ui means we end up with a - setWindowIcon call in ui_foo.h. Along with setting the window title - bar icon, it also sets the taskbar icon on Windows. A 16x16 PNG gives - us a jaggy taskbar icon. (Windows ICO format is supported via a plugin - which might not be available everywhere, otherwise we could try using - a .ico resource.) - - Move the setWindowIcon call from ge990d1b to the top of the MainWindow - constructor and enable it everywhere. + Use COPY_ADDRESS_SHALLOW instead of duplicating TVB_SET_ADDRESS and SET_ADDRESS calls for the same address. - Change-Id: I4e9765200bb3676c4faa8e0ab1505ce02fb64870 - Reviewed-on: https://code.wireshark.org/review/6762 - Petri-Dish: Gerald Combs <gerald@wireshark.org> + Change-Id: I0c9cc5d574fdd73ecf1f8b32dbbf0ddb2b885116 + Reviewed-on: https://code.wireshark.org/review/7437 + Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit d8d2d8e -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Fri Jan 23 15:09:50 2015 +0000 - - jpeg: Add handling for comment marker - - Change-Id: I10ad7021f6535d65d88faf734fb5800e4415a811 - Reviewed-on: https://code.wireshark.org/review/6759 - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> - -commit cce3ad2 -Author: Petr Gotthard <petr.gotthard@honeywell.com> -Date: Tue Jan 20 19:04:05 2015 +0100 - - Correctly dissect the AMQP 0-9 heartbeat frames. The heartbeat frames were - incorrectly highlighted as erroneous. - - Change-Id: I94f8ef73e2432543ae3965da3789f27e872951ea - Reviewed-on: https://code.wireshark.org/review/6685 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit b32e39e -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Jan 20 12:26:14 2015 -0800 - - Test suite: Add verbosity to the HTTP2 test. - - We should probably do the same for the other decryption tests but we're - having issues with HTTP2 right now. - - Change-Id: I8e8f5da200a29a5ca1cddb39c082bb7ee12d1eaf - Reviewed-on: https://code.wireshark.org/review/6686 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit f5c0bd2 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Fri Jan 23 09:56:28 2015 +0100 +commit 5f2c8e9 +Author: Martin Kaiser <wireshark@kaiser.cx> +Date: Thu Feb 19 22:52:42 2015 +0100 - 802.11: Fix encoding for VHT NDP STA Info - - Using little endian for encoding + zvt: functions for dissecting a bitmap and an apdu as a sequence of bitmaps - Ping-Bug: 10786 - Change-Id: Ic2a7f52ccbba32a801c102df4e5aa0a792654602 - Reviewed-on: https://code.wireshark.org/review/6755 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I87233df8fc17ac0aca0d9daefcebd95f47699808 + Reviewed-on: https://code.wireshark.org/review/7450 + Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> + Tested-by: Martin Kaiser <wireshark@kaiser.cx> -commit bab7447 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sun Dec 7 14:30:50 2014 +0100 +commit 5644627 +Author: Guy Harris <guy@alum.mit.edu> +Date: Sat Feb 28 23:12:12 2015 -0800 - CAPWAP: Add support of Fortinet Vendor Specific Element + "Break" the Acme reader so that the tests work. - Based from FortiAP/WiFi 5.2.x + We don't want to have to change the pcap-ng file against which we + compare, so we hardcode the year here to be the same as the year from + the pcap-ng capture. - Change-Id: Ia78d15d54db01939a3d91947db39e35b3abc2519 - Reviewed-on: https://code.wireshark.org/review/5646 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: Ibd83d06e035341f617b8285f6ba51c749c38a177 + Reviewed-on: https://code.wireshark.org/review/7448 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit e990d1b -Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Jan 22 16:48:17 2015 -0800 +commit 0f3ae32 +Author: Guy Harris <guy@alum.mit.edu> +Date: Sat Feb 28 18:57:47 2015 -0800 - Try to fix the jaggy taskbar icon. + Call TIMEDEFVn macros in all PACKET_DESCRIBE() macros. - Possibly related to https://bugreports.qt.io/browse/QTBUG-19441. + Create TIMEDEFV10() and, for it and for V20, V21, and V22, undefine the + ones used for the read routine and define dummy ones for the read-seek + routines (as those record formats have relative, not absolute, times). - Change-Id: Idf7ff8a247f459ce465907760ca0ebeaff2cffa8 - Reviewed-on: https://code.wireshark.org/review/6746 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 888229b -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Thu Jan 22 22:40:01 2015 -0500 - - Make netlink dissector register the attribute length header field info + Have all of them set presence_flags. - The header field info variable named hfi_netlink_len isn't registered - by the netlink dissector, but is added to the tree, resulting in a - runtime error. This commit changes the variable name slightly, to - be more accurate, and correctly registers it. + That way: - Bug: 10884 - Change-Id: Iaa4e556d5bbe87b72a0cdca2fbf397fa95e074cc - Reviewed-on: https://code.wireshark.org/review/6751 - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 407b703 -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Fri Jan 23 00:04:18 2015 -0500 - - Fix some WsLua documentation errors + 1) if we *can* set the time stamps in the seek-read routine, we do; - The format of the API chapter was a bit screwed up, as was the - indentation level of attributes. Also, some functions introduced - in 1.11.3 were not documented as being since that version. + 2) we always set presence_flags in read and seek-read routines. - Change-Id: I7912488c6da5b5ae72933e4c5ce49f8fbf0b0e34 - Reviewed-on: https://code.wireshark.org/review/6753 - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I837507245e8a0cbc68c7c5fd8365f474d085488e + Reviewed-on: https://code.wireshark.org/review/7445 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 8d1a984 -Author: Bill Meier <wmeier@newsguy.com> -Date: Fri Jan 23 00:24:46 2015 -0500 +commit 7130875 +Author: Guy Harris <guy@alum.mit.edu> +Date: Sat Feb 28 12:35:16 2015 -0800 - Remove incorrect 'if (tree)' + Convert fixed-point binary to floating-point in a portable fashion. - Incorrect because of one or both of the following: - - col_...()/expert...() called under 'if (tree)' - - vars set under 'if (tree)' used later (not under 'if (tree)' - as args to col_...()/expert_...() + No need to try to construct an IEEE floating-point number by hand, piece + by piece; just sign-extend the value to 32 bits, convert that integral + value to a floating-point value, and divide the result by 32768 to + properly scale the value. - Change-Id: I89f7d453f2d6eaa40d51cbd794ed2c9be7e549de - Reviewed-on: https://code.wireshark.org/review/6754 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit 5a23a02 -Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Jan 22 19:33:37 2015 -0800 - - Add .dirstamp - it's apparently some autotools thing. + (Yes, in practice, the chances are overwhelming that we'll be running on + a machine with IEEE floating point - people probably won't be running us + on a VAX, and the UN*Xes on which we're likely to run on a System/3x0 or + z/Architecture machine require, and use, the new IEEE floating-point + capabilities - but no need to be gratuitiously non-portable.) - Change-Id: I3303744858d807b1472c2e53ff6d886270664be2 - Reviewed-on: https://code.wireshark.org/review/6752 + Change-Id: Ie90a61847e68c3b849de2984139a97004a4ad659 + Reviewed-on: https://code.wireshark.org/review/7444 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 19a8eaf +commit 5892d3c Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Jan 22 13:04:15 2015 -0800 +Date: Sat Feb 28 01:13:41 2015 -0800 - Use luaL_{check,opt}integer() rather than luaL_{check,opt}int(). + Don't use ctime(). - Lua prior to 5.3 defined luaL_{check,opt}int() as macros wrapping - luaL_{check,opt}integer() with a cast to int; Lua 5.3 doesn't. + The API checks warn about it being deprecated - that doesn't seem to + cause a problem with the buildbot, but does result in failures from the + Petri dish. Format the first and last packet time in an ISO 8601-style + format. - It sounds as if the Lua developers are deprecating luaL_{check,opt}int(): + Call them "First packet time" and "Last packet time", rather than "Start + time" and "End time", as they're not necessarily the times when the + capture started or ended. - http://osdir.com/ml/general/2014-10/msg46568.html + (Both make the output a bit more like the Statistics -> Summary window.) - Change-Id: I2d0b649dcd57ede124f31d39f7945f342ae9b18f - Reviewed-on: https://code.wireshark.org/review/6744 - Petri-Dish: Guy Harris <guy@alum.mit.edu> + Change-Id: Ibf02999851f49c7951c6f6152c70efa271414bd9 + Reviewed-on: https://code.wireshark.org/review/7442 Reviewed-by: Guy Harris <guy@alum.mit.edu> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Tested-by: Hadriel Kaplan <hadrielk@yahoo.com> - -commit 2eaa467 -Author: Evan Huus <eapache@gmail.com> -Date: Thu Jan 22 20:53:24 2015 -0500 - - oids: fix memory leak - - In oid_encoded2subid_sub(), the scope we get may be NULL, in which case if we - don't return our allocated buffer, it is our responsibility to free it. Minor - regression from ge333e4c90f0aca41b0a56cef22fd80d0b0e73e14. - - Bug: 10883 - Change-Id: I324ca770278ab0575511c5e9ab72b70d6ac1a391 - Reviewed-on: https://code.wireshark.org/review/6748 - Reviewed-by: Evan Huus <eapache@gmail.com> -commit 612e286 +commit 65303ef Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Jan 22 17:51:48 2015 -0800 +Date: Fri Feb 27 19:51:37 2015 -0800 - Fix test script to test Lua Pinfo, and fix problem it found. + Remove some unneeded includes of <sys/time.h>. - The test script was running lua/nstime.lua rather than lua/pinfo.lua for - the Pinfo test, and the Pinfo test was testing the ipproto property for - a Pinfo, but that was removed. - - Change-Id: Iccdccd265dd550e41640af3acd607362f1f2f02e - Reviewed-on: https://code.wireshark.org/review/6747 + Change-Id: I9e4e6efa9f8c7dbff7627f8d5fc3278ab383618d + Reviewed-on: https://code.wireshark.org/review/7441 + Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 5b55288 -Author: Jeff Morriss <jeff.morriss.ws@gmail.com> -Date: Thu Jan 22 14:39:55 2015 -0500 - - Add a changelog entry for the license tag change (I82de1bc4ffcb1e962b1a35dc58aaa87aca04ed5e). - - Change-Id: I5e715579be9b415cd0fd957c66c7bd82319c88b3 - Reviewed-on: https://code.wireshark.org/review/6743 - Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> - -commit 96f9746 -Author: Bill Meier <wmeier@newsguy.com> -Date: Thu Jan 22 12:05:57 2015 -0500 +commit 3b23561 +Author: Guy Harris <guy@alum.mit.edu> +Date: Fri Feb 27 19:49:28 2015 -0800 - pppoe: col_...()/expert...() shouldn't be under 'if (tree)' + Don't use struct timeval if we only care about seconds. - Change-Id: I93726546d86af677153b6b2d46fc072851a33460 - Reviewed-on: https://code.wireshark.org/review/6741 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit f38a63a -Author: Stefan Metzmacher <metze@samba.org> -Date: Tue Sep 23 23:11:25 2014 +0200 - - packet-smb2: implement SMB2 NegotiateContexts + time_t suffices in that case. - Change-Id: I0a2c7ffa2490196989dce96b659337b4fee92c7e - Signed-off-by: Stefan Metzmacher <metze@samba.org> - Reviewed-on: https://code.wireshark.org/review/6711 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: Ica7a79fb6f8c7cc7fb6decd5fcd391dccfdb3fc6 + Reviewed-on: https://code.wireshark.org/review/7440 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 48c90d1 -Author: Stefan Metzmacher <metze@samba.org> -Date: Tue Sep 23 23:12:29 2014 +0200 +commit 30d878f +Author: Roland Knall <roland.knall@br-automation.com> +Date: Fri Dec 12 15:11:07 2014 +0100 - packet-smb2: fix getting the dataoffset in dissect_smb2_write_request() + openSAFETY: Add support for openSAFETY 1.5 - It's 2 byte only so we need to use tvb_get_letohs(). + openSAFETY 1.5 will be the next version of the openSAFETY + protocol. This will include all renditions necessary for + future versions of the IEC 61784-3 specifications. - Change-Id: Idbab6428f4242abbbff089d7e1d1bf4cc86930b1 - Signed-off-by: Stefan Metzmacher <metze@samba.org> - Reviewed-on: https://code.wireshark.org/review/6710 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit 97d0f36 -Author: Stefan Metzmacher <metze@samba.org> -Date: Wed Jan 21 08:17:19 2015 +0100 - - packet-smb2: correctly dissect dcerpc traffic over different named pipe handles + - SNMT service for CT preseeding + - 40 bit counter value flag support + - Adapt CRC calculation for 40bit counter + - Display 40bit counter value - Change-Id: Id98d1c7e28d88f6cd50f5ef770eec95e57008458 - Signed-off-by: Stefan Metzmacher <metze@samba.org> - Reviewed-on: https://code.wireshark.org/review/6709 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit 749c68c -Author: Stefan Metzmacher <metze@samba.org> -Date: Wed Jan 21 08:14:23 2015 +0100 - - packet-dcerpc: change transportsalt to guint64 - - This will be able to hold also SMB2 file ids and maybe other stuff in future. - - Change-Id: Ib55895a346b7dc6562291730693453728c99fe91 - Signed-off-by: Stefan Metzmacher <metze@samba.org> - Reviewed-on: https://code.wireshark.org/review/6708 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: Ia9f8e11de813d27bc14437d32ee3d0486810c634 + Reviewed-on: https://code.wireshark.org/review/5728 + Reviewed-by: Roland Knall <rknall@gmail.com> + Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 87e691f +commit abd8be3 Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Jan 22 03:05:34 2015 -0800 +Date: Fri Feb 27 18:46:44 2015 -0800 - Remove a mysterious comment that no longer applies. - - There's nothing special about LUA_VERSION when it comes to the user - overriding it - they'd do that by changing it, the same as with any - other _VERSION variable. Remove the comment about it, which is now out - of date in any case. + Get rid of unused variable. - Change-Id: I414ddaff43c96304f49b81bdbd135d85536c17dc - Reviewed-on: https://code.wireshark.org/review/6739 + Change-Id: I4141f00285cbb6080a782ea2837ea87b7100e081 + Reviewed-on: https://code.wireshark.org/review/7439 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 39a984e -Author: Bastien Bailly <babassbailly@free.fr> -Date: Thu Jan 22 09:50:37 2015 +0100 +commit 60cc2e0 +Author: Guy Harris <guy@alum.mit.edu> +Date: Fri Feb 27 18:23:14 2015 -0800 - GTP: Bad bytes read for extended rnc id value + Clean up timestamp handling. - offset+=2; is missing and bytes used for extended rnc id value are the same that for rnc id value. + Use nstime_t rather than struct timeval when we want + seconds-and-fractions, so that, when writing the file, we can handle + nanosecond-resolution time stamps. Calculate the relative time stamp as + a 64-bit integer rather than using floating-point. - Bug:10877 - Change-Id: I2830191e434812d42ab625e7a6e0478a191b7d95 - Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-on: https://code.wireshark.org/review/6738 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit f8fa70f -Author: Marko Hrastovec <marko.hrastovec@gmail.com> -Date: Wed Jan 21 15:03:43 2015 +0100 - - Decoding of Asterix categories 063 and 065 extended to item decoding. + Use time_t rather than struct timeval if we only want seconds. - Categories 063 and 065 were decoded only partially. Now the dissector - dissects all the items in these two categories. + Have the routines that write out 16-bit and 32-bit numbers convert them + to little-endian themselves, rather than having to be passed a + little-endian number. - Change-Id: Ib8fd1d18327cbea668600f7376a6b83a270909a2 - Reviewed-on: https://code.wireshark.org/review/6714 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit dadf2c1 -Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Jan 22 00:32:28 2015 -0800 - - Lua 5.3.0 is now out; install it. (It has better 64-bit integer support.) + Have a routine that writes out 48-bit values in little-endian order, and + use that to write out packet time stamps. - Change-Id: I99cad6bd6c5646bfbaddfdde317673cf749766a8 - Reviewed-on: https://code.wireshark.org/review/6737 + Change-Id: Ia6e047079e48915647502178e0a1c61177010c62 + Reviewed-on: https://code.wireshark.org/review/7438 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 2cd0472 +commit dbbb1d3 Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Jan 22 00:30:47 2015 -0800 +Date: Fri Feb 27 15:48:45 2015 -0800 - Un-install and re-install if the installed and specified versions differ. + We don't need to check for strings.h. - If, for a package, the version specified by the _VERSION variable - doesn't match the version installed (as indicated by a -done file), - un-install it, and remove the downloaded version, before doing any - installs, so that the specified version replaces the installed version. + We never use it; the autoconf script does, but that's as a result of + some macros that checks for various standard and non-standard-but-common + headers. It's been ages since strings.h was anything other than a BSD + source-compatibility hack, not even needed these days when writing code + for *BSD-flavored OSes, as they have <string.h>. - Change-Id: I32021c7be8cdc277ad51c9f11cfdb57e3bb542c4 - Reviewed-on: https://code.wireshark.org/review/6736 + Change-Id: Iad2dc6e55207b52fc8af494ddfca4089c2eb426b + Reviewed-on: https://code.wireshark.org/review/7434 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 5a928c2 +commit 8c86fbc Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Jan 22 00:18:40 2015 -0800 +Date: Fri Feb 27 14:55:30 2015 -0800 - Remove autotools packages if something they depend on changes. + <string.h>, not <memory.h>, is the header file for memcpy(). - Uninstall automake if autoconf is going to be changed; remove libtool if - autoconf or automake is going to be changed. + Don't include <memory.h> when using memcpy(), include <string.h>. - Change-Id: I4aced967cb7bed197d3f1a4be851a0bc78c8f12d - Reviewed-on: https://code.wireshark.org/review/6735 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 2cc9474 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Jan 21 20:15:05 2015 -0800 - - When uninstalling a library, first uninstall what depends on it. + We don't need to check for memory.h, so don't do it in CMake (we don't + explicitly check for it in autoconf, but it's checked for by some macro + we do use). - Change-Id: I80a719acd90e225b28ca16a24ca74030498a5a42 - Reviewed-on: https://code.wireshark.org/review/6734 + Change-Id: I7aa93d4ea93bab9beff597939d3c24aecda3d52e + Reviewed-on: https://code.wireshark.org/review/7433 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 0fbb25f +commit 81fa9e0 Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Jan 21 20:05:23 2015 -0800 +Date: Fri Feb 27 14:18:01 2015 -0800 - Rename install_libpixman to install_pixman, to match uninstall_pixman. + wmem, unlike emem, doesn't use mmap(); remove some no-longer-needed checks. - Change-Id: If71895cae49000ff4a4b5bb8211f0b21feed82bc - Reviewed-on: https://code.wireshark.org/review/6733 + Change-Id: Ic9b57c7c7042fadf938bfa48a3aabe23ad33370f + Reviewed-on: https://code.wireshark.org/review/7432 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit b7db12e +commit 823766b Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Jan 21 18:40:49 2015 -0800 +Date: Fri Feb 27 13:55:00 2015 -0800 - Do tests in the order the comment before them implies. + We don't use gethostbyname2(), don't check for it. - Change-Id: Ie82ce54915866bdf635da832dd2f4c4ae1f2937e - Reviewed-on: https://code.wireshark.org/review/6732 + Change-Id: Iff2e5ffe31692b06e1fd07ec0b259ac885a7ed63 + Reviewed-on: https://code.wireshark.org/review/7431 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 64108f4 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Jan 21 18:30:26 2015 -0800 +commit 5e2dcb3 +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Fri Feb 27 09:46:23 2015 -0500 - Give PortAudio a versioned -done file. + Remove a couple useless variables. - If there's an unversioned -done file, make it a versioned file under the - assumption that the requested version is what's installed. + This may fix a compile warning-turned-error on an old version of SLES that + Anders reported. - Create a versioned file when installing. Use the installed version when - uninstalling, and remove the versioned file. - - Change-Id: Ic21e0f139bb35df8f159a5ba7732706357a099fb - Reviewed-on: https://code.wireshark.org/review/6731 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I72e5dec00bc0088cd77a206284221cb43ae89547 + Reviewed-on: https://code.wireshark.org/review/7429 + Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> + Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> -commit 0426236 +commit edb5e4b Author: Jeff Morriss <jeff.morriss.ws@gmail.com> -Date: Tue Jan 20 20:41:49 2015 -0500 +Date: Thu Feb 26 21:10:25 2015 -0500 - Get us building with the subdir-objects automake option. + Use getnameinfo() instead of gethostbyaddr(). - subdir-objects will be enabled unconditionally in automake-2.0 and - automake-1.14 gives us warnings about the upcoming change. + Also fix up some formatting. - Rework I1b3c517f08d3c752ee03cb89482ee4951ceb5bf3 (and - I416f2d3611fb61659b9a7f7285e5f54a354fbe7d) to give wslua/make-reg.pl the directory of - the source files rather than the full path to each. - - In echld don't use sources in the top-level directory in libechld: it breaks - distclean with subdir-objects turned on. - - Bug: 10648 - Change-Id: I404b074f1558376064c35d8fc96aea7e3d042a76 - Reviewed-on: https://code.wireshark.org/review/6697 + Change-Id: I3348179626e97daaddfbc89e3ed21e39915e3de4 + Reviewed-on: https://code.wireshark.org/review/7423 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> -commit d93a90b -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Jan 21 18:09:30 2015 -0800 - - Make the individual install_ and uninstall_ functions idempotent. - - Move the "do I want this and, if so, is it already installed?" checks - into the install_ functions. - - Move the "is this already installed?" checks into the uninstall_ - functions, and have them clear the appropriate installed version - variable when finished. - - Also, fetch the installed versions early in the main line. - - Change-Id: I9e5d8ca48285c6d424a4a2a5f53f4aa449a891d3 - Reviewed-on: https://code.wireshark.org/review/6730 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 33c1858 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Jan 21 16:27:09 2015 -0800 +commit e5e8af9 +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Wed Feb 25 20:40:55 2015 -0500 - Pull the installs into a function. + Restore synchronous name resolution (revert SVN rev52115). - Call it install_all to avoid collision with the OS's install command, if - any; rename the uninstall function to uninstall_all to match. + These gethostbyaddr() calls should be changed to getaddrinfo() but only in + master. - Change-Id: I9383424ff3910f04244493569fed3e5bc5d3d99d - Reviewed-on: https://code.wireshark.org/review/6729 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I7e2d31ceb0e072beb7f324336d7b145c3adbe3a0 + Reviewed-on: https://code.wireshark.org/review/7402 + Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> -commit 16f2147 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Jan 21 16:17:07 2015 -0800 +commit 2d48179 +Author: Michal Labedzki <michal.labedzki@tieto.com> +Date: Fri Feb 20 15:30:23 2015 +0100 - Pull the install and uninstall sequences into functions. + Qt: Automatically scroll the packet list. - That lets us put the install and uninstall sequences for a particular - tool or library together, and separates them from the overall - installation and uninstallation flow. + Add an "Auto Scroll in Live Capture" action to the Go menu. It's in the + View menu in the GTK+ UI but it seems to make more sense as a navigation + item. - Change-Id: I5e7def9983b587ba7c3276a9d5762db340a04802 - Reviewed-on: https://code.wireshark.org/review/6728 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit f7d9334 -Author: Bill Meier <wmeier@newsguy.com> -Date: Wed Jan 21 16:55:47 2015 -0500 - - isakmp: col_...() shouldn't be called under 'if (tree)' + Use a timeout interval for automatic scrolling. I haven't run any tests + to see if this makes a difference but it would seem that the less + drawing we do during a high speed capture the better, particularly for + remote displays. - Change-Id: I6fa497ca99e2ad3b675697fd28eeafd61190a17c - Reviewed-on: https://code.wireshark.org/review/6726 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit bc5c484 -Author: Bill Meier <wmeier@newsguy.com> -Date: Wed Jan 21 15:49:12 2015 -0500 - - Remove some dead initializers + Update the x-stay-last icons. - Change-Id: I16c88b5e8f6e79a0d9b33b9c3c4d94f77ecfdfa2 - Reviewed-on: https://code.wireshark.org/review/6723 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit b0f37ba -Author: Bill Meier <wmeier@newsguy.com> -Date: Wed Jan 21 15:33:36 2015 -0500 - - vcdu: minor cleanup + Note that we might want to make prefs.capture_auto_scroll a "recent" + setting. - - Remove dead initializers (and localize some vars); - - proto_item_set_len() takes a 'proto_item *'; - - Use gboolean for a TRUE/FALSE var; - - Remove a set of unneeded brackets. + Mark auto_scroll_live and packet_list_check_end GTK+ only. - Change-Id: Ic7b27e2cd321c9d307c01cc4afdb0fc4c6d3cd55 - Reviewed-on: https://code.wireshark.org/review/6722 - Reviewed-by: Bill Meier <wmeier@newsguy.com> + Bug: 10601 + Co-authored-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I645d27c0814f0e4a0d5b01ae68be366847e2522d + Reviewed-on: https://code.wireshark.org/review/7292 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 0671965 -Author: Bill Meier <wmeier@newsguy.com> -Date: Wed Jan 21 15:12:40 2015 -0500 +commit 2462c0d +Author: Dmitry Bazhenov <dima_b@pigeonpoint.com> +Date: Fri Feb 27 10:31:32 2015 +0500 - usb-hid: fix 2 minor bugs and some dead initializers + Use VCINSTALLDIR environment variable in order to locate MSVCR_DLL. + This fixes Windows build in cases when MSVS is installed in non-default + directory. - One bug was introduced in g4d58904 - - Change-Id: I16a5e83f11f48038945e957c7e6ce9d50b4aec46 - Reviewed-on: https://code.wireshark.org/review/6721 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit 32ab59f -Author: Bill Meier <wmeier@newsguy.com> -Date: Wed Jan 21 14:27:46 2015 -0500 - - synphasor: General cleanup - - - col_...() shouldn't be under 'if (tree)'; - - remove dead initializers; - - use proto_tree_add_subtree() in place of ..._add_text()/...add_subtree() - in one more instance; - - tvb_length() --> tvb_reported_length(); - - use 'proto tree *' variable instead of incorrect 'proto_item *' var in - one instance; - - use SYNP_... for a few macro names to prevent any possible - namespace collisions; - - fix some long-lines, indentation and whitespace. - - Change-Id: I4e0a2e5d0b5e13b72a14ec6dd3779a7104534445 - Reviewed-on: https://code.wireshark.org/review/6720 - Reviewed-by: Bill Meier <wmeier@newsguy.com> + Change-Id: I9cfa3f728d64e9d5952c68b2b2b70e627d3f5c3e + Reviewed-on: https://code.wireshark.org/review/7426 + Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> -commit 009ca9f -Author: Bill Meier <wmeier@newsguy.com> -Date: Wed Jan 21 11:41:34 2015 -0500 +commit e4afcc8 +Author: Sean O. Stalley <sean.stalley@intel.com> +Date: Thu Feb 19 13:31:46 2015 -0800 - srvloc: fix a very minor bug + Fixed MAUSB Flags subfield dissection - Change-Id: I822602c569fd6241757ceb558224c255937f3130 - Reviewed-on: https://code.wireshark.org/review/6719 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit 3dc1b4e -Author: Bill Meier <wmeier@newsguy.com> -Date: Wed Jan 21 11:38:33 2015 -0500 - - ieee802154: (trivial) proto_item_set_len() takes a 'proto_item *' + Previously, the version field was being dissected as flags. - Change-Id: I83945ccf73e2c8f355a3ff843271d35143758b1d - Reviewed-on: https://code.wireshark.org/review/6718 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit e1f4f53 -Author: Dario Lombardo <lomato@gmail.com> -Date: Wed Jan 21 15:00:56 2015 +0100 - - HPFEEDS: cleanup in the dissector code. - - Change-Id: Ia675fb703811c4b6be6a278d9396a917dfcf982d - Reviewed-on: https://code.wireshark.org/review/6715 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: Ic7d5fd6262e844c9e578dbc29cd5b6e40078ae9f + Signed-off-by: Sean O. Stalley <sean.stalley@intel.com> + Reviewed-on: https://code.wireshark.org/review/7398 + Petri-Dish: Michael Mann <mmann78@netscape.net> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit fb1e149 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Jan 21 08:41:19 2015 -0800 +commit 2366113 +Author: Sean O. Stalley <sean.stalley@intel.com> +Date: Thu Feb 19 13:20:56 2015 -0800 - NSIS: Simplify wireshark.nsi. + Added basic MA USB isochronous packet support - Replace a pile-o-ifdefs with generated include files. This should make - it easier to add an NSIS target to CMake. + Iso fields in a MA USB header are now dissected, + instead of treating them as non-iso fields. - Drop ICONV_DIR and ADNS_DLL. We haven't used either for quite a while. - - Change-Id: I71b08cccdb9fe2b2a166b63848a9ded5ebc5f873 - Reviewed-on: https://code.wireshark.org/review/6717 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I13c9ba5b0c54ef0b5130c2e87c7de3de9dbe9e22 + Signed-off-by: Sean O. Stalley <sean.stalley@intel.com> + Reviewed-on: https://code.wireshark.org/review/7397 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 163071e -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Wed Jan 21 10:06:33 2015 +0100 +commit bc8228b +Author: Sean O. Stalley <sean.stalley@intel.com> +Date: Thu Nov 13 17:15:31 2014 -0800 - GSM SIM: for a FETCH command, a Le of 0 means 256 bytes + Added Dissection of CancelTransfer MA packets - Change-Id: Ia8969747c215a5ba7e9242b6266114b0e9e00859 - Reviewed-on: https://code.wireshark.org/review/6712 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 17a1748 -Author: Josip Medved <jmedved@jmedved.com> -Date: Tue Jan 20 23:42:17 2015 -0800 - - Updated NSN dictionary with vendor-specific Sy application AVPs. + Type-specific subfields of CancelTransferReq/Resp are now dissected. - Change-Id: I4cd9bd7f7219e4d9ff1bb8a71fab32439a8a9a35 - Reviewed-on: https://code.wireshark.org/review/6705 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I0f03e14df936409125b263409de605dde96d53c0 + Signed-off-by: Sean O. Stalley <sean.stalley@intel.com> + Reviewed-on: https://code.wireshark.org/review/7396 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 6c728d5 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Jan 21 01:00:43 2015 -0800 +commit 9cc49a7 +Author: Sean O. Stalley <sean.stalley@intel.com> +Date: Tue Nov 11 17:52:31 2014 -0800 - Support Sun^WOracle C's -xldscope=hidden for hiding externals. + Updated MAUSB Packet Type values - Change-Id: Id9c852f384a4450b82c8d596f4628d1ccbcf95bc - Reviewed-on: https://code.wireshark.org/review/6707 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 2ee0ea0 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Tue Jan 20 23:22:40 2015 +0100 - - IEEE 802.15.4: fix display of 64 bits address (broken in gecaa1f8) + Packet type values are now consistant with spec. + Also, values in enum mausb_pkt_type are now consistant with + mausb_type_string array. - Change-Id: I1fc117ac6522b4df53ceafb635aeb3b1f34a54d3 - Reviewed-on: https://code.wireshark.org/review/6695 - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: I515332bdbc1d1f06bd03e3da314c44d7e842f2f9 + Signed-off-by: Sean O. Stalley <sean.stalley@intel.com> + Reviewed-on: https://code.wireshark.org/review/7395 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit ed413e9 -Author: Jeff Morriss <jeff.morriss.ws@gmail.com> -Date: Tue Jan 20 21:44:49 2015 -0500 +commit 0002424 +Author: Michael Mann <mmann78@netscape.net> +Date: Tue Feb 24 13:46:44 2015 -0500 - Link only the GUIs with SBC (if we have SBC). The other programs don't - (yet) use libcodec. + Remove most of the tvb_get_ptr calls in the packet-batadv.c dissector. - Also, there's no need to explicitly call pkg-config to get SBC's - CFLAGS and LIBS: PKG_CHECK_MODULES does that for you. + These calls were all getting ether addresses which can be gotten by other means. - Change-Id: Ia7aa84bb81b8223773661ae2dc663731acaf6c6b - Reviewed-on: https://code.wireshark.org/review/6700 - Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Change-Id: I9a3d564483c9ee9b8e5183bb9086da8a315c41fc + Reviewed-on: https://code.wireshark.org/review/7421 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 46fabdc -Author: Jeff Morriss <jeff.morriss.ws@gmail.com> -Date: Tue Jan 20 22:00:24 2015 -0500 +commit 14697b8 +Author: Michael Mann <mmann78@netscape.net> +Date: Tue Feb 24 14:16:48 2015 -0500 - Make the license tag in the RPM more specific: Wireshark is GPLv2+. + Pass tvb and offset into print_nsap_net() and print_area() to "hide" the tvb_get_ptr call that dissectors are using. - Change-Id: I82de1bc4ffcb1e962b1a35dc58aaa87aca04ed5e - Reviewed-on: https://code.wireshark.org/review/6701 + Change-Id: Ibc5a51be462d431b85b34cac7a358d736ec7b9db + Reviewed-on: https://code.wireshark.org/review/7422 + Reviewed-by: Michael Mann <mmann78@netscape.net> + Petri-Dish: Michael Mann <mmann78@netscape.net> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit bc86257 +commit 64c0678 Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Jan 20 23:27:08 2015 -0800 +Date: Thu Feb 26 20:35:31 2015 -0800 - Also support -xarch=sse_42 in the Sun C compiler for x86(-64). + Again, we need a separate pointer to advance through the buffer. - Change-Id: Ib6d0ae9c237b96568e2522d2077b311b3ac5af2e - Reviewed-on: https://code.wireshark.org/review/6706 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit db6f733 -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Jan 20 20:39:09 2015 -0800 - - Always set the COMPILE_FLAGS property, so we can always fetch it. - - If we aren't adding -Werror, just set it to a null string, so when we - fetch it to add the SSE 4.2 flag to it for ws_mempbrk_sse42.c, it - doesn't fail. - - Change-Id: I53858130c025e094ed8d0d975451961506fb1a39 - Reviewed-on: https://code.wireshark.org/review/6704 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 41cbbc2 -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Jan 20 20:32:27 2015 -0800 - - Don't set SSE4_2_FLAG to -msse4.2 unless -msse4.2 works. - - Change-Id: I54eca86d53dc0e4015a15491b9adfdfe9ef9e346 - Reviewed-on: https://code.wireshark.org/review/6703 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 8a0bd92 -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Jan 20 19:17:36 2015 -0800 - - Check whether we can use nmmintrin.h. - - If we think the compiler supports SSE 4.2, check whether we can use - nmmintrin.h if we tell the compiler to compile with SSE 4.2 support; if - not, disable SSE 4.2 support. - - This matches what we do in autotools. - - Change-Id: I474d53d2fe7e2628faca7309efd7155b63bd7eab - Reviewed-on: https://code.wireshark.org/review/6702 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 8051657 -Author: Jeff Morriss <jeff.morriss.ws@gmail.com> -Date: Mon Jan 12 15:16:03 2015 -0500 - - Modernize the description of Wireshark given in the RPM info. - - The initial suggestions came from Michal Labedzki on - https://code.wireshark.org/review/#/c/4178 - - Change-Id: Iae04d667f70ae73b46d2edc1645c238ef6efc518 - Reviewed-on: https://code.wireshark.org/review/6511 - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - Reviewed-by: Niels de Vos <devos@fedoraproject.org> - Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> - -commit 64f4287 -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Jan 20 18:46:10 2015 -0800 - - Get rid of trailing blank. + In this case, sometimes we step through the buffer and sometimes we + don't, so we always use strlen(); use a separate pointer when we're + stepping through the buffer. - Change-Id: Ia1bbd632fe00cfe6b919aacc0cd198953211fe7f - Reviewed-on: https://code.wireshark.org/review/6699 + Change-Id: Id69898760b4c255146c6eae0ab44c1d358c9ccbd + Reviewed-on: https://code.wireshark.org/review/7425 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit bf23953 +commit 9ac60ff Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Jan 20 18:44:17 2015 -0800 +Date: Thu Feb 26 20:16:22 2015 -0800 - Only turn -msse4.2 on for ws_mempbrk_sse42.c, and don't always build it. + address_to_string routines need to remember the beginning of the buffer. - Move all the SSE 4.2 stuff to wsutil/CMakeLists.txt. + Either they don't have a pointer into the buffer that they advance, in + which case strlen(buf)+1 works just fine, or they do, in which case - Don't put ws_mempbrk_sse42.c in WSUTIL_FILES by default; add it if we - think the compiler supports compiling for SSE 4.2. + 1) they'd better save the pointer to the beginning of the + buffer, so they can figure out how long the string is when + they're done - Add -msse4.2 to its COMPILE_FLAGS, but don't add it to any other - compiler flags - we don't want to build anything else with -msse4.2 by - default, as the only code that uses SSE 4.2 instructions but *only* does - so if the processor supports it is our mempbrk implementation. (And - *add* it, don't *replace* the existing flags with -msse4.2; that way, - -Werror is left in there as well.) + and - Change-Id: I979b37a37e4b88b3af11e2275e89441118c8ce0a - Reviewed-on: https://code.wireshark.org/review/6698 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit f215102 -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Jan 20 16:29:06 2015 -0800 - - Handle CFLAGS disabling SSE 4.2. - - When checking whether nmmintrin.h works, add -msse4.2 at the *beginning* - of CFLAGS, so that user (or Gentoo build process) settings with - -mno-sse4.2 override it. + 2) they don't need to use strlen(), they can just subtract the + pointers. - Bug: 10792 - Change-Id: I1b77c2a092360a86bc7012d29642ff3303b60812 - Reviewed-on: https://code.wireshark.org/review/6696 + Bug: 11016 + Change-Id: I81ce9d517336a15bd81f0c6225756ce5178ec6cf + Reviewed-on: https://code.wireshark.org/review/7424 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 5f70fd6 -Author: Bill Meier <wmeier@newsguy.com> -Date: Tue Jan 20 16:44:10 2015 -0500 - - dsi: fix a trivial bug - - Change-Id: Ieafbd148211154a465ab1ce8fe36d2110882c458 - Reviewed-on: https://code.wireshark.org/review/6694 - Reviewed-by: Bill Meier <wmeier@newsguy.com> +commit 1e66e74 +Author: Dmitry Bazhenov <dima_b@pigeonpoint.com> +Date: Thu Feb 26 16:47:50 2015 +0500 -commit d2d699a -Author: Michael Mann <mmann78@netscape.net> -Date: Tue Jan 20 10:05:06 2015 -0500 - - Move all SigComp functionality to the SigComp dissector. + Add dissector for "Bad Password Threshold" IPMI LAN configuration parameter. - While it does make packet-sigcomp.c much bigger, there's no reason for it to be in epan directory. + Add dissectors for IPv6-related IPMI LAN configuration parameters. - Change-Id: I2d78c32de1d56e76578e610d4df586b5610d1b49 - Reviewed-on: https://code.wireshark.org/review/6682 + Bug:11012 + Change-Id: I9b7380d2451acb6d68a03361e26dc3a6ebc129a0 + Reviewed-on: https://code.wireshark.org/review/7404 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 160af3c -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Tue Jan 20 22:20:54 2015 +0100 - - HTTP2: fix test failure on Solaris SPARC - - Do not make any assumption on the endianness: not all hosts running Wireshark are little endian - - Change-Id: I8792904f7000b4f2b9e44ffe41f350ba8b4932d4 - Reviewed-on: https://code.wireshark.org/review/6693 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 74ed8b5 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Jan 19 13:10:59 2015 +0100 +commit 0f29e5d +Author: Dario Lombardo <lomato@gmail.com> +Date: Thu Feb 26 13:51:50 2015 +0100 - Add DNS stats to release-notes + isis: bugfix in csnp source id length. - Remove in NEWS by gca174999 - - Change-Id: I000b7d6421db247dcafacfa73ef049e938d42cc5 - Reviewed-on: https://code.wireshark.org/review/6650 + Change-Id: Ib9f8507ed0a5a0788970b5fa150917f7c1b10de3 + Reviewed-on: https://code.wireshark.org/review/7418 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> - -commit 0169cc8 -Author: Bill Meier <wmeier@newsguy.com> -Date: Tue Jan 20 15:26:54 2015 -0500 - - Remove some dead initializers - - Change-Id: I0478fa5c476a1914ae0c18feafc7720dd3111d84 - Reviewed-on: https://code.wireshark.org/review/6690 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit eefd529 -Author: Bill Meier <wmeier@newsguy.com> -Date: Tue Jan 20 15:23:50 2015 -0500 - - bpdu: Fix minor bug introduced in g188aa9a - - Change-Id: Ibce8848dded5896223af117a85bc0b6e321160e8 - Reviewed-on: https://code.wireshark.org/review/6689 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit 2c312b6 -Author: Bill Meier <wmeier@newsguy.com> -Date: Tue Jan 20 14:47:23 2015 -0500 - - acn: col_...() shouldn't be called under 'if (tree)' - - Change-Id: I4d7d1826391b0ac12ef6ad184e7c79d279db5e28 - Also: remove some dead initializers. - Reviewed-on: https://code.wireshark.org/review/6688 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit c0a403a -Author: Bill Meier <wmeier@newsguy.com> -Date: Tue Jan 20 14:18:53 2015 -0500 - - 6lowpan: Fix a few minor bugs; Also: Misc - - (Bugs were introduced in gf5e2b42); - Misc: - Localize a few variables; - Remove some dead initializers. - - Change-Id: Ib7493740ecf29ed9f753475f721b47a64f54a278 - Reviewed-on: https://code.wireshark.org/review/6687 - Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit f63628d +commit 8ae714d Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Jan 20 09:43:33 2015 -0800 +Date: Thu Feb 26 10:22:28 2015 -0800 - CMake: Use wrapper scripts instead of symlinks. + Remove a dead assignment found by Clang. - When building an application bundle, create wrapper scripts at the top - level instead of symlinking to each executable. + The code in question was copied from ui/gtk/capture_file_dlg.c. The dead + assignment there was removed in 68ceffe. - Change-Id: I080e43de545a709b29c1d6b6c6ec416e5a5a8247 - Reviewed-on: https://code.wireshark.org/review/6683 - Reviewed-by: Evan Huus <eapache@gmail.com> + Change-Id: I605f181b623fbd87ab41505d30a79d7a4fe649df + Reviewed-on: https://code.wireshark.org/review/7419 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 5268d7f -Author: Bill Meier <wmeier@newsguy.com> -Date: Tue Jan 20 12:51:08 2015 -0500 - - cattp: Minor tweaks and whitespace changes - - Change-Id: I128318ffb385930f00675030227e0048306a9f4c - Reviewed-on: https://code.wireshark.org/review/6684 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit 6e6a129 -Author: Gerald Combs <gerald@zing.org> -Date: Sun Jan 18 13:27:13 2015 -0800 +commit 3e5c0bf +Author: Gerald Combs <gerald@wireshark.org> +Date: Thu Feb 26 08:18:04 2015 -0800 - CMake: Set an output directory for plugins. + Qt: Fix packet detail and byte view scrolling - Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all - platforms. Add WiresharkPlugin.cmake so that we can start defining common - macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds. + Make sure we call scrollToByte ByteViewText::setFieldHighlight. + Explicitly scroll to our selected QTreeWidgetItem in + ByteViewText::mousePressEvent. - Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2 - Reviewed-on: https://code.wireshark.org/review/6640 + Bug: 11013 + Change-Id: I0a6381f6760ed48a4f496be8a06b1e56faa5a05b + Reviewed-on: https://code.wireshark.org/review/7416 + Petri-Dish: Gerald Combs <gerald@wireshark.org> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit af3924a -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Jan 8 17:04:05 2015 +0100 - - HTTP2: Add HPACK decode to test suite - - Change-Id: Ic84942b78a795974d6e2023751245ad98b8f1142 - Reviewed-on: https://code.wireshark.org/review/6415 - Reviewed-by: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit b2e172a -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Tue Jan 13 10:41:32 2015 +0100 - - DHCP/BOOTP: Option 125 Suboption: (5) fix display Modem Capabilities - - Only display dissect of Modem Capabilites when sub option = 5 - Actually, it is always display when ftype == special (like sub option = 0) - - Change-Id: I5b75654b750bae5ae5022adcb5e8dd055ce6b291 - Reviewed-on: https://code.wireshark.org/review/6519 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit f3cbee6 -Author: Evan Huus <eapache@gmail.com> -Date: Mon Jan 19 11:55:01 2015 -0500 - - NCP2222: fix possible buffer-overflow - - Caught by ASAN (thanks Alexis!) - - Change-Id: Ibbe2c405ba1a3ba0d5a5b9ffff9e95282526028b - Reviewed-on: https://code.wireshark.org/review/6652 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 1af7b97 -Author: Dario Lombardo <lomato@gmail.com> -Date: Mon Jan 19 23:12:25 2015 +0100 +commit 123be13 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Thu Feb 26 14:01:08 2015 +0100 - Bug fix in json dissector that made the heuristic fail. + ANSI IS-637 A: ensure that num_fields is not null before calling text_decoder - Change-Id: Iff53cfd8fd9d760b04c638c87f8a44587b268cd7 - Reviewed-on: https://code.wireshark.org/review/6674 + Bug: 11014 + Change-Id: Id2c7913d96743424380bd75c4005ec747ee7dd50 + Reviewed-on: https://code.wireshark.org/review/7412 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 11e557a -Author: Matthieu Texier <matthieu@texier.tv> -Date: Thu Jan 15 18:24:20 2015 +0100 +commit e914bd5 +Author: AndersBroman <anders.broman@ericsson.com> +Date: Thu Feb 26 16:18:38 2015 +0100 - ISIS: Making a segregated function for sub-tlv used by multiple tlv + [GTP CDR] Add support for CDR data record format version 12.6.0 - Change-Id: Ifda28dea4b5282ea01a51cdcb3297aeeeb2a848d - Reviewed-on: https://code.wireshark.org/review/6550 + Bug: 11015 + Change-Id: Iea4a4cd4e4e8b41ef781c92c838f17ea6d16e499 + Reviewed-on: https://code.wireshark.org/review/7413 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 8c15ac4 -Author: Guy Harris <guy@alum.mit.edu> -Date: Mon Jan 19 18:32:42 2015 -0800 - - Possibility -> certainty. - - Change-Id: I03440a9b4ca13399aa14f3baaabd7aa40a843f28 - Reviewed-on: https://code.wireshark.org/review/6678 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit f16e8fb -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Jan 19 13:33:01 2015 -0800 - - pdb_zip_package: Enable multithreaded compression. - - Change-Id: If72c65663abb7e3bf1a436d1ecb5eb84f67ad3f8 - Reviewed-on: https://code.wireshark.org/review/6677 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit c3ad53f -Author: Guy Harris <guy@alum.mit.edu> -Date: Mon Jan 19 16:47:55 2015 -0800 - - Fix one item. - - We *do* get the absolute path of the executable, so we *could* look for - "run" right before the executable name. The issue is that there's not - the stronger libtool-imposed convention that the executable is in - ".libs", so the chances of a false positive or false negative are - higher. - - Change-Id: Ib2d5f370d50fee07479c4ffe6f90ba4a91c7f271 - Reviewed-on: https://code.wireshark.org/review/6676 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 7c69079 -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Jan 19 13:33:01 2015 -0800 - - CMake: Add a pdb_zip_package target. - - Add a "pdb_zip_package" target similar to the NMake pdb_zip target. - - Change-Id: I23d114a63fa05f722ee90b77ea458d9e496e5bf9 - Reviewed-on: https://code.wireshark.org/review/6673 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit bea25fa -Author: Guy Harris <guy@alum.mit.edu> -Date: Mon Jan 19 13:10:22 2015 -0800 - - The times in question are local, not UTC. - - Revert to the older code, but just show the time as "Not representable" - if gmtime() fails. - - Change-Id: I435facc042e3ca35fb07292a4b2657ccdfd02abb - Reviewed-on: https://code.wireshark.org/review/6672 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 58d9ca8 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sun Jan 11 16:46:36 2015 +0100 - - add some more apdus to the apdu table - - Change-Id: Id5e5efea46e9ff6196607e56f0212fb083e8635c - Reviewed-on: https://code.wireshark.org/review/6670 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - -commit 6c02abf -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sun Jan 11 15:14:21 2015 +0100 - - start dissecting the ZVT authentication apdu - - add a length paramenter to the body dissection functions in the apdu table - - Change-Id: I4abbd9078fd36385a816963ab042f443e3c26b60 - Reviewed-on: https://code.wireshark.org/review/6669 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - -commit 4fc8286 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sun Jan 11 13:41:27 2015 +0100 - - display the control field text in the info col - - Change-Id: I3dc0f58b4861a08be687214cae9c6681ebcac286 - Reviewed-on: https://code.wireshark.org/review/6668 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - -commit c846af1 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sun Jan 11 12:45:39 2015 +0100 - - continue the dissection of ZVT APDUs - - define an apdu table with the direction, minimum length - and a fuction to dissect the apdu payload - - set the source and destination address columns depending on the apdu - - add some entries to the apdu table - - Change-Id: I52bd15bfab7bbe6c97dfe64084e69a51e65a8a6e - Reviewed-on: https://code.wireshark.org/review/6667 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - -commit 71d83aa -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Mon Jan 19 07:04:48 2015 +0100 - - tvb_length() -> tvb_captured_length() - - Change-Id: I520b38ed37b2d16d9a15f57b8e83b0b59c9a528c - Reviewed-on: https://code.wireshark.org/review/6666 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - -commit 0dcb91d -Author: Bill Meier <wmeier@newsguy.com> -Date: Mon Jan 19 15:38:29 2015 -0500 - - synphasor: (trivial) Do dissector_add_uint("rtacser.data",...) only once - - and not each time prefs are changed. - - Also: do minor whitespace changes. - - Change-Id: I04bfc212e288473a78113e8b124ce4a13ad74ad1 - Reviewed-on: https://code.wireshark.org/review/6663 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit 5fa13c6 -Author: Bill Meier <wmeier@newsguy.com> -Date: Mon Jan 19 15:32:45 2015 -0500 - - README.dissector: Minor update re date/time display. - - Change-Id: Iae467efeccd2e51ea66aab029100c958de7d374e - Reviewed-on: https://code.wireshark.org/review/6662 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit 7a81add -Author: Bill Meier <wmeier@newsguy.com> -Date: Mon Jan 19 15:19:46 2015 -0500 - - synphasor: prevent possible crash; gmtime() can return NULL; - - Don't do manual conversion of a time-field to UTC using gmtime(). - Use the standard Wireshark mechanisms. - - Change-Id: I2eaee074a590ecab492336bb6ad794bdd036f699 - Reviewed-on: https://code.wireshark.org/review/6661 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit 7e1d73d -Author: Bill Meier <wmeier@newsguy.com> -Date: Mon Jan 19 15:15:45 2015 -0500 - - dmp, gmhdr, vssmonitoring: prevent possible crashes; - - gmtime()/localtime() can return NULL. - - Change-Id: If0589261429ee15d0c07972a99d94f9fe83626f6 - Reviewed-on: https://code.wireshark.org/review/6660 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit d1cace9 -Author: Bill Meier <wmeier@newsguy.com> -Date: Mon Jan 19 15:03:23 2015 -0500 - - smb-pipe: prevent possible crash; gmtime() can return NULL. - - For FT_ABSOLUTE_TIME fields: - - Instead of calling gmtime()/mktime() to convert a time to UTC time - which is then displayed using proto_tree_add_time(), - - Use ABSOLUTE_TIME_UTC as the 'display' value for the field and then - display the field using proto_tree_add_item(). - - Change-Id: I1926c40de76a86072437902cb7621d3873827b11 - Reviewed-on: https://code.wireshark.org/review/6659 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit b41065e +commit 50b15cc Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Jan 19 21:28:52 2015 +0100 +Date: Thu Feb 26 14:00:22 2015 +0100 - BGP: EVPN - Route Type 4 - "Invalid length of IP Address" - "Expert Info" shows a false error - - Wrong offset (14 -> 20) to get IP Address Legnth + Translations : fix trailing whitespace when generate translations file - Issue Reported by Rui - Bug: 10873 - - Change-Id: Ib7aa80ac78028a2c8d548f4030278166be9ed0cc - Reviewed-on: https://code.wireshark.org/review/6657 + Change-Id: I4142912c7a139f57f0ac5291bf3ed6762abec35c + Reviewed-on: https://code.wireshark.org/review/7410 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 9fd5078 +commit d60d473 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Jan 19 21:28:04 2015 +0100 +Date: Sun Feb 22 20:00:20 2015 +0100 - BGP: fix field bgp.evpn.nlri.mpls_ls is not of type FT_STRING, FT_STRINGZ, or FT_STRINGZPAD + Qt: Update translation + + lupdate/lrelease ui/qt/Wireshark.pro - Change-Id: Ida14611dee9eb01e1eab13a96c15ab3d759ed1cd - Reviewed-on: https://code.wireshark.org/review/6656 + Change-Id: Ic77adf7ff48d528553ac57bdf04d1ff6e036efdd + Reviewed-on: https://code.wireshark.org/review/7312 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit ab8a13d -Author: Guy Harris <guy@alum.mit.edu> -Date: Mon Jan 19 12:26:06 2015 -0800 +commit 3546914 +Author: Dario Lombardo <lomato@gmail.com> +Date: Thu Feb 26 11:03:21 2015 +0100 - Don't mix declarations and code - it's not legal C90. + rsync: improved info for protocol. - Change-Id: I1a89c729255560d596e4d7701468cca3e9000357 - Reviewed-on: https://code.wireshark.org/review/6655 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I9d1ae0bf1d6df0b9da0220aeff2dd73b5f18f38a + Reviewed-on: https://code.wireshark.org/review/7407 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit c0fd539 +commit bcf870e Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Mon Jan 19 20:50:12 2015 +0100 +Date: Thu Feb 26 13:35:26 2015 +0100 - ZigBee: fix dissection of epoch time in OTA cluster + SMPP: AT_STRINGZ address allocation must use the pinfo pool - Bug: 10872 - Change-Id: I25275ecb76cc03774ab210fb33a3bef5b1982585 - Reviewed-on: https://code.wireshark.org/review/6653 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit de4164f -Author: AndersBroman <anders.broman@ericsson.com> -Date: Mon Jan 19 15:24:47 2015 +0100 - - On my system NSIS installs in the path defined in environment variable - ProgramFiles(x86)=C:\Program Files (x86) - Add that to the locations where we look for it. I couldn't use - ProgramFiles(x86) as a constant so put the path verbatim. - - Change-Id: Ibad9d4e2544e5b3924e10c68f02e072b0012226f - Reviewed-on: https://code.wireshark.org/review/6651 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit c8bca4f -Author: Josip Medved <jmedved@jmedved.com> -Date: Mon Jan 19 00:33:22 2015 -0800 - - Updated company name from Nokia Siemens Networks to Nokia Solutions and Networks. + Fixes an ASAN failure reported by Alexis - Change-Id: I93782facc2e3f9ff6358cf617968fac30bac1f7a - Reviewed-on: https://code.wireshark.org/review/6647 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I33b21d148e631e8a554882283a1c7284d701af1a + Reviewed-on: https://code.wireshark.org/review/7409 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 1b5a965 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Jan 19 09:46:36 2015 +0100 +commit 29feae5 +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Mon Feb 23 17:03:43 2015 -0500 - JSMN : fix typo (it will be fix make distcheck) + Use tcp_dissect_pdus() in the SSTP dissector. - Change-Id: I188be77b77a5a52b233d482d6d8ea8b97adc00db - Reviewed-on: https://code.wireshark.org/review/6649 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit 48e90da -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Jan 19 08:38:16 2015 +0100 - - Fix make dist on Ubuntu buildbot + I happened across the discussion in Ia44e0791b6ee78ad594de342c4f2401bad9beb4e + which indicates that protocols running over SSL can use tcp_dissect_pdus() too. + So do it in the SSTP dissector. - Change-Id: Id3a5ed08fb8b7c721f8eeabbba723a9de0d47b0f - Reviewed-on: https://code.wireshark.org/review/6648 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit f90a10a -Author: Josef Baumgartner <josef.baumgartner@br-automation.com> -Date: Tue Oct 21 13:12:18 2014 +0200 - - epl: Rework POWERLINK (EPL) dissector - - With this patch we want to enable a better support of POWERLINK - as a protocol for people who have to perform network diagnostics using - analyzing tools. Up until now, the main tool used was Omnipeek. - Now wireshark will be used more and more, due to the new extcap - infrastructure, which supports debug tools to be added as capture - devices. - - To better facilitate that change, we have adapted the textual - representation of the Omnipeek dissector for POWERLINK, as it - allows for a faster and simpler diagnosis routine. - - Additionally the name of the protocol has been changed to it's - correct name "POWERLINK" as this is the official name used by - EPSG for describing the protocol. - - Changelog: - - Add error code definitions and string values. - - Change name for protocol column to POWERLINK which is more commonly - used than EPL. - - Reformat output in info column to look like output the output of - the POWERLINK plugin for Omnipeek. This facilitates the transition - to Wireshark. The added information and changed output improves the - debugging of POWERLINK nerworks. - - Change-Id: I795e2487f2ae7af6b90c29366a1843c9fabffa85 - Reviewed-on: https://code.wireshark.org/review/5581 - Reviewed-by: Roland Knall <rknall@gmail.com> - Petri-Dish: Anders Broman <a.broman58@gmail.com> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I3de14c1b2af5e4e5fe3630121366b71a5ad223cf + Reviewed-on: https://code.wireshark.org/review/7333 + Reviewed-by: Peter Wu <peter@lekensteyn.nl> + Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> -commit f53be88 +commit 96d1ce0 Author: Dario Lombardo <lomato@gmail.com> -Date: Fri Jan 2 21:33:49 2015 +0100 +Date: Wed Feb 25 15:23:32 2015 +0100 - JSON dissector changed into heuristic dissector. + chdlc: Added "control" to proto tree. - To check if a payload is json, the library libjsmn has been added to the source tree, with its licence (MIT). - TODO: the libjsmn can be used to extract tokens in the standard dissection other than heurisitic part. - - HPFEEDS dissector has also been changed in order to leverage the new json dissector. - - Bug: 10834 - Change-Id: Ib1df2a699982dbdd2b5418e97edbdb5cbd9c8978 - Reviewed-on: https://code.wireshark.org/review/6350 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: I027b6cd274673a5ae78a23f7a3d484ff83791eae + Reviewed-on: https://code.wireshark.org/review/7388 + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 119416e -Author: Luke Mewburn <luke@mewburn.net> -Date: Tue Dec 23 18:32:34 2014 +1100 +commit b034870 +Author: Dmitry Bazhenov <dima_b@pigeonpoint.com> +Date: Thu Feb 26 12:59:42 2015 +0500 - TCAP: support dialogue confirmation - - TCAP permits the changing of the originating address on the first - backwards continue (i.e. the establishment of the dialogue). - See ITU-T Q.771 (06/97) clause 3.1.2.2.2.2 Confirmation of the dialogue. - In practice, a BEGIN replied to with an END can also exhibit this behaviour. - - For example, a BEGIN from GT A TID TA -> GT B, - and the reply CONTINUE from GT B2 TID TB -> GT A TID TA. - To support this, only support a single address hash in - tcaphash_begin_info_key_t and tcaphash_end_info_key_t. - The match of the first CONTINUE should find the appropriate - tcaphash_begin and create the appropriate tcaphash_end entries. + Fix a couple of bugs in IPMI dissector: - Also fix compile warning with DEBUG_TCAPSRT. + * Fix incorrect offset for Block Selector field + in Get LAN Configuration Parameter request. + * Expect 0x83 completion code ("Attempt to read write-only parameter") + for Get LAN Configuration Parameter command instead of + Set LAN Configuration Parameter command. - Bug: 10841 - Change-Id: Ibe75e3940e757727357b20be10f9c195c5888fdd - Reviewed-on: https://code.wireshark.org/review/6446 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I5be37c5f96db91b70329bfce906ce76f7b8b6958 + Reviewed-on: https://code.wireshark.org/review/7403 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> -commit c4297e6 -Author: Diederik de Groot <ddegroot@talon.nl> -Date: Sun Jan 18 00:23:33 2015 +0100 +commit 3336f71 +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Wed Feb 25 21:29:10 2015 -0500 - Skinny: packet-skinny.c - Changes: Number of small changes to the xml file: - - some fields being connected to the wrong message version - - some header field naming + Actually define HAVE_GETADDRINFO if we find it. - Change-Id: I062c31777a4193de3d5c44b0ba733dd9d1702352 - Reviewed-on: https://code.wireshark.org/review/6602 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 199cb06 -Author: Sergio Moreno Mozota <sergio.morenomozota@telefonica.com> -Date: Sat Jan 17 23:24:22 2015 -0500 - - RTP: Parse problem in dissect_rtp_hext_rfc5215_onebyte + AC_CHECK_FUNC() doesn't define HAVE_XXX but AC_CHECK_FUNCS() does. And + AC_CHECK_LIBS() certainly doesn't define HAVE_<function>. - some commercial IPTV streamers send bogus info in the extension headers, add some sanity check to skip the erroneous bytes. + Also remove some ancient comments. - Bug: 10513 - Change-Id: I6f20073a00ed0f791fa99701534360d304060053 - Reviewed-on: https://code.wireshark.org/review/6606 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I49d701bb96d3bd3c55c4beb99d532e397ec554ad + Reviewed-on: https://code.wireshark.org/review/7400 + Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> + Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> -commit e333e4c -Author: Michael Mann <mmann78@netscape.net> -Date: Sat Jan 17 14:11:29 2015 -0500 +commit 4e12b59 +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Wed Feb 25 21:39:34 2015 -0500 - Convert OID APIs to use wmem. + Check whether we HAVE_GETADDRINFO before using it. - There are a few oid functions that are only called in oids_test.c. I'll presume the APIs are used in proprietary dissectors rather than just remove them. + One spot was missing the check. - Change-Id: I4595e00f93bf9ab8cf2493fe0432b91960f55a3f - Reviewed-on: https://code.wireshark.org/review/6592 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Reviewed-by: Evan Huus <eapache@gmail.com> - Reviewed-by: Guy Harris <guy@alum.mit.edu> - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: I72d1d3d2dec2cc71b02861ace59dc9e189721cfb + Reviewed-on: https://code.wireshark.org/review/7401 + Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> -commit 59155d1 +commit 0692d75 Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 18 17:48:53 2015 -0800 +Date: Wed Feb 25 13:04:59 2015 -0800 - Eliminate ep_strdup(), as it's no longer used. + Make the V10 path a bit more like the other paths. - Also, remove some no-longer-existent functions from checkAPIs.pl. + Provide {FULL,PART}SIZEDEFV10 macros, similar to what's provided for the + other versions, containing the code to set the packet length and + captured data length, and use the TRACE_V10_REC_LEN_OFF() macro directly + after that to set the various length and offset values in the + pseudo-header. - Change-Id: I2bf11e3ec03a34f9e89d58d560e340d76fd3ddc1 - Reviewed-on: https://code.wireshark.org/review/6645 + Change-Id: I3513371057601b44821d89ebaa7565ab370a67f5 + Reviewed-on: https://code.wireshark.org/review/7393 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 5162b7f -Author: Bill Meier <wmeier@newsguy.com> -Date: Sun Jan 18 18:41:37 2015 -0500 +commit 1a3dd34 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Wed Feb 25 17:49:31 2015 +0100 - smpp: Prevent crash if invalid date/time field. + ATN-CPDLC: never put a break in a TRY block - gmtime()/localtime() can return NULL; + It will skip the execution of ENDTRY block - Bug 10868 - Change-Id: I496bab62555c7741b3d159726e74a3d14c4b51cb - Reviewed-on: https://code.wireshark.org/review/6644 - Reviewed-by: Bill Meier <wmeier@newsguy.com> + Bug: 9952 + Change-Id: I55af248b7d31cf1b75aae695ef8c149367791820 + Reviewed-on: https://code.wireshark.org/review/7391 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit b2b640f -Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 18 15:48:22 2015 -0800 +commit 618eaec +Author: Martin Mathieson <martin.r.mathieson@googlemail.com> +Date: Wed Feb 25 15:50:49 2015 +0000 - Reflect the disappearance of the seasonal allocator. + delete_includes.py: add target for ui/qt - Change-Id: I1c76bf9eed516aa9afbc04b1b9236a04b0b1988c - Reviewed-on: https://code.wireshark.org/review/6643 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I9dc51fbef50941f04ccf5b0b5a8cd71f3693ade4 + Reviewed-on: https://code.wireshark.org/review/7389 + Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> -commit 4cea624 -Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 18 15:46:23 2015 -0800 +commit be68cdb +Author: Tibensky <tibensky233@gmail.com> +Date: Wed Feb 25 15:57:35 2015 +0100 - This currently requires emem.h. - - Change-Id: I55cca8de9be07fbec4e771c0f6d50075fc75bef8 - Reviewed-on: https://code.wireshark.org/review/6642 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + [Diameter] Add some AVPs and AVP values from + 3GPP TS 32.299 + version 12.7.0 (2015-01) + Ping-Bug:11008 + Change-Id: Ib7f52c743f43d8a1c70c9fb100663292d7c4a87e + Reviewed-on: https://code.wireshark.org/review/7387 + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit ae92cd4 -Author: AndersBroman <a.broman@bredband.net> -Date: Sun Jan 18 16:38:35 2015 +0100 +commit 03988e9 +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Wed Feb 25 09:12:04 2015 -0500 - [Qt] Run windeployqt for Qt versions greater than 5.2 + Add the ATN dissectors to the CMake build. - Change-Id: I3c7e7ed35ffead280c1ac394a4ef8172a89fe3a6 - Reviewed-on: https://code.wireshark.org/review/6622 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: Ic4963994ed9d1996c74c5ba3db723e93073f4649 + Ping-bug: 9952 + Reviewed-on: https://code.wireshark.org/review/7386 + Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> + Reviewed-by: Evan Huus <eapache@gmail.com> -commit 5970223 +commit 9dfade3 Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 18 14:16:55 2015 -0800 +Date: Wed Feb 25 00:11:56 2015 -0800 - Put back ep_alloc0(), accidentally deleted in the removal of the se_ stuff. + Make the _offset values static constants. - (The se_ stuff wasn't as contiguous as I thought.) + No need to export them outside this file, and making them constants + might convince the compiler not to bother fetching their values from + memory when referring to them. - Also fix some comments to no longer refer to #defines for se_ stuff. - - Change-Id: Ibc53e6f0f135bee9795f98550d5242e8e58afb16 - Reviewed-on: https://code.wireshark.org/review/6641 + Change-Id: Ib8605bf0bb9091721a51827c45fe75d19a15ba26 + Reviewed-on: https://code.wireshark.org/review/7378 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 820c795 +commit 6b6c11c Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 18 13:30:21 2015 -0800 +Date: Tue Feb 24 22:11:57 2015 -0800 - This file currently does need emem.h. + Have a PACKET_DESCRIBE() for V30's seek-read routine. + + That way it'll set the captured length and reported length the same way + it's done in the read routine. - Change-Id: I27e709470d92d4be32ae42a3f4672f2070eaf65e - Reviewed-on: https://code.wireshark.org/review/6639 + Change-Id: I8b1f2d0d8fa688f44b6f61f16dc2e21b5648fc12 + Reviewed-on: https://code.wireshark.org/review/7376 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 7940bbc +commit 98e8d52 Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 18 13:26:12 2015 -0800 +Date: Tue Feb 24 21:23:32 2015 -0800 - Nobody uses se_ allocations, so remove the code for them. + Make the V10 PACKET_DESCRIBE() macro a little more like the others. - Don't check for se_ routines in checkAPIs; the failure to compile or - link will suffice to catch attempts to use them. + Rename the V10 PACKET_DESCRIBE()'s "fpp" argument to "type", and have it + declare the pointer variable. - Update comments in another test script to reflect the disappearance of - the session allocator. - - Change-Id: If50d953c7130f48b696bc2dd9d327bea2af49bd4 - Reviewed-on: https://code.wireshark.org/review/6638 + Change-Id: I3ac52ebdef0aec7bc95052277537185132886b57 + Reviewed-on: https://code.wireshark.org/review/7374 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit d2d4cf2 +commit 0856de5 Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 18 13:10:18 2015 -0800 +Date: Tue Feb 24 20:25:13 2015 -0800 - Remove a couple more apparently-no-longer-necessary emem.h includes. + Rename the "type" argument to V10's PACKET_DESCRIBE() to "ver". + + Move it in the argument list, and use it instead of a hard-coded 10 + (even though it's always passed as 10), to match the other + PACKET_DESCRIBE() macros. - Change-Id: I007a904613653b60a5b1a4fdc8261bc1480e41c6 - Reviewed-on: https://code.wireshark.org/review/6637 + Change-Id: Idd0a23a58cc6bb0d2de799b039db776d279cc03e + Reviewed-on: https://code.wireshark.org/review/7372 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 050bc7d +commit 825a833 Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 18 13:02:15 2015 -0800 +Date: Tue Feb 24 20:14:36 2015 -0800 - Update some comments to reflect reality. + Call the version-number argument to GENERATE_CASE_xxx() "ver". - Get rid of references to ep_ and se_ allocation in code that now uses - wmem allocation instead. + The name "type" is thrown around to mean both a version number and a + part of a structure member, and some other macros use "ver" for the + version number; try to make things a little less inconsistent. - Fix API documentation of conversation_table.h routines to reflect that - as well - some APIs changed to pass wmem scopes. - - Also, zbee_sec_key_hash() now takes the output buffer as an argument and - just returns it, and nobody actually uses the return value, so change it - to return void. - - Change-Id: Ife1ec675a9322fd0f0be306a9d639ec17aad1c7a - Reviewed-on: https://code.wireshark.org/review/6636 + Change-Id: I61405cf41cca43fe607154af7498944c5ec0ef11 + Reviewed-on: https://code.wireshark.org/review/7370 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 929d41c -Author: Evan Huus <eapache@gmail.com> -Date: Sun Jan 18 12:15:26 2015 -0500 - - Replace the last THROW ep_ calls with wmem - - They (should) all be strictly within the context of dissection, so can just - become packet_scope. - - Change-Id: Iaaa733628132f3ee3f1597f3df956e44080734f6 - Reviewed-on: https://code.wireshark.org/review/6631 - Petri-Dish: Evan Huus <eapache@gmail.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Evan Huus <eapache@gmail.com> - -commit 212eb17 -Author: Evan Huus <eapache@gmail.com> -Date: Sun Jan 18 12:08:39 2015 -0500 +commit fc6df64 +Author: Guy Harris <guy@alum.mit.edu> +Date: Tue Feb 24 19:12:35 2015 -0800 - replace DISSECTOR_ASSERT ep strings with wmem + Use FULL/PART as an argument to all PACKET_DESCRIBE() macros. - the DISSECTOR_ASSERT macro and friends are all guaranteed to be called within - the scope of a dissection, so they are safe to replace with wmem_packet_scope. + Makes the various flavors of that macro more similar. - Change-Id: I2684fb902da78d50aca5f4644df66c060caff625 - Reviewed-on: https://code.wireshark.org/review/6629 - Reviewed-by: Evan Huus <eapache@gmail.com> + Change-Id: Ie95ee8db0b226458146b055b54b7d61835f1e508 + Reviewed-on: https://code.wireshark.org/review/7368 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 44e7ce5 +commit 22b4b63 Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 18 12:18:38 2015 -0800 +Date: Tue Feb 24 19:00:17 2015 -0800 - Remove some apparently-unnecessary includes of emem.h. + Get rid of an unused argument to PACKET_DESCRIBE(). - Change-Id: Ib7d1b587b439ff21ec6b7f1756ce6ccf25b66f80 - Reviewed-on: https://code.wireshark.org/review/6635 + Change-Id: Ic2037f5bf7eb43f93ba39f91bca3fc267c8fb850 + Reviewed-on: https://code.wireshark.org/review/7366 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 7abb103 -Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Jan 15 13:07:48 2015 -0800 - - CMake: Copy data files to the run directory. - - Set DATAFILE_DIR to a value that includes the build configuration. Add a - copy_data_files target that copies AUTHORS-SHORT, the default filters, - and other support files to the run directory. Add FindPowerShell.cmake - and require it on Windows. Remove some OS X BUNDLE_RESOURCE_ - declarations which are now covered by copy_data_files. - - Change-Id: Iade74946dd5ed2c54239036aa4970f9ffc4681a4 - Reviewed-on: https://code.wireshark.org/review/6561 - Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> - Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 24954d6 -Author: Bill Meier <wmeier@newsguy.com> -Date: Sun Jan 18 14:45:30 2015 -0500 - - proto.c: Update some comments to reflect reality - - Change-Id: I0f82666cb233688d94d6f3a2c45d7490a7f79bec - Reviewed-on: https://code.wireshark.org/review/6634 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit e601e01 +commit 04b6b56 Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 18 11:46:28 2015 -0800 +Date: Tue Feb 24 16:15:13 2015 -0800 - Remove some apparently-unnecessary includes of emem.h. + Give all PACKET_DESCRIBE() macros a HEADERVER argument. - Also update a comment to no longer speak of ep_ allocation, and add an - include of <glib.h> to ui/profile.c, which was formerly relying on the - include of emem.h to drag it in. + A bit of regularization. - Change-Id: I08926699ee96cf66672836b6ee3bbb405b507ce8 - Reviewed-on: https://code.wireshark.org/review/6633 + Change-Id: I60e0bd50891e1ba3e9c40f8d1d14d63534e08138 + Reviewed-on: https://code.wireshark.org/review/7364 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 233dc64 +commit 08c85ec Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 18 11:33:27 2015 -0800 +Date: Tue Feb 24 16:06:49 2015 -0800 - Remove some apparently-unnecessary includes of emem.h. + Call header version arguments HEADERVER. - Change-Id: Id50ce3e707056cca8f30052f05c451ce431b39b5 - Reviewed-on: https://code.wireshark.org/review/6632 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 71c21a6 -Author: Michael Mann <mmann78@netscape.net> -Date: Fri Jan 16 12:35:14 2015 -0500 - - Remove seasonal memory from address resolution. - - This is the last remaining use of se_ memory APIs. - - Change-Id: Ic0508a830bc5460bc743d21eb33ffdd7f4ce2eb5 - Reviewed-on: https://code.wireshark.org/review/6574 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Reviewed-by: Evan Huus <eapache@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 90fc37e -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sun Jan 18 18:08:07 2015 +0100 - - make things a bit easier to read... + Use that rather than TYPE or acttype (to indicate that it's a header + version number to use as the "xxx" in NSPR_HEADER_VERSIONxxx, and to use + the same name throughout). - Change-Id: I3499c2f9e07a960f8bdf83973693bdeb4fb4ebd9 - Reviewed-on: https://code.wireshark.org/review/6630 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - -commit 1722d2a -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sun Jan 18 17:28:16 2015 +0100 - - remove trans_info parameter from dissect_usb_hid_report_item() - - Change-Id: I04eba644be7dd3e64b67c7d42c596bcdcf6a1942 - Reviewed-on: https://code.wireshark.org/review/6628 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - -commit 4399319 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sun Jan 18 17:16:15 2015 +0100 - - clean up the functions that dissect the hid requests - - Change-Id: Ie4d52b62824a8c0c777ffce3988fbe1fd4e5b4a4 - Reviewed-on: https://code.wireshark.org/review/6627 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - -commit 9ba910f -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sun Jan 18 17:07:41 2015 +0100 - - remove redundant (and unused) paramter usb_trans_info - - Change-Id: Ibb683f6d42125b13417aceb06949102a9821d626 - Reviewed-on: https://code.wireshark.org/review/6626 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - -commit 2441a23 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jan 18 08:04:40 2015 -0800 - - [Automatic manuf, services and enterprise-numbers update for 2015-01-18] - - Change-Id: If1c72e3b58ced6b9b86a584d96f632b2433751e8 - Reviewed-on: https://code.wireshark.org/review/6623 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 0d92b99 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Jan 18 15:20:57 2015 +0100 - - ISUP: add dissection of generic number qualifier indicator - - Bug: 10865 - Change-Id: Ib4cd60f570250490d5417c692f487711a65536b1 - Reviewed-on: https://code.wireshark.org/review/6620 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit b01ef11 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Jan 18 15:35:29 2015 +0100 - - HTTP: revert a change done in g0ee179c - - As indicated in the comment above, the previous code was done on purpose to handle the NUL case - - Bug: 10866 - Change-Id: I66eb9f6fbc9477456310978b420ba30975d81b0a - Reviewed-on: https://code.wireshark.org/review/6621 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 2660806 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sun Jan 18 13:51:00 2015 +0100 - - no need for if(tree) - - Change-Id: I7e8cfe3a220d65e80afa109a62867c4ff2ce08e8 - Reviewed-on: https://code.wireshark.org/review/6619 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - -commit c922801 -Author: Michael Mann <mmann78@netscape.net> -Date: Sat Jan 17 18:30:07 2015 -0500 - - ftype (integer): fix Uninitialized argument value found by Clang Analyzer - - Change-Id: I79e893f1d810a90c6a495067941d2e393e9fee72 - Reviewed-on: https://code.wireshark.org/review/6501 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit e7593ea -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Jan 18 13:13:00 2015 +0100 - - asn2wrs: autodetect if 64 bits variant is required for constrained integers - - It does not work with defines, but is already a great step forward - - Change-Id: I346d4124690ec46a2299d4eae8031bbb19a3db8e - Reviewed-on: https://code.wireshark.org/review/6617 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 12d17d2 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Jan 18 13:35:20 2015 +0100 - - Update libwireshark0.symbols - - Change-Id: I694448a998d3a1b74b19d2f1dfd6bb2be5bbce39 - Reviewed-on: https://code.wireshark.org/review/6616 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Tested-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit c326fca -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Jan 18 12:22:22 2015 +0100 - - LDAP: g8c608e6 did not include the changes in template file, that got lost afterwards - - Change-Id: I5d79d3e48c1ad83713a312dce39b749f47b0ecc8 - Reviewed-on: https://code.wireshark.org/review/6612 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 13b1e90 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Jan 18 11:58:02 2015 +0100 - - ASN.1: regenerate dissectors after g506409d - - Change-Id: If82112ce7bae4de0c0c24794dc57ffebbf401978 - Reviewed-on: https://code.wireshark.org/review/6611 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: I14cfc819e44ce4388c27d521a1256dec8d80df2e + Reviewed-on: https://code.wireshark.org/review/7361 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit ebea11a +commit c4b76a9 Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 18 02:46:49 2015 -0800 +Date: Tue Feb 24 14:32:28 2015 -0800 - We need epan/wmem/wmem.h regardless of whether we have GeoIP. - - It's used to generate the "sorry, we don't have GeoIP" message. + More indentation cleanups. - Change-Id: Ibd4e15508d3e2d09d81951b4dc23a1264971bb7a - Reviewed-on: https://code.wireshark.org/review/6610 + Change-Id: Ia448727e6340723800d92097f0ef7f3582ef6340 + Reviewed-on: https://code.wireshark.org/review/7359 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit c7500dd +commit 0dc5edf Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 18 02:43:54 2015 -0800 +Date: Tue Feb 24 14:28:21 2015 -0800 - Fix another dfilter_compile() call. + Clean up indentation. - Change-Id: I8b035a09b1bc1981a78a80e0a2547dce65a2ac9c - Reviewed-on: https://code.wireshark.org/review/6609 + Change-Id: I80f8c5c642ebc1fe0169e39c1af9584cfbb89d1a + Reviewed-on: https://code.wireshark.org/review/7357 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit cfcbb28 +commit 37c09e3 Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 18 02:22:19 2015 -0800 +Date: Tue Feb 24 14:22:24 2015 -0800 - Clean up ftype-conversion and dfilter error message string handling. - - Have dfilter_compile() take an additional gchar ** argument, pointing to - a gchar * item that, on error, gets set to point to a g_malloc()ed error - string. That removes one bit of global state from the display filter - parser, and doesn't impose a fixed limit on the error message strings. - - Have fvalue_from_string() and fvalue_from_unparsed() take a gchar ** - argument, pointer to a gchar * item, rather than an error-reporting - function, and set the gchar * item to point to a g_malloc()ed error - string on an error. + Pull more into PACKET_DESCRIBE() for the V10 seek-read routine. - Allow either gchar ** argument to be null; if the argument is null, no - error message is allocated or provided. + Just like the read routine. - Change-Id: Ibd36b8aaa9bf4234aa6efa1e7fb95f7037493b4c - Reviewed-on: https://code.wireshark.org/review/6608 + Change-Id: If6bd98bea15f1c8dc7454a5dac0ea57920bddc8c + Reviewed-on: https://code.wireshark.org/review/7355 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit c60fb30 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sun Jan 18 10:23:10 2015 +0100 - - Try to make Mac OS X Buildbots happy - - fix return makes pointer from integer without a cast - - Change-Id: Iaa55de58c36b1a59b08946836e519fee7bb889fc - Reviewed-on: https://code.wireshark.org/review/6607 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit a1f2342 -Author: Michael Mann <mmann78@netscape.net> -Date: Sat Jan 17 21:17:24 2015 -0500 - - Miscellaneous ep_strdup_printf replacement. - - Change-Id: I973c672e9d573ad67e9b9fd82a5610aaf8a74efa - Reviewed-on: https://code.wireshark.org/review/6605 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit ef7e8aa -Author: Michael Mann <mmann78@netscape.net> -Date: Sat Jan 17 20:59:20 2015 -0500 - - Remove ep_strndup - - Change-Id: Id336dc16f97a0973754993094aa637813c0ca31c - Reviewed-on: https://code.wireshark.org/review/6604 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 403be72 -Author: Michael Mann <mmann78@netscape.net> -Date: Sat Jan 17 20:34:35 2015 -0500 - - Remove emem from GeoIP - - Change-Id: Ifa96dc38a277b86c28f762489251dcc595afae67 - Reviewed-on: https://code.wireshark.org/review/6603 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 86726f4 -Author: Michael Mann <mmann78@netscape.net> -Date: Fri Jan 16 23:11:49 2015 -0500 - - Trim down the use of ep_ memory in the display filter code. - - Couldn't quite eliminate it completely, but it's much improved. Need to figure out where/when to free dfilter_error_msg. - - Change-Id: I10216e9546d38e83f69991ded8ec0b3fc8472035 - Reviewed-on: https://code.wireshark.org/review/6591 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 0ad15f8 -Author: Michael Mann <mmann78@netscape.net> -Date: Sat Jan 17 16:55:46 2015 -0500 - - Replace the last of ep_alloc and ep_alloc0 with wmem equivalent. - - Change-Id: I0338d0acda5e4b9957aad4825ca2cfd6fa506ead - Reviewed-on: https://code.wireshark.org/review/6596 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit b5eb971 -Author: Michael Mann <mmann78@netscape.net> -Date: Sat Jan 17 16:30:25 2015 -0500 - - Replace all remaining instances of ep_new with wmem_new and wmem_packet_scope. - - Change-Id: I50b2cd0e233554bc58082e96e8d879b40edfc0c1 - Reviewed-on: https://code.wireshark.org/review/6595 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit be113e8 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Jan 12 20:04:32 2015 +0100 - - DHCP/BOOTP: Option 125 Suboption: (1) option-len always expects 1 but specification allows for more - - We believe this is a bug in Wireshark with Option 125 Suboption: (1) option-len where Wireshark always expects 1 but specification is more flexible. - Re: http://www.cablelabs.com/wp-content/uploads/specdocs/CL-SP-CANN-DHCP-Reg-I10-1308081.pdf page 15 part 4.2.2 'The DHCPv4 Option Request Option' - - Issue reported by Steve Krebs - - Bug:10784 - Change-Id: I8eced7a70877d13d925b81c0f47885609baa7633 - Reviewed-on: https://code.wireshark.org/review/6510 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 506409d -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Jan 17 22:43:46 2015 +0100 - - X509AF: dissect Certificate Serial Number as INT64 instead of INT32 - - Bug: 10862 - Change-Id: Ie315298dd090b3b689f6a9bfff6f6f5bf7cc715a - Reviewed-on: https://code.wireshark.org/review/6594 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 77dac91 -Author: Michael Mann <mmann78@netscape.net> -Date: Fri Jan 16 23:18:46 2015 -0500 - - A few more emem replacements with wmem. - - Change-Id: Icfb319fba937642db637a7f26b5e7627461df3b0 - Reviewed-on: https://code.wireshark.org/review/6590 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 5c5b3f7 -Author: Michael Mann <mmann78@netscape.net> -Date: Fri Jan 16 21:47:48 2015 -0500 - - Convert proto_construct_match_selected_string to use wmem. - - Change-Id: I7a40c0996517aa71b4ddb764ce3a6e92a55260ad - Reviewed-on: https://code.wireshark.org/review/6589 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 6010d99 -Author: Sebastian Kloeppel <sk@nakedape.net> -Date: Thu Jan 15 11:19:41 2015 +0100 - - Added Card Application Toolkit Transport Protocol (CATTP) dissector - - Bug: 10843 - Change-Id: I35350d98b4225be12875b16e67506f7385ea9f28 - Reviewed-on: https://code.wireshark.org/review/6111 - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit ffa8bdd -Author: Russel <russel@appliedinvention.com> -Date: Fri Jan 16 14:27:10 2015 -0800 - - Correct PF field offset when looking for DA - - Previous code was not shifting far enough, was checking PS instead - of PF. - - Change-Id: Ic0bdbb4dfaa7bdd708a49f1fb67706dd949f2607 - Reviewed-on: https://code.wireshark.org/review/6578 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 8ec6ac6 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sun Jan 11 11:57:42 2015 +0100 - - dissect CCRC, APRC and the APDU body's data - - Change-Id: I21f7420286ed3e668ce4dc0eac06bbf4172039d6 - Reviewed-on: https://code.wireshark.org/review/6588 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - -commit 21e40ea -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sat Jan 10 18:33:32 2015 +0100 - - dissect the serial characters and the CRC - - Change-Id: I64af822f30b02d313f5242014ff5e40a73dffa35 - Reviewed-on: https://code.wireshark.org/review/6587 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - -commit a38b714 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Jan 17 14:55:22 2015 +0100 - - RSYNC: Malformed Packet on rsync-version with length 2 - - RSYNC dissector always think the resync-version length = 4 - - Bug:10863 - Change-Id: I2dee3ff7195af110223903d79b938849666878a7 - Reviewed-on: https://code.wireshark.org/review/6584 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit aa1057d -Author: maisheri <maisheri.hitesh@gmail.com> -Date: Sat Jan 17 14:05:38 2015 +0530 - - EAPOL-MKA: Included fixes for the distributed sak handling. - - Change-Id: Id91ba408266f18a9336811bf9d8b875796ea0cc1 - Reviewed-on: https://code.wireshark.org/review/6582 - Reviewed-by: maisheri <maisheri.hitesh@gmail.com> - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit 62ea319 +commit 592ee9e Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Jan 16 18:59:12 2015 -0800 +Date: Tue Feb 24 13:56:16 2015 -0800 - PacketLogger files can be big-endian or little-endian. + Swallow up more V10 stuff into PACKET_DESCRIBE(). - Bug: 10861 - Change-Id: Iedb248aa4a96e65bb525ba6475dc767e5dfefbe0 - Reviewed-on: https://code.wireshark.org/review/6579 + That makes it even more like V2x and V3x and slightly less unclear. + + Change-Id: I798ead123ba6418be0252067773a951390e26ce8 + Reviewed-on: https://code.wireshark.org/review/7353 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 3f284fb -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Thu Jan 15 22:41:13 2015 +0100 +commit 2a31311 +Author: Guy Harris <guy@alum.mit.edu> +Date: Tue Feb 24 13:21:51 2015 -0800 - USB: do not put usb_address_t structure on stack and initialize it completely (including implicit padding for alignment) + Have PACKET_DESCRIBE() for V10. - Bug: 10857 - Change-Id: Ib8339a5dc1c9461e681e0015c3f851c642f300c9 - Reviewed-on: https://code.wireshark.org/review/6560 - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 1e8c6ee -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Fri Jan 16 22:28:13 2015 +0100 - - Update a comment + Have it set the record type and initialize the presence bits. - Change-Id: I7bf1173bfb23e5f083b8aaf09476b30b4791aae0 - Reviewed-on: https://code.wireshark.org/review/6577 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit fa54781 -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Jan 16 11:26:20 2015 -0800 - - Update comment to reflect the current reality. + That makes it a bit more like V2x and V3x, and makes the code slightly + less unclear. - Change-Id: I7f8c66723efc9d21ec3abc08e57db1df5f772f04 - Reviewed-on: https://code.wireshark.org/review/6576 + Change-Id: Ibfbe2143b24a68c3fa3f576616fde81918b01feb + Reviewed-on: https://code.wireshark.org/review/7351 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 23666ba +commit fe5aea7 Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Jan 16 10:40:26 2015 -0800 +Date: Tue Feb 24 13:02:31 2015 -0800 - Spaces separate bytes; they don't have to surround them. + Move the setting of rec_type. - I.e., you don't need a trailing blank, at least not with the current - version (and there shouldn't be a requirement for such an extra trailing - blank). + This makes the code slightly less unclear. (You are in a maze of twisty + little C macros, all different.) - Change-Id: Ia2b732c74fc6020acc01a2c0c52ed3567d36d762 - Reviewed-on: https://code.wireshark.org/review/6575 + Change-Id: I9f1bcc7a9a1a7afe87ede8b1ba513e3d8e53845c + Reviewed-on: https://code.wireshark.org/review/7349 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit b6ec25f -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Fri Jan 16 18:05:15 2015 +0100 +commit ced6fba +Author: Guy Harris <guy@alum.mit.edu> +Date: Tue Feb 24 19:34:37 2015 +0000 - IS-IS: Add missing i variable for subclv loop (IS Reachability) - - Issue found by Alexander Okonnikov + Revert "exntest: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang" - Change-Id: I4eacab63a685b84c0d75811b96dc452471244337 - Reviewed-on: https://code.wireshark.org/review/6573 - Reviewed-by: Evan Huus <eapache@gmail.com> - -commit 22543d3 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Fri Jan 16 18:03:03 2015 +0100 - - IS-IS: wrong length for SubTLV 18 (TE default Metric) + This reverts commit f9fc25241ca0c735c0945bebf04669f17c3ffbff. - Issue found by Alexander Okonnikov + Apparently, clang is wrong about those increments being dead, as the tests done by exntest fail as a result of this change. Perhaps it doesn't understand setjmp/longjmp. - Change-Id: I8c1da71183f5bba50bb0bb541c259d5dba0b067d - Reviewed-on: https://code.wireshark.org/review/6572 - Reviewed-by: Evan Huus <eapache@gmail.com> + Change-Id: I248fba972e52bcbc97a228777139ca22a835f4b6 + Reviewed-on: https://code.wireshark.org/review/7347 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 3f57512 -Author: Evan Huus <eapache@gmail.com> -Date: Fri Jan 16 11:09:51 2015 -0500 +commit c280a40 +Author: Gerald Combs <gerald@wireshark.org> +Date: Tue Feb 24 10:31:29 2015 -0800 - Kill more unused emem functions + Qt: Escape ampersands in checkboxes and radio buttons. - Change-Id: Ib81410b6d760886f2ae585f44ac58fc135da62c7 - Reviewed-on: https://code.wireshark.org/review/6568 - Petri-Dish: Evan Huus <eapache@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Evan Huus <eapache@gmail.com> - -commit 4fa7396 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Jan 15 12:45:02 2015 +0100 - - CMakeList.txt/Makefile.am (root) : fix indent (use tabs) + Convert "&" to "&&" in checkbox and radio button preference labels so + that they aren't interpreted as shortucts. Fixes - Makefile.am: avoid double space - CMakeList.txt: Add modelines info + QKeySequence::mnemonic: "Attempt to dissect LCID 1&2 as srb1&2" contains multiple occurrences of '&' - Change-Id: Ic27d16b2f502362509ab13158e5428208afe3925 - Reviewed-on: https://code.wireshark.org/review/6570 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: Iacab6f81db01e6eca2cfdbaeda666f2e9c1016ed + Reviewed-on: https://code.wireshark.org/review/7346 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 16d367f -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Fri Jan 16 17:09:51 2015 +0100 +commit c0c6278 +Author: Roland Knall <roland.knall@br-automation.com> +Date: Tue Feb 24 10:15:47 2015 +0100 - ZBee ZCL: use tvb_get_guint8() (avoid tvb_get_ptr... !) + openSAFETY: Remove Macro and clear dissection - Change-Id: I248ddb1dee5398528279807968b095cbc5413ae0 - Reviewed-on: https://code.wireshark.org/review/6569 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 531df02 -Author: Michael Mann <mmann78@netscape.net> -Date: Fri Jan 16 08:15:41 2015 -0500 - - Remove se_ alloced memory from packet_list_store + Removing the macros for packet sender/receiver as it makes + the code hard to read and maintain. the more generic routine + opensafety_packet_node is also used for displaying the time + request sender and recipient. - Change-Id: I7aa2f5f8b433468ad2c2cd73cfce986d128a9ae0 - Reviewed-on: https://code.wireshark.org/review/6565 - Reviewed-by: Evan Huus <eapache@gmail.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 0235775 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Fri Jan 16 14:59:54 2015 +0100 - - GSM SIM: enhance dissection of APDU Class byte + Also clearing up the message id field, as it is the wrong size + and making the detection for the value an hf_field with an + array value. - Change-Id: I2089ff665a92ce16a0af100e2515463c92c6d057 - Reviewed-on: https://code.wireshark.org/review/6567 - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: I31cf0f944fe803fb503f4c5d29e106dfae0f6938 + Reviewed-on: https://code.wireshark.org/review/7344 + Reviewed-by: Roland Knall <rknall@gmail.com> + Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit ada1eec -Author: Michael Mann <mmann78@netscape.net> -Date: Sun Jan 11 21:32:53 2015 -0500 - - SE_COPY_ADDRESS -> WMEM_COPY_ADDRESS - - Copy addresses with wmem-scope instead of (forced) seasonal scope. All existing instances were converted to wmem_file_scope, but the flexibility is there for other scopes. - - Change-Id: I8e58837b9ef574ec7dd87e278470d7063ae8c1c2 - Reviewed-on: https://code.wireshark.org/review/6564 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 260b19e -Author: Michael Mann <mmann78@netscape.net> -Date: Fri Jan 16 08:29:57 2015 -0500 - - Remove seasonal memory from everything except address resolutions - - This includes circuits, conversations and streams as well as camel and h225 dissectors. - - Change-Id: Ia5ee70a5e5c6bcb420f0f19df126595246a3c042 - Reviewed-on: https://code.wireshark.org/review/6566 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit b2c4586 -Author: Chris Brandson <chris.brandson@gmail.com> -Date: Thu Jan 15 19:20:08 2015 -0800 - - bug 10833 undecoded bitmaps were being displayed raw which is hard to interpret, changed to an more friendly format - - Change-Id: If79a695646837cdfb3e1b168a47b96984c58e328 - Reviewed-on: https://code.wireshark.org/review/6563 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit a4d1709 -Author: Jeff Morriss <jeff.morriss.ws@gmail.com> -Date: Thu Jan 15 21:46:52 2015 -0500 - - (Trivial) Move a comment next to the code related to it. - - Change-Id: I83749a1b30059cc8e8f13b58fbde74e9ab873582 - Reviewed-on: https://code.wireshark.org/review/6562 - Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> - -commit d009b55 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Jan 15 19:48:39 2015 +0100 - - Quakeworld: Nesting level does not match indendation (CID 1159218) - - Change-Id: I6d18f103bda6db025eebfc902453256b007dddf7 - Reviewed-on: https://code.wireshark.org/review/6556 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 3f8fbb7 -Author: Michael Mann <mmann78@netscape.net> -Date: Sun Jan 11 21:18:22 2015 -0500 +commit 30ed6a1 +Author: Gerald Combs <gerald@wireshark.org> +Date: Wed Feb 18 17:18:27 2015 -0800 - Remove the last two true calls to se_alloc. + Qt: Apply recent settings. - (The other calls are just wrapped in macros) + Add PacketList::applyRecentColumnWidths which set the packet list + column widths from our recent settings. Make sure it gets called at + startup and when we change profiles. - Change-Id: I6a029dddf7742ba95510ec24cec30553461e48c6 - Reviewed-on: https://code.wireshark.org/review/6558 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Reviewed-by: Evan Huus <eapache@gmail.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit e530c89 -Author: Michael Mann <mmann78@netscape.net> -Date: Sun Jan 11 19:48:54 2015 -0500 - - Replace se alloced memory in compare stat tap. + Save the packet list header state so that we can restore it when we + reset the model (i.e. freezing and thawing) and load a new capture file. + Save the state when the user resizes a column. As a side effect this + works around a weird bug that adjusts the width of column 1 at an + inopportune time. - Also replaced comments mentioning se_alloc memory with wmem_file_scope, since it's more accurate. + Add a profileChanging signal so that we can save the main window geometry + in each profile. - It seems that many of the TShark stat taps may be leaking memory, because the hash tables created by the taps don't get a chance to be freed. Somewhat academic since TShark exits shortly after displaying any stats, but a leak none the less. + Get rid of MainWindow::configurationProfileChanged. It was unused. - Change-Id: I8ceecbd00d65b3442dc02d720b39c2e15aa0c8a6 - Reviewed-on: https://code.wireshark.org/review/6557 - Reviewed-by: Evan Huus <eapache@gmail.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 7d43836 -Author: Deon van der Westhuysen <deonvdw@gmail.com> -Date: Tue Jan 6 10:22:48 2015 +0100 - - QT: stats_tree plug-ins not added to statistics menu + Apply saved pane widths and heights. Note that we might want to add a + separate pair of recent settings for the Qt panes. - Wireshark Qt does not add plug-ins that register with stats_tree_register_plugin() to the statistics menu in the ui (like the gtk version does). + Use the last opened directory in the capture file dialog. - This patch dynamically adds all registered stats_tree plug-ins to the statistics menu. + Git rid of some unneeded Q_UNUSEDs while we're here. - Bug: 9528 - Change-Id: I99f9415502ca9f7121d494c856861edc1a762079 - Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-on: https://code.wireshark.org/review/6336 - Petri-Dish: Gerald Combs <gerald@wireshark.org> + Bug: 10953 + Change-Id: I812aff59818cf0b4d1598b580627d32728d2e9d7 + Reviewed-on: https://code.wireshark.org/review/7247 + Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> + Tested-by: Michal Labedzki <michal.labedzki@tieto.com> + Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit d5ee022 -Author: Michael Mann <mmann78@netscape.net> -Date: Thu Jan 15 15:09:47 2015 -0500 - - Replace C++ style comment with C style. - - Change-Id: Ibee0dccdb5a330866dcd0047216cd5a4da45fc8b - Reviewed-on: https://code.wireshark.org/review/6559 - Reviewed-by: Michael Mann <mmann78@netscape.net> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit c610c38 +commit f9fc252 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Jan 15 19:46:11 2015 +0100 +Date: Thu Feb 19 22:41:32 2015 +0100 - Conversation Table : Copy-paste error (CID 1262415) + exntest: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - Change-Id: I37fd8154f93763ac091528921d1b66d8e8fd56dd - Reviewed-on: https://code.wireshark.org/review/6555 + Change-Id: I91ec67e8c2168dd9a93c3894abdf304c0a75845d + Reviewed-on: https://code.wireshark.org/review/7263 Reviewed-by: Michael Mann <mmann78@netscape.net> -commit e75dd98 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Jan 15 19:45:10 2015 +0100 - - NetFlow: Assign instead of compare (CID 1262419 & 1262420) - - Change-Id: Idc2c2e02b973f65c6c2f22f2d1bfd8545cd23f63 - Reviewed-on: https://code.wireshark.org/review/6554 - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> - -commit 1562827 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Jan 15 19:38:25 2015 +0100 - - Packet List (Qt): Missing break in switch (CID 1262418) - - Change-Id: Id46f2be5b5206dfcb0ce7e7ea2d31398eff54917 - Reviewed-on: https://code.wireshark.org/review/6552 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 3385984 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Jan 15 19:43:11 2015 +0100 - - Address to str: Missing break in switch (CID 1262416 & 1262417) - - It will also fix "Unused Value" (CID 1262422) - - Change-Id: I626c087365e9d6fe625f807ab8ded518d94cab64 - Reviewed-on: https://code.wireshark.org/review/6553 - Reviewed-by: Evan Huus <eapache@gmail.com> - -commit adf0881 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Jan 15 19:26:52 2015 +0100 - - HTTP: fix implicit conversion shortens 64-bit value into a 32-bit value - - It will be make Mac OS X buildbot happy - - Change-Id: I628445c1358675a58cc2d26ce1ca3007dd619ff3 - Reviewed-on: https://code.wireshark.org/review/6551 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit 9c044e2 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Thu Jan 15 14:25:24 2015 +0100 - - ZigBee: packet scope memory cannot be used for BASE_CUSTOM callbacks - - Change-Id: I28fe21151b9f8c91786ca6c56d141a458419c501 - Reviewed-on: https://code.wireshark.org/review/6548 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 69d32a9 -Author: Uli Heilmeier <uh@heilmeier.eu> -Date: Mon Jan 12 16:26:39 2015 +0100 +commit b125fea +Author: Daniel Mack <daniel@zonque.org> +Date: Tue Feb 24 09:32:38 2015 +0100 - HTTP Dissector: Add CitrixAGBasic authentication + epan: fix build error with gcc5 - Citrix uses a proprietary authentication schema called CitrixAGBasic for - their StoreFront/Web Interface product. + gcc5 bails out with the below error. - The Header looks like: - Authorization: CitrixAGBasic username="dGVzdHVzZXI="; domain= \ - "dGVzdGRvbWFpbg=="; password="c2VjcmV0"; AGESessionId= \ - "YzI0NmRkMmFmYmE5ZTk5M2I5ZDRkN2UwYzYzZWExN2U=" - - This patch enhances the HTTP dissector to decode this authentication data. - - Due to non-discolsure I can only provide a faked GET request as a pcap - capture (attached to this bug). + CC libwireshark_la-tvbparse.lo + CC libwireshark_la-tvbuff_base64.lo + tvbparse.c: In function 'cond_not_char': + tvbparse.c:254:18: error: logical not is only applied to the left hand side of comparison [-Werror=logical-not-parentheses] + if (! offset < tt->end_offset ) { + ^ + cc1: all warnings being treated as errors + Makefile:1843: recipe for target 'libwireshark_la-tvbparse.lo' failed - Bug: 10851 - Change-Id: Ic8e48db94809c9c64889cd050911de3fe23cdcdd - Reviewed-on: https://code.wireshark.org/review/6526 - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: I4e8654e97079da6b39be580fc766eecefb4c7ea6 + Reviewed-on: https://code.wireshark.org/review/7339 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit e0539ed -Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Jan 15 08:34:52 2015 -0800 +commit 4ee6bcb +Author: Peter Wu <peter@lekensteyn.nl> +Date: Sat Feb 21 18:43:14 2015 +0100 - CMake: Rename the windeployqt variable. + websocket: avoid recursion, use tcp_dissect_pdus - The windeployqt variable name ends up in the cache. Change it to - QT_WINDEPLOYQT_EXECUTABLE, which follows conventions used in the Qt - CMake modules. - - Change-Id: I14998b921009e44e5ca743e2915fe84447b22df0 - Reviewed-on: https://code.wireshark.org/review/6549 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 58bb07b -Author: Graham Bloice <graham.bloice@trihedral.com> -Date: Wed Jan 14 22:59:21 2015 +0000 - - Fix-copy-qt-dll + Use tcp_dissect_pdus to handle reassembly and avoid a recursion in + dissect_websocket. The HTTP dissector is modified to preserve + desegmentation functionality (tested with the capture from bug 8448). - The copy-qt-dll custom command should ensure the qt bin dir is on - the path. - Modify the flags passed to windeployqt depending on the configuration. + As tcp_dissect_pdus is used now, the workaround for bug 8448 can be + removed and the actual frame dissection logic becomes simpler (the + length is checked in get_websocket_frame_length). - Change-Id: I12860d415f80cee323c72aa8a4892eaa6126f165 - Reviewed-on: https://code.wireshark.org/review/6537 - Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> - Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> + Bug: 10989 + Change-Id: I67af96a6c7be88c2a77e1c4138abe90bdb880774 + Reviewed-on: https://code.wireshark.org/review/7285 + Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit a1fce22 -Author: Martin Kaiser <martin.kaiser@paytec.ch> -Date: Thu Jan 15 16:18:23 2015 +0100 - - remove the executable bits from packet-zvt.c - - (I should not use git on cygwin for adding new files) - - Change-Id: I314d78073f1ebd633a20ff7c9ac3d0b236b3906a - Reviewed-on: https://code.wireshark.org/review/6547 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - -commit ba7aa19 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Wed Dec 24 12:42:16 2014 +0100 - - start a dissector for ZVT Kassenschnittstelle - - this is a protocol between payment terminals and - electronic cash-register systems / vending machines - - Change-Id: Ieac87c0af8e15f2dfe8b4a6274f3b56d652a5b1f - Reviewed-on: https://code.wireshark.org/review/6531 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - Tested-by: Martin Kaiser <wireshark@kaiser.cx> - -commit 1e1d96f -Author: AndersBroman <anders.broman@ericsson.com> -Date: Thu Jan 15 16:01:40 2015 +0100 - - Modify the errorcode defenition to suit ANSI MAP, this is (probably) OK as - ANSI MAP is currently the only user of ANSI TCAP. - Bug: 6112 - - Change-Id: I49f89c862ddc8351091a9a939415e4ba6e7603f5 - Reviewed-on: https://code.wireshark.org/review/6546 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit ef0435b -Author: Evan Huus <eapache@gmail.com> -Date: Thu Jan 15 08:31:26 2015 -0500 - - ZigBee: don't use packet_scope outside of dissection - - The decode_* functions defined here are called post-dissection for formatting - labels, so don't have access to packet scope. Just use and free manual memory. - - Introduced in gbdfabe59. - - Bug: 10855 - Change-Id: I9b0085b1f7779ae6fbd12482c44d8f611cdbb49f - Reviewed-on: https://code.wireshark.org/review/6545 - Reviewed-by: Evan Huus <eapache@gmail.com> - -commit c2350a5 -Author: Evan Huus <eapache@gmail.com> -Date: Thu Jan 15 05:42:06 2015 -0500 - - rsvp: fix typo - - caught by test suite as: - Duplicate field detected in call to proto_register_field_array: - rsvp.call_attributes is already registered - - Change-Id: Ibf4ead3026b9930fb8f6ab07f0a5a4c299cedc35 - Reviewed-on: https://code.wireshark.org/review/6544 - Reviewed-by: Evan Huus <eapache@gmail.com> - -commit 0d9248e -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Thu Jan 15 09:41:32 2015 +0000 - - Netflow: Fix spelling of 'latitude' - - Change-Id: Iaae40f4a191e458645263c8d7a114392cd063707 - Reviewed-on: https://code.wireshark.org/review/6543 - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> - -commit adaa661 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Jan 7 21:32:47 2015 +0100 +commit c466d40 +Author: ranushekhar <ranushekhar@gmail.com> +Date: Mon Feb 23 18:17:33 2015 +0530 - Update to libnghttp2 0.7.1 + NS Trace (NetScaler Trace) file format is not able to export specified packets - Change-Id: Ib8d40586a3b95674447819f77eaaa69376dce6fd - Reviewed-on: https://code.wireshark.org/review/6411 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit 5b92ab9 -Author: Miltos Patsiouras <mipatsio@gmail.com> -Date: Sat Nov 15 15:33:25 2014 +0200 - - RSVP: Add support of GMPLS Support for Metro Ethernet Forum and G.8011 (RFC 6004) - - This document describes a method for controlling two specific types - of Ethernet switching via Generalized Multi-Protocol Label Switching - (GMPLS). This document supports the types of switching corresponding - to the Ethernet services that have been defined in the context of the - Metro Ethernet Forum (MEF) and International Telecommunication Union - (ITU) G.8011. Specifically, switching in support of Ethernet private - line and Ethernet virtual private line services are covered. Support - for MEF- and ITU-defined parameters is also cover - - Bug: 7841 - Change-Id: I12e12d01d497bd0e9703efcf6bd8ad100805bccc - Change-Id: I180c095652604bc025ab81171dd8a042e0930f08 - Reviewed-on: https://code.wireshark.org/review/5323 + Bug: 10998 + Change-Id: Ic2c5ad5b01be3e0c39b1e93badcc4f2246c420fe + Reviewed-on: https://code.wireshark.org/review/7327 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 06ddb7e +commit 30651ab Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Tue Jan 13 11:45:15 2015 +0100 +Date: Sun Feb 22 12:43:25 2015 +0100 - CAPWAP: Add a IEE802.11 Message Element Type (RFC5416) + DNS: Ignore Client Subnet option's data length when > 16 - * IEEE 802.11 Information Element (1029) + When DNS Client Subnet length is > 16, the limit coming from avoid stack smashing with tvb_memcpy - Add add_tagged_field to packet-ieee80211.h (will be used by other dissector) + Issue reported by Boaz - Change-Id: Icd13be416ccc47fb2309b9962e9a47c339885d1e - Reviewed-on: https://code.wireshark.org/review/6524 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Bug:10988 + Change-Id: I6103ba47fac9817410c7fc399c18e96c66ab8438 + Reviewed-on: https://code.wireshark.org/review/7308 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit fcd2d4f -Author: Graham Bloice <graham.bloice@trihedral.com> -Date: Wed Jan 14 23:05:02 2015 +0000 - - Fix cmake-cflags - - The flags that are deleted are already supplied by the CMake generator. - - Change-Id: Ifafc2343ac0c5d365a39f4a181b23f54c65bce74 - Reviewed-on: https://code.wireshark.org/review/6538 - Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> - -commit cb1f8a3 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Jan 12 18:14:00 2015 +0100 - - CAPWAP: Add some IEE802.11 Message Element Type (RFC5416) - - * IEEE 802.11 OFDM Control (1033) - * IEEE 802.11 Update WLAN (1044) - - Change-Id: I702de1d649b1dc2af1de83ee21152c6a18f42dfc - Reviewed-on: https://code.wireshark.org/review/6509 + Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit f6021e8 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Jan 12 17:13:28 2015 +0100 +commit b9af5a5 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Mon Feb 23 16:50:18 2015 +0100 - CAPWAP: Add a new Message Element Type (RFC5415) - - * Delete Station (18) + proto.c: avoid corrupting stack when printing a 64 bits field in BASE_DEC_HEX or BASE_HEX_DEC format - Change-Id: I33afa96d183b8ff22725d2e00dcfeccea3fdfa04 - Reviewed-on: https://code.wireshark.org/review/6508 + Bug: 10994 + Change-Id: Id5049054d5b04838df325f03a6bfa238a2063fb7 + Reviewed-on: https://code.wireshark.org/review/7329 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit d9ec8ab -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sun Jan 4 13:16:47 2015 +0100 - - mate_util: fix parameter ... not found in the function declaration [-Wdocumentation] - - Change-Id: I66af53ee06866b45339814b5fa949551c0dd45c1 - Reviewed-on: https://code.wireshark.org/review/6535 - Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 6f630c1 -Author: Jeff Morriss <jeff.morriss.ws@gmail.com> -Date: Wed Jan 14 21:04:32 2015 -0500 - - Fix the compile: Use the new (double) variable. - - Change-Id: I38a9b0f55e9f19fe7f4f09f5eec2817dd822c6d0 - Reviewed-on: https://code.wireshark.org/review/6542 - Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> - -commit b63a942 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Jan 14 16:55:40 2015 -0800 - - Fix a crash in the GTK+ RTP Streams dialog. - - Make sure we copy guint, gdouble, and gchar * data to variables of the - correct type. Fixes a crash when trying to copy CSV data (we were trying - to stuff a gdouble into a char *). - - Change-Id: I3cbcc48216a078f85f13860d14707f309b9820d7 - Reviewed-on: https://code.wireshark.org/review/6541 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit d443db0 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Jan 14 16:41:38 2015 -0800 - - Fix indentation. - - Change-Id: I089d18d6dde56c04d75f7c991511728a0a66f699 - Reviewed-on: https://code.wireshark.org/review/6540 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 9a19d6d -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Jan 14 15:13:40 2015 -0800 +commit 770ac91 +Author: Gerald Combs <gerald@zing.org> +Date: Sun Feb 22 14:56:38 2015 -0800 - CMake: Look for FOP and HHC only when needed. - - FOP is only required for generating PDF output and HHC is only needed - for CHM output. Don't look for them unconditionally. + Qt: Fix a crash when changing the layout. - Change-Id: I7bec7d061c9e9e8b99431cab873e8c719469552c - Reviewed-on: https://code.wireshark.org/review/6539 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 242f711 -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Jan 13 13:32:12 2015 -0800 - - CMake: Update windeployqt discovery. + Freeze and thaw the packet list when changing the layout. This has the + side effect of clearing the proto tree and byte view, which avoids + reading a bad tvb pointer. Note that we might want to add a cleanup + callback to free_data_sources. - Update the comments and add a URL. Use HINTS, which is more correct - according to the documentation. + Save and restore the current row. Add CaptureFile::currentRow. Fix a + couple of comparisons in PacketList. - Change-Id: I82a7e2790dfa0b398e2b534f9f45851f55bdc0d2 - Reviewed-on: https://code.wireshark.org/review/6536 + Change-Id: I26f9b97ae5a7cdb4fb6e5e6e675570884900e995 + Reviewed-on: https://code.wireshark.org/review/7337 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 5b8fa72 -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Jan 13 13:32:12 2015 -0800 +commit a6f4bdb +Author: Daniel Mack <daniel@zonque.org> +Date: Tue Feb 24 00:50:19 2015 +0100 - CMake: Copy Qt DLLs to the target directory. + pcap-common: fix build error with gcc5 - Add a "copy_qt_dlls" target similar to "copy_cli_dlls". Wireshark.exe - must exist before windeployqt can be run, so we can't create a PRE_BUILD - target. Add copy_qt_dlls to the default target instead. + gcc5 complains about the issue below, so add a trivial fixup. - Change-Id: If85d89478472b10b31229413465955fe98b0ef02 - Reviewed-on: https://code.wireshark.org/review/6529 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 86fde78 -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Jan 13 10:15:18 2015 -0800 - - CMake: Copy wireshark-gtk dependent DLLs to the target directory. - - Add a "copy_gtk_dlls" target similar to "copy_cli_dlls". - - Change-Id: Id1df1d0ec00c46fccec90c4b8c0c8a2d2a14766a - Reviewed-on: https://code.wireshark.org/review/6527 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 20e2c05 -Author: AndersBroman <anders.broman@ericsson.com> -Date: Wed Jan 14 13:47:08 2015 +0100 - - [E212]Modify dissect_e212_mcc_mnc() to take E212 number type as an - argument. While at it remove deprecated APIs - - Change-Id: Ib1a7e9d7aeba6379fb4492816a0ac602e67493c6 - Reviewed-on: https://code.wireshark.org/review/6534 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 36aca29 -Author: Graham Bloice <graham.bloice@trihedral.com> -Date: Mon Jan 12 15:12:04 2015 +0000 - - Minor Development Guide updates - - Corrected info about paths to built executable. - Cross referenced empty debugger sections to the section with info. + CC libwiretap_la-pcap-common.lo + pcap-common.c: In function 'pcap_byteswap_nflog_pseudoheader': + pcap-common.c:1290:30: error: logical not is only applied to the left hand side of comparison [-Werror=logical-not-parentheses] + if (!(nfhdr->nflog_version) == 0) { + ^ + cc1: all warnings being treated as errors - Change-Id: I4366825990f1a5286c7292c9f00e540160c1b5d0 - Reviewed-on: https://code.wireshark.org/review/6520 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> + Change-Id: I9f5b090ffd564f203cc3fb4ff302f2e4752865f0 + Reviewed-on: https://code.wireshark.org/review/7336 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 0ee179c -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Tue Jan 13 23:18:37 2015 +0100 +commit 5e34492 +Author: unknown <drkor@hotbox.ru> +Date: Mon Feb 23 21:19:30 2015 +0300 - HTTP: allocate header_name in packet scope instead of file scope + BSSMAP: VGCS/VBS Assignment Request wrong first parameter - While we are at it, factorize the copy of value string + According to specification first mandatary parameter is Channel Type (BE_CHAN_TYPE) + but not Current Channel Type 1 (BE_CURR_CHAN_1). + And also "Channel Type" is TLV but not TV type. - Change-Id: I2a16155641b8bd8623baf51f787a5f450e7b3803 - Reviewed-on: https://code.wireshark.org/review/6530 + Change-Id: I740dc10930a854fcb1cf2e09a19d57a16f8cf33e + Reviewed-on: https://code.wireshark.org/review/7330 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 63a3d04 +commit 4a07667 Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Jan 13 15:13:40 2015 -0800 +Date: Mon Feb 23 12:51:23 2015 -0800 - Consistently use the "g_string_free returns a C string pointer" idiom. - - g_string_free(str, FALSE) frees the GString container but not the - underlying g_malloc()ed string; instead, it returns a pointer to the - g_malloc()ed string. - - Fix those places that didn't already get the string pointer from - g_string_free() to do so rather than manually extracting the string - themselves. + Get rid of no-longer-needed variables. - And fix one place that didn't even need to use a string - it was just - scanning a C string without even modifying it. - - Change-Id: Ibbf4872bf5b9935b9907f539b6edb1013f3053a5 - Reviewed-on: https://code.wireshark.org/review/6532 + Change-Id: I2758c4f57fdaaa61c1d73ca9b5ccaf427599a624 + Reviewed-on: https://code.wireshark.org/review/7332 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 9f5e4fb +commit 2899cf4 Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Jan 13 13:00:59 2015 -0800 +Date: Sun Feb 22 18:59:43 2015 -0800 - uat_load() and uat_save() return a success indication; use it. - - Instead of always ignoring the return value, always check it, and only - report an error if it returns FALSE. + Don't add redundant information to the top-level flags item for NBNS. - (Alternative: have it return NULL on success and a pointer to a - g_malloc()ed string on failure.) + We already add the opcode, a "this is a response" indication for + responses and, for non-WACK responses, the response code. No need to + add it again. - Fix a comment while we're at it. - - Change-Id: Icb72c9f47775b6552e3eb4fe5ddcc85482bfb5fb - Reviewed-on: https://code.wireshark.org/review/6528 + Change-Id: I2dd0f937568057a96cd70511c872f811ea838106 + Reviewed-on: https://code.wireshark.org/review/7331 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 25f010b +commit 255de16 Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Tue Jan 13 14:26:34 2015 +0100 +Date: Mon Feb 23 14:50:28 2015 +0100 - MAC LTE: upgrade dissector to v12.4.0 + RSVD: add missing initialization of lun parameter - Change-Id: Ieb5395a6ae7a1d7625fe645d0caf14008993d3d9 - Reviewed-on: https://code.wireshark.org/review/6521 + Bug: 10993 + Change-Id: I0232cf616f880a02d50f20c67d9f76a642153737 + Reviewed-on: https://code.wireshark.org/review/7328 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit bc23f79 -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Jan 13 12:13:45 2015 -0800 - - UAT error string pointers should not be const pointers. - - UAT error strings are usually allocated by g_strdup() or - g_strdup_printf(), and must ultimately be freed by the caller. - - Make the pointer-to-error-string-pointer arguments to various functions - be "char **", not "const char **". - - Fix cases that finds where a raw string was being used, as that won't - work if you try to free it; g_strdup() it instead. - - Add a missing free of an error string. - - Remove some no-longer-necessary casts. - - Remove some unnecessary g_strdup()s (the string being handed to it was - already g_malloc()ated). - - Change some variable declarations to match. - - Put in XXX comments for some cases where the error string is just freed, - without being shown to the user. - - Change-Id: I40297746a2ef729c56763baeddbb0842386fa0d0 - Reviewed-on: https://code.wireshark.org/review/6525 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit a988253 -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Jan 12 14:44:42 2015 -0800 - - CMake: Copy libwireshark dependent DLLs to the target directory. - - Add a "copy_cli_dlls" target which copies the DLLs required to run our - command line programs to the run directory. - - Fix the spelling of "KERBEROS". Start filling in variables so that we - can populate config.nsh. - - Change-Id: I9b3ed912dfbffecbf09f2893efa2c9d82e709521 - Reviewed-on: https://code.wireshark.org/review/6513 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 42e4040 -Author: AndersBroman <anders.broman@ericsson.com> -Date: Tue Jan 13 15:12:45 2015 +0100 - - [GPRS CDR]Fix faulty ASN1 modification - Should be: egsnPDPRecord [70] EGSNPDPRecordV750 - - Change-Id: I4b03524c09b6ce603cf4783144d588c8839a16e6 - Reviewed-on: https://code.wireshark.org/review/6523 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit db7f25f -Author: AndersBroman <anders.broman@ericsson.com> -Date: Tue Jan 13 14:04:44 2015 +0100 - - [GPRS CDR] Handle Rel 7 CDRs - - Change-Id: I09833a326e486273c3eacaceba0963fe88e0dac6 - Reviewed-on: https://code.wireshark.org/review/6522 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit f90eeb1 -Author: Guy Harris <guy@alum.mit.edu> -Date: Mon Jan 12 20:35:44 2015 -0800 - - When allocating address structures, use wmem_new0(). - - For structures used as the data in an address, use wmem_new(), so that - structure padding is zeroed out; the comparison code for addresses - compares all bytes of the structure for addresses that are structures, - and the hashing code for hash tables using addresses as keys hash all - the bytes, so we have to make sure that, for addresses that are the - same, *all* bytes are the same. - - Change-Id: I995fd26cc2f20edb5a599f95562b720561708e57 - Reviewed-on: https://code.wireshark.org/review/6517 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit b204ff4 -Author: Guy Harris <guy@alum.mit.edu> -Date: Mon Jan 12 20:07:09 2015 -0800 +commit 9667666 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Mon Feb 23 13:05:46 2015 +0100 - Do bounds checking when decompressing WCP packets. + ui/gtk: use GTK+ 2 name for control keys - Extract the data offset and count only once, and make sure we don't run - past the end of the data we've copied from the packet; have - decompressed_entry() just do the decompression, rather than also - fetching the data offset and count. + The GDK_KEY_* names are part of GTK+ 3, GTK+ 2 does not have the _KEY_ + infix. See + https://developer.gnome.org/gtk3/stable/gtk-migrating-2-to-3.html#id-1.6.3.3.6 - Add some comments while we're at it. - - Bug: 10844 - Change-Id: I2dc2f9594422ffa8f15fd5c57c9dac2e30e363f4 - Reviewed-on: https://code.wireshark.org/review/6514 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 63d8e44 -Author: Jörg Mayer <jmayer@egg.fg-networking.de> -Date: Tue Jan 13 02:35:37 2015 +0100 - - Fix ASCIIDOC detection broken by commit ae2888aeb2b418c9f62 - - Change-Id: I36cd42a9040e8f8ab2b11ff4211a1298663909a2 - Reviewed-on: https://code.wireshark.org/review/6512 - Reviewed-by: Jörg Mayer <jmayer@loplof.de> - -commit de5e7b8 -Author: Michael Mann <mmann78@netscape.net> -Date: Mon Jan 12 11:24:37 2015 -0500 - - Fix casting compiler warning + Fixes regression from "ui/gtk: fix control combos such as ctrl-a, + ctrl-c". - Change-Id: I179706042168cb4fd1bfb5f9c573f302d9d62fa0 - Reviewed-on: https://code.wireshark.org/review/6506 - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: I4d470212d172f978c171e54ff7377ddc211817ac + Reviewed-on: https://code.wireshark.org/review/7325 + Reviewed-by: Balint Reczey <balint@balintreczey.hu> -commit 0b271aa -Author: Evan Huus <eapache@gmail.com> -Date: Mon Jan 12 10:08:29 2015 -0500 +commit d488d63 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Wed Feb 18 20:06:57 2015 +0100 - Remove ep_strbuf code + ssl-utils: refactor keyfile matching - Thanks to Michael's work, it is now totally unused. + Merge the three separate regexes into a single pattern and use named + groups. This avoid magic numbers (group positions) and removes a + possible error source when the ht array gets out of sync with the + patterns array (by human error). - Change-Id: I67b5f7c69535a08f96f449c36c429e2548f4ea11 - Reviewed-on: https://code.wireshark.org/review/6505 - Petri-Dish: Evan Huus <eapache@gmail.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Evan Huus <eapache@gmail.com> - -commit f699f61 -Author: Jeff Morriss <jeff.morriss.ws@gmail.com> -Date: Fri Jan 9 16:44:15 2015 -0500 - - Error out if the user requests the SBC library but it's not found. + This is supposed to be more readable and allows for easier extension of + the regex. - Change-Id: I7c152420703d0d37c7b29d3c8f535b17180e020a - Reviewed-on: https://code.wireshark.org/review/6455 - Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> - -commit 7967ef9 -Author: Michael Mann <mmann78@netscape.net> -Date: Fri Jan 9 19:50:09 2015 -0500 - - Remove emem APIs from UAT functionality. - - Change-Id: I009c09f25d170e5c9aaaef713eaacb3252817856 - Reviewed-on: https://code.wireshark.org/review/6460 - Petri-Dish: Michael Mann <mmann78@netscape.net> + Change-Id: I816525f358cdb89ff9f8ebc1211139b1f8c23840 + Reviewed-on: https://code.wireshark.org/review/7245 Reviewed-by: Evan Huus <eapache@gmail.com> - Petri-Dish: Anders Broman <a.broman58@gmail.com> + Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 554a397 -Author: AndersBroman <anders.broman@ericsson.com> -Date: Mon Jan 12 13:58:49 2015 +0100 - - [GPRS CDR] Add expert info for unknown record types. - - Change-Id: Ib485f435b6c423b06c7c31f2cf681d01261bfc15 - Reviewed-on: https://code.wireshark.org/review/6504 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit d7bce33 -Author: Graham Bloice <graham.bloice@trihedral.com> -Date: Mon Jan 12 11:26:59 2015 +0000 +commit 306c819 +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Thu Feb 19 22:32:31 2015 +0100 - Fix Cygwin path + jmirror packet dissector expects ipv6 flow label = 0 - Fix the Cygwin path added for tests so that Cygwin comes after the - existing path and that the correct link command is found for exntest. + When the ipv6 flow label is non-zero the dissector does not detect the payload as being ipv6. - Same change to runa2x.sh to be consistent. + Issue reported by Shehan Perera - Change-Id: I177a5e7d17a0077b0e8ca7d264d7e725a5312e24 - Reviewed-on: https://code.wireshark.org/review/6503 - Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> - Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> - Tested-by: Graham Bloice <graham.bloice@trihedral.com> + Bug:10976 + Change-Id: I1de4966dfefd1afa9bb51b9a7570091aad59fbdd + Reviewed-on: https://code.wireshark.org/review/7260 + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 0385d15 -Author: Graham Bloice <graham.bloice@trihedral.com> -Date: Sun Jan 11 20:37:03 2015 +0000 +commit 4c994e3 +Author: Jeroen Sack <jeroen@jeroensack.nl> +Date: Sun Feb 22 21:37:42 2015 +0100 - Fix Cygwin path in runa2x.sh - - As I don't have Cygwin on the path, the uname -o call failed. - The method used here seems to work reliably without needing Cygwin - on the path. + L2CAP information message contained two bits that were wrongly dissected. - Change-Id: I206db542b5e89895a43c48626e2d14fff380fc8f - Reviewed-on: https://code.wireshark.org/review/6497 - Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> + Change-Id: I308b6ed1a3953676212b9c0bb6cd7fc180210534 + Reviewed-on: https://code.wireshark.org/review/7323 + Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> -commit a49e1d5 -Author: Graham Bloice <graham.bloice@trihedral.com> -Date: Fri Jan 2 17:20:46 2015 +0000 +commit 6765bf7 +Author: Guy Harris <guy@alum.mit.edu> +Date: Sun Feb 22 18:50:50 2015 -0800 - Make running the tests a little easier on Windows + Fix generation of address-with-resolution strings. - 1. Set the igncr option a little differently, this is the preferred - way according to the latest Cygwin bash update announcement - (See https://sourceware.org/ml/cygwin-announce/2014-10/msg00015.html, Sect 4a) - The previous way didn't work for me. - 2. Ensure /usr/bin is on the path if running under Cygwin. - I really don't want Cygwin on my normal paths, the build process - adds if required, so this change makes the test scripts do the same. + XXX_to_str routines should return the length, in bytes, of the generated + string, including the terminating '\0'. - Change-Id: I0f4da1fa87802bf0a4039bb5a91e577fae506d79 - Reviewed-on: https://code.wireshark.org/review/6243 - Tested-by: Graham Bloice <graham.bloice@trihedral.com> - Reviewed-by: Gerald Combs <gerald@wireshark.org> - Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> - -commit 2619edd -Author: AndersBroman <anders.broman@ericsson.com> -Date: Fri Jan 9 16:39:47 2015 +0100 - - [E212] Make it possible to use different filters for MCC and MNC in LAI - RAI and SAI. + As their reutrn values include the terminating '\0', we need to subtract + 1 from the return value if, when appending the ")" after the address + string, we want to skip past the address string rather than skipping + past the terminating '\0'. - Change-Id: I2abcc868899b8752f66347b3a0fe190670c3ce3f - Reviewed-on: https://code.wireshark.org/review/6447 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit e974a6f -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Jan 10 16:13:31 2015 +0100 - - msg_rng_rsp (Wimax): fix Copy-paste error (CID 11158604) - - Change-Id: I134d8178d741d741404963a89f60e1d1bfd9a2dd - Reviewed-on: https://code.wireshark.org/review/6473 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: Ibfd41e6d7152d05070706e6d76fc3e56a097a75b + Reviewed-on: https://code.wireshark.org/review/7324 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 706c625 +commit 1c4053f Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Fri Dec 19 11:09:28 2014 +0100 +Date: Thu Feb 19 22:38:45 2015 +0100 - ISIS: Add code and length for SubTLV Extended IS Reachability - - * remove some proto_tree_add_text call + BMP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - Change-Id: I18bc26cc95934e77b19d24edbb417af4c895d53e - Reviewed-on: https://code.wireshark.org/review/6468 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I322be0953ce8c872f8464c3e095dfe9006d3b67b + Reviewed-on: https://code.wireshark.org/review/7261 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit ca17499 -Author: Jeff Morriss <jeff.morriss.ws@gmail.com> -Date: Fri Jan 9 16:47:44 2015 -0500 - - Add DJI UAV Drone Control Protocol to the list of new protocols. - - (This change also brings NEWS up to date with release-notes.asciidoc) - - Change-Id: Ie61c27901947210ddf95bbb1bb8c36e489bc0c8c - Reviewed-on: https://code.wireshark.org/review/6456 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 4a0ec75 +commit b9296b7 Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 11 13:18:39 2015 -0800 - - Use the GTK+ 2 name for VoidSymbol. - - We can use the GTK+ 2 GDK_xxx names with GTK+ 2 or 3; apparently, some - versions of GTK+ 2 don't support the GDK_KEY_xxx names. - - Change-Id: I52b14a7f2273f2af2b914c3646eb33d21673057e - Reviewed-on: https://code.wireshark.org/review/6498 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 528a857 -Author: Graham Bloice <graham.bloice@trihedral.com> -Date: Sat Jan 10 21:29:57 2015 +0000 +Date: Sun Feb 22 12:21:47 2015 -0800 - Fix CMake generation and use of Windows .rc files + Fix handling of longitude and latitude values. - CMake now generates local copies of .rc files for all the Windows - components and uses the files in the build of the components. + The formatting routine is getting passed the 5-byte value, not some + 8-byte value that includes the 3 bytes after it, so shifting it produces + the wrong value. - The .rc.in files that include an icon were modified to allow the icon - path to be set by CMake. The path is removed for nmake builds. + Make the longitude and latitude FT_UINT40, as they're only 5 bytes long. - Updated build architecture detection, required for wireshark.manifest.in - - Change-Id: I7b1ff43050e9b0efb861d1041636fb4aef49a4f8 - Reviewed-on: https://code.wireshark.org/review/6482 - Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> + Change-Id: I35aa05887bcfdfc1107fef2ac5069f1fe96fda3a + Reviewed-on: https://code.wireshark.org/review/7321 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 7d004dc -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Jan 11 20:53:11 2015 +0100 +commit 08bee7d +Author: Guy Harris <guy@alum.mit.edu> +Date: Sun Feb 22 12:04:48 2015 -0800 - Revert "Lemon: Update lemon tools" + Clean up display of raw hex latitude/longitude values. - This reverts commit 5855dd8d538eb81d4825961b1bf0d583bf96f751. + 1) It's only 40 bits long, so show only 10 hex digits. - This Lemon update fails to compile on OSX and triggers asserts on other platforms - - Change-Id: I12a8a2bf32db31e5a9b0cb1a67a39724e30f3e91 - Reviewed-on: https://code.wireshark.org/review/6496 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit c8c9917 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Jan 11 15:35:08 2015 +0100 - - Fix some more regressions introduced in gecaa1f8 + 2) If you're putting "0x" before the number, blank-padding on the left + looks weird; use zero-padding. - Convert one other set of static variables to pinfo scoped memory while we are at it + 3) Fix unbalanced parentheses. - Change-Id: If550b76ef6a4dd2707d79de8579ac439d16dce79 - Reviewed-on: https://code.wireshark.org/review/6490 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: I76aedb1fb82f699ee08102b97b0d72e09d8c5917 + Reviewed-on: https://code.wireshark.org/review/7320 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 5855dd8 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Aug 27 22:20:12 2014 +0200 +commit 066ae91 +Author: Guy Harris <guy@alum.mit.edu> +Date: Sun Feb 22 11:54:56 2015 -0800 - Lemon: Update lemon tools - - Fix warning: declaration shadows a variable in the global scope [-Wshadow] - - Add include <config.h> - - Fix warning: unused parameter 'argc' [-Wunused-parameter] (using _U_) - - Fix implicit conversion loses integer precision - - Fix comparison of integers of different signs: 'size_t' (aka 'unsigned long') and 'int' [-Wsign-compare] - - Fix function declaration isn’t a prototype [-Wstrict-prototypes] - - Fix warning: old-style function definition [-Wold-style-definition] - - Fix trailing whitespace - - Fix use -T for template for epan\Makefile.nmake, epan\dfilter\Makefile.nmake, plugins\mate\Makefile.nmake, plugins\tpg\Makefile.nmake and cmake/modules/UseLemon.cmake - - Fix -Wmissing-prototypes + Put back address family field. - Remove unused function (acttab_free) - - Add basename the filename with only filename (no path...) - - Change-Id: Ia79f61e29f828575df61cc89134c6c553044e86d - Reviewed-on: https://code.wireshark.org/review/3976 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I89d60f78a0c834663c426f5ec50c6033ba9f99e1 + Reviewed-on: https://code.wireshark.org/review/7318 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 74b20dc -Author: Peter Wu <peter@lekensteyn.nl> -Date: Thu Dec 18 12:31:49 2014 +0100 +commit 99ff8ba +Author: Guy Harris <guy@alum.mit.edu> +Date: Sun Feb 22 11:24:33 2015 -0800 - gtk: fix crash on Broadway GDK backend - - The Broadway GDK backend does never sets event->string. This results in - a crash when filter_string_te_key_pressed_cb tries to read its contents. - - Since the documentation marks reading the string as deprecated, try to - handle the character conversion here. It is based on - _gdk_x11_event_translate_keyboard_string (from gtk+), but without trying - to interpret Escape as '\033', and without trying to convert control - characters (example: Ctrl + 1). A buffer of 6 bytes is used to hold a - UTF-8 code point (there is no zero terminator, so 7 bytes as found in - the original implementation is unnecessary). + Use file extensions even more as a heuristic. - As g_locale_from_utf8 returns dynamically allocated memory, change the - control flow to have a single exit point where pointers are freed as - needed. + If a file type has a list of "typical" extensions, and a file has an + extension that is *not* one of those extensions, the file is unlikely to + be of that type. - Reproduce with gtk3: - $ broadwayd :5 - $ GDK_BACKEND=broadway BROADWAY_DISPLAY=:5 wireshark-gtk - (now open http://localhost:8085/ and start typing in the display filter) + For files that have extensions, after we try the heuristics that have a + list of "typical" extensions that includes the file's extension, try the + heuristics that have no such list, and after that try the heuristics + that have such a list but where the list *doesn't* include the file's + extension. - Keys tested: e € (AltGr + 5) ü (AltGr + ", u) - In the X11 backend, these still get displayed correctly. In the broadway - backend however, the accents are missing due to a bug in the broadway - implementation. + This fixes, for example, some cases where non-PacketLogger files were + getting identified as PacketLogger files. - Change-Id: Ic1f0ee2b87cd573023ee8e966f06489b3b744dcf - Reviewed-on: https://code.wireshark.org/review/5832 - Reviewed-by: Balint Reczey <balint@balintreczey.hu> - -commit ae2888a -Author: Gerald Combs <gerald@zing.org> -Date: Sat Jan 10 18:02:07 2015 -0800 - - CMake: Try to fix Cygwin a2x discovery. - - Change-Id: I46ddd10ab533ff7114aa6a4241a9a261da19329c - Reviewed-on: https://code.wireshark.org/review/6487 - Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 9b9a06c -Author: Robert Grange <robionekenobi@bluewin.ch> -Date: Sun Jan 11 12:57:06 2015 +0100 - - packet-mq: Avoid using sort in dissector - - Avoid using sort for string_value_ext. The string value are now - sorted at definition - - Change-Id: I08452b0423289d04e55ed7e3573e74bfcc329865 - Reviewed-on: https://code.wireshark.org/review/6488 - Reviewed-by: Robert Grange <robionekenobi@bluewin.ch> - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: I2d8c3b983ed6ccd692beb888668f77eb9b5f437b + Reviewed-on: https://code.wireshark.org/review/7315 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 9d55a0b +commit 73508e8 Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jan 11 08:05:06 2015 -0800 +Date: Sun Feb 22 08:05:29 2015 -0800 - [Automatic manuf, services and enterprise-numbers update for 2015-01-11] + [Automatic manuf, services and enterprise-numbers update for 2015-02-22] - Change-Id: I2f9625ebc812095bd4c7464981a96b38c4548694 - Reviewed-on: https://code.wireshark.org/review/6491 + Change-Id: Ida0ae626be0753c05435f3828d5137863309ebf1 + Reviewed-on: https://code.wireshark.org/review/7309 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit f2bedeb -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Jan 11 14:54:24 2015 +0100 - - FDDI: fix a memory corruption introduced in gecaa1f8 - - Bug: 10845 - Change-Id: I4d47711f397d9aaa965dff3e97478517f638a2e2 - Reviewed-on: https://code.wireshark.org/review/6489 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit aa9376e -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Jan 10 19:19:04 2015 +0100 - - LTE RRC: upgrade dissector to v12.4.0 - - Change-Id: I0bd6c124bd3aa0efe09db81135adc690751e08ae - Reviewed-on: https://code.wireshark.org/review/6477 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit d07364d -Author: Michael Mann <mmann78@netscape.net> -Date: Sat Jan 10 12:41:04 2015 -0500 - - Restore #undef HAVE_STDLIB_H and #undef HAVE_STRING_H in kerberos dissector. - - These were removed when the kerberos dissector was switched to being a pure ASN.1 dissector (see dea68bf00f7c5872950814da81ba532a6372ccb3). - - Change-Id: I04177046250d039a750f4e4e4dd956d8beab23bc - Reviewed-on: https://code.wireshark.org/review/6476 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit f5c4d06 -Author: Michael Mann <mmann78@netscape.net> -Date: Sat Jan 10 19:04:06 2015 -0500 - - Replace some "low hanging fruit" uses of emem. - - Most of the remaining ep_ uses are grouped with specific functionality. - - Change-Id: I8fa64a17acc6bcdcf6891b2d28715ac0c58f1a4a - Reviewed-on: https://code.wireshark.org/review/6484 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit fdd6554 +commit d1865e0 Author: Guy Harris <guy@alum.mit.edu> -Date: Sat Jan 10 16:26:46 2015 -0800 +Date: Sun Feb 22 00:56:00 2015 -0800 - Rename the FT_BYTES separator types to SEP_ from BASE_. + Make FT_{U}INT{40,48,56,64} handle BASE_CUSTOM. - There's no requirement for "display" field values to have names - beginning with BASE_; use SEP_, to indicate that they're separators. + Finish the job of handling integral values > 32 bits similarly to who we + handle values 32 bits or less. - (And, yes, we should introduce SEP_NONE, with a value of 0, and use it.) + In cases that "should not happen", and where we might *not* be executing + in the context of a dissector (filling in the field label can be done + lazily, being deferred to "print" time, and that doesn't happen in the + context of a dissector), use g_assert_not_reached() rather than + DISSECTOR_ASSERT_NOT_REACHED() - the latter throws an assertion that's + not caught if we're not doing dissection, so we crash anyway. - While we're at it, fix BASE_SEMICOLON - the separator is a colon, not a - semicolon - and document SEP_SPACE in doc/README.dissector. - - Change-Id: I856aafda2c60b8320dffe287f0deb06a9604a2bf - Reviewed-on: https://code.wireshark.org/review/6486 + Bug: 10983 + Change-Id: Ia81a0a4925394f99aa35193a333f3e9659a9b93d + Reviewed-on: https://code.wireshark.org/review/7307 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit b4f5b6e -Author: Graham Bloice <graham.bloice@trihedral.com> -Date: Sun Jan 11 00:05:42 2015 +0000 - - Update CMake "Project names" and Folders - - This gives a more structured layout in Visual Studio - - Change-Id: I0da87a3e5ec759c69aeee031366cf287485cdac2 - Reviewed-on: https://code.wireshark.org/review/6485 - Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> - Tested-by: Graham Bloice <graham.bloice@trihedral.com> - -commit b2f03cb -Author: Gerald Combs <gerald@zing.org> -Date: Sat Jan 10 14:41:55 2015 -0800 +commit 1157aa8 +Author: Guy Harris <guy@alum.mit.edu> +Date: Sat Feb 21 23:26:06 2015 -0800 - make-version.pl updates. + Set 64-bit signed values with proto_tree_set_int64(). - Set the version variables in CMakeLists.txt directly from - make-version.pl instead of pulling them from configure.ac. + As in "don't set it with proto_tree_set_uint64(), signed vs. unsigned + matters". - Use the correct default value for VERSION_EXTRA in config.nmake. - - wireshark-common.files was removed in g97e1491. We don't need to update - it any more. - - Change-Id: I751b6df9ac16e19090712aa79a68e308397c1d25 - Reviewed-on: https://code.wireshark.org/review/6483 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I23ef3d172fa40c0867dfb6a078ce292bd5282170 + Reviewed-on: https://code.wireshark.org/review/7306 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 2219f78 -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Sat Jan 10 19:48:05 2015 +0000 +commit 2196378 +Author: Guy Harris <guy@alum.mit.edu> +Date: Sat Feb 21 19:45:08 2015 -0800 - Netflow: do transport resolution on ports (if know they are UDP or TCP) + Fetch values appropriately according to the value's type. - Change-Id: I8fc3675f03b7eaec6a9385638197067981762a70 - Reviewed-on: https://code.wireshark.org/review/6474 - Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> - -commit 14cad60 -Author: Michael Mann <mmann78@netscape.net> -Date: Sat Jan 10 14:20:06 2015 -0500 - - Remove ep_ allocated memory from get_conversation_filter and just return a g_alloced string. + This fixes some crashes. - Change-Id: Ie7f6b2c5479fec1a44afb5e446ef6abf304113af - Reviewed-on: https://code.wireshark.org/review/6480 - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: I47583777486486114675ba98cb58971adb8b1b10 + Reviewed-on: https://code.wireshark.org/review/7305 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 59c1e32 +commit 8d5da72 Author: Michael Mann <mmann78@netscape.net> -Date: Fri Jan 9 12:51:15 2015 -0500 +Date: Sat Feb 14 18:01:53 2015 -0500 - Add BASE_SPACE for FT_BYTES + Add tvb_address_with_resolution_to_str. - It's just like BASE_DOT, BASE_DASH and BASE_SEMICOLON, only its a space between bytes. Since this seems pretty specific to FT_BYTES, perhaps there is a better was to represent the functionality (like FT_BOOLEAN uses numeric values for number of bits)? + Convert dissectors to using the API where appropriate. - Change-Id: I1a8f1ab263ece2736a8012b66fdd6a9105db7282 - Reviewed-on: https://code.wireshark.org/review/6451 + Change-Id: I059582f73a75635d4a0338d02d4c4b212162480b + Reviewed-on: https://code.wireshark.org/review/7296 + Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net> -commit effc826 -Author: Michael Mann <mmann78@netscape.net> -Date: Sun Jan 4 11:17:53 2015 -0500 +commit ddafa7e +Author: Guy Harris <guy@alum.mit.edu> +Date: Sat Feb 21 14:53:39 2015 -0800 - Add preference to display spaces between bytes for FT_BYTES fields. - - I think this can make fields more readable (for a small amount of bytes). + Update Debian symbols list. - Converted DeviceNet dissector to use proto_tree_add_item for some FT_BYTES field as tvb_bytes_to_str_punct was used to create this effect "manually". - - Change-Id: I59e2acf9b00a4eb1279e6c2b2b7bd8ecef20db9b - Reviewed-on: https://code.wireshark.org/review/6304 - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: Iaf5d8022f2005ac32133896c74f45246a2310684 + Reviewed-on: https://code.wireshark.org/review/7303 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 02fb290 +commit bfb4327 Author: Guy Harris <guy@alum.mit.edu> -Date: Sat Jan 10 11:47:46 2015 -0800 +Date: Sat Feb 21 12:39:00 2015 -0800 - Sort the value_string_exts at dissector registration time. + Remove tvb_ from the names of wsutil mempbrk routines. - You *CANNOT* defer it until dissection time, otherwise "tshark -G - values" will fail. + Routines that don't take a tvbuff as an argument shouldn't have tvb_ in + the name. - Change-Id: I4edf9abda271baaf916f020a211b9add5543ecc7 - Reviewed-on: https://code.wireshark.org/review/6481 + Change-Id: I3550256551e30b3f329cbbfca71ef27c727d29c0 + Reviewed-on: https://code.wireshark.org/review/7302 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 531a9f0 +commit f3a68f0 Author: Guy Harris <guy@alum.mit.edu> -Date: Sat Jan 10 11:39:43 2015 -0800 +Date: Sat Feb 21 12:17:30 2015 -0800 - Squelch a compiler warning. + Rename the slower-but-portable mempbrk to ws_mempbrk_portable_exec(). - The clang I'm using warns about a non-constant format string in - val_to_str_ext() calls; get rid of the unknown_format variable and, - instead, make two different proto_item_append_text() calls with - different format arguments in the val_to_str_ext()-call arguments. + That parallels ws_mempbrk_sse42_exec(). - Change-Id: Id668efe666634798c278958bd7e6d790ec476539 - Reviewed-on: https://code.wireshark.org/review/6479 + Change-Id: I1662badc6d1efab5bdd827f29bbad3712464ec43 + Reviewed-on: https://code.wireshark.org/review/7301 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 51acf16 -Author: Robert Grange <robionekenobi@bluewin.ch> -Date: Fri Jan 9 11:06:10 2015 +0100 +commit e35aa1f +Author: Guy Harris <guy@alum.mit.edu> +Date: Sat Feb 21 12:13:54 2015 -0800 - packet-mq: sort some value_string_ext in dissector - - Some value_string_ext are sorted only in the dissector, - and only once. + Move declarations of internal ws_mempbrk routines to a separate header. - Adapted as said in comments. - Added test for sort in dissect_mq_spx + Put the internal routines, which are only to be used by the + implementation of the mempbrk functions, to a separate header file, so + that they're not exported even in the standard header file. - Change-Id: If72159fe96ab28a3ed540778d67996e152b4f110 - Reviewed-on: https://code.wireshark.org/review/6444 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: I92c39b138de3e4f9da1b102210b39d50728e2fd6 + Reviewed-on: https://code.wireshark.org/review/7300 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit b760da9 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Jan 10 10:16:37 2015 +0100 +commit f12d231 +Author: Guy Harris <guy@alum.mit.edu> +Date: Sat Feb 21 12:07:21 2015 -0800 - MQ: ensure that at least 4 bytes were captured before doing heuristic checks + More wrapping of constants with G_GUINT64_CONSTANT(). - Otherwise it could trigger an exception - - Change-Id: I280e3c5d9e5554e4be49035c03e0170ae4495e6e - Reviewed-on: https://code.wireshark.org/review/6463 - Reviewed-by: Robert Grange <robionekenobi@bluewin.ch> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: I11771b08cc4e57692c42dd3fc8976fe390b3025d + Reviewed-on: https://code.wireshark.org/review/7299 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 7600ddb -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Jan 10 16:12:29 2015 +0100 +commit f868da2 +Author: Guy Harris <guy@alum.mit.edu> +Date: Sat Feb 21 11:43:08 2015 -0800 - UTS: fix Copy-paste error (CID 11158603) + Update Debian symbols file. - Change-Id: Ibabb8ab3ccb0543856c84822542baa1ac0139f7e - Reviewed-on: https://code.wireshark.org/review/6472 - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: Ide84741afffbd7c8c6dac44cf456291e2609af9d + Reviewed-on: https://code.wireshark.org/review/7298 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 15ac6eb -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Jan 10 16:12:07 2015 +0100 +commit 0808fc0 +Author: Guy Harris <guy@alum.mit.edu> +Date: Sat Feb 21 11:40:39 2015 -0800 - ISMACRYP: fix Copy-paste error (CID 11158602) + 64-bit constants need to be wrapped in G_G{U}INT64_CONSTANT(). - Change-Id: I4978627115f46a8aa90ccf67f7c008cdf9986da6 - Reviewed-on: https://code.wireshark.org/review/6471 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit e2fa5a5 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Jan 10 16:11:41 2015 +0100 - - CTDB: fix Copy-paste error (CID 11158596) + Otherwise, they don't get the right suffix to tell the compiler that + they're 64-bit even on ILP32 platforms. - Change-Id: Ieaa70505f4b880569be6126166a71f32d84f79a8 - Reviewed-on: https://code.wireshark.org/review/6470 - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: I5c52a999d21707602e0a4174a142d1d1036242be + Reviewed-on: https://code.wireshark.org/review/7297 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 6780519 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Jan 10 16:11:15 2015 +0100 +commit 1694e81 +Author: Guy Harris <guy@alum.mit.edu> +Date: Sat Feb 21 11:35:08 2015 -0800 - NLM: fix Copy-paste error (CID 11158588) + The shortening to 32 bits is intentional, so add a cast. - Change-Id: I0d2736f3e00c62bb908e346a641d0ddc8b171fd2 - Reviewed-on: https://code.wireshark.org/review/6469 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 0f6b09d -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Jan 10 16:26:55 2015 +0100 - - to_str (epan): fix parameter 'scope' not found in the function declaration [-Wdocumentation] + The cast reassures the compiler that we do, in fact, know what we're + doing, so it doesn't issue a warning. - Change-Id: Ie414d28415b71a79780d37fae454b90a7a610e1c - Reviewed-on: https://code.wireshark.org/review/6475 - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: Ie3bc4e1c955f9c5cad5506e26fc72e12f7a8f854 + Reviewed-on: https://code.wireshark.org/review/7295 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 1a30c97 +commit ffeadb7 Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Fri Dec 19 15:43:50 2014 +0100 +Date: Thu Jan 22 12:27:23 2015 +0100 - Bluetooth: A2DP: APT-X: Unhardcode stream configuration + Bluetooth/GUI: ATT: Use alphabetical order in makefile - Change-Id: I16cfb4d014020a7fb2c67fef3128021c9901719a - Reviewed-on: https://code.wireshark.org/review/6442 - Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> + Change-Id: Ia34dd6b783a1c8214956166b07ffb1537f04aa1d + Reviewed-on: https://code.wireshark.org/review/7291 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - Tested-by: Michal Labedzki <michal.labedzki@tieto.com> -commit f343710 +commit b8388c6 Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Mon Dec 29 09:45:40 2014 +0100 +Date: Thu Feb 5 11:57:27 2015 +0100 - Bluetooth: HCI: Detect Vendor by "Read Local Version Information" + Ftypes: Double: Minor fixes - There is information about manufacturer of Bluetooth chip. - Also try to detect if that "permament" info is not changed, - if so informs user about this rare event (probably there is an issue) + Fix comments typos and use safe equivalent of sprintf. - Change-Id: I1fa748a67ad7943e61d4445d240f0578b94560fc - Reviewed-on: https://code.wireshark.org/review/6408 - Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Change-Id: Icc9d69532dc35e8a58a78c0eacdb42214b679069 + Reviewed-on: https://code.wireshark.org/review/7290 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - Tested-by: Michal Labedzki <michal.labedzki@tieto.com> -commit 55df238 +commit 9ad00fd Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Mon Dec 29 08:53:15 2014 +0100 +Date: Sat Feb 14 18:49:36 2015 +0100 - Bluetooth: SMP: Add missing opcode for "Identity Address Information" + Qt: Fix for QT < 4.8 - Also fix tvb_length, tvb_length_remaining warnings. + QApplication::queryKeyboardModifiers() was introduced in 4.8. + Try to be compatibile with my old Qt 4.7.2. - Bug: 10299 - - Change-Id: Ib8b55ea9f2220394a5896d13e5cc4e2cefff1e13 - Reviewed-on: https://code.wireshark.org/review/6407 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: Ie4abdd397cf2f10bb50132b09fed198d30425ee7 + Reviewed-on: https://code.wireshark.org/review/7289 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - Tested-by: Michal Labedzki <michal.labedzki@tieto.com> -commit d6e0409 +commit 8e43698 Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Tue Dec 23 14:57:45 2014 +0100 +Date: Mon Feb 9 12:34:11 2015 +0100 - Bluetooth: Add HCI Vendor Broadcom dissector - - Since those command/events are vendor specific and proprietary - not all commands/events are implemented. All implemented commands can be - found in Open Source implementations for Broadcom chip. If you found more, - please let me know. + Set phdr encap for pcap file - Change-Id: Ie68d3737c88a8cef39260a9d93192cfc81871d6c - Reviewed-on: https://code.wireshark.org/review/6406 + Change-Id: Id600b395d6fd2711c9b392a60454e5bd9a3eb465 + Reviewed-on: https://code.wireshark.org/review/7288 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - Tested-by: Michal Labedzki <michal.labedzki@tieto.com> -commit c69b2ab +commit 2d1d83a Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Sat Jan 3 16:26:53 2015 +0100 +Date: Sat Feb 21 17:42:28 2015 +0100 - Bluetooth: ATT: Dissect opcode with more precision + Use correct mem scope for source address in Text Logcat - Change-Id: Iddc1a6d899b10b0d5c25723a71da7dcd11c6dfad - Reviewed-on: https://code.wireshark.org/review/6405 - Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> + Change-Id: I94594e5c7ad8a398dd86ee3fe496077196f81fb9 + Reviewed-on: https://code.wireshark.org/review/7287 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - Tested-by: Michal Labedzki <michal.labedzki@tieto.com> -commit 7177ced +commit c093797 Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Wed Dec 17 16:12:41 2014 +0100 +Date: Sat Feb 21 17:40:40 2015 +0100 - USB: Fix Conversation/Endpoint filters + Fix GTK-shark - There were not fields for that, so simple add them. + Looks like a copy/paste issue. + ERROR: wireshark/color_filters.c:100:color_filters_add_tmp: assertion failed: (strlen(prefs.gui_colorized_fg)==69) - Change-Id: I489bae24ac96ea0baf395add731f4d62ccf19352 - Reviewed-on: https://code.wireshark.org/review/6401 - Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> - Tested-by: Michal Labedzki <michal.labedzki@tieto.com> + Change-Id: I7b8309cfc178fd834951078a098bbce986639ed2 + Reviewed-on: https://code.wireshark.org/review/7286 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> -commit c93d0ab -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Fri Jan 9 17:12:26 2015 +0100 +commit e2bcee6 +Author: JC Wren <jcwren@jcwren.com> +Date: Wed Dec 17 15:19:20 2014 -0500 - IS-IS: Incorrect decoding of IPv4 Interface/Neighbor Address sub-TLVs in Extended IS Reachability TLV - - Correct 4-byte IPv4 address is incorrectly detected as wrong 6-byte IPv4 address and cannot be decoded (IPv4 Interface Address (sub-TLV type 6) and IPv4 Neighbor Address (sub-TLV type 8) of Extended IS Reachability TLV (TLV type 22) of IS-IS. + Make FT_{U}INT64 behave more like FT_{U}INT32, add support for FT_{U}INT{40,48,56} - Wrong offset for some Sub-TLV - - Issue found by Alexander Okonnikov - - Bug: 10837 - Change-Id: I81d083722da72115e1905237352650d380e9d0ac - Reviewed-on: https://code.wireshark.org/review/6453 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Change-Id: I57354c309ecf3a0c8f0c7cff485638027f30bb19 + Reviewed-on: https://code.wireshark.org/review/5813 Reviewed-by: Michael Mann <mmann78@netscape.net> + Petri-Dish: Michael Mann <mmann78@netscape.net> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 5fe1f66 +commit 13531d3 Author: Michael Mann <mmann78@netscape.net> -Date: Fri Jan 9 23:04:47 2015 -0500 +Date: Thu Feb 12 19:51:11 2015 -0500 - Finish off emem_strbuf_t usage. + Convert dissectors to use address_with_resolution_to_str instead of two separate calls for address string and name resolution. - Change-Id: Ib0b911c86a7f8a7cca022e9e324c910664ce397e - Reviewed-on: https://code.wireshark.org/review/6461 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 3a9869d -Author: Evan Huus <eapache@gmail.com> -Date: Fri Jan 9 12:28:10 2015 -0500 - - Remove/replace ep_strsplit() - - Change-Id: I4a803d83844d937804849b2ad3b067381c9b96d0 - Reviewed-on: https://code.wireshark.org/review/6448 - Petri-Dish: Evan Huus <eapache@gmail.com> - Reviewed-by: Evan Huus <eapache@gmail.com> + Change-Id: I7c8cfbcf201b3b73afe731302572646ce7833d64 + Reviewed-on: https://code.wireshark.org/review/7284 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> -commit e54b5f0 -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Jan 9 10:39:17 2015 -0800 +commit c1b672c +Author: Peter Wu <peter@lekensteyn.nl> +Date: Thu Feb 19 23:58:41 2015 +0100 - CMake: Copy admonition graphics to the correct directory. + checkAPIs: match packet-*.[ch], independent of locale - Change-Id: Iecba4000c487a90efedfc7547771539c3748a7f0 - Reviewed-on: https://code.wireshark.org/review/6454 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 8bd80e0 -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Jan 9 13:53:17 2015 -0800 - - CMake: Set WIRESHARK_TARGET_PLATFORM. + In perl, the \w character group seems to match '-' depending on the + locale. On Linux (with the C or en_US.UTF-8 locale), packet-ssl-utils.c + does not match. - Set WIRESHARK_TARGET_PLATFORM near the top of CMakeLists.txt. It's used - by a couple of our modules and will be used for NSIS packaging. + This patch makes the regex match anything except for the path separator. - Change-Id: Ief43733bdf162998cd54ff3732f94c8baa3d1e11 - Reviewed-on: https://code.wireshark.org/review/6458 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I27543072295af5f2bd5ea8ab36e5d913bebf7d85 + Reviewed-on: https://code.wireshark.org/review/7266 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit a81f0d1 +commit 5012cf8 Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Jan 9 14:15:39 2015 -0800 +Date: Fri Feb 20 15:49:35 2015 -0800 - Fix airpdcap debugging code. + Call pre_init_prefs each time our profile changes. + + Manually back out gafa96c3 so that we can set our preferences to their + default values each time we switch profiles. + + Zero the prefs struct at startup. - Change-Id: Ied1094dd3c6ad176fea830c0857ba43e09d3cb10 - Reviewed-on: https://code.wireshark.org/review/6457 + Change-Id: Ic28db44cd0c4cdf640e977d7277f7357db10ebe8 + Reviewed-on: https://code.wireshark.org/review/7282 + Petri-Dish: Gerald Combs <gerald@wireshark.org> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 2bb26ea +commit ae9cc88 Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Jan 9 10:23:51 2015 -0800 +Date: Fri Feb 20 17:03:48 2015 -0800 - CMake: Copy CHM graphics from the correct source. + Qt: Fix unsaved changes behavior. - Change-Id: Iea67bdaf8d83009c808bd39693fe273b3181ff76 - Reviewed-on: https://code.wireshark.org/review/6452 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit f5de0c4 -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Fri Jan 9 18:11:26 2015 +0000 - - Netflow: Fix some duplicate label names + Check the return value of testCaptureFileClose in + MainWindow::openCaptureFile and add testCaptureFileClose to + MainWindow::closeEvent. Some of the file opening and closing behavior + still needs to be cleaned up but this should at least keep the user from + losing unsaved data. - Change-Id: I077bdd6394898a445c00a1e7aec1c4c11b3e9ec2 - Reviewed-on: https://code.wireshark.org/review/6450 - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> + Bug: 10944 + Change-Id: I7d7b563a6b72f48b41a5a3aff2837655557869ff + Reviewed-on: https://code.wireshark.org/review/7283 + Petri-Dish: Gerald Combs <gerald@wireshark.org> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 4f65899 +commit ead79e6 Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Jan 9 08:58:15 2015 -0800 +Date: Fri Feb 20 13:44:27 2015 -0800 - CMake: Migrate to hhc.cmake. + Clear the filter expression list in prefs.c. + + Move filter_expression_nuke from ui/gtk to epan and rename it to + filter_expression_free. Call it in prefs_reset along with the other + preference reset routines. - Remove FindHHC.cmake in favor of CMake's FindHTMLHelp. Remove the - hhc.cmd wrapper. + This keeps the Qt filter toolbar from filling up with duplicate + expressions when the profile changes. - Change-Id: I548e58d2264c74596e9067d5053b056c35089b3c - Reviewed-on: https://code.wireshark.org/review/6449 + Change-Id: I9fae9a7b48944079ea342a126979d9e79af0d22b + Reviewed-on: https://code.wireshark.org/review/7281 + Petri-Dish: Gerald Combs <gerald@wireshark.org> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit ffb6f10 +commit 422ad10 Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Jan 8 17:16:09 2015 -0800 +Date: Fri Feb 20 10:32:15 2015 -0800 - CMake: Cygwin-ify the xmllint path as well. + Qt: Apply the main window geometry directly. - Change-Id: I5e62ed6baeed3fcb76cdffd30666ad01713acd2a - Reviewed-on: https://code.wireshark.org/review/6439 + As of g2c00d66 we create the main window after we've read the recent + settings. This means that we can get rid of the property animation + workaround in MainWindow::loadWindowGeometry. + + Change-Id: I028061c5bdab9261f9394a1840bcdcb752a4f0c8 + Reviewed-on: https://code.wireshark.org/review/7278 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 1b4f965 -Author: Dario Lombardo <lomato@gmail.com> -Date: Fri Jan 2 15:28:20 2015 +0100 +commit 1a10f5f +Author: Peter Wu <peter@lekensteyn.nl> +Date: Fri Feb 20 16:09:06 2015 +0100 - Some typos fixed. + ui/gtk: fix control combos such as ctrl-a, ctrl-c - Change-Id: I65df0c40d771c4854b73fd5c35d1af600f15f324 - Reviewed-on: https://code.wireshark.org/review/6445 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 872a239 -Author: AndersBroman <anders.broman@ericsson.com> -Date: Fri Jan 9 10:16:06 2015 +0100 - - Add missing #include ( "ui/gtk/old-gtk-compat.h" ) + Ignore any Ctrl combinations to allow pasting to work. Regression + introduced in "gtk: fix crash on Broadway GDK backend". - Change-Id: Ic53c3cd4a38c587ab3c0dcb9f8349ca50e338f80 - Reviewed-on: https://code.wireshark.org/review/6443 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I3d53db2d224cb604b52081002ff923c8684a8d0a + Reviewed-on: https://code.wireshark.org/review/7276 + Reviewed-by: Balint Reczey <balint@balintreczey.hu> + Tested-by: Balint Reczey <balint@balintreczey.hu> -commit 284229c -Author: Michael Mann <mmann78@netscape.net> -Date: Thu Jan 8 13:16:01 2015 -0500 +commit bccb7f7 +Author: AndersBroman <anders.broman@ericsson.com> +Date: Fri Feb 20 15:02:08 2015 +0100 - Convert EUI64 address APIs to use wmem. + [Diameter] It's MCC first in 3GPP AVP 909 RAI - Change-Id: I57d2e435ac72ea07ec9a567e0b1ce4410966e3d2 - Reviewed-on: https://code.wireshark.org/review/6419 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> + Change-Id: If4dd0d64d5a8d313ae9e62d2fcce3606ef8eb4f4 + Reviewed-on: https://code.wireshark.org/review/7274 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 17f1a44 -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Fri Dec 19 15:41:57 2014 +0100 - - Bluetooth: AVDTP: Fix other-side Reconfigure - - It is used to properly configure internal SEP data using to - properly decode music stream. - - Change-Id: If8a15267ce072eaedfac947d7558be2d3e796483 - Reviewed-on: https://code.wireshark.org/review/6404 - Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - Tested-by: Michal Labedzki <michal.labedzki@tieto.com> - -commit 5be440f -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Thu Dec 18 10:42:01 2014 +0100 - - Bluetooth: AVDTP/VDP: Add link to first and last packet in the stream - - Useful for analyzing stream issues. - - Change-Id: I1c9f43807dc3abc050cf17c971fbd270b812faa5 - Reviewed-on: https://code.wireshark.org/review/6402 - Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - Tested-by: Michal Labedzki <michal.labedzki@tieto.com> - -commit 879a221 -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Thu Dec 18 15:19:50 2014 +0100 +commit 9fe9505 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Fri Feb 20 12:47:52 2015 +0100 - Bluetooth: BTLE RF: Remove tree and reduce indentation level + addr_resolv.c: fix a stack buffer overflow detected by ASAN - Useless check for tree avoid setting Bluetooth addresses. + Issue reported by Alexis - Change-Id: If38465679370c5ea74f6d916e409e337d60cf7db - Reviewed-on: https://code.wireshark.org/review/6403 - Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - Tested-by: Michal Labedzki <michal.labedzki@tieto.com> + Change-Id: I0ef19625b6844fbc2996b75d51e86f949e358c8d + Reviewed-on: https://code.wireshark.org/review/7273 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 6a6e2ef -Author: Michael Mann <mmann78@netscape.net> -Date: Thu Jan 8 12:13:18 2015 -0500 +commit a99cc2f +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Fri Feb 20 12:35:06 2015 +0100 - Have ipxnet addresses use wmem scoped memory. + address_types.c: fix a "conditional jump or move depends on uninitialised value" error found by Valgrind - Change-Id: I1d8eed2ceacccce2768590f0689cd2c83a5e56e9 - Reviewed-on: https://code.wireshark.org/review/6418 - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: Ic752bb6aa1ba56e113895fcbed52f417ac0128f7 + Reviewed-on: https://code.wireshark.org/review/7272 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 456095c -Author: Michael Mann <mmann78@netscape.net> -Date: Thu Jan 8 11:54:36 2015 -0500 +commit c84b022 +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Thu Feb 19 22:55:11 2015 +0100 - disperse atalk-utils.[ch] + MQTT: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - The functionality was suiting for address_to_str.c and the #defines belong in packet-atalk.h. Kept the address structure with the "address string conversion", but that can probably be better cleaned up when the address to str as a whole is cleaned up. - - Would also consider making AT_ATALK an FT_ type as well. - - Change-Id: Ia534096c707e6fb94acdfee0d332beda6571c371 - Reviewed-on: https://code.wireshark.org/review/6417 - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> + Change-Id: I730b752680c85777a074a6b2bb4aef0c9f4d3ff5 + Reviewed-on: https://code.wireshark.org/review/7265 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit d296c75 -Author: Michael Mann <mmann78@netscape.net> -Date: Thu Jan 8 13:59:33 2015 -0500 +commit 56356b8 +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Thu Feb 19 22:43:47 2015 +0100 - Some more random removal of ep_ memory. + MCPE: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - Change-Id: I6eccd20280e907bd9e6a5fcf873ccf80afddecac - Reviewed-on: https://code.wireshark.org/review/6416 - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> + Change-Id: I7053c3c9e42cb4246ae504d31213bf95917a34f2 + Reviewed-on: https://code.wireshark.org/review/7264 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 45cbdbc -Author: AndersBroman <anders.broman@ericsson.com> -Date: Thu Jan 8 10:01:56 2015 +0100 +commit f89edfd +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Thu Feb 19 22:40:57 2015 +0100 - Add missing #include ( "ui/gtk/old-gtk-compat.h" ) + addr_resolv: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - Change-Id: I03ddea2fc7db52df1ff3571e196250bc5e3ff036 - Reviewed-on: https://code.wireshark.org/review/6410 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I559151afab48892c51b702d008c1583570bd8754 + Reviewed-on: https://code.wireshark.org/review/7262 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit fb40fd3 -Author: Joerg Mayer <jmayer@loplof.de> -Date: Fri Jan 9 02:34:21 2015 +0100 - - Add a possible replacement for the cmd hack to work around hhc.exe - returning non-null on success. - To be invoked via "cmake -P hhc.cmake <single-arg>". - - Change-Id: Ib2584379c512cbd7f437f36ef932b372fe02203a - Reviewed-on: https://code.wireshark.org/review/6440 - Reviewed-by: Jörg Mayer <jmayer@loplof.de> - -commit 4bc8d0f +commit 95382c3 Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Jan 8 16:55:26 2015 -0800 +Date: Thu Feb 19 16:05:49 2015 -0800 - CMake: Try to fix the xsltproc path. + Suppress a bunch of cast-qual warnings. - Try to make the xsltproc path compatible with Cygwin. This is a blind - attempt to fix the Windows 8 buildbot. It works fine locally. + Squelch - Change-Id: Ib9d55dd07c6b17cfddf313716227d347109d2103 - Reviewed-on: https://code.wireshark.org/review/6438 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 67b1593 -Author: Michael Mann <mmann78@netscape.net> -Date: Thu Jan 8 16:16:56 2015 -0500 - - Remove proto_tree_add_ax25 + warning: cast discards ‘__attribute__((const))’ qualifier from pointer target type [-Wcast-qual] - There isn't a legitimate use for the API, all cases can be covered with proto_tree_add_item. As a bonus, a few more tvb_get_ptr calls can be removed. + similar to g630f54f. - Change-Id: I3bb86ba8f05ef3363407bcfe9b059ee27ebc135d - Reviewed-on: https://code.wireshark.org/review/6429 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit ecaa1f8 -Author: Michael Mann <mmann78@netscape.net> -Date: Thu Jan 8 17:07:25 2015 -0500 - - convert variables that were static just because of SET_ADDRESS macro to use the proper pinfo->pool instead. + Change strtod to g_ascii_strtod to squelch a checkAPIs error. - Change-Id: I914918d9629f654ead497dddac0f412b690e4409 - Reviewed-on: https://code.wireshark.org/review/6430 - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: Ib2d26ef89f08827a5adc07e35eaf876cd7b8d14e + Reviewed-on: https://code.wireshark.org/review/7269 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit a2abf8b -Author: Joerg Mayer <jmayer@loplof.de> -Date: Fri Jan 9 02:04:49 2015 +0100 +commit 9423a13 +Author: Guy Harris <guy@alum.mit.edu> +Date: Thu Feb 19 16:23:39 2015 -0800 - Fix CMake Warning "Argument not separated from preceding token by whitespace." + Just have init_progfile_dir() take a void pointer. - Change-Id: I1ecd3bd0081c2f69d4e4f21f84cb46d086b657a2 - Reviewed-on: https://code.wireshark.org/review/6437 - Reviewed-by: Jörg Mayer <jmayer@loplof.de> - -commit ab717f2 -Author: Joerg Mayer <jmayer@loplof.de> -Date: Fri Jan 9 01:58:52 2015 +0100 - - Use the FindHTMLHelp.cmake provided by cmake to find the hhc. - Lower case some function/macro calls. + dladdr() takes a void * as a code pointer; have init_progfile_dir() do + so, and do the casting in the calls. We don't care about the signature + of the function whose address we're passing, we just want to pass a + pointer to *something* in the main program. - Change-Id: I57532e3b4701963b88a536a7ecfe7dfaf4be3d4c - Reviewed-on: https://code.wireshark.org/review/6436 - Reviewed-by: Jörg Mayer <jmayer@loplof.de> + Change-Id: I9372620a97b0eb53c2bb3c0c41a238b4408f3709 + Reviewed-on: https://code.wireshark.org/review/7270 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 03f273a +commit ec6ec49 Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Jan 8 15:39:27 2015 -0800 +Date: Thu Feb 19 15:18:44 2015 -0800 - HTML Help: Fix titles. - - AsciiDoc converts single quotes into curly quote entities, which HTML - Help doesn't support. Use sed to fixup the title string. + Qt: Fix automatic update status in welcome screen. - We might want to drop HTML Help at some point. + Wait until the application has been initialized before checking + prefs.gui_update_enabled. - Change-Id: I0c7d3be90c0de7dbac0f1367cc6ba323c7380939 - Reviewed-on: https://code.wireshark.org/review/6435 + Change-Id: I6e52ba26064b6c5b882992c30c76b65d4a618848 + Reviewed-on: https://code.wireshark.org/review/7268 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 315cc72 +commit 0d3b51a Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Jan 8 16:27:34 2015 -0800 +Date: Thu Feb 19 15:04:15 2015 -0800 - CMake: Revert the release notes xsltproc command. + Remove quotes from an Nmake macro. - Should fix the release_notes_txt target. - - Change-Id: Ie930c49ad34ad70070b8f7d28d79bee55f263c40 - Reviewed-on: https://code.wireshark.org/review/6434 + Change-Id: Ibe6a544af49c39c12ce13264fb010ccdc54d471b + Reviewed-on: https://code.wireshark.org/review/7267 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 1baf9bb -Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Jan 8 15:50:15 2015 -0800 - - Use G_GINT64_CONSTANT() for 64-bit constants. - - Change-Id: I2b4f24c0e68f8d1edb53981b2ada7db6cd0eff72 - Reviewed-on: https://code.wireshark.org/review/6433 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit cd7408e +commit 999bbc9 Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Jan 6 16:59:32 2015 -0800 +Date: Tue Feb 10 13:48:48 2015 -0800 - CMake: Enable DocBook on Windows. + Qt: Add more version and packaging information to the main window. - Add a wrapper script and CMake macros which lets us run Cygwin's a2x - from Windows. Add *another* wrapper script that ignores the return value - of hhc.exe. + Add a "flavor" (for lack of a better word) banner, which can be set at + build time via WIRESHARK_VERSION_FLAVOR / VERSION_FLAVOR. Set it to + "Development Build" by default. This effectively migrates the + "DEVELOPMENT VERSION" logo image text from the GTK+ UI. - Move the ASCIIDOC2DOCBOOK macro to FindASCIIDOC.cmake. Add FindHHC.cmake. - Add hints to FindFOP.cmake. + Add full release and automatic update information at the bottom. - Use unique file names in the HTML Help chain in an attempt to avoid a - race condition. + Remove the short version from the welcome banner (top left). To do: - - Fix curly quote in HHC title. - Change-Id: I9b154b7fbd02703656e2ab380199ec0a6db4e36d - Reviewed-on: https://code.wireshark.org/review/6379 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 4b8c668 -Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Jan 8 13:25:54 2015 -0800 - - To register an SCTP port, register in "sctp.port", not "udp.port". + - Add back support for gui_version_placement. - Change-Id: I8f013b2895e42919ea0d97cdc35414ea3f5aec9b - Reviewed-on: https://code.wireshark.org/review/6422 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit d8773b1 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Thu Jan 8 21:08:13 2015 +0100 - - MQ: fix crash at startup + - Move the version and repository branch to the flavor label? - the array given to qsort algorithm must be alterable + - Add update links as appropriate to the bottom. - Change-Id: I811cade161b7635e9bc9e070c1ec37d2cce50d1f - Reviewed-on: https://code.wireshark.org/review/6420 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit c94192d -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Thu Jan 8 16:08:06 2015 +0000 - - Netflow: add (hidden) root filters for each vendor with supported 'pie' entries - - Change-Id: I2bdca4c092c247ab253d6ceb3770ac7ea935cdad - Reviewed-on: https://code.wireshark.org/review/6414 - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> - -commit 8bfd306 -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Wed Dec 31 10:53:25 2014 +0100 - - Bluetooth: Update to latest Assigned Numbers (up to 4.2) + - Clean up layout and spacing. - Also start decoding next two profile attribute groups in SDP - (MPS and CTN) and add new two fields in EIR/AD. - - Change-Id: I4dc13df2b3b13e8c2a2a5c4af2cabae9ee83d539 - Reviewed-on: https://code.wireshark.org/review/6409 - Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit 90453a4 -Author: Bill Meier <wmeier@newsguy.com> -Date: Thu Jan 8 10:42:51 2015 -0500 - - mka: Minor cleanup - - Remove unneeded/unused code; - Remove 'dead initializers'; - tvb_captured_length() ==> tvb_reported_length(); - Reformat a few long lines. - - Change-Id: I4a09bf330e939613ea8a47e69d4fc7b21dd496e8 - Reviewed-on: https://code.wireshark.org/review/6413 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit e123878 -Author: Bill Meier <wmeier@newsguy.com> -Date: Thu Jan 8 10:40:25 2015 -0500 - - zbee-zcl-misc: Minor changes - - tvb_captured_length() --> tvb_reported_length(); - whitespace changes. - - Change-Id: Id9c302d84f28ec23e554445777c7685c8d09918c - Reviewed-on: https://code.wireshark.org/review/6412 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit e63e771 -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Tue Dec 30 09:11:03 2014 +0100 - - Bluetooth: AVDTP: Present bitfields for codec ad true/false - - Previously they are present as hex value. - - Change-Id: Ia30ba4da02e6bd4b0d68987506245e0534feadb6 - Reviewed-on: https://code.wireshark.org/review/6400 - Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 2d448f0 -Author: Michael Mann <mmann78@netscape.net> -Date: Fri Jan 2 22:19:53 2015 -0500 - - Eliminate proto_tree_add_text from some dissectors. - - Change-Id: Ief4c377d56748e1a8ed0ef7fe5ba03b9be00cd8d - Reviewed-on: https://code.wireshark.org/review/6267 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I28af33e6c2beb855f803a2dfedef49f3e8389057 + Reviewed-on: https://code.wireshark.org/review/7071 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 2021845 -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Tue Dec 30 11:18:35 2014 +0100 +commit c200f1e +Author: Guy Harris <guy@alum.mit.edu> +Date: Thu Feb 19 13:29:20 2015 -0800 - autotools: Add possibility to build without optional codec SBC + Rename packet-nbns.c to packet-nbt.c to reflect that it's not just NBNS. - SBC is optional but build any time if configure script detect it, - so let user choose if it really want it. Default to build with SBC. + packet-nbt.c handles all of NetBIOS-over-TCP, not just the name service; + the file name is historical. - Bug: 10794 - - Change-Id: I1b936c628c9de0179aa3d5da5ac547bd910af8ba - Reviewed-on: https://code.wireshark.org/review/6399 - Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Tested-by: Michal Labedzki <michal.labedzki@tieto.com> - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> + Change-Id: I333d331fd9453cea8d1d7595b4fd2650f0a92e98 + Reviewed-on: https://code.wireshark.org/review/7259 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 0078211 -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Thu Jan 8 11:16:27 2015 +0100 +commit a6c44c2 +Author: Ebben Aries <exa@fb.com> +Date: Mon Feb 9 10:20:20 2015 -0800 - Add quotation marks in Conversations/Endpoints when address is string + [bmp] Adding dissector for BGP Monitoring Protocol - Change-Id: I39d49542cd563db1f6d3423b4e382a9a5e1c801b - Reviewed-on: https://code.wireshark.org/review/6398 - Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - Tested-by: Michal Labedzki <michal.labedzki@tieto.com> - -commit ec8ca91 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Jan 8 11:36:35 2015 +0100 - - BTSDP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + * Support per draft-ietf-grow-bmp-07 - Change-Id: I48ddaa9ffe8f81094d63dd886dd15bb63888cbd7 - Reviewed-on: https://code.wireshark.org/review/6396 - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: Iadb833157e7832077429c048e28e9814da29e2c6 + Reviewed-on: https://code.wireshark.org/review/7192 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit a3e934f +commit 20e2c38 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Jan 8 11:36:21 2015 +0100 - - BATADV: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - - Change-Id: I3c33511389aa2f4b3eed73f1c712561b20e18bf7 - Reviewed-on: https://code.wireshark.org/review/6395 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit bd1cd01 -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Thu Jan 8 12:22:18 2015 +0100 - - GTK/RTP Player: Fix crash when touch RTP Stream - - Move converts of addresses when they are really valid. - - Change-Id: Ie0c77e8e23bd97ba55d68dad7da7015b9d355b0d - Reviewed-on: https://code.wireshark.org/review/6397 - Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> - Reviewed-by: Michal Orynicz <michal.orynicz@tieto.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Tested-by: Michal Labedzki <michal.labedzki@tieto.com> - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - -commit b6cf61b -Author: Dario Lombardo <lomato@gmail.com> -Date: Thu Jan 8 09:51:05 2015 +0100 +Date: Wed Feb 18 20:00:38 2015 +0100 - Small parenthesis fix + libnl: disable pedantic warning of libnl lib - Change-Id: I6bab238a37f7309daece7a7bfc062da41819d9ff - Reviewed-on: https://code.wireshark.org/review/6394 - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 513ed24 -Author: Evan Huus <eapache@gmail.com> -Date: Mon Jan 5 18:07:56 2015 -0500 - - ieee80211: initialize bssid for data frames - - Hypothentical fix for - https://bugs.launchpad.net/ubuntu/+source/wireshark/+bug/1407662 which I haven't - actually tried. - - Change-Id: Ib6d30873be7676eef756731a56a1d21a41c2c16c - Reviewed-on: https://code.wireshark.org/review/6330 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit a323f0c -Author: Robert Grange <robionekenobi@bluewin.ch> -Date: Sat Dec 27 17:46:33 2014 +0100 - - packet-mq: Add New Def, Reformat Lines, re-order val_str def - - Add missing definition, add new definition, Reformat some lines - Re-order the value_string used with ext_value_string definition - so they are in asc ASCII order as the ext_value_string is now - sorted before first use - - renamed own tvb_get... funct to new tvb_get_guintxx funct - and deleted own tvb_get... funct - use ptvcursor_ funct instead of own macro to increment offset - removed <epan/tvbuff.h> in *.c files - correct [-Wunused-const-variable] + Part 2... - Change-Id: Iaee26289e098cde0e5787ca1c98de64b6b733fa2 - Reviewed-on: https://code.wireshark.org/review/6079 - Reviewed-by: Robert Grange <robionekenobi@bluewin.ch> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I47b74c81ee7b7cd8296ce9da5a60ad6aecef8c78 + Reviewed-on: https://code.wireshark.org/review/7239 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 37e64d8 +commit 5c60289 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Jan 7 18:18:46 2015 +0100 +Date: Tue Feb 10 11:02:42 2015 +0100 - Unistim: Nesting level does not match indendation (CID 1159216) + Qt Wireshark - Once a live capture is stopped the title bar persists in reporting "Capturing from interface name" - Change-Id: I024f47a41328ea7e8db3c79012b892f3cb48caad - Reviewed-on: https://code.wireshark.org/review/6376 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit dcc4936 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Tue Jan 6 23:04:55 2015 +0100 - - use the http server port as index for the ws.port dissector table + With Qt Wireshark the title bar persists in reporting "Capturing from <interface name>" even though capturing has stopped. - pinfo->match_uint is not set if websocket is called because of a - previous http Upgrade: header and http is running on a non-standard port + With GTK Wireshark once a live capture is stopped the title bar is updated to report the interface name(s) used for the unsaved capture file. - Bug: 10805 - Change-Id: Ib0d35d29fe947cfb7b21107e734c64debbb91048 - Reviewed-on: https://code.wireshark.org/review/6353 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - Tested-by: Martin Kaiser <wireshark@kaiser.cx> - -commit 866d2f8 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Jan 7 18:09:55 2015 +0100 - - PPCAP: Nesting level does not match indendation (CID 1259218) + Issue reported by Jim Young - Change-Id: I3d3a4243913f7f0267342693868ec1f2981534e3 - Reviewed-on: https://code.wireshark.org/review/6374 + Bug:10948 + Change-Id: Ia6099f63f82b6610ade5c81af0cf257236f076ec + Reviewed-on: https://code.wireshark.org/review/7050 + Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 20414eb -Author: Michael Mann <mmann78@netscape.net> -Date: Wed Jan 7 20:25:29 2015 -0500 +commit 2bc71d3 +Author: Roland Knall <roland.knall@br-automation.com> +Date: Thu Feb 19 15:16:51 2015 +0100 - Replace some ep_alloc and ep_alloc0 with its wmem equivalent. + openSAFETY: Merge both CT values - These cases were pretty easy to identify. Also replaced some comments that referenced ep_alloced memory, when it's now in fact wmem_alloced. + Both values mean the same thing and should be found using + the same hf_field, as this eases debugging scenarios. - Change-Id: I07d2f390a9c0b34aa2956880476755d1acf5db0a - Reviewed-on: https://code.wireshark.org/review/6392 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I23f675e22623b5e66354708319a41dcf34143e30 + Reviewed-on: https://code.wireshark.org/review/7257 + Reviewed-by: Roland Knall <rknall@gmail.com> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit cff098e -Author: Michael Mann <mmann78@netscape.net> -Date: Wed Jan 7 19:24:52 2015 -0500 +commit b43fecb +Author: Osman Sakalla <osman.sakalla@ericsson.com> +Date: Thu Feb 19 15:46:38 2015 +0100 - guid_to_ep_str -> guid_to_str - - guid_to_str now uses wmem allocation. + patch for PMIPv6 MAG GPS coordinates - Change-Id: I8e48d1a720942fbefbaa6227ae0929cb9f856359 - Reviewed-on: https://code.wireshark.org/review/6391 + Change-Id: I25bbd67775e19c2a0199507538b7dcfe5ce28bf6 + Reviewed-on: https://code.wireshark.org/review/7256 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 5d610b5 -Author: Michael Mann <mmann78@netscape.net> -Date: Wed Jan 7 18:24:17 2015 -0500 +commit 9fba8c8 +Author: Dario Lombardo <lomato@gmail.com> +Date: Wed Feb 18 23:55:51 2015 +0100 - Remove decode_numeric_bitfield. - - It was only used by 1 dissector and that dissector can just use bitmasking in the hf_ field. + Bugfix in nbns dissector. - Change-Id: I99179356dd7cbfab0c7be1512357a7e4c0eecde6 - Reviewed-on: https://code.wireshark.org/review/6390 + Change-Id: I5375a1ae2e48fe0c7ff6e3dde24b8d7b02b1f27f + Reviewed-on: https://code.wireshark.org/review/7251 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 4a5ca5c -Author: Michael Mann <mmann78@netscape.net> -Date: Wed Jan 7 18:13:23 2015 -0500 +commit d330cf7 +Author: Dario Lombardo <lomato@gmail.com> +Date: Wed Feb 18 19:07:22 2015 +0100 - bytes_to_ep_str -> bytes_to_str + Documentation fix (reported by Richard Sharpe). - Change-Id: Ifcda8328dedec0ef4104c3a124d6246f99493750 - Reviewed-on: https://code.wireshark.org/review/6389 + Change-Id: Ie4979c1be0e325178e3c662e0b2c5bbfc58456d9 + Reviewed-on: https://code.wireshark.org/review/7252 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 2209678 -Author: Michael Mann <mmann78@netscape.net> -Date: Wed Jan 7 16:24:17 2015 -0500 +commit ca68a7a +Author: AndersBroman <anders.broman@ericsson.com> +Date: Thu Feb 19 15:21:34 2015 +0100 - ep_<protocol>_port_to_display -> <protocol>_port_to_display + Add some casts to satisfy the various compilers. - Adjust any other ep_ related APIs related to the transition. - - Change-Id: I961b371c2c4bda557e0f1817705c27eef0dae66c - Reviewed-on: https://code.wireshark.org/review/6388 + Change-Id: I7687fc0b433774fe447757af00bdaa2fc44ac59d + Reviewed-on: https://code.wireshark.org/review/7254 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 907d145 -Author: David Ameiss <netshark@ameissnet.com> -Date: Wed Dec 10 14:21:19 2014 -0600 - - Various minor updates to the LBM dissectors. - - Change-Id: I36954ea0d8b525b4d7a1b3407f9e9d0e1c9bbd67 - Reviewed-on: https://code.wireshark.org/review/6378 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit d245f38 -Author: Bill Meier <wmeier@newsguy.com> -Date: Wed Jan 7 20:50:45 2015 -0500 - - packet-irda.c: Add editor modelines - - Change-Id: I626b60a185e750af94306892cd41dc8729920cfd - Reviewed-on: https://code.wireshark.org/review/6393 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit 6edb27b -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Jan 7 16:50:23 2015 -0800 - - FT_DOUBLEs are 8 bytes; use FT_FLOAT for 4-byte floating-point values. - - Change-Id: Ia39f8604229df18e1cdbbf81b78cd423e70f0f3c - Reviewed-on: https://code.wireshark.org/review/6386 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 8f1b82b -Author: Luke Mewburn <luke@mewburn.net> -Date: Mon Dec 22 23:35:55 2014 +1100 +commit adf6f89 +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Thu Feb 19 09:11:06 2015 -0500 - Set the (GT) address even if the message is routed by SSN. - - If sccp.set_addresses is enabled, always SET_ADDRESS to the GT - if the GT is present, not just if ROUTE_ON_GT. This fixes TCAP - session handling in some situations. + Add some casts to satisfy the various compilers. - Change-Id: Ic088a4de408303a34c17c42820602ed6bf113840 - Reviewed-on: https://code.wireshark.org/review/6053 + Change-Id: Ic6a1124da986555d07cfeb71167b74f192c1c062 + Reviewed-on: https://code.wireshark.org/review/7253 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> -commit 5e8c053 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Jan 7 11:43:15 2015 -0800 +commit 8d16ac4 +Author: Michael Mann <mmann78@netscape.net> +Date: Thu Feb 12 12:03:49 2015 -0500 - Squelch a compiler warning. + Add name resolution support to address type. - No need for buflen to be bigger than len, which it will be on LP64 and - LLP64 platforms if it's size_t and len is guint32. + Add address_with_resolution_to_str API that returns address string + name resolution in the format %s (%s), first string is resolved name (if available) and second string is raw address string. - Change-Id: Iffd2940187180cde1ad55ff7d3bd7c45acf22eba - Reviewed-on: https://code.wireshark.org/review/6380 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit ccce7ab -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Jan 7 18:13:51 2015 +0100 - - capture file dlg (GTK): Nesting level does not match indendation (CID 1159217) + Convert AT_FCWWN to using proper name resolution format - Change-Id: I9ae1862993a3a9d10bd7575295b08c91752cb77f - Reviewed-on: https://code.wireshark.org/review/6375 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit d3f67c1 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Jan 7 18:19:58 2015 +0100 - - S5066DTS: Nesting level does not match indendation (CID 1159211 & 1159212) + First use of address_with_resolution_to_str with field types in proto.c - Change-Id: I8145696de995e821793e7bc1576d5a5673c7b503 - Reviewed-on: https://code.wireshark.org/review/6377 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit a6ba632 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Jan 7 18:07:25 2015 +0100 - - BTLE: Nesting level does not match indendation (CID 1261651) - - Change-Id: I11e436ca91c766edc8e85fd2402e61a17465bee2 - Reviewed-on: https://code.wireshark.org/review/6373 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 64a7bac -Author: Michael Mann <mmann78@netscape.net> -Date: Wed Jan 7 10:11:22 2015 -0500 - - tvb_bytes_to_ep_str -> tvb_bytes_to_str - - Change-Id: I79c613cbdd8dc939dd4c29ebc477fb6eefd5bfc4 - Reviewed-on: https://code.wireshark.org/review/6371 + Change-Id: I2ae77c29a4ffc30bb919fbec00f06629830898c2 + Reviewed-on: https://code.wireshark.org/review/7196 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 98d3b14 -Author: Michael Mann <mmann78@netscape.net> -Date: Wed Jan 7 09:36:06 2015 -0500 - - Replace bytes_to_ep_str_punct with wmem equivalent. - - Change-Id: I8aa7d7374db94685fd875cbf358c3bfbc83f3255 - Reviewed-on: https://code.wireshark.org/review/6370 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 9cfe67f -Author: Michael Mann <mmann78@netscape.net> -Date: Wed Jan 7 08:29:35 2015 -0500 - - tvb_bytes_to_ep_str_punct -> tvb_bytes_to_str_punct - - Also change bytestring_to_str to match bytes_to_ep_str_punct functionality (limiting byte string size) - - Change-Id: Idb958c7f0c203d103629469302b81fa922714f7e - Reviewed-on: https://code.wireshark.org/review/6369 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 493f03b -Author: Michael Mann <mmann78@netscape.net> -Date: Wed Jan 7 00:19:55 2015 -0500 +commit 7208355 +Author: Guy Harris <guy@alum.mit.edu> +Date: Thu Feb 19 02:14:39 2015 -0800 - Remove bytestring_to_ep_str + Don't put CORBA IDL dissectors in ASN1_ variables. - Use wmem equivalent bytestring_to_str + Put them into separate CORBA_IDL_ variables, to keep the two types of + generated dissectors separate. - Change-Id: I1ec7509e3adb36ab0f65317459653cb3b4b11af8 - Reviewed-on: https://code.wireshark.org/review/6368 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 2139110 -Author: Dario Lombardo <lomato@gmail.com> -Date: Fri Dec 12 11:12:24 2014 +0100 - - Updates in it translation. - - Change-Id: I3a7b71daa6e4e69ef9cc6dcb777851a8643d6684 - Reviewed-on: https://code.wireshark.org/review/6367 - Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: I4eb091a76ba5bc7d73533ef38fb29adc12a8ec42 + Reviewed-on: https://code.wireshark.org/review/7250 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 667897c -Author: AndersBroman <anders.broman@ericsson.com> -Date: Wed Jan 7 17:34:33 2015 +0100 +commit 6eae09f +Author: Vincenzo Reale <smart2128@baslug.org> +Date: Tue Feb 17 18:39:32 2015 +0100 - [MIP6] Update to handling of - Mobility Header Link-Layer Address (MH-LLA) Option - to RFC 5268 e.g no special handling of length. - Bug:10043 + lupdate for Italian (new strings translated) - Change-Id: Id32789fa5e34766c5734b0be13af015473ac257c - Reviewed-on: https://code.wireshark.org/review/6372 + Change-Id: I22ecf6950d47b63d5512c029d745b75be932554d + Reviewed-on: https://code.wireshark.org/review/7197 + Reviewed-by: Dario Lombardo <lomato@gmail.com> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit a479d9a -Author: Evan Huus <eapache@gmail.com> -Date: Wed Jan 7 09:22:30 2015 -0500 - - simplify tvb_address_to_str - - deduplicate most of the tvb_get_ptr calls - - Change-Id: Ic95b1d545bfebf58fc64a81f816c47d63e5ddcd0 - Reviewed-on: https://code.wireshark.org/review/6366 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Reviewed-by: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Evan Huus <eapache@gmail.com> - -commit 734e408 -Author: Orgad Shaneh <orgads@gmail.com> -Date: Wed Jan 7 10:25:35 2015 +0200 +commit c8f6d21 +Author: Hofer Manuel <manuel@mnlhfr.at> +Date: Wed Jan 14 21:15:05 2015 -0500 - MSVC: Fix opting out of libraries + Add a dissector for Microsoft's SSTP protocol. - When *_DIR variables are defined (even if empty), nmake tries - to build them and fails. + ... with some changes from Jeff Morriss: + - Change how SSTP is "registered": rather than trying something complicated, + just put the intelligence for recognizing SSTP into the HTTP dissector. + (This does mean the SSTP dissector needs to do its own desegmentation now + but it makes things much cleaner.) + - Use proto_tree_add_subtree_format() instead of proto_tree_add_text() + + proto_item_add_subtree(). + - The messagetype is 16 bits, use tvb_get_guint16() instead of tvb_get_guint8() + (fixes COL_INFO display) + - A few other few misc. cleanups - Don't set them at all if not configured to. + (I didn't update NEWS because I can no longer build NEWS without adding UTF8 + fancy quotes and so forth.) - Change-Id: I3825c16f26e45a1a3fc489633084a074838f8c34 - Reviewed-on: https://code.wireshark.org/review/6365 - Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> + Bug: 8239 + Change-Id: I3631ae65f67bea69815ccf43472fdbcac3ca3499 + Reviewed-on: https://code.wireshark.org/review/7227 + Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit ed9a9be -Author: Michael Mann <mmann78@netscape.net> -Date: Tue Jan 6 14:52:54 2015 -0500 +commit ff1c33c +Author: Peter Wu <peter@lekensteyn.nl> +Date: Wed Feb 18 13:01:33 2015 +0100 - Use tvb_address_to_str as an optimization + ssl: check for minimal SSLv3/TLS record size - Change-Id: Ic79d8bdc58b84087531b298b3b27273c1afccd4f - Reviewed-on: https://code.wireshark.org/review/6357 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 4088a82 -Author: Michael Mann <mmann78@netscape.net> -Date: Tue Jan 6 14:54:03 2015 -0500 - - SET_ADDRESS -> TVB_SET_ADDRESS to "hide" some of the tvb_get_ptr use. + When a TLS record is fragmented over multiple TCP segments, with its + first byte in one segment, and the remainder over the others, + ssl_looks_like_sslv3() throws an exception because it tries to access + the third byte. - Not all changes were able to remove their corresponding tvb_get_ptr, because there are other API dependent on the (tvb_get)pointer, but future iterations optimizing those other APIs will then be able to remove it. + This breaks the encryption state, resulting in very weird (scrambled) + decrypted data. To fix this, check the record size before using it. Also + add TLSv1.1 and TLSv1.2 as known version. - Change-Id: Id7cefd440b81834de1d1aace7cd0789b1c871a22 - Reviewed-on: https://code.wireshark.org/review/6358 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 6252074 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Tue Jan 6 21:28:56 2015 +0100 - - DJIUAV: small cleanups - - - fix some typos - - remove a useless include - - change an obsolete API - - comment unused hf entries for now - - Change-Id: I5939bc2fe9ddc6c422f35423aa22e884f20f088d - Reviewed-on: https://code.wireshark.org/review/6349 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: Ie0ca78302a5d6c4241ea699d2ef6f7b873dd51ee + Reviewed-on: https://code.wireshark.org/review/7234 + Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 50a9863 +commit 7d66c25 Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Jan 7 02:17:14 2015 -0800 +Date: Wed Feb 18 20:33:49 2015 -0800 - Don't run checkapi on .rc files. + That's not an ASN.1 dissector (and gets warnings). - Change-Id: I75879bfcd0d9706523447146b16c319d3eb56d23 - Reviewed-on: https://code.wireshark.org/review/6361 + Change-Id: I55b49080c64a44c1e5752ab986cb6b27772d14db + Reviewed-on: https://code.wireshark.org/review/7248 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 9696eb6 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Tue Dec 30 14:31:04 2014 +0100 - - SMB: the "encryption key" in the negotiate response is not really a key - but the data for the Challenge/Response authentication - - (at least, that's my understanding of - http://msdn.microsoft.com/en-us/library/ee441946.aspx) - - rename the items and filter strings accordingly - - Bug: 10777 - Change-Id: I38378f0b31252d7bc8ec5e8ad7cee81a1a48cb4d - Reviewed-on: https://code.wireshark.org/review/6137 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit a76559e +commit 58f7788 Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Jan 6 20:53:54 2015 -0800 +Date: Wed Feb 18 12:51:43 2015 -0800 - Cast away an insignificant warning. + Move some ASN.1 dissectors to the clean list. - Change-Id: Ifd74719ced4d1ff99a2a913ad6a6797d3e80b311 - Reviewed-on: https://code.wireshark.org/review/6359 + Change-Id: If642132eb4a2b77db5e56b150b85f064b4b10b30 + Reviewed-on: https://code.wireshark.org/review/7244 + Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 3bb887f -Author: Michael Mann <mmann78@netscape.net> -Date: Tue Jan 6 23:27:36 2015 -0500 - - Fix compiler error because I didn't completely amend last patch. - - Change-Id: I7b8ffc4a63e69b5f50666dc1cf3482ae20124c0f - Reviewed-on: https://code.wireshark.org/review/6356 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 47d670d -Author: Michael Mann <mmann78@netscape.net> -Date: Mon Jan 5 19:26:28 2015 -0500 - - Add tvb_address_to_str. - - This is intended to handle ALL address types retrieved from a tvbuff. - - One of the (good) side effects of this function is that it can replace a lot of the "hidden" ep_alloc calls used to allocate memory for the address string. - - A few existing "popular" helper tvb_ functions were turned into pure macros calling tvb_address_to_str. Some of the "less used" helper tvb_ functions were just directly replaced with tvb_address_to_str. - - Change-Id: I361d991c4ad90142173e63eae02a94d68af3ec43 - Reviewed-on: https://code.wireshark.org/review/6333 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 0f426d6 -Author: Joseph Huffman <jhuffman@codeaurora.org> -Date: Mon Jan 5 09:53:53 2015 -0800 +commit 493ab6b +Author: Guy Harris <guy@alum.mit.edu> +Date: Wed Feb 18 17:16:04 2015 -0800 - Improved handling of ARDP fragmented packets. + Check whether emmintrin.h can be used *without* -msse4.2. - With the AllJoyn Reliable Datagram Protocol large packets are fragmented in - a way that Wireshark doesn't desegment. The AllJoyn dissector now detects - this situation and reports things to the user in a manner which indicates - things are behaving normally rather than an error condition. + If not, we can't use SSE 4.2, as we need to be able to include it in + files that use tvb_pbrk_compile()/tvb_pbrk_exec() even if they're not + compiled with -msse4.2 (most files aren't, as we need to isolate SSE 4.2 + instructions to a small bit of code that uses them only if running on + hardware that supports them). - Change-Id: I1f2aa722b6e0d1ed3572ff332b4dd8c0e5c5a765 - Signed-off-by: Joseph Huffman <jhuffman@codeaurora.org> - Reviewed-on: https://code.wireshark.org/review/6344 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: I62262a3c45fa14e200967916ac0ffc283f8e322c + Reviewed-on: https://code.wireshark.org/review/7246 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 85e69d4 -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Jan 6 15:44:19 2015 -0800 +commit e29dca7 +Author: Guy Harris <guy@alum.mit.edu> +Date: Wed Feb 18 12:11:34 2015 -0800 - Fix GCC pragma. - - Fix "error: #pragma GCC diagnostic not allowed inside functions". + Not all compilers support turning of "format=". - Change-Id: Iaa7e39ac46975f00bc337b97875ba8b77295064a - Reviewed-on: https://code.wireshark.org/review/6355 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit e3eab83 -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Jan 6 15:08:51 2015 -0800 - - checkAPIs: C++ comments are allowed in Windows resource files. + The clang on my machine doesn't; just do "format" instead. (The best + way to handle this may be to do the formatting ourselves, so that we can + get thousands separators on *all* platforms, regardless of whether its + printf formatter supports it.) - Change-Id: I3885278bf293b1fd7db812ce265734bcdc904c6f - Reviewed-on: https://code.wireshark.org/review/6354 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I1948d1799688cb3cf1d7b0de0696c09f6bf23f1c + Reviewed-on: https://code.wireshark.org/review/7241 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 6e03daf +commit fcc05a4 Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Jan 6 11:52:53 2015 -0800 +Date: Wed Feb 18 12:00:36 2015 -0800 - Try to suppress clang warnings in exntest. - - Nested TRYs result in: + Use plain old ASCII for the SimpleDialog delimiter. - warning: declaration shadows a local variable + Use a UUID for the SimpleDialog primary delimiter instead of trying to + leverage Unicode. - Change-Id: Ifaa7baebde0ea4c18be5a53ab7e7964e84716496 - Reviewed-on: https://code.wireshark.org/review/6347 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Bug: 10953 + Change-Id: Ib518b32ef65b50f311b061ab5a267e7d1aa9f01b + Reviewed-on: https://code.wireshark.org/review/7240 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 119f564 +commit 3a79d04 Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Tue Jan 6 21:59:04 2015 +0100 +Date: Tue Feb 17 18:30:14 2015 +0100 - MBIM: call dissector_(add|delete)_uint only when necessary + H.248: fix dissection of ServiceChangeReason for version 1 - Change-Id: I12bbe9e1d81560f1874d4e575b19db1842fa0c72 - Reviewed-on: https://code.wireshark.org/review/6352 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit a6e6dee -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Jan 6 12:19:04 2015 -0800 - - NSIS: Quote all paths in config.nsh. + My understanding of RFC 3015 is that the encoding of this field was not different in version 1 compared to newer releases - Fix the MAKEDIR substitution. Add config.nsh to .gitignore. - - Change-Id: I9c5f6469569e826e4a8036b9b1b483c16558f788 - Reviewed-on: https://code.wireshark.org/review/6351 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Bug: 10879 + Change-Id: Iaa81679388860c0df4adc673ca6e56aff6f4591c + Reviewed-on: https://code.wireshark.org/review/7195 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit f39366b -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Tue Jan 6 11:18:24 2015 +0000 +commit fb4252e +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Tue Feb 17 21:29:37 2015 +0100 - NetFlow: Add Ixia 'IxFlow' fields and make some general usability improvements + RADIUS: Add new dicto from FreeRADIUS + commit 6c51e945a73844029f347c3fdaa0de1ec96473f1 + Author: Alan T. DeKok <aland@freeradius.org> + Date: Tue Feb 10 13:22:39 2015 -0500 - - Sequence number analysis using flow sequence within an observation domain. - - Link back from data set to template frame, if have seen - - Show more information (observation domain ID, set ID, etc) in Info column and protocol roots - - Look up protocol field from ip_proto + New dictionary - Change-Id: I3147387a3cd0d1fc33b879b3ba226753ed2cd8dd - Reviewed-on: https://code.wireshark.org/review/6331 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit 29207bf -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Jan 6 12:08:41 2015 -0800 - - $(MSVCR_DLL) might contain spaces, so we need to quote that sed expression. - - Change-Id: Ia3aca07a5aa8adcc99d17fa559662d79659f46ca - Reviewed-on: https://code.wireshark.org/review/6348 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I60ba21dbadd3e35c1b0b01d7cea14b683f7f2a0c + Reviewed-on: https://code.wireshark.org/review/7237 + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit ea46a44 +commit dd15191 Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Jan 5 12:53:46 2015 -0800 +Date: Wed Feb 18 10:34:20 2015 -0800 - NSIS: Move definitions to their own file. + Suppress a printf grouping warning. - Convert the pile-o-makensis-flags to a pile-o-sed-commands which creates - a "config.nsh" file. This should hopefully make it easier to port the - "packaging" target to CMake. + Suppress - Change-Id: I439fea5721c5b209a753044a8e9e8ac6fc5291c3 - Reviewed-on: https://code.wireshark.org/review/6345 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit a70929c -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Jan 6 10:44:37 2015 -0800 - - CMake: Add an ENABLE_CODE_ANALYSIS option. + warning: ISO C does not support the ''' printf flag [-Wformat=] - Currently Visual Studio-only. Enabling it adds /analyze:WX- to - LOCAL_CFLAGS, similar to config.nmake. + We verify that we *do* support it via HAVE_GLIB_PRINTF_GROUPING. - Change-Id: Ida68831e85f5f04b9f84faa95a39fed24e5f490d - Reviewed-on: https://code.wireshark.org/review/6346 + Change-Id: Iedcf1d1856238e05babde5fe8ec23f64fbf2cdcf + Reviewed-on: https://code.wireshark.org/review/7238 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 087fea3 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Tue Jan 6 10:36:37 2015 +0100 - - DJI UAV: Add dissector to autotools and add modelines info - - Change-Id: I2a312af906ddf01ff05083a657f474a921ab95a3 - Reviewed-on: https://code.wireshark.org/review/6337 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit dd65274 -Author: Joerg Mayer <jmayer@loplof.de> -Date: Tue Jan 6 16:20:04 2015 +0100 - - Revert e65f581ffa86f6bfd566a9b66ca2c882f465727f, which - reverts commit 89291ad4f3293893387b385a0800cad42215ddd4 - Protect the new macro with "m4_ifdef" instead. - Add comments to keep the old and the new flags in sync. - - Change-Id: I37dea1a5c8d743f5dcf4a4d9ff38ff92200271d0 - Reviewed-on: https://code.wireshark.org/review/6343 - Reviewed-by: Jörg Mayer <jmayer@loplof.de> - -commit 1d7da82 +commit 0dd7714 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Tue Jan 6 10:41:01 2015 +0100 +Date: Thu May 22 21:44:06 2014 +0200 - DNS: fix no previous prototype for 'qname_labels_count' [-Wmissing-prototypes] + Add AddressSanitizer (ASAN) build option + --enable-asan for autotools + -D ENABLE_ASAN:BOOL=TRUE for CMake - Change-Id: I2c5b662f6b46d60a97a491ca8ec01b3f0e41fa56 - Reviewed-on: https://code.wireshark.org/review/6338 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 5fb2f27 -Author: Gerald Combs <gerald@zing.org> -Date: Thu Jan 1 11:41:03 2015 -0800 - - Qt: Add a context menu to the packet list header. + Need Clang/LLVM >= 3.1 or GCC >= 4.9 - Don't carry over the sort items from the GTK+ UI (for now, at least). - Update some names. Add a column editor frame similar to the "Go to - Packet" and "Search" frames. + More information about ASAN https://code.google.com/p/address-sanitizer/wiki/AddressSanitizer - Change-Id: I1bd3834a26994de96894d2b7512bce2c19915c77 - Reviewed-on: https://code.wireshark.org/review/6277 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Change-Id: I833d4216d9508b8f7550ebc1dff6326734bdb53a + Reviewed-on: https://code.wireshark.org/review/1727 + Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit cbca7ee -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Tue Jan 6 13:58:59 2015 +0100 - - p_mul: Indicate if fletcher algorithm is used. - - The first version of ACP 142 uses the fletcher algorithm for checksum. - Indicate if this (now old variant) checksum is used. - - Change-Id: Id6f3e7ecfcde022b339bdb956cd6f642a917076a - Reviewed-on: https://code.wireshark.org/review/6342 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> -commit 0910b55 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Tue Jan 6 13:51:33 2015 +0100 - - s5066ses: Fixed some missing sapid mappings. - - The previous s5066ses commit added sapid value strings but missed - updating PDU type 21 and 25. - - Change-Id: I5cd4dba14eacdf2f590490a95b0cc62b04193b9e - Reviewed-on: https://code.wireshark.org/review/6341 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - -commit e8568c8 -Author: Ricardo Cristian Ramirez <r.cristian.ramirez@gmail.com> -Date: Sun Jan 4 02:19:12 2015 +0200 - - s5066sis: Consume transport layer data in S5066sis - - S5066 spec describes a transport layer for some - clients like Acp 142 and DMP but not for all of - them. Since RCOP/UDOP header definition are given - in S'5066 specification, consuming these header - bytes in S'5066 SIS dissector may be appropriate - - Bug: 10827 - Change-Id: Iffdf5d567e1a417ccbafdac919f5a5200159d31b - Reviewed-on: https://code.wireshark.org/review/6292 - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Stig Bjørlykke <stig@bjorlykke.org> - -commit 55de46f -Author: Michael Mann <mmann78@netscape.net> -Date: Mon Jan 5 11:12:08 2015 -0500 +commit b356887 +Author: Dario Lombardo <lomato@gmail.com> +Date: Wed Feb 18 14:45:53 2015 +0100 - Replace ep_address_to_str with address_to_str. + Bugfix in ui/qt/CMakeLists.txt (missing file). - Change-Id: I4f1078b20f41800f72a751612703ad0d4c2ae87b - Reviewed-on: https://code.wireshark.org/review/6323 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> + Change-Id: I1db046f2e0555c8fc78d71ec6646c18cbb6f31eb + Reviewed-on: https://code.wireshark.org/review/7235 + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 124272e -Author: Anish Bhatt <anish@chelsio.com> -Date: Mon Jan 5 22:50:44 2015 -0800 - - [PROFINET] v2: Fix swapped MaintenanceRequired & MaintenanceDemanded bits - - Fix the correct code path this time. - Bug: 10753 - - Change-Id: I7bc2e74c91868986303e8b41b25e43a665be1860 - Reviewed-on: https://code.wireshark.org/review/6335 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> -commit eb98b04 -Author: Anish Bhatt <anish@chelsio.com> -Date: Mon Jan 5 22:26:46 2015 -0800 +commit 4342333 +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Tue Feb 17 21:30:59 2015 +0100 - Revert "[PROFINET] Fix swapped MaintenanceRequired & MaintenanceDemanded bits" + libnl: disable pedantic warning of libnl lib - This reverts commit 0452f763fb0dd2cf7e38f0a127c306199a814c3e. Changes should - have been made in ChannelProperties instead of Submodule state. Current - implementation merely *appears* to be correct as we are reading it as a two bit - value but instead should be addressing it as individual bits, little endian - Bug: 10753 + /usr/include/libnl3/netlink/types.h:25:15: warning: comma at end of enumerator list [-Wpedantic] + /usr/include/libnl3/netlink/handlers.h:65:9: warning: comma at end of enumerator list [-Wpedantic] + /usr/include/libnl3/netlink/handlers.h:81:18: warning: comma at end of enumerator list [-Wpedantic] + /usr/include/libnl3/netlink/handlers.h:113:18: warning: comma at end of enumerator list [-Wpedantic] + /usr/include/libnl3/netlink/utils.h:43:13: warning: comma at end of enumerator list [-Wpedantic] + /usr/include/libnl3/netlink/attr.h:47:16: warning: comma at end of enumerator list [-Wpedantic] + /usr/include/libnl3/netlink/route/link.h:95:23: warning: comma at end of enumerator list [-Wpedantic] + ... - Change-Id: Ia3bd088aeb376b8511d64352f62c4304e4129ba6 - Reviewed-on: https://code.wireshark.org/review/6334 + Change-Id: I3f14e9d4887569e5d7befe1adb77561c8793437e + Reviewed-on: https://code.wireshark.org/review/7201 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Gerald Combs <gerald@wireshark.org> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit a7a1704 -Author: Graham Bloice <graham.bloice@trihedral.com> -Date: Mon Jan 5 23:40:52 2015 +0000 - - Minor CMake updates to better group build artefacts - - Move capchild, caputils, codecs and wsutil into a Libs group - Move gtkui into UI group - Move update-sminmpec into tools group - - Change-Id: Iaf2bfe4697265af2c3ed9c9d7de2d5d1ef3cafee - Reviewed-on: https://code.wireshark.org/review/6332 - Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> - Tested-by: Graham Bloice <graham.bloice@trihedral.com> - -commit 1176db2 +commit 7263af8 Author: Guy Harris <guy@alum.mit.edu> -Date: Mon Jan 5 13:18:26 2015 -0800 +Date: Wed Feb 18 00:03:42 2015 -0800 - Squelch harmless compiler warnings. + Eliminate some DIRTY_ file lists. - (Yes, we know, we're casting 16-bit integers to pointers. That's - because various generic maps need to be able to take arbitrary values as - keys, and sometimes the arbitrary values aren't structures to which we - point, but just integral values, and that's why GUINT_TO_POINTER() - exists, but it doesn't do enough casting to suppress harmless warnings.) + We don't want to encourage people to add to those lists, we want to + encourage people to subtract *from* those lists (either by fixing + warnings or, if an infelicitous API, or an infelicitous declaration of + an API on some platforms, or a program generator that doesn't take + sufficient care to avoid warnings - I'm looking at *you*, Flex - makes + it impossible to fix without introducing other problems, using the + DIAG_OFF()/DIAG_ON() macros if possible). Eliminate the empty lists, to + make it harder to fill them up again. - Change-Id: I1a9c68b4b1007f0a38017ba3570b94efb0b6845a - Reviewed-on: https://code.wireshark.org/review/6329 + Change-Id: I298d07952c0cb1842a4ea71ba7e07c68e94a04e9 + Reviewed-on: https://code.wireshark.org/review/7229 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 318b8f8 -Author: Joerg Mayer <jmayer@loplof.de> -Date: Mon Jan 5 20:41:45 2015 +0100 - - Beginnings of dissection of the dji drones control protocol. - - Change-Id: Ifda0b97df7e25b535a5010f25c8e8e1af83cb532 - Reviewed-on: https://code.wireshark.org/review/6328 - Reviewed-by: Jörg Mayer <jmayer@loplof.de> - -commit 15a238a -Author: Joerg Mayer <jmayer@loplof.de> -Date: Mon Jan 5 20:35:25 2015 +0100 +commit 9707ff8 +Author: Gerald Combs <gerald@wireshark.org> +Date: Tue Feb 17 21:18:43 2015 -0800 - Override optimization and other flags for make based generators. - Before this patch it was not possible to override e.g. the optimization - or debug flags in case the build type was set. + Uninstall wireshark.appdata.xml. - Change-Id: I53bfddd27f87ad5482227f786af8c4728c5774fc - Reviewed-on: https://code.wireshark.org/review/6327 - Reviewed-by: Jörg Mayer <jmayer@loplof.de> + Change-Id: Ic955e008b686af448f2091de891f8457623ae7d5 + Reviewed-on: https://code.wireshark.org/review/7228 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 13dbf52 -Author: Stephen Fisher <sfisher@sdf.org> -Date: Mon Jan 5 11:37:44 2015 -0700 +commit 630f54f +Author: Gerald Combs <gerald@wireshark.org> +Date: Tue Feb 17 13:33:15 2015 -0800 - Attempt to fix "make distcheck" on Ubuntu buildbot + Fix various warnings in wireshark-qt.cpp. - Change-Id: I6e7ea1e2aaf839fdb3af8a3a5a47aabbb12056ef - Reviewed-on: https://code.wireshark.org/review/6326 - Reviewed-by: Stephen Fisher <sfisher@sdf.org> - -commit cbc5faa -Author: Stephen Fisher <sfisher@sdf.org> -Date: Sun Jan 4 22:19:24 2015 -0700 - - Get rid of some GNU make extensions so users can build with - the make that comes with *BSD and other systems now. + Squelch warnings due to (char *) casts. - Change-Id: Ib2eee8d37e7029202675bac35839b1c0d5fc5131 - Reviewed-on: https://code.wireshark.org/review/6320 - Reviewed-by: Stephen Fisher <sfisher@sdf.org> - -commit 22b4ec9 -Author: Michael Mann <mmann78@netscape.net> -Date: Sun Jan 4 21:40:05 2015 -0500 - - Replace ep_display_to_address with wmem equivalent display_to_address. + Use "include_directories(SYSTEM..." in CMakeLists.txt so that we + don't get pedantic warnings about things we can't easily fix such + as QList loop optimizations. Not sure if there's an easy way to do + this in Autotools. - Almost all instances require using "manual" memory management, but it gets some ep_ calls out of the GUI. + Pass get_gui_compiled_info to init_progfile_dir. C++ don't have to + show you any stinkin' ::main. - Change-Id: Ifa7303766b08d09442ccf3d7063cbe061578ecd9 - Reviewed-on: https://code.wireshark.org/review/6318 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 9a7318a -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sun Jan 4 13:00:54 2015 +0100 - - Wimax: fix no previous prototype for ... [-Wmissing-prototypes] + warning: ISO C++ forbids taking address of function ‘::main’ [-Wpedantic] - Change-Id: I1dac7d362bab680c313766de19d51132d1ce6dfa - Reviewed-on: https://code.wireshark.org/review/6298 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: If1c77284ab0d1b4786bce4e926a4109dd9b1ae34 + Reviewed-on: https://code.wireshark.org/review/7207 + Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 4270673 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Jan 5 11:05:56 2015 +0100 +commit b3f3d66 +Author: Gerald Combs <gerald@zing.org> +Date: Tue Feb 17 18:11:01 2015 -0800 - OSITP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + Update Qt version checks. - Change-Id: Ied8e931541e8e570ef32376eec61779a32bbd493 - Reviewed-on: https://code.wireshark.org/review/6322 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit b03a21a -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Jan 5 11:05:20 2015 +0100 - - SMTP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + It looks like QPaintDevice::devicePixelRatio() was added in 5.1. - Change-Id: I234b9dad79e3327637f8cdcd406a49f9e7435f33 - Reviewed-on: https://code.wireshark.org/review/6321 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Back out some debugging code. + + Change-Id: I40f19c0d7901ce95f587531983e5c6644daf64f4 + Reviewed-on: https://code.wireshark.org/review/7226 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit c411029 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Jan 3 20:18:56 2015 +0100 +commit a5aab24 +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Thu Sep 18 11:47:21 2014 -0400 - Update to QCustomPlot 1.3.0 + Add an appdata entry for Wireshark. - Reapply remove trailing whitespace and some spelling fixes - Fix also a not ASCII caracter in qcustomplot.h + Based on the one from Richard Hughes. - Change-Id: Ibd5433015dd117f4d028c842a4add53041adbd11 - Reviewed-on: https://code.wireshark.org/review/6275 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 696fcdb -Author: Dario Lombardo <lomato@gmail.com> -Date: Tue Dec 30 12:31:46 2014 +0100 - - Added DNS statistics support + A French translation of the description field is included. - This affects both the dissector (that has been added with a tap interface and a stats generator) and the UI (to recall the stats menu). + Links to two screenshots are provided--they are stored in my home directory + on wireshark.org (for lack of a better place that I can put them). - Change-Id: I90658f7aa6707aa39bdd787a51b20fed4dbddc53 - Reviewed-on: https://code.wireshark.org/review/6236 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Bug: 10479 + Change-Id: Ida9b9e46c0fb23a7baff50f98afa597b25b8ca54 + Reviewed-on: https://code.wireshark.org/review/4178 + Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> -commit 087723a +commit 909d891 Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 4 20:06:55 2015 -0800 +Date: Tue Feb 17 17:21:25 2015 -0800 - Suppress the check for ' as a formatting character on Windows. + Some additional UAT update callback changes. - Change-Id: I006359faeeeb5d01ecdb57878c599c5e8a93a77f - Reviewed-on: https://code.wireshark.org/review/6319 + I guess the signature mismatch must just be a warning with Clang; it's + not with MSVC. + + Change-Id: Ic1f4cb88471f7e13019e891f111978310dfada73 + Reviewed-on: https://code.wireshark.org/review/7225 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit fc39b9b -Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 4 17:43:19 2015 -0800 +commit b10bad1 +Author: Gerald Combs <gerald@wireshark.org> +Date: Tue Feb 17 16:01:39 2015 -0800 - In CMake, check for thousands-grouping support in the GLib printf routines. + Fix QCustmPlot retina problems. - We do that with the autotools; do it with CMake as well. + Make sure our intermediate pixmaps have the same number of pixels as the + screen. - We could, in theory, handle thosands-grouping ourselves, on all - platforms supporting ANSI C (for which read "all platforms we care - about") by using localeconv()'s thousands_sep and grouping items, but - that's a bit more work. + A merge request with the same changes has been made upstream. - Fix autotools' comment for that item while we're at it (it checks the - GLib printf routines, not the system printf routines). - - Change-Id: I000f0f3b955d9b192ade15e3fabc46d6b48a052e - Reviewed-on: https://code.wireshark.org/review/6317 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I19950181d52f347e3aa7f5abb6e9ad33a4097abf + Reviewed-on: https://code.wireshark.org/review/7224 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 533f857 +commit 9d1ea65 Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 4 16:31:49 2015 -0800 +Date: Tue Feb 17 16:48:10 2015 -0800 - Don't check for nl80211 stuff if we don't have libnl. - - While we're at it, do the checks in the same order that we do in - autotools. + Fix comments to reflect reality. - Change-Id: Ie253cdeb740a5be4a5817ce4f7ed683aeea868c8 - Reviewed-on: https://code.wireshark.org/review/6316 + Change-Id: I63aeb49e442eb6eba5cdf35ded221894c1d0ea6c + Reviewed-on: https://code.wireshark.org/review/7223 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 8fe6b04 +commit 859511d Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 4 16:25:51 2015 -0800 +Date: Tue Feb 17 16:40:28 2015 -0800 - Note why we only default to enabling libnl on Linux. + Make UAT record update callbacks return a success/failure indication. - (Just as we note why we only check for it on Linux in autotools.) + Have them return TRUE on success and FALSE on failure. Check the return + value rather than whether the error string pointer is null or not. - Change-Id: I58c1f31fdf667ed554a4e911df13e5c864171ac0 - Reviewed-on: https://code.wireshark.org/review/6315 + Change-Id: I800a03bcd70a6bbb7b217cf7c4800e9cdcf2189c + Reviewed-on: https://code.wireshark.org/review/7222 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 05fd11e -Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 4 16:11:56 2015 -0800 +commit 3f765b3 +Author: Gerald Combs <gerald@zing.org> +Date: Sun Feb 15 17:58:12 2015 -0800 - Add a check for NL80211_PROTOCOL_FEATURE_SPLIT_WIPHY_DUMP. + Add a CF_FUNC macro for casting BASE_CUSTOM functions. - Just as we check for it in autotools, check for it in CMake. + Add a CF_FUNC macro to match VALS, TFS, etc. This should help us to avoid + the following warning: - Change-Id: I342a3fcde6a5f8190dac67260f25c070b6f5430f - Reviewed-on: https://code.wireshark.org/review/6314 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 2f1ac87 -Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 4 14:10:56 2015 -0800 - - Clean up handling of INET6. + warning: ISO C forbids initialization between function pointer and 'void *' [-Wpedantic] - We wire it on, so we don't need a commented out wiring-it-on on Windows. + We could start adding DIAG_OFF+DIAG_ON everywhere but this seems to be + more consistent with the other macros in proto.h. Update each instance + of BASE_CUSTOM to use CF_FUNC. - Explain *why* we're wiring it on rather than doing checks for IPv6 - support. + Adjust a dummy variable name generated by asn2wrs.py that was triggering + an invalid error in checkhf.pl. - Change-Id: I205ba2456160f9dad48041f27c63a09cdcdc12d3 - Reviewed-on: https://code.wireshark.org/review/6313 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Fix an encoding arguement in packet-elasticsearch.c found by + fix-encoding-args.pl. + + Change-Id: Id0e75076c2d71736639d486f47b87bab84e07d22 + Reviewed-on: https://code.wireshark.org/review/7150 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 553cdfd +commit be5e595 Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 4 13:19:47 2015 -0800 +Date: Tue Feb 17 14:56:31 2015 -0800 - No need to #define HAVE_PYTHON. + Make it a bit more like the way it was before all these changes. - We don't check it (we don't support Python as an extension language - - the experimental support was dropped). - - Change-Id: Iedbe1dc5095614676c7eb3026d02f421bdba0d1d - Reviewed-on: https://code.wireshark.org/review/6312 + Change-Id: I9fc0ef50574a7e068c32e3f6ffeb3634df9474d4 + Reviewed-on: https://code.wireshark.org/review/7212 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit fac8356 -Author: Hadriel Kaplan <hadriel@128technology.com> -Date: Mon Dec 29 00:21:15 2014 -0500 - - Make all Lua code use wmem not emem - - Changed all remaining code in wslua that was using emem, to use wmem or - simpler methods. - - Bug: 9927 - Change-Id: I3d19a770e0fd77d996bdb6b61a76a722cc2bcd55 - Reviewed-on: https://code.wireshark.org/review/6109 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 5653fce +commit efd18e6 Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Jan 4 12:58:49 2015 -0800 +Date: Tue Feb 17 14:54:37 2015 -0800 - No *pcap should have pcap_open() without the other remote extensions. - - WinPcap 3.0 introduced pcap_open(); it also introduced - pcap_findalldevs_ex() and pcap_createsrcstr(). If you're going to put - pcap_open() in libpcap, there's not much point to doing so but not also - putting pcap_findalldevs_ex() and pcap_createsrcstr() there. + A UAT's update is expected to set *error; do so. - (And, in the future, there'll be support for remote capturing with - pcap_create() and pcap_activate(), with no need for pcap_createsrcstr(), - and a replacement for pcap_findalldevs() and pcap_findalldevs_ex(), - which we'll also check for.) + Its callers treat a non-null error pointer as a failure and a null error + pointer as a success, so it has to set *error, even if it's only setting + it to NULL. - So there's no need to check for pcap_findalldevs_ex() or - pcap_createsrcstr(). - - Change-Id: I9323aad20136684d05d1e909326792a2f1408887 - Reviewed-on: https://code.wireshark.org/review/6311 + Change-Id: I48b2faa4bc013e4a754180dfae487829c8fe35a6 + Reviewed-on: https://code.wireshark.org/review/7211 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 9aeb249 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Jan 4 18:47:40 2015 +0100 +commit 23c8bb8 +Author: Martin Kaiser <wireshark@kaiser.cx> +Date: Tue Feb 17 23:13:00 2015 +0100 - ACSE: get rid of an evil global variable + [zvt] dissect some more fields - Bug: 10787 - Change-Id: I225dab439e195bbd308bcafd4658e77ef9023c0f - Reviewed-on: https://code.wireshark.org/review/6263 - Tested-by: Pascal Quantin <pascal.quantin@gmail.com> - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Evan Huus <eapache@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: I93ffcfddd59a196a7e4f9f354b99884a7f5a814c + Reviewed-on: https://code.wireshark.org/review/7208 + Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> + Tested-by: Martin Kaiser <wireshark@kaiser.cx> -commit d9b480d -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Jan 4 19:22:05 2015 +0100 +commit eca4d29 +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Tue Feb 17 19:31:14 2015 +0100 - PKIX1Explicit: get rid of an evil global variable + STUN : fix indent (use 4spaces) - Bug: 10744 - Change-Id: I9fbd7c881ab6b17fa9febb55a4f33dbb229c900b - Reviewed-on: https://code.wireshark.org/review/6264 - Tested-by: Pascal Quantin <pascal.quantin@gmail.com> - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Evan Huus <eapache@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: Ifbaf0f396b24d5506722f0e0df0dd17c1969a435 + Reviewed-on: https://code.wireshark.org/review/7202 + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit d16f114 -Author: Michael Mann <mmann78@netscape.net> -Date: Wed Dec 24 22:12:17 2014 -0500 +commit 47f27e3 +Author: Martin Kaiser <wireshark@kaiser.cx> +Date: Fri Feb 13 17:19:48 2015 +0100 - Convert "FC Member Identifier" fields from all strings to their "native" formats. + [Qt] don't clear the display filter when a capture file is closed - Change-Id: I7ea32170b1cdcbc16c1d62b1069c4ed71ea6e9bb - Reviewed-on: https://code.wireshark.org/review/6099 - Reviewed-by: Michael Mann <mmann78@netscape.net> + Bug: 10951 + Change-Id: I958aa9e88c30ac20cd7d7971ee903ac97265c1f4 + Reviewed-on: https://code.wireshark.org/review/7098 + Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> + Tested-by: Martin Kaiser <wireshark@kaiser.cx> -commit d3581ae +commit da62086 Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Jan 2 14:06:42 2015 -0800 +Date: Tue Feb 17 12:35:07 2015 -0800 - Make sure we don't underrun a buffer when decrypting SSL. - - Discovered by Noam Rathaus. + WSUG: Add more dialog guidelines. - Change-Id: Ia0275601b2a825ba616656064d9a6eca109e34fa - Reviewed-on: https://code.wireshark.org/review/6256 - Petri-Dish: Gerald Combs <gerald@wireshark.org> + Change-Id: I59a14bf9712c05d75398b8ed2dc103fe3443f7af + Reviewed-on: https://code.wireshark.org/review/7203 Reviewed-by: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Evan Huus <eapache@gmail.com> -commit ac52f0e -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Jan 3 20:26:08 2015 +0100 - - SCTP (Graph Dialog Qt): fix Copy-paster error (CID 1158585) - - Change-Id: I8939dbc8339284f9a1e515aff533d67ddbb6d469 - Reviewed-on: https://code.wireshark.org/review/6274 - Reviewed-by: Evan Huus <eapache@gmail.com> - -commit c2f6ce7 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Dec 24 15:30:03 2014 +0100 - - TCP: Update Multipath TCP (MPTCP) to final RFC (RFC 6824) - - * Add Fast Close subtype - * Sender MAC => Sender HMAC - * Display some reserved field - * Add new flag (Checksum, Extensibility, HMAC-SHA1...) from MP Capability subtype - * Use also proto_tree_add_bitmask for flag - - Change-Id: I2e4dfd75623d3218c574e3a112e799666adcc377 - Reviewed-on: https://code.wireshark.org/review/6034 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Evan Huus <eapache@gmail.com> - -commit f648247 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Jan 4 18:43:57 2015 +0100 - - Get rid of warning: comma at end of enumerator list [-Wpedantic] - - Change-Id: I8faca065e1afff6d4d29b9b96c1b0f0b135163a7 - Reviewed-on: https://code.wireshark.org/review/6306 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 4a94374 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Jan 4 18:33:22 2015 +0100 - - Fix linkage on Windows machine - - Change-Id: I24c8670fdf0910c3324fcfa8db8a8dbaad1dfbba - Reviewed-on: https://code.wireshark.org/review/6305 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit ff01bc6 -Author: Peter Wu <peter@lekensteyn.nl> -Date: Fri Dec 19 20:28:05 2014 +0100 - - gtk: fix crash when moving columns - - When the columns are moved, the packet list is redrawn from the - columns-changed signal handler. Apparently GTK does not like that the - parent contains got destroyed. - - Call packet_list_recreate outside the callback to workaround this issue. - Since the signal handler is blocked, it can never be called twice (and - there will always be at most one packet_list_recreate_delayed - scheduled). - - Bug: 10795 - Change-Id: Ia97d330c8bef747809fa09a8709a19cb03c7e00a - Reviewed-on: https://code.wireshark.org/review/5881 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 553da37 -Author: Michael Mann <mmann78@netscape.net> -Date: Sat Jan 3 21:56:16 2015 -0500 - - Create BASE_DOT, BASE_DASH, and BASE_SEMICOLON types for the FT_BYTES field type. - - These "bases" will put a ".", "-", or ":" respectively between hexidecimal bytes in the field in packet view and display filter. FT_BYTES with BASE_NONE will have no separator in the packet view, but continue to have the ':' as a separator in the display filter. - - Converted the "string" hf_ entries that used tvb_fc_to_str as a string to use proto_tree_add_item with FT_BYTES/BASE_DOT type. - - Converted applicable tvb_bytes_to_ep_str_punct() calls to use the new BASE values. - - Change-Id: I2442185bb314d04a3ff2ba57883652ecd738b5f9 - Reviewed-on: https://code.wireshark.org/review/6098 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 2085bbe -Author: Sylvain Munaut <tnt@246tNt.com> -Date: Sun Jan 4 16:57:10 2015 +0100 - - gmr1_rach: Update dual-values fields to use true_false_string - - Change-Id: I87f2be4b28f6409e525afc36e8ed834fae3befbb - Signed-off-by: Sylvain Munaut <tnt@246tNt.com> - Reviewed-on: https://code.wireshark.org/review/6300 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 84e43d9 -Author: Sylvain Munaut <tnt@246tNt.com> -Date: Sun Jan 4 16:46:12 2015 +0100 - - gmr1_rach: Add support for GmPRS/GMR-1 3G Channel Request Type 1 & 2 - - Those are related to the Packet Data service. - - Change-Id: Ia8e9732901609e1cdad38558aac4a2f3475a0a9d - Signed-off-by: Sylvain Munaut <tnt@246tNt.com> - Reviewed-on: https://code.wireshark.org/review/6291 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 1cd9d02 +commit 2c43b68 Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Jan 4 08:05:05 2015 -0800 +Date: Tue Feb 17 12:29:31 2015 -0800 - [Automatic manuf, services and enterprise-numbers update for 2015-01-04] + Set a window icon for WiresharkDialog. - Change-Id: Id1c008d9bbce7d9fdf8b1d2ec7d382e9d205db17 - Reviewed-on: https://code.wireshark.org/review/6301 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit dbcb0b5 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sun Jan 4 12:51:21 2015 +0100 - - stats tree plugin: fix no previous prototype for 'plugin_register_tap_listener' [-Wmissing-prototypes] + Otherwise it ends up with a generic icon. - Change-Id: If8ea78b9aceb9dbd7f2103aa141b57715188ff4f - Reviewed-on: https://code.wireshark.org/review/6297 - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: I47292c966332073d07ef358316cf8b40bcf1329b + Reviewed-on: https://code.wireshark.org/review/7200 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit b0b51dd +commit e61f3d5 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Jan 3 20:47:53 2015 +0100 +Date: Tue Feb 17 21:21:06 2015 +0100 - GTPv2: fix Logically dead code (CID 1250813) + 802.11: fix no previous prototype for 'wlan_col_filter_str' & 'wlan_bssid_col_filter_str' [-Wmissing-prototypes] - Change-Id: I1761af90bd85b14e6021a5d7b07686a37593a152 - Reviewed-on: https://code.wireshark.org/review/6279 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit fa0ebfc -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sun Jan 4 13:14:50 2015 +0100 - - BACAPP: fix empty paragraph passed to '@param' command [-Wdocumentation] + Fix also some indent typo (3spaces -> 2spaces) - Change-Id: Ibef3cee6930dea08fc7a87635c48de609d3d4015 - Reviewed-on: https://code.wireshark.org/review/6299 + Change-Id: I1aa9df1540e80946b85dde0e6bd87bf39e8d8f19 + Reviewed-on: https://code.wireshark.org/review/7199 Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 83ac5b7 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Jan 3 20:44:06 2015 +0100 - - GTPv2: fix Logically dead code (CID 1255924) - - Change-Id: Ia21d8f68b5d898b4493da8cf948ad421f94234fc - Reviewed-on: https://code.wireshark.org/review/6278 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 98ba630 -Author: Sylvain Munaut <tnt@246tNt.com> -Date: Sat Jan 3 01:36:19 2015 +0100 +commit fd870e3 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Fri Feb 13 17:58:25 2015 +0100 - gmr1_rach: Fixup the MOC Dialled Number decoding - - Turns out the special values 1023/1022/1021 can happen in any group - and not just the last one. + CMIP: get rid of some evil global variables - The last one is still special though with codes [1100->1209] being - exclusive to it. + Fixes an ASAN failure reported by Alexis + Note that some global variables remain as I do not know enough on this protocol to safely remove them - Change-Id: If86d0260aaa2cc1215560b89d7fc57d7ef21f082 - Signed-off-by: Sylvain Munaut <tnt@246tNt.com> - Reviewed-on: https://code.wireshark.org/review/6290 - Petri-Dish: Michael Mann <mmann78@netscape.net> + Change-Id: If392a8f09ef2fc2f2d46871a71149e29fe5e292c + Reviewed-on: https://code.wireshark.org/review/7099 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit a22ea3d -Author: Sylvain Munaut <tnt@246tNt.com> -Date: Sat Jan 3 10:50:28 2015 +0100 - - gmr1_rach: Update NULL GPS position decoding with reality - - The spec doesn't always match 100% reality. In this case it seems some - manufacturer implemented NULL GPS position with longitude. - - Change-Id: I0c09627d64814a9467ecbecdc18e43974e4bab4a - Signed-off-by: Sylvain Munaut <tnt@246tNt.com> - Reviewed-on: https://code.wireshark.org/review/6289 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit a16ac8f -Author: Sylvain Munaut <tnt@246tNt.com> -Date: Fri Jan 2 14:38:25 2015 +0100 +commit edf05db +Author: Robert Cragie <robert.cragie@gmail.com> +Date: Tue Feb 17 17:56:06 2015 +0000 - gmr1_rach: Use FT_INT24 instead of FT_UINT24 for latitude/longitude - - No need to do sign extension manually, the core code now supports - signed integers with bitmask and it will do the sign extension. - Not sure if that was always the code, but it works now. + Corrected display format for EUI-64 - This also have the advantage that the real value 'seen' by wireshark - when applying filters is the real signed value. - - Change-Id: I47e2357e5556160a00110ad63e3342879769a0b9 - Signed-off-by: Sylvain Munaut <tnt@246tNt.com> - Reviewed-on: https://code.wireshark.org/review/6288 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: I0913337a29efac5c39e30897cad7e90195fa984a + Reviewed-on: https://code.wireshark.org/review/7198 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 7c9d6ff -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Sat Jan 3 19:27:59 2015 -0500 +commit c621a77 +Author: Ryan Doyle <ryan@doylenet.net> +Date: Sat Jan 31 14:00:08 2015 +1100 - Lua: replace proto_tree_add_text calls + PCP: updated protocol dissection for new PDU types - Replace proto_tree_add_text() calls in Lua API code, to use Lua-specific hfinfo items. + Introduce basic dissection for AUTH PDU type as well as detecting if a + conversation is about to initiate a secure sockets connection (kind of + like STARTTLS) and then pass all packets through the SSL dissector + if that is the case. Also clean up some duplication with constants. - Bug: 10828 - Change-Id: I9b5899106502a9bdbc748b5ec0f27b787d374562 - Reviewed-on: https://code.wireshark.org/review/6296 - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> + Change-Id: I66f663ca6ab4291f8d0321430e3e126a0be77a93 + Reviewed-on: https://code.wireshark.org/review/7109 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 2ef85f5 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Jan 3 19:29:05 2015 +0100 - - WiFi Display: fix no previous prototype for ... [-Wmissing-prototypes] - - It is the revert of adb81f335d17a151361f00001e125480eeaf7bc5 - - Change-Id: I7a19ff175ca1ab59d0d0d9e89b3b3e6e12de3b96 - Reviewed-on: https://code.wireshark.org/review/6273 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit aad1a81 -Author: Graham Bloice <graham.bloice@trihedral.com> -Date: Sat Jan 3 20:52:54 2015 +0000 +commit a355daf +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Mon Feb 16 15:14:57 2015 -0500 - Fix out-of-tree build includes of config.h - - If a file in the same directory as config.h, e.g. wireshark-qt.cpp - has a #include "config.h", or another header it includes also has - a #include "config.h", then an out-of-tree build, e.g. CMake will - pick up any in-tree config.h and odd things may happen. The correct - form is #include <config.h> which will pick up the out-of-tree - version. - - To find this, introduce a deliberate error and then make an out-of-tree - build, noting where it fails and fix that file. If that file includes - other files that still cause the build to fail, set the compiler - to emit the pre-processed version so you can locate the include with - the next errant "config.h". Repeat ad nauseum. - - Possibly all includes of "config.h" should be changed to <config.h> + Give users a more helpful error message if they enter an SSL protocol we don't + know. - Revert "CMake: Clobber the top-level config.h before we build." + First, if we know the protocol (by filter name) tell them that the dissector + just isn't set up to run over SSL but it could be--if they contact the Wireshark + developers. - This reverts commit 1f3849ce614aeae5fda742beffe5558e7c2a8b71. + Second, don't tell them that the dissectors which have called + ssl_dissector_add() are the only ones that are valid; those are just commonly + used ones. - Ping-Bug: 10301 - Change-Id: Ie567e7cc696fd48f3e730fc27032c5d2a7d8f341 - Reviewed-on: https://code.wireshark.org/review/6285 - Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> - Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> + Change-Id: I1b72bccd4c96c21c73a19fa2d87fe2c0b875a0fa + Reviewed-on: https://code.wireshark.org/review/7185 + Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 9384854 -Author: Guy Harris <guy@alum.mit.edu> -Date: Sat Jan 3 14:35:01 2015 -0800 +commit 0da88ba +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Mon Feb 16 22:32:25 2015 -0500 - Use g_strdup_printf(), rather than a fixed-length buffer, for the app name. - - Add some missing g_free()s while we're at it. + Don't send an effectively empty message (no TVBs) to the SCTP tap. - Change-Id: Id38acc21d3c0b337e5d05baaf5ebbcd63699ff50 - Reviewed-on: https://code.wireshark.org/review/6287 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 9df7386 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Jan 3 19:43:57 2015 +0100 - - It is also 2015 for Mac OS X :-) + This prevents the tap from crashing (asserting out) because there's no + (initialized) TVB to look at. - Change-Id: Idbd5e09ac80015feee7ddd30b9569219fde596e1 - Reviewed-on: https://code.wireshark.org/review/6269 + Bug: 9849 + Change-Id: I370a49ef32a67e504c30cf1762a2180bf13c56ca + Reviewed-on: https://code.wireshark.org/review/7190 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 9ab44b3 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sat Jan 3 19:43:24 2015 +0100 +commit 9150a92 +Author: AndersBroman <anders.broman@ericsson.com> +Date: Tue Feb 17 13:12:53 2015 +0100 - Info.plist : fix indent (use tabs) + Add missing json.h - Change-Id: I241c124fa341ae5d6126a189374d69dea1a08d96 - Reviewed-on: https://code.wireshark.org/review/6268 + Change-Id: Ib1d67fdcc016532ab6e4140df357a6d0dd5cf09d + Reviewed-on: https://code.wireshark.org/review/7193 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 760aa14 -Author: Guy Harris <guy@alum.mit.edu> -Date: Sat Jan 3 14:00:47 2015 -0800 - - Use g_strdup_printf(), rather than a fixed-length buffer, for the app name. - - Change-Id: Ie6034e229f37278fce44b2fddad9250dfb5bc6c8 - Reviewed-on: https://code.wireshark.org/review/6286 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit dfa50e6 -Author: Guy Harris <guy@alum.mit.edu> -Date: Sat Jan 3 13:36:02 2015 -0800 - - Use get_ws_vcs_version() to generate the version string. - - That's what we do in, for example, dumpcap. - - Also, use g_strdup_printf() for the strings, rather than using - fixed-length arrays. - - Change-Id: I36ad201e3eda903ef3a089bafb09df0581efe512 - Reviewed-on: https://code.wireshark.org/review/6284 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit a190c93 -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Fri Jan 2 23:28:44 2015 +0000 - - Remove unnecessary includes from wiretap folder - - Change-Id: I10d3057801673bc1c8ea78f144215869cc4b1851 - Reviewed-on: https://code.wireshark.org/review/6217 - Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> - -commit 1f3849c -Author: Gerald Combs <gerald@zing.org> -Date: Sat Jan 3 12:02:56 2015 -0800 +commit bd91109 +Author: Dario Lombardo <lomato@gmail.com> +Date: Mon Jan 19 19:54:41 2015 +0100 - CMake: Clobber the top-level config.h before we build. + Added JSON native file support. - If you use the same source directory for in-tree Autotools or Nmake - builds and out-of-tree CMake builds you can end up with a conflicting - config.h a the top of your source tree. Try to remove it in CMake before - building our config.h + libjsmn has also been moved from epan/ to wsutil/ to make it visible from wiretap. - Ping-Bug: 10301 - Change-Id: I7ebeb31c92022fd28cbfca05fdb6931ffa2d9cae - Reviewed-on: https://code.wireshark.org/review/6282 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 4d3acd9 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Jan 3 17:59:54 2015 +0100 - - tshark: dump port number when generating SCTP, TCP or UDP conversations - - Change-Id: Ie3cda43a4cfca06482f2cee09f33230d1535b77d - Reviewed-on: https://code.wireshark.org/review/6265 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I59abb3419acb1baa83194b38152d3651ed5c123c + Bug: 10878 + Reviewed-on: https://code.wireshark.org/review/6716 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 17dcd95 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Jan 3 20:40:16 2015 +0100 +commit 1478db0 +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Mon Feb 16 22:39:27 2015 -0500 - IPv6: do not allocate tap data on stack + Fix up formatting and indentation a bit. - Bug: 10780 - Change-Id: I2526fb9a5a2dfd61b19dff5ba1b7902f77927f4a - Reviewed-on: https://code.wireshark.org/review/6276 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Tested-by: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: Ifdc6b8b2525efdc9e0f73519e73afbd4adbf65f4 + Reviewed-on: https://code.wireshark.org/review/7191 + Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> -commit 2f34ae9 +commit 5ebc577 Author: Guy Harris <guy@alum.mit.edu> -Date: Sat Jan 3 11:03:05 2015 -0800 - - Remove the testing stuff. - - The problem was probably that we had two competing config.h files, with - some source files including one of them and othe source files including - the other, with the nmake config.h defining HAVE_KERBEROS and - HAVE_MIT_KERBEROS and the CMake config.h defining neither, and with - wireshark-qt.cpp including the nmake config.h, so that it expected there - to be a read_keytab_file() routine, and - epan/dissectors/packet-kerberos.c including the CMake config.h, so that - it didn't define a read_keytab_file() routine. - - (If the CMake build is done out-of-tree, with its config.h file outside - the source tree, and the nmake build done in-tree, with its config.h in - the top-level source directory, wireshark-qt.cpp, in the top-level - source directory, might pick up the config.h in the same directory, but - epan/dissectors/packet-kerberos.c doesn't have a config.h in its source - directory and might pick up the config.h from the CMake build - directory.) - - Change-Id: I040126026c4101aca1264affc04e585fee89b87b - Reviewed-on: https://code.wireshark.org/review/6272 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit e133ba9 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Jan 3 18:06:33 2015 +0100 - - tshark: dump port number when generating SCTP endpoints statistics - - Change-Id: I72b557f0d12ba7a8c13288399a97ef1634121f79 - Reviewed-on: https://code.wireshark.org/review/6266 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 0452f76 -Author: Anish Bhatt <anish@chelsio.com> -Date: Fri Jan 2 20:00:08 2015 -0800 +Date: Mon Feb 16 13:35:16 2015 -0800 - [PROFINET] Fix swapped MaintenanceRequired & MaintenanceDemanded bits + Fix FSF address. - - Bug: 10753 - - Change-Id: Ib5522eba5c1d9107219ee2d70c96899ba6f22ca1 - Reviewed-on: https://code.wireshark.org/review/6258 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit e7c4241 -Author: Graham Bloice <graham.bloice@trihedral.com> -Date: Fri Jan 2 18:06:58 2015 +0000 - - Fix Windows x64 CMake build - - Unfortunately Kerberos for Windows (kfw) has a different lib - name for x86 & x64. Fix FindKERBEROS.cmake to check for both - lib names. - - Change-Id: I525df6de099d4e50322226317bda8d93d7a8dd23 - Reviewed-on: https://code.wireshark.org/review/6246 - Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> - Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: I3881fcd211bbfbecd92c3a8c2a440da30b20393f + Reviewed-on: https://code.wireshark.org/review/7188 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit d7c3edd -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Thu Jan 1 21:34:16 2015 -0500 +commit be5259d +Author: Joerg Mayer <jmayer@loplof.de> +Date: Mon Feb 16 22:26:23 2015 +0100 - Lua: replace deprecated functions - - Remove deprecated functions from Lua API code: tvb_length and - tvb_length_remaining. The calls to proto_tree_add_text() are - left in, as I have no idea what to replace them with. The calls - to ep_* are being left in, as they're removed by change-id - I3d19a770e0fd77d996bdb6b61a76a722cc2bcd55. + OK, at least on my system uic is called uic-qt5, same for moc and rcc. + Found while doing an accidental autofoo build instead of cmake build. - Bug: 10822 - Change-Id: Ib0686f90be1edc892d3ecf401b91eb7484540b3e - Reviewed-on: https://code.wireshark.org/review/6247 - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: Ie8ab648561f88e0a28a64c06d4d78652643c91dd + Reviewed-on: https://code.wireshark.org/review/7187 + Reviewed-by: Jörg Mayer <jmayer@loplof.de> -commit 61c6fb8 -Author: Guy Harris <guy@alum.mit.edu> -Date: Sat Jan 3 03:06:53 2015 -0800 +commit a5f4389 +Author: Joerg Mayer <jmayer@loplof.de> +Date: Sat Feb 7 20:56:53 2015 +0100 - Remove the probes from packet-kerberos.c. - - None of HAVE_KERBEROS, HAVE_MIT_KERBEROS or HAVE_HEIMDAL_KERBEROS or - HAVE_LIBNETTLE defined when it's compiled. So how is HAVE_KERBEROS - getting defined when wireshark-qt.cpp is compiled? + Whitespace fix (space before tab) - Change-Id: If238ff54aa4f0cda662c7a52d76e33363a77240d - Reviewed-on: https://code.wireshark.org/review/6262 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: Iccbac2ff5d95639d478437eefa16d1dd2757128b + Reviewed-on: https://code.wireshark.org/review/7186 + Reviewed-by: Jörg Mayer <jmayer@loplof.de> -commit 544ed8a +commit db2395f Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Jan 2 23:41:28 2015 -0800 +Date: Mon Feb 16 11:50:40 2015 -0800 - Stick some #define probes in on Windows. + Fix declaration and export the routines. - Let's try to figure out why, on the 64-bit Windows build, - wireshark-qt.cpp is being compiled to call read_keytab_file() but - packet-kerberos.c is not being compiled to define it. + Add a missing semicolon, and export the routines with WS_DLL_PUBLIC, so + they can be used by plugins. - Change-Id: I782406e2189819d9400b84b6632fe0fb62c5996d - Reviewed-on: https://code.wireshark.org/review/6261 + Change-Id: Iaf52e70ce9fbfce3cfa675c453b7d39a0341dfeb + Reviewed-on: https://code.wireshark.org/review/7184 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 16fe32f +commit 907f4e8 Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Jan 2 20:06:34 2015 -0800 +Date: Mon Feb 16 11:37:21 2015 -0800 - Temporarily #if 0 out the call to read_keytab_file(). - - If this fixes the Win64 build, somehow HAVE_KERBEROS is getting defined - when this is built but we're not actually building read_keytab_file in - packet-kerberos.c. - - If that *doesn't* fix the Win64 build's failure to find - read_keytab_file(), something Really Weird is going on, because nobody - should be looking for it. + We now get that from common libwireshark code. - Change-Id: If607e0eeeff854693cf9ce2ea1009d34a20a9992 - Reviewed-on: https://code.wireshark.org/review/6259 + Change-Id: If3b15d01689c6bbfad6422c4a30f9ece5e2b3b83 + Reviewed-on: https://code.wireshark.org/review/7183 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 33ba8d3 +commit cfb1bc3 Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Jan 2 16:27:24 2015 -0800 +Date: Mon Feb 16 11:32:39 2015 -0800 - Support -K iff HAVE_KERBEROS is defined. + Put the 64-bit hash routines into a common file. - This *shouldn't* make a difference, but it's a bit clearer, and, if it - *does* make a difference with some build, there's a bug in the - configuration process for that build. + Some or all are used by the Infiniband, MBIM, and RSVD dissectors; put + them into a common source file, with a header for them, and just include + the header in the dissectors. - Clean up indentation while we're at it. - - Change-Id: I94aa6d565c3d5545620a7aeeaabce03153ec5e1c - Reviewed-on: https://code.wireshark.org/review/6257 + Change-Id: I724f0c2232ba751ccbd491222af6f03bafd6d63c + Reviewed-on: https://code.wireshark.org/review/7182 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit d1d5bf1 -Author: Michael Mann <mmann78@netscape.net> -Date: Fri Jan 2 12:19:10 2015 -0500 - - Replace proto_tree_add_text in dissector header files where it was used in a macro that should be expert info. - - Change-Id: I045368a0a91586231fc4b1e2700c2275088b76af - Reviewed-on: https://code.wireshark.org/review/6244 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 5eecf81 -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Jan 2 13:17:15 2015 -0800 - - Don't define a stub read_keytab_file() on Windows if we don't have Kerberos. - - We don't declare it, so all the DLL export stuff won't work, and we - shouldn't need it, as we shouldn't be calling it if we don't have - Kerberos (we shouldn't support the -K option if we don't have Kerberos, - for example). - - Change-Id: I7e7b12aa93c4f31953300ef513fc09a1f55f8aef - Reviewed-on: https://code.wireshark.org/review/6255 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 970e7c1 -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Jan 2 12:33:49 2015 -0800 - - Try to clarify the PowerShell requirements. - - Change-Id: Ie4ad0388b920ba4a8483ad8af351ddbdd121a28b - Reviewed-on: https://code.wireshark.org/review/6254 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 42baa9d +commit 4765bbc Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Fri Jan 2 21:02:13 2015 +0100 +Date: Mon Feb 16 20:24:51 2015 +0100 - USB HID: fix report descriptor main items dissection - - true_false_string definitions were inverted - While we are at it, use the exact same wording as in the spec - - Bug: 10825 - Change-Id: Ia391b310e92eb88a9a144a2fb0974701a460afc8 - Reviewed-on: https://code.wireshark.org/review/6251 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 7d943e1 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Fri Jan 2 19:20:03 2015 +0100 - - Add back "version.h" inclusion - - It got removed by the automatic include cleaning scripts - Also add it to text2pcap.c as it is used to get the version when writing a pcapng file + RSVD: fix compilation with GLib < 2.22.0 - Change-Id: I3d56985fa1d04bcb066fe015a588c24cf3cb7267 - Reviewed-on: https://code.wireshark.org/review/6248 + Change-Id: Ia82d42faa766f68e167b1c1affa5307980909fb8 + Reviewed-on: https://code.wireshark.org/review/7181 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit b90f784 -Author: Michael Mann <mmann78@netscape.net> -Date: Fri Jan 2 12:34:21 2015 -0500 - - Add sanity check to ensure integer types don't get set to BASE_NONE. - - This is checked by Wireshark, but the script should catch it earlier in case Wireshark/TShark isn't run after the script is executed (a mistake I've made several times). - - Change-Id: I1d113871b10fcae5a6d3e9036cc80d7b1ec1ae57 - Reviewed-on: https://code.wireshark.org/review/6245 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit e7d0cdc -Author: Graham Bloice <graham.bloice@trihedral.com> -Date: Fri Jan 2 13:12:17 2015 +0000 - - Fix lua tests on Windows - - Convert TEST_DIR path to a Windows path, this is used in all the lua tests. - Fix a typo - - Change-Id: I38808822c998ed1df007732b3701b6b13d6c886b - Reviewed-on: https://code.wireshark.org/review/6235 - Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - -commit a3c705a -Author: Bill Meier <wmeier@newsguy.com> -Date: Fri Jan 2 11:24:30 2015 -0500 - - mux27010: Add a link to info about the mux27010 packet structure. - - Change-Id: I46f8efc8c95bf4501a631ef3adc5291939ab1497 - Reviewed-on: https://code.wireshark.org/review/6240 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit 887d198 -Author: Evan Huus <eapache@gmail.com> -Date: Fri Jan 2 11:11:21 2015 -0500 - - test: improve check for out-of-tree tests - - Rather than running `cd` and letting it potentially fail, just use the `-d` flag - to test that `run` exists and is a directory. Avoids useless stderr output. - - Change-Id: Iab8b63681db6256aa1a6fc389d2536acbd491aba - Reviewed-on: https://code.wireshark.org/review/6239 - Reviewed-by: Evan Huus <eapache@gmail.com> - -commit 5cb96a0 -Author: Evan Huus <eapache@gmail.com> -Date: Fri Jan 2 11:07:28 2015 -0500 +commit febc2e1 +Author: Richard Sharpe <realrichardsharpe@gmail.com> +Date: Mon Feb 16 07:48:57 2015 -0800 - test: default WS_QT_BIN_PATH to WS_BIN_PATH - - it used to be SOURCE_DIR, which is still the fallback for WS_BIN_PATH, but this - way if you specify a custom WS_BIN_PATH it gets picked up for both + Fix a portability problem raised by Guy Harris. My first implementation would + not work on 32-bit platforms because I assumed that pointers were 64-bit + items. I have now moved to a slightly different scheme suggested by Evan Huus. - Change-Id: If9198565fc7b7b3911550fd200adb0f918622540 - Reviewed-on: https://code.wireshark.org/review/6238 + Change-Id: I34f4dceea9952d5633603e71a8e8ae8f4b9154cc + Signed-of-by: Richard Sharpe <realrichardsharpe@gmail.com> + Reviewed-on: https://code.wireshark.org/review/7179 + Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com> - -commit 1c7ffed -Author: Evan Huus <eapache@gmail.com> -Date: Fri Jan 2 10:48:19 2015 -0500 - - ositp: fix some BASE_ errors from g7935ba9f5be - - Change-Id: I71639f95f8efff9619e00dae45763ff863f0ca21 - Reviewed-on: https://code.wireshark.org/review/6237 - Reviewed-by: Evan Huus <eapache@gmail.com> - -commit 27fa202 -Author: Joerg Mayer <jmayer@loplof.de> -Date: Wed Nov 5 21:00:26 2014 +0100 - - Make it easier to run tests out of tree. - - Change-Id: I4ed10339d3c543d9d199e5262b6e7bb8247544ac - Reviewed-on: https://code.wireshark.org/review/5148 - Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> + Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com> -commit 7935ba9 -Author: Michael Mann <mmann78@netscape.net> -Date: Thu Jan 1 19:05:06 2015 -0500 - - Eliminate proto_tree_add_text from packet-ositp.c - - Change-Id: If97f1b17bf8dbd6bac708b7dfbef6df73fad0f30 - Reviewed-on: https://code.wireshark.org/review/6218 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Evan Huus <eapache@gmail.com> - -commit 3cc6aee -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Thu Jan 1 21:16:40 2015 -0500 +commit 6331755 +Author: Guy Harris <guy@alum.mit.edu> +Date: Mon Feb 16 10:37:58 2015 -0800 - Lua: regex test suite fails with UTF-8 locale + Get rid of duplicate typedef. - Due to the change in change-id Ib43e16a9d98d08e5ddaff81fd3235f5b64d7b95b, the setlocale() call has been moved earlier in tshark's processing, such that Lua plugins load with the environment locale instead of C-locale. Since that matches Wireshark's behavior, it's good, but it causes the Lua regex test suite to fail. So the test suite needs to be fixed. - - Bug: 10824 - Change-Id: I3dcad15a9e247a1e42d2f708ccfb7272de2fe960 - Reviewed-on: https://code.wireshark.org/review/6226 - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> + Change-Id: I389132ec27405394ca73fb9c09950d8a91ea32a7 + Reviewed-on: https://code.wireshark.org/review/7180 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 55c385e -Author: Evan Huus <eapache@gmail.com> -Date: Wed Dec 31 17:05:58 2014 -0500 +commit 5955efc +Author: Anish Bhatt <anish@chelsio.com> +Date: Sat Feb 14 22:24:58 2015 -0800 - tvb: implement endianness-paramterized getters + [80211ac] Change VHT MIMO Control to use add_bitmask - e.g. tvb_get_guint16(tvb, offset, ENC_LITTLE_ENDIAN) - - Change-Id: Iea02fd59b13678aca741d028fb1f66f334447498 - Reviewed-on: https://code.wireshark.org/review/6191 + Change-Id: If3d597dd6dbf746e0f971e52073f9790b6a0ceda + Reviewed-on: https://code.wireshark.org/review/7128 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Evan Huus <eapache@gmail.com> - -commit 611cfd0 -Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Jan 1 19:54:34 2015 -0800 - - Always set decrypt_len when setting decrypt. - - This may not always be necessary, but.... - - Change-Id: Ib409839dbee0574c516568a1f43793f8b407f611 - Reviewed-on: https://code.wireshark.org/review/6232 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit a621bb7 -Author: Stephen Fisher <sfisher@sdf.org> -Date: Fri Jan 2 03:49:10 2015 +0000 - - Revert "Bring pkg.m4 in from pkgconfig version 0.28 so we can use the PKG_PROG_PKG_CONFIG macro to try searching for pkg-config even when it isn't installed. Without this (and without pkg-config installed) the configure script is broken. With it, it gives a mes" - - This reverts commit f94eb278624b5e5ff357ec7f943a16fb7ef2e61b. - - Change-Id: I1a74fa221bdb3d72e88a46ced64e0d434a8fe552 - Reviewed-on: https://code.wireshark.org/review/6231 - Reviewed-by: Stephen Fisher <sfisher@sdf.org> - -commit 8541578 -Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Jan 1 17:53:24 2015 -0800 - - When deccoding base-64, the result is the length of the *decoded* result. - - That way, for example, format_text() calls on the decoded result don't - go past the end of the decoded result. - - Fix some more indentation while we're at it. - - Bug: 10823 - Change-Id: Ia7b7b1d9fb06af5df945f19a375bf5bef3277018 - Reviewed-on: https://code.wireshark.org/review/6221 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 5c529c9 -Author: Bill Meier <wmeier@newsguy.com> -Date: Thu Jan 1 20:41:49 2015 -0500 - - Add '*.nativecodeanalysis.xml' to 'clean' targets - - Change-Id: I90dbf0b31fc737150a01533763a7869b34c68cb6 - Reviewed-on: https://code.wireshark.org/review/6220 - Reviewed-by: Bill Meier <wmeier@newsguy.com> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 06a1f46 -Author: Michael Mann <mmann78@netscape.net> -Date: Thu Jan 1 19:56:03 2015 -0500 +commit 17828b5 +Author: Anish Bhatt <anish@chelsio.com> +Date: Thu Feb 12 01:32:02 2015 -0800 - Have hf variables outputted in the order they were found in the file. + [80211ac] Add partial beamforming support - Previously they were "randomly sorted" in the hash table. The hf "array" is outputted in the order found, so have the hf variable declaration match. + Adds support to decode beamforming report, but actual beamforming + matrices are not decoded. Requires bit level manipulation of varying lengths + of data which is not currently supported, and section spec only seems to + mention size and contents, not representation - Change-Id: I4b078a6328ba7c2781f07bb41d701412fc74ba22 - Reviewed-on: https://code.wireshark.org/review/6219 + Bug 10169 + Change-Id: Icc2188b79f95b5e38b64ded348b7a0696b5504ed + Reviewed-on: https://code.wireshark.org/review/7111 Reviewed-by: Michael Mann <mmann78@netscape.net> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 454fd6e -Author: Bill Meier <wmeier@newsguy.com> -Date: Thu Jan 1 19:45:22 2015 -0500 - - Add "Editor modelines"; Adjust whitespace as needed. - - Change-Id: Ic5a5acb0f36d3aa144edbfb1ae71097b18426db4 - Reviewed-on: https://code.wireshark.org/review/6216 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit 887cce4 -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Fri Jan 2 00:29:11 2015 +0000 - - Restore another include to try to fix solaris build - - Change-Id: I5b8dc27943297aae88c652be98d982f75ed9a3ee - Reviewed-on: https://code.wireshark.org/review/6215 - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> - -commit 1c14f5b -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Fri Jan 2 00:15:40 2015 +0000 +commit 7fee7df +Author: AndersBroman <anders.broman@ericsson.com> +Date: Mon Feb 16 15:13:25 2015 +0100 - Restore inclusion of gui_utils.h to pixmap_save.c + [Diameter] Use proto_tree_add_bitmask() to add the diameter flags. - Change-Id: Ied83d36d8f56f8dc1550ff5ae68bc2b61ea6f1b6 - Reviewed-on: https://code.wireshark.org/review/6214 - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> + Change-Id: I9cb6e46551b0a25a458311a53365469552d5c195 + Reviewed-on: https://code.wireshark.org/review/7177 + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 860cb39 +commit b2c81bb Author: Michael Mann <mmann78@netscape.net> -Date: Tue Dec 30 23:26:19 2014 -0500 +Date: Wed Feb 11 22:16:01 2015 -0500 - tshark: Add endpoints statistics + Make get_manuf_name return a const string. - "stat name" has been official changed to "endpoints" for all dissectors, rather than a mixture of "host"/"endpoints" based on dissector. + Model get_manuf_name after get_ether_name so that a string (either name resolved or colon-separated bytes) is always stored in a hash table. This will make name resolution of addresses perform a little better because it doesn't have to worry about the wmem_allocator. - Change-Id: If34bcb5165b493948e784ba038ab202803a59843 - Reviewed-on: https://code.wireshark.org/review/6154 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: If976fe7b0c3f9cd053225096c2ac05418f061af6 + Reviewed-on: https://code.wireshark.org/review/7081 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 07c9492 -Author: Michael Mann <mmann78@netscape.net> -Date: Fri Dec 19 08:08:38 2014 -0500 +commit b2d23ec +Author: Anders <anders.broman@ericsson.com> +Date: Mon Feb 16 10:53:05 2015 +0100 - Remove pkt_comment member from packet_info structure. + [STUN] Avoid fetching stuff twice from the tvb. - Change-Id: Ifd3d201a09944e3fc36188f891ea8a584886101d - Reviewed-on: https://code.wireshark.org/review/5884 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: I923818ea41791b2f41c5bce3c5927014580eb2b7 + Reviewed-on: https://code.wireshark.org/review/7174 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit f384fa0 -Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Jan 1 15:33:01 2015 -0800 - - Fix tpyo. - - Change-Id: I5b190ee35086664ed053d376def4e21ab9ad9236 - Reviewed-on: https://code.wireshark.org/review/6213 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 2ce7dfe -Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Jan 1 15:27:53 2015 -0800 - - More indentation cleanups. - - Change-Id: I6d21bda89f8032d302620e21ac393dc345165ac7 - Reviewed-on: https://code.wireshark.org/review/6212 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 6c24c7e -Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Jan 1 15:14:51 2015 -0800 - - Clean up indentation. - - Change-Id: I5aa6cafc6249b3a820b1bbf2eddc2ec1fdc88685 - Reviewed-on: https://code.wireshark.org/review/6211 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 43f09e6 -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Thu Jan 1 23:09:08 2015 +0000 - - Remove unneeded includes from ui folder - - Change-Id: Ifd1eebff9080cd3867e44e4dcb2d2681370ed60a - Reviewed-on: https://code.wireshark.org/review/6128 - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> - -commit 5981dab -Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Jan 1 15:05:25 2015 -0800 +commit 0ce7fd4 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Mon Feb 16 00:14:18 2015 +0100 - Declare read_keytab_file() in epan/dissectors/packet-kerberos.h. + Trivial Dead assignment fixes in configure - Don't throw its declaration in file.h, as it's not defined in file.c. - Instead, include it in epan/dissectors/packet-kerberos.h and include - that wherever read_keytab_file() is called. + Fixes a Dead assignment and unused variable warning. - Yes, that means you also have to include <epan/asn1.h> and, therefore, - you have to include <epan/packet.h>. Yes, that should be cleaned up, - perhaps by splitting the Kerberos support code into "stuff that handles - encryption keys without any reference to dissection" and "stuff that - does dissection-related work". + With this patch and http://www.cmake.org/Bug/view.php?id=15203, + `scan-build cmake` will give zero warnings! - Change-Id: Ide5c31e6d85e6011d57202f728dbc656e36138ef - Reviewed-on: https://code.wireshark.org/review/6210 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 445ddc8 -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Wed Dec 31 15:24:18 2014 -0500 - - Lua: FieldInfo '==' check isn't really equality - - The FieldInfo metamethod for equality (letting you use the '==' operator) - doesn't check for equality, but rather if the left-hand side is within - the right-hand side. It should be equality instead. Also, all of the - FieldInfo operate overloads should push a boolean even if they're false - result. - - Bug: 10820 - Change-Id: Ibddaab29713f26d22ddb4d5804b9edb15e93fd79 - Reviewed-on: https://code.wireshark.org/review/6186 - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> + Change-Id: Idc7a03fbf1e8196bc139a2c6663ec48b897f2897 + Reviewed-on: https://code.wireshark.org/review/7144 + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 6d6ba64 -Author: Bill Meier <wmeier@newsguy.com> -Date: Thu Jan 1 12:21:36 2015 -0500 +commit a4b3be5 +Author: Richard Sharpe <realrichardsharpe@gmail.com> +Date: Sat Feb 14 15:28:01 2015 -0800 - .gitignore: Add '*.nativecodeanalysis.xml' + Complete the RSVD Dissector further by handling SCSI requests. - Change-Id: I54133af8626125b51e4263d3c77358752bdcf339 - Reviewed-on: https://code.wireshark.org/review/6209 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit 7ed0cd7 -Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Jan 1 10:28:06 2015 -0800 - - wireshark-qt.cpp belongs in, err, umm, the Qt Wireshark - not the GTK+ one. + Still have to handle response, but this points the way, I think. + Handle responses. Still have to handle sense info. - Change-Id: I101be1967f45bcb56d72784a456e394ca7e51323 - Reviewed-on: https://code.wireshark.org/review/6208 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: Ic692de15b8178fbe274791ffbc000e8f35b40653 + Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com> + Reviewed-on: https://code.wireshark.org/review/7127 + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 72f035d -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Thu Jan 1 18:50:37 2015 +0100 +commit e56f34e +Author: Gerald Combs <gerald@wireshark.org> +Date: Sun Feb 15 19:25:05 2015 -0800 - Qt: fix crash when opening Preferences window on Windows + Suppress more pedantic warnings. - Do not use delete on g_allocated memory + Suppress - Change-Id: I84e0adc65c45520916adb9b2f6d46ca3f144486e - Reviewed-on: https://code.wireshark.org/review/6207 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 1663c2a -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Thu Jan 1 14:09:29 2015 +0100 - - Welcome in 2015 + warning: initialization of a flexible array member [-Wpedantic] - Change-Id: Ib581b9383b211ea8dbcea1cadf98a2b8c3548ab5 - Reviewed-on: https://code.wireshark.org/review/6204 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: I49c2cf8b97539660742ef1b19752a0f56404d78a + Reviewed-on: https://code.wireshark.org/review/7155 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit e8e38b4 +commit 7c3fd2a Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Jan 1 04:36:07 2015 -0800 +Date: Mon Feb 16 03:13:25 2015 +0000 - wireshark-qt.cpp is only a Qt Wireshark source file. + Revert "Revert "Fix duplicate Display Filter Macro check"" - It's not a GTK+ Wireshark source file, so don't include it in - wireshark-gtk. + This reverts commit 876c322df8b6a944cb4358c313c4fc46afe99719. - Change-Id: I0affa1fab1a29e10e1cf446e49182c9c4f218b87 - Reviewed-on: https://code.wireshark.org/review/6203 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 6ef4cbd -Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Jan 1 04:16:05 2015 -0800 - - Include "file.h" to get read_keytab_file() declared. + Wrong branch. It builds in master; it does *not* build in 1.12 or 1.10. - Change-Id: I7e9ea47019f259a56a8652d0e003e23a3e1d1366 - Reviewed-on: https://code.wireshark.org/review/6202 + Change-Id: I3a2409d5a37f08965d6caac64dc97a48a1c5d1b8 + Reviewed-on: https://code.wireshark.org/review/7152 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 219d37e +commit 876c322 Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Jan 1 04:13:05 2015 -0800 +Date: Mon Feb 16 03:10:46 2015 +0000 - Let routines from the Kerberos dissector be called from C++. - - Wrap its declarations in the usual "extern "C"" stuff. + Revert "Fix duplicate Display Filter Macro check" - Change-Id: I353ab334bc08a69fdacaaab5672edf758b14766a - Reviewed-on: https://code.wireshark.org/review/6201 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 0a64b55 -Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Jan 1 03:28:48 2015 -0800 - - Remove wireshark_cxx. + This reverts commit f5902a677e24ff96869d3c335f4fb8aaa6d0e543. - It may have been part of the "build Qt Wireshark as C++" hacks, and is - now causing build problems. + This is not a simple cherry-pick; backporting this fix will have to be done manually. - Change-Id: If471bf3dca01f1bc6e9b5b871d0de3159e4c8e1c - Reviewed-on: https://code.wireshark.org/review/6200 + Change-Id: I53efc06a8e35c6b1aa793edf4e702cabee2e929b + Reviewed-on: https://code.wireshark.org/review/7151 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 8bf7078 -Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Jan 1 01:19:57 2015 -0800 +commit 45674b7 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Mon Feb 16 00:37:03 2015 +0100 - Move ui/qt/main.cpp to wireshark-qt.cpp, and get rid of the dummy.cpp hack. + Qt: fix "Assigned value is garbage or undefined" - Change-Id: Ib4684264363593372b3bf078cf17cae1a1cb10d6 - Reviewed-on: https://code.wireshark.org/review/6199 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit a4019a3 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 31 21:02:46 2014 -0800 - - Rename a variable to avoid a compiler warning. + Clang Static Analyzer reported that function link_changed uses a garbage + value for "device.links" which is indeed the case when + global_capture_opts.all_ifaces->len == 0. - (Thanks, IBM and AT&T.) + There seem to be some issues here: + - When global_capture_opts.all_ifaces->len == 0, then device is + uninitialized. + - When no interface name matches, the last entry will always be + updated. + - There is duplicate code querying for the interface by name. - Change-Id: Ifcffd4937f90ca466c01ebc4f3e3bd8555a9b078 - Reviewed-on: https://code.wireshark.org/review/6198 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 21697af -Author: Graham Bloice <graham.bloice@trihedral.com> -Date: Wed Dec 31 13:56:34 2014 +0000 - - Added DNP3 support for g13 and g43, output command events + This patch addresses the above issues by extracting the interface name + check into a new utility function which returns NULL when a device is + not found. Then the callers (such as link_changed) will check this + value. - Bug: 10347 - Change-Id: Ic173f31d8cf3fd002454f4c22b85c19bae42d544 - Reviewed-on: https://code.wireshark.org/review/6175 - Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> - Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 889c566 -Author: Michael Mann <mmann78@netscape.net> -Date: Tue Dec 30 16:45:01 2014 -0500 - - Eliminate proto_tree_add_text from WiMax plugin. + While at it, stop storing a copy of (interface_t), use a pointer + instead. This allows for removal of g_array_remove_index followed by + g_array_insert_val. - Most of this was done with a custom perl script that picked out the field names from the XBIT macro and generated an hf_ and filter (that was humanly tweaked from there). + Verified with clang 3.5.1. - Change-Id: I563db9f8ea216efe37322b784ab0daf25c038d9e - Reviewed-on: https://code.wireshark.org/review/6149 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> + Change-Id: I03e0f179577a23a3f1efdca768e67922273192f0 + Reviewed-on: https://code.wireshark.org/review/7145 + Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 114e773 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 31 16:46:50 2014 -0800 +commit ea5f5be +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Sun Feb 15 18:32:14 2015 +0100 - Call setlocale() before getting version information. + Update Release Notes - That way, the setlocale() call used to get the current locale will get - the right answer. + Add QNEX6 (QNET) and add description for some other protocol (GVSP, corosync...) - Change-Id: Ib43e16a9d98d08e5ddaff81fd3235f5b64d7b95b - Reviewed-on: https://code.wireshark.org/review/6197 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: Ia515a134e73835e6d2c81e8ccc210e9fcc424701 + Reviewed-on: https://code.wireshark.org/review/7134 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit a53b67c -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 31 16:10:02 2014 -0800 +commit 2bec642 +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Sun Feb 15 18:08:38 2015 +0100 - Don't include header files that we don't appear to need. - - Some don't appear to be necessary at all, as ui/qt/main.cpp doesn't do - very much (most of the work is done in various class implementations, - including WiresharkApplication), and a few only appear to be necessary - on Windows. + proto(.h): fix parameter 'offset' not found in the function declaration [-Wdocumentation] - Change-Id: Ic9eae65e77e2425144f7fe4885fc865fcf6ab1ff - Reviewed-on: https://code.wireshark.org/review/6196 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: Ib79831e02a9a6457ca49c21536ce46df7d4cafa0 + Reviewed-on: https://code.wireshark.org/review/7133 + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Peter Wu <peter@lekensteyn.nl> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 9a7d455 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 31 15:32:42 2014 -0800 +commit 4f3646f +Author: Peter Wu <peter@lekensteyn.nl> +Date: Sat Feb 14 15:36:09 2015 +0100 - Use setlocale() to get the current locale. + Fix handling of invalid UAT items - This: + If the UAT file failed a field check, then the user_data pointer may be + empty. As a result uat_save() triggers an invalid write. - 1) should work on Windows; + (Discovered while working with a dfilter_macros file having duplicate + names for bug 10957, caught by ASAN.) - 2) reflects what the C environment is actually set up to use, - rather than what the environment variables for locale are - set up to use - C programs default to the C locale and only - pick up the setting from the environment variables etc. if - you explicitly request the system locale with a setlocale() - call. + The second issue fixed in this patch is that the validity of an item is + only calculated when a new record is added. So even if the user edits + the UAT and makes the entry valid, it would not be saved. This is solved + by adding a new uat_update_record() function which got wires up into GTK + and Qt. - Change-Id: Iee064237e70501a5450d4daa9ab849391f200efd - Reviewed-on: https://code.wireshark.org/review/6195 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 1bc2565 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 31 14:53:29 2014 -0800 - - Don't include signal.h unless we need it. + Some open-coded g_array_index and UAT[_USER]_INDEX_PTR are also + converted. - Change-Id: I3965e0951eee919720f780b5e52732fd18fd9786 - Reviewed-on: https://code.wireshark.org/review/6194 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 91e4330 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Dec 31 14:21:50 2014 -0800 - - Qt: Convert more dialog titles. + Even after this patch, Qt has some issues with UAT handling. In + particular, it saves new, but empty/invalid, items. It also it does not + check individual fields when saving all fields (unlike Gtk). This patch + focused on getting Gtk fixed first so ignores those existing issues. - Change-Id: I9c3e3471a92b7af9347a541bece3d9405d37dce0 - Reviewed-on: https://code.wireshark.org/review/6193 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: Ia35cfe9d2b793c65144ae7e29a1ed706b6668d99 + Reviewed-on: https://code.wireshark.org/review/7120 + Petri-Dish: Michael Mann <mmann78@netscape.net> + Reviewed-by: Peter Wu <peter@lekensteyn.nl> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 0e57ff2 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 31 14:47:04 2014 -0800 +commit f5902a6 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Sat Feb 14 17:59:27 2015 +0100 - We no longer do anything signal-related, so don't include <signal.h>. + Fix duplicate Display Filter Macro check - Update a comment pertaining to that, while we're at it. + Since commit 4a1bd75b60171d781dc9f2d3ffd6d498acc74b1a + (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7471), the data + pointer does not match anything from the macros array. - Change-Id: Ic0a3f8575f8e98ca6032ed3e06e3dd76055d65a1 - Reviewed-on: https://code.wireshark.org/review/6192 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 23b1127 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 31 13:43:01 2014 -0800 - - Swallow get_glib_version_info() into get_compiled_version_info(). + This patch fixes a false warning by checking for duplicates before the + name is committed. - It's not that complicated, so we might as well just do it in line. - - Change-Id: I10809db554e668a853d28e7dca48b2de0ed51ad3 - Reviewed-on: https://code.wireshark.org/review/6190 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Bug: 10957 + Change-Id: Id61110bf63de1de80b85524705a2df6a5e7be33a + Reviewed-on: https://code.wireshark.org/review/7119 + Reviewed-by: Peter Wu <peter@lekensteyn.nl> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 93efc20 +commit fea325d Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 31 13:25:13 2014 -0800 +Date: Sun Feb 15 14:46:30 2015 -0800 - "#else", not "#elif", for the last part of a chain of conditionals. + Handle DLT_LOOP differently from DLT_NULL. - Also give more details, for future reference, on how to determine - whether the processor supports CPUID. + That's a little cleaner, and lets us preserve the LINKTYPE_ value for + DLT_LOOP captures. ("Preserve" here doesn't mean "write files with a + link-layer header type of 12", as that's ambiguous; we write it with a + link-layer header type of LINKTYPE_LOOP, i.e. 108. If programs on + OpenBSD don't recognize that as DLT_LOOP, that's a bug in OpenBSD's + libpcap or in the program.) - Change-Id: I01e7173e45b0079f02338e51248238c05302dbd2 - Reviewed-on: https://code.wireshark.org/review/6189 + Change-Id: I48a2e04aed41c013823ffb5c588d2a8e8b376e15 + Reviewed-on: https://code.wireshark.org/review/7143 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit c15b749 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Wed Dec 31 17:36:13 2014 +0100 - - Qt: fix 'Limit to display filter' functionality in Conversations/Endpoints windows - - Change-Id: Ib57df32fbbe820b1105b11200b112d56a112e2a9 - Reviewed-on: https://code.wireshark.org/review/6180 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit d5d2c0e -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 31 11:51:33 2014 -0800 - - ws_cpuid() returns a success/failure indication; make it gboolean. - - Change-Id: I03403ce29c4ac343d56fc2cf33aa8da90a082cbb - Reviewed-on: https://code.wireshark.org/review/6185 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 35cf7c6 +commit 1917023 Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 31 11:46:04 2014 -0800 +Date: Sun Feb 15 14:03:12 2015 -0800 - Distinguish between IA-32 and non-x86. + Don't base interpretation of LINKTYPE_ values on DLT_ value definitions. - In case we make ws_cpuid() work on IA-32 processors, add a separate - "always returns no" version of ws_cpuid() for non-x86 processors. + Instead, explicitly check for particular build platforms. This means + that the interpretation of the link-layer type values with different + meanings on different platforms won't be dependent on the particular + version of libpcap with which Wireshark happens to be built, and also + means that we don't have to fix pcap-common.c to include pcap.h or + net/bpf.h. - Change-Id: Id6fbd3e5c7d4f04063bc9bcd8f1644cd617b297e - Reviewed-on: https://code.wireshark.org/review/6184 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit cb7c949 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 31 11:34:08 2014 -0800 - - Move some routines into ws_version_info.c. - - The routines to get compiler, GLib version, CPU, and memory info are - used only in routines in ws_version_info.c; move them into - ws_version_info.c and make them static. + Fix some comments while we're at it. - Change-Id: I58edd18da3301095012d2c7a3c5198e5a7073964 - Reviewed-on: https://code.wireshark.org/review/6183 + Bug: 10956 + Change-Id: If331d9b92081fb0bdf416620fb2ad8dce57dea6b + Reviewed-on: https://code.wireshark.org/review/7140 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit ce9ca9d -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Dec 31 12:52:52 2014 +0100 - - rtse.cnf: fix Nesting level does not match indendation (CID 1159214) - - Change-Id: I86e6c9103990bedf93c323e1360394a7c0a39db4 - Reviewed-on: https://code.wireshark.org/review/6173 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit f42fe1a -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Dec 31 11:53:00 2014 +0100 +commit ad6d259 +Author: Gerald Combs <gerald@zing.org> +Date: Sun Feb 15 10:25:17 2015 -0800 - Zbee ZDP: fix Copy-paste error (CID 1158598) + EtherCAT: Suppress pedantic warnings. - Change-Id: If98d391f51c9d2aa31b1a3a93b774d91d364cccc - Reviewed-on: https://code.wireshark.org/review/6163 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 02f41b1 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Dec 31 12:42:09 2014 +0100 - - GTPv2: fix Copy-paste error (CID 1158587) + Try to suppress - Change-Id: I56eaa2071b4b8042c214cf882d35ebec646d2cb5 - Reviewed-on: https://code.wireshark.org/review/6169 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit f485b28 -Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Dec 31 08:53:39 2014 -0800 - - Test suite: Make sure we have a usable locale before we run iconv. + warning: type of bit-field 'foo' is a GCC extension [-Wpedantic] - Change-Id: Ib1f3143dc48af4c556b9bcdfafbb477fd59b6359 - Reviewed-on: https://code.wireshark.org/review/6181 + Change-Id: If161a509db2d6aaad3bb656318902f0bc7b0d0a9 + Reviewed-on: https://code.wireshark.org/review/7136 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit fad9b76 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Dec 31 12:39:57 2014 +0100 - - wslua field: fix Copy-paste error (CID 1158590 & 1158589) - - Change-Id: I566ddd2930b5c86bc32ca9ba12cd4be7d994bd22 - Reviewed-on: https://code.wireshark.org/review/6168 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 24c076f -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Dec 31 12:37:22 2014 +0100 - - pcapng (wiretap): fix Copy-paste error (CID 1158591 & 1158592) - - Change-Id: I117c007c0a8be573bb3069fc44a490e6e5d2fef8 - Reviewed-on: https://code.wireshark.org/review/6167 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit b0e6fbf +commit bfde04b Author: Bill Meier <wmeier@newsguy.com> -Date: Wed Dec 31 11:08:07 2014 -0500 +Date: Sun Feb 15 13:58:39 2015 -0500 - umts_fp: Replace se_new0(...) by wmem_new0(wmem_file_scope(), ...) + ui/gtk/*.c: Add editor modelines; As needed: Fix indentation - Change-Id: I9d40ffd199147fb8b975c493253d5cf796be5983 - Reviewed-on: https://code.wireshark.org/review/6179 + Change-Id: I8cd9d9fe5f12c284f46b8f725766f681faccd753 + Reviewed-on: https://code.wireshark.org/review/7138 Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit f7b6dcc -Author: Hadriel Kaplan <hadriel@128technology.com> -Date: Mon Dec 29 20:49:05 2014 -0500 - - Lua: allow a Dissector object to be passed in for register_heuristic - - Bug: 10695 - Change-Id: I81181b2d00fcb5f0c25ab89bbe4968897f47a3a6 - Reviewed-on: https://code.wireshark.org/review/6131 - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 1121288 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Dec 31 12:33:15 2014 +0100 - - GTP: fix Copy-paste error (CID 1158594 & 1158595) - - Change-Id: I501c0d666c7b280656e2d7cf7a196d489d452eff - Reviewed-on: https://code.wireshark.org/review/6166 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit a1732dc -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Wed Dec 31 16:47:28 2014 +0100 - - GTK: fix 'Limit to display filter' functionality in Conversations/Endpoints windows - - Change-Id: I1efb7717c9eb4638fbff292e2953accc3e945ee6 - Reviewed-on: https://code.wireshark.org/review/6178 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 9e7d69f +commit 7229c54 Author: Bill Meier <wmeier@newsguy.com> -Date: Wed Dec 31 10:30:33 2014 -0500 +Date: Sat Feb 14 22:31:53 2015 -0500 - checkAPIs.pl: Error/warnings output goes to STDERR + epan/ftypes/*.[hc]: As needed: Add editor modelines & Fix indentation - Change-Id: Ib6f460147c26c4fbfb9bd0fd8dd0dd12561be9ea - Reviewed-on: https://code.wireshark.org/review/6177 + Change-Id: Ib0bd1ea7801ab450b300a94c4757f16d0dd75760 + Reviewed-on: https://code.wireshark.org/review/7137 Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit 493e413 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Dec 31 12:50:46 2014 +0100 - - SCTP: fix Nesting level does not match indendation (CID 1159213 & 1159215 ) - - Change-Id: Icd04c5f1f09b9cf704828e4b6a598cd2c1f6dd15 - Reviewed-on: https://code.wireshark.org/review/6172 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit beb50e6 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Dec 31 12:49:27 2014 +0100 +commit 0ed1b0f19 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Sat Feb 14 23:36:47 2015 +0100 - DHCPv6: fix Nesting level does not match indendation (CID 1159219) + Add ws_mempbrk_sse42_compile to Valgrind suppression list - Change-Id: Id57a9f2df6a4011078b0bef359b2cd5503f6f7ce - Reviewed-on: https://code.wireshark.org/review/6171 - Reviewed-by: Michael Mann <mmann78@netscape.net> + When running Valgrind 3.10.0 on an Ubuntu 10.10 x64 guest with Virtualbox 4.3.22, ws_cpuid_sse42() call triggers a false positive when checking ECX bit 20 + Guy kindly verified the assembler code and confirmed that everything seems fine + Let's remove the error to avoid noise when running Valgrind on a capture + Change-Id: I357633950249a0c781482865c3221a1babdc74e2 + Reviewed-on: https://code.wireshark.org/review/7124 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Reviewed-by: Evan Huus <eapache@gmail.com> -commit 784b39c -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Dec 31 12:48:09 2014 +0100 +commit e326318 +Author: Anders <anders.broman@ericsson.com> +Date: Sun Feb 15 18:54:28 2015 +0100 - GTPv2: fix typo in Anders e-mail Address + Only call tvb_get_ptr() once to set src and dst addresses- - Change-Id: I2410aa7bce574c9153b971b2d8b0cbfbe24e54dc - Reviewed-on: https://code.wireshark.org/review/6170 + Change-Id: I206b25ec512b3665b36307276ab3748e0a5ff73b + Reviewed-on: https://code.wireshark.org/review/7135 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 0f6f2bd -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Dec 31 12:26:14 2014 +0100 - - jxta: fix Copy-paste error (CID 1158599 & 1158600) - - Change-Id: Ica4ade2e7de70cefc4e77d421e35ddd72e688c16 - Reviewed-on: https://code.wireshark.org/review/6165 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit aeb10b9 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Dec 31 12:20:55 2014 +0100 - - mount: fix Copy-paste error (CID 1224605) - - Don't longer need to check if(tree) - - Change-Id: I4ec572df28bad3c487c3c744840d97b79781feb3 - Reviewed-on: https://code.wireshark.org/review/6164 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 7c93e81 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 29 18:05:09 2014 +0100 +commit bf15134 +Author: Gerald Combs <gerald@wireshark.org> +Date: Sun Feb 15 08:04:51 2015 -0800 - Column utils: Missing varargs init or cleanup (CID 1212122) + [Automatic manuf, services and enterprise-numbers update for 2015-02-15] - Change-Id: I013c737c2cd62e3f1f49b113a7ce0c0616e1ecc4 - Reviewed-on: https://code.wireshark.org/review/6119 - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: Ie7aa5657e123ef609e05fc6f09782cc5d2443308 + Reviewed-on: https://code.wireshark.org/review/7130 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 60d7413 +commit 29e1b45 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Dec 31 12:29:12 2014 +0100 +Date: Sun Feb 15 12:37:36 2015 +0100 - prefs: fix typo + IS-IS (LSP): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - Change-Id: Ic4dbbab5e53b5745cb703e6e30b2dc6251c3918e - Reviewed-on: https://code.wireshark.org/review/6161 + Change-Id: I1b68151f0cb09afd6a6aeba2a71a15624c2fbc97 + Reviewed-on: https://code.wireshark.org/review/7129 Reviewed-by: Michael Mann <mmann78@netscape.net> -commit c34c2a6 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Wed Dec 31 12:36:58 2014 +0100 - - Fix conversations filtering - - Change-Id: Ic615830a373deab349a0a5a62f25b131e0bcbf18 - Reviewed-on: https://code.wireshark.org/review/6162 - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 3865bca -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Wed Dec 31 15:17:19 2014 +0100 - - Update libwsutil symbols - - Change-Id: Icddb71202fb44ab3cf2ee5923b5a10f71f078ce5 - Reviewed-on: https://code.wireshark.org/review/6176 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 22701ad -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Wed Dec 31 13:48:51 2014 +0100 - - DNS: ensure that suffix_addr structure is always initialized - - Bug: 10816 - Change-Id: Ifd036148f9f2e76516913bda11cf07fdb63def94 - Reviewed-on: https://code.wireshark.org/review/6174 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 37efc4a -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 31 02:23:14 2014 -0800 - - We do stuff with signals only on UN*Xes. - - Change-Id: I1b1a304143cf4e4a14107d1d55057cef24552a70 - Reviewed-on: https://code.wireshark.org/review/6160 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 914dc6c -Author: Luke Mewburn <luke@mewburn.net> -Date: Wed Dec 24 13:19:57 2014 +1100 +commit 65763cf +Author: Gerald Combs <gerald@zing.org> +Date: Sat Feb 14 13:36:45 2015 -0800 - E.164: display country_code as decimal not hex - - Display and filter e164.country_code and e164.identification_code - as decimal instead of hexadecimal, as that is more natural. - E.g. Use 'e164.country_code == 61' instead of 'e164.country_code == 0x61' - to match Australia (+61...) + Try to fix diagnostic suppression. - If the country_code or identification_code contain BCD digits > 9 - add an expert info warning. + Test the compiler for "-Wpedantic" instead of "-pedantic" since DIAG_OFF + and DIAG_ON expect a "-W" flag prefix. Be more strict about the compiler + versions that DIAG_OFF and DIAG_ON support. - Required modifying the various prefix to description value_string - arrays from hex to decimal constants, and converting the decoded BCD - from hex to decimal before adding to the proto tree. - - Change-Id: Ibedfc75246fe409b7d63776083379bb028fb784b - Reviewed-on: https://code.wireshark.org/review/6054 - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: I9304c544912102f1719b79e9250f97b40a324430 + Reviewed-on: https://code.wireshark.org/review/7123 + Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 8f75a2e -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 31 00:50:01 2014 -0800 - - And, again, no more version_info.c. - - Change-Id: I0500383aa6c553e995c60fad850553c0ce5a66d9 - Reviewed-on: https://code.wireshark.org/review/6159 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit a3d946c -Author: Ebben Aries <exa@fb.com> -Date: Wed Dec 31 00:54:40 2014 -0700 - - BGP : Simple typo fix for BGP Attribute - - Change-Id: I793eed5c7d63c82e13847c8a6c8fd6def3025b8c - Reviewed-on: https://code.wireshark.org/review/6158 - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - Tested-by: Hadriel Kaplan <hadrielk@yahoo.com> - -commit 64dd98e -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Dec 30 23:09:41 2014 -0800 - - No version_info.c any more. - - Change-Id: I96f4d07ac08d80811bb4ba9469cba8265d288945 - Reviewed-on: https://code.wireshark.org/review/6157 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 938b6a7 +commit 1b43a80 Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Dec 30 23:07:24 2014 -0800 +Date: Sat Feb 14 14:52:24 2015 -0800 - Wrong function name. + Note why some header checks are done even if unnecessary on UN*X. - Change-Id: I56e6a7dbb7290963548fdd61784554d67fc70bfe - Reviewed-on: https://code.wireshark.org/review/6156 + Change-Id: I0ea8cbaed65922e4dd5e49bbb7578b392deb8c02 + Reviewed-on: https://code.wireshark.org/review/7125 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 0bf38f7 -Author: Hadriel Kaplan <hadrielk@yahoo.com> -Date: Tue Dec 30 17:39:56 2014 -0500 +commit bade5f3 +Author: Richard Sharpe <realrichardsharpe@gmail.com> +Date: Sat Feb 14 11:41:47 2015 -0800 - Lua: getting fieldinfo.value for FT_NONE causes assert + A small correction to the documentation to bring it in line with the code. - Retrieving an FT_NONE field's value through `fieldinfo.value` or - `fieldinfo()` causes an assert. It should retrieve the label instead. - - Bug: 10815 - Change-Id: Ia80443f3dd046b2cc31d1dff70d599e96d6f6fe3 - Reviewed-on: https://code.wireshark.org/review/6150 - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - Tested-by: Hadriel Kaplan <hadrielk@yahoo.com> + Change-Id: I5818b9f3348a70d817bf885697cd67440d812889 + Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com> + Reviewed-on: https://code.wireshark.org/review/7121 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 27be466 -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Dec 30 22:28:25 2014 -0800 +commit f80a720 +Author: Gerald Combs <gerald@zing.org> +Date: Sat Feb 14 10:18:26 2015 -0800 - Do the full string in get_{compiled,runtime}_version_info(). + WSUG and image updates. - Have them start the string with "Compiled" or "Running on", and return - the string when done. + Update the protocol hierarchy, conversation, and endpoint sections of + the User's Guide. When everything is an admonition nothing stands out. + Make a series of "NOTE"s plain old paragraphs. Scale the new + conversation and endpoint images to fit the page width. This looks funny + in my browser but I'm not sure about the best way to fix it. - Change-Id: Ic4d290c963621fa0385dc5aab766fd4ad31d3810 - Reviewed-on: https://code.wireshark.org/review/6155 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 84110d2 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Tue Dec 30 23:46:24 2014 +0100 - - tshark: endpoints statistics are not supported for now, do not list them in -z + Move image/compress-pngs to the tools directory. Use it to reduce the + size of the WSUG and WSDG images. - Move statistics registration to "GUI" callback registration + Fixup traffic table column names and window titles. - Change-Id: Id27c049dc8f91d311e9231342ae40749ca0ff5fc - Reviewed-on: https://code.wireshark.org/review/6151 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: I674342ed901fc64563b384ee5e1f35413736cb19 + Reviewed-on: https://code.wireshark.org/review/7122 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit c1f3047 -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Dec 30 19:36:26 2014 -0800 +commit e11d7ef +Author: Gerald Combs <gerald@wireshark.org> +Date: Fri Feb 13 13:51:05 2015 -0800 - Move the version_info.c stuff to wsutil/ws_version_info.c. + Fix diagnostics macros and squelch a gcc warning. - Change-Id: I3a5c7e219974bfb924819b43b4d445eaf00e5bde - Reviewed-on: https://code.wireshark.org/review/6153 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 4eeb440 -Author: Michael Mann <mmann78@netscape.net> -Date: Tue Dec 30 19:25:35 2014 -0500 - - Remove proto_tree_add_text from packet-dcerpc-pn-io.c + Both clang and gcc define __GNUC__. Make sure we account for that when + defining diagnostic macros. - Change-Id: Ia144061dc8c394d9ae89135009d06457e2aabb7d - Reviewed-on: https://code.wireshark.org/review/6152 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit dcbebe0 -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Dec 30 12:38:52 2014 -0800 - - Test suite: Start testing our output for valid UTF-8. + Use DIAG_OFF + DIAG_ON to suppress gcc -pedantic warnings about + frame_data. - Feed the output of `tshark -G <glossary>` to `iconv -f UTF-8`. Adjust a - couple of the Bluetooth dissectors and X11 keysyms accordingly. + Get rid of packet_char_enc casts. - Change-Id: I5b04dc3fa4734c8f0a795daf44bd398fe5ebc1bd - Reviewed-on: https://code.wireshark.org/review/6146 + Change-Id: Idbcc61bcdb35c1d20f185461c69451dcdf73bae9 + Reviewed-on: https://code.wireshark.org/review/7106 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 3b57861 -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Dec 29 14:12:43 2014 -0800 +commit 5cc0ad8 +Author: Gerald Combs <gerald@zing.org> +Date: Sat Feb 14 09:00:36 2015 -0800 - Qt: More WiresharkDialog conversions. + Remove a duplicate typedef. - Convert the Follow Stream and Export Objects dialogs. - - Change-Id: I8a4dda634f2f0475a24cf09601f76fb52069fe50 - Reviewed-on: https://code.wireshark.org/review/6126 + Change-Id: Ie26785cc3577bda84cb4d244aab5a607797b99fb + Reviewed-on: https://code.wireshark.org/review/7118 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 97f5f39 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Tue Dec 30 19:33:16 2014 +0100 - - free the temporary buffers allocated by gnutls_x509_privkey_export_rsa_raw() - - Bug: 10740 - Change-Id: Idd4afab1bca6204d17c4bd4345661ec821f209e0 - Reviewed-on: https://code.wireshark.org/review/6145 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - Tested-by: Martin Kaiser <wireshark@kaiser.cx> - -commit bc7a9e5 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Tue Dec 30 16:23:07 2014 +0100 - - Fix IPv6/IPX statistics generation - - Use a doubly-linked list and iterate on the reversed statistics list to always test the bigger strings first - - Bug: 10813 - Change-Id: Ibfedac9648db58e6dadc2334eec678e26daca906 - Reviewed-on: https://code.wireshark.org/review/6140 - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 935c8bf -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Tue Dec 30 18:07:32 2014 +0100 - - Websocket: use pinfo pool and not packet one for the unmasked data tvb - - As indicated in README.wmem, pinfo pool must be used for anything that might - end up being passed to add_new_data_source - - Change-Id: I4a6396fc52e6c70c771390f502d58199c38c172a - Reviewed-on: https://code.wireshark.org/review/6144 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit f3f736c -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Tue Dec 30 17:57:44 2014 +0100 - - clean up the part where dissect_websocket() is called recursively - - Change-Id: Ia94ddb2c4cb03fe5d1af9f8d316e1cdb18fe8283 - Reviewed-on: https://code.wireshark.org/review/6143 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - Tested-by: Martin Kaiser <wireshark@kaiser.cx> - -commit 246f727 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Tue Dec 30 17:50:30 2014 +0100 - - use packet-scoped memory for the unmasked data tvb - - Change-Id: I5f9b769e26c16072a1656dfe9094487d6dfe76f4 - Reviewed-on: https://code.wireshark.org/review/6142 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - Tested-by: Martin Kaiser <wireshark@kaiser.cx> - -commit e05e8f8 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Tue Dec 30 17:44:45 2014 +0100 +commit ca534b1 +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Sat Feb 14 13:03:45 2015 +0100 - skip the payload if it's empty + MIP6: Local Mobility Anchor Address mobility option code is treated incorrectly - Change-Id: Ib38e747bc762422c690abc1cb127bb0944c80ce2 - Reviewed-on: https://code.wireshark.org/review/6141 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - Tested-by: Martin Kaiser <wireshark@kaiser.cx> - -commit 8629aa2 -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Dec 29 15:15:59 2014 -0800 - - Qt: Continue using the new window title format. + The first packet is an IPv6 packet with Local Mobility Anchor Address mobility option with Option-Code=1. Wireshark parses its address as IPv4 address. - Update several dialog titles to "Wireshark · <subtile...>". + The second packet is an IPv6 packet with Local Mobility Anchor Address mobility option with Option-Code=2. Wireshark parses its address as IPv6 address. - Change-Id: I64645e913500ecd55a008e1609b46385dafe7de9 - Reviewed-on: https://code.wireshark.org/review/6127 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 1ee4369 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Tue Dec 30 16:47:30 2014 +0100 - - no need for if(tree) + According to RFC 5949 (https://tools.ietf.org/html/rfc5949#section-6.2.2), Option-Code=1 means IPv6 and Option-Code=2 means IPv4, exactly the opposite to what Wireshark does. - Change-Id: I0b20b66e1b44da0362c13009946a69738a2aa267 - Reviewed-on: https://code.wireshark.org/review/6138 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - Tested-by: Martin Kaiser <wireshark@kaiser.cx> + Bug: 10961 + Change-Id: I03b76dda8beae211e67e6c9e1f40d122e851b1b5 + Reviewed-on: https://code.wireshark.org/review/7113 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit d45fe5c +commit 847f590 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Tue Dec 30 10:48:44 2014 +0100 +Date: Sat Feb 14 12:47:38 2015 +0100 - .mailmap: Add Hadriel Kaplan + MIP6: AUTH mobility option parses Mobility SPI and Authentication Data incorrectly - Change-Id: Iddab5a98e47d90fe4a7e6fbf6b55bbb16e528415 - Reviewed-on: https://code.wireshark.org/review/6136 - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - Tested-by: Hadriel Kaplan <hadrielk@yahoo.com> - -commit e0d268b -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Dec 29 17:24:44 2014 -0800 - - stats_tree: Make sure some structs are fully initialized. + The authentication data in the AUTH option in attached IPv6 packet contains one byte too much. This byte is read beyond the option data. + In Wireshark, clicking on the AUTH shows that the option ends at 0xCE while clicking on the Authentication Data shows that it ends at 0xCF. - Get rid of a strcpy. + Reported by Boaz - Change-Id: I49460969fdf627fdb89030115ad5a658e300a5d4 - Reviewed-on: https://code.wireshark.org/review/6130 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Bug:10626 + Change-Id: I0bcfd6331bc1de30f25d16590487c0e3bf5c002f + Reviewed-on: https://code.wireshark.org/review/7112 Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 4556498 -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Dec 29 11:42:01 2014 -0800 +commit 91b5042 +Author: Michael Mann <mmann78@netscape.net> +Date: Wed Feb 11 20:13:36 2015 -0500 - Qt: Convert more dialogs to WiresharkDialog. - - Make the Sequence, IO Graph, Statistics Tree, and VoIP Calls dialogs - subclasses of WiresharkDialog. - - Remove "Stats Tree" from Statistics Tree dialog titles. Don't complain - if the user opens more than one instance of the dialog. + "Hide" hashether_t structure. - Use the applicationName property in WiresharkApplication instead of a - separate variable. + One use in a GUI function isn't really enough to justify making the structure public. - Add a preexisting item to the IO Graph bug list (hovering when the file - is closed clears the graph). - - Change-Id: I8411a25305d00b16e0d4a82fa50a9bad5c85b239 - Reviewed-on: https://code.wireshark.org/review/6125 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: Ic7dee275ba0a2bd4e19c06702a867417c5624c27 + Reviewed-on: https://code.wireshark.org/review/7080 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit b6ff338 +commit a64fc6c Author: Guy Harris <guy@alum.mit.edu> -Date: Mon Dec 29 18:57:31 2014 -0800 +Date: Sat Feb 14 00:04:36 2015 -0800 - Tabs are not necessarily set every 4 spaces. + Don't check for C89 headers. - Use spaces, not tabs, for indentation; that makes the code's layout - indepencent of tab settings, which might be every *8* spaces. + 1988 called, they want their lack of a C standard back. We don't need + to check whether we have stdarg.h, stddef.h, stdlib.h, or string.h, as + they're specified by C89 and I don't think there are any platforms we + care about that don't have a C89 environment in which we could be built. - Change-Id: I69891b6424a668f1ee0ca80cc622b8cb0ed8967e - Reviewed-on: https://code.wireshark.org/review/6132 + Change-Id: I447551181284fab7722354b62774625ed8ee94bc + Reviewed-on: https://code.wireshark.org/review/7110 + Petri-Dish: Guy Harris <guy@alum.mit.edu> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit ed58d88 -Author: Michael Mann <mmann78@netscape.net> -Date: Sun Dec 28 21:43:51 2014 -0500 +commit f623537 +Author: Guy Harris <guy@alum.mit.edu> +Date: Fri Feb 13 18:08:47 2015 -0800 - Remove some proto_tree_add_text outside the dissector directory. + We use GLib's directory-reading routines, so we don't need <dire[cn]t.h>. - Change-Id: I890846a0cede755a603243b4048fb5c917b2826b - Reviewed-on: https://code.wireshark.org/review/6112 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: Id86e5d6d0ab24adb1bfff0688f33a40f2fdaed8d + Reviewed-on: https://code.wireshark.org/review/7108 + Petri-Dish: Guy Harris <guy@alum.mit.edu> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 0d414e5 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Dec 27 23:15:41 2014 +0100 +commit b5a3b65 +Author: Gerald Combs <gerald@wireshark.org> +Date: Fri Feb 13 16:18:57 2015 -0800 - Add ability to follow UDP stream by index + Qt: Fix side effects of recent WiresharkDialog changes. - -z "follow,udp" tshark cli command now supports a stream index - It is now possible to select the UDP stream displayed in Qt GUI (like for TCP) - - Change-Id: Ia367f36ea4f60db0fddb997a7e0903c09e172f2d - Reviewed-on: https://code.wireshark.org/review/6083 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 0905202 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 29 18:03:59 2014 +0100 - - TN5250: Missing break in switch (CID 280477) + Quit the application when the main window closes. This cleans up any + other top-level windows that might be open. - fix also indent typo + Don't dereference a NULL pointer when opening the sequence dialog from + the VoIP calls dialog. - Change-Id: I47ff84a6062a203e14b9dde420a1a2efd5b05fab - Reviewed-on: https://code.wireshark.org/review/6118 - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: I9902d40ead1c5f2e541b6d79f3d957228e4e9687 + Reviewed-on: https://code.wireshark.org/review/7107 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 0fb4cdb -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 29 18:12:43 2014 +0100 +commit f85d1c8 +Author: Gerald Combs <gerald@wireshark.org> +Date: Fri Feb 13 11:18:30 2015 -0800 - Wimaxasncp: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + WSUG: Add a note about dialogs vs windows. - Change-Id: Ie2808d20a7f8e28bfe9b929b1b222a901a29f510 - Reviewed-on: https://code.wireshark.org/review/6120 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 621dbdd -Author: Graham Bloice <graham.bloice@trihedral.com> -Date: Sat Sep 27 09:37:11 2014 +0100 - - Windows build improvements: - - Added /Zo flag for VS2013 builds to add more debugging info - Removed obsolete comment on unused /GS flag and obsolete - /FR flag. - Removed '#ifdef WIRESHARK_GENERATE_BSC_FILE' and related - (which specified the obsolete /FR flag). - Added /RELEASE flag to linker to set checksum in PE header - Fixed an old typo. - CMake added /INCREMENTAL:NO flag to linker to overide default - and prevent warning messages. - - Change-Id: I039b884657d2886acc273dc6dd099d07a7b8ec7d - Reviewed-on: https://code.wireshark.org/review/6110 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> - Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: I38d7838db2be59af8a31d94b7cafeeef62698215 + Reviewed-on: https://code.wireshark.org/review/7105 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 71fe134 +commit 3e3fc9f Author: Bill Meier <wmeier@newsguy.com> -Date: Mon Dec 29 14:20:44 2014 -0500 +Date: Fri Feb 13 14:02:43 2015 -0500 - rtsp: Fix (what I think may be) a minor bug. - - (Also fixes a compiler 'Shadow' warning in a different way - than the now reverted previous fix). + epan/dfilter/*.c: As needed: Add editor modelines & Fix indentation - Change-Id: Iedcac3d402b89d1b0261a49647bf39cc854d1a0c - Reviewed-on: https://code.wireshark.org/review/6123 + Change-Id: I410839329a98bd806c60961dfb9693d5eeeeb702 + Reviewed-on: https://code.wireshark.org/review/7104 Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit 7ca5ad9 +commit 6040bcd Author: Bill Meier <wmeier@newsguy.com> -Date: Mon Dec 29 13:52:09 2014 -0500 +Date: Fri Feb 13 13:43:32 2015 -0500 - rtsp: Fix compiler 'Shadow' warning ... + caputils/*.c: As needed: Add editor modelines & Fix indentation - Change-Id: I404546fc5eab82d7cb12971723040b4aa77f6a90 - Reviewed-on: https://code.wireshark.org/review/6122 + Change-Id: I081446fbbc242c01f8ac9dede575c3ea77421c42 + Reviewed-on: https://code.wireshark.org/review/7103 Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit 72dedab +commit 82f081d Author: Bill Meier <wmeier@newsguy.com> -Date: Mon Dec 29 13:05:26 2014 -0500 +Date: Fri Feb 13 13:25:19 2015 -0500 - rtsp: Replace g_warning() by expert...() (dissectors shouldn't do termio). + wslua*: Add editor modelines; Fix indentation, etc as needed. - Also: Add an expert...() in rtsp_create_conversation() for - "Unknown transport type". - - Change-Id: I1d8ca20b9c0bc1e3d11b947b6653a2e2669a0f96 - Reviewed-on: https://code.wireshark.org/review/6121 + Change-Id: I6df5d46f4b263104aa9cb6353cc987087cdb867e + Reviewed-on: https://code.wireshark.org/review/7102 Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit ea08072 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 29 17:11:01 2014 +0100 - - Wireshark Dialog (Qt): Add Modelines info - - Change-Id: I6689f5a95c6dc051d660198fd58ae96967f3468f - Reviewed-on: https://code.wireshark.org/review/6116 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 90ba166 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 29 16:33:21 2014 +0100 - - capture_file.h (Qt): missing ] - - Change-Id: Ibc512f03913d77a6c4f0cdbcf5141efbd94b22f0 - Reviewed-on: https://code.wireshark.org/review/6115 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit fce9da3 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 29 10:18:21 2014 +0100 - - Zebra: Fix some indent typo - - Change-Id: I41869fe46e6867333d14f6f86953ff01e2d112a8 - Reviewed-on: https://code.wireshark.org/review/6114 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 211789c -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 29 10:17:04 2014 +0100 - - OpenFlow: Capatilize O and F of OpenFlow (when use Decode as) - - Remove also a trailing whitespace in OpenFlow TCP port preference - - Change-Id: I5c3f42e634e0fee4fecf1a7f2dd1c75a68165b45 - Reviewed-on: https://code.wireshark.org/review/6113 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 10bfe2c +commit 9c866ff Author: Bill Meier <wmeier@newsguy.com> -Date: Mon Dec 29 11:07:54 2014 -0500 +Date: Fri Feb 13 12:05:26 2015 -0500 - dcerpc: Replace g_warning() by expert...() (dissectors shouldn't do termio). + Replace tabs by spaces when editor modelines has "expandtab" - Change-Id: If51a9acbb3b5a5b1623c72651c8a3ef2dd8ad068 - Also: Replace (one of many) proto_tree_add_text() instances. - Reviewed-on: https://code.wireshark.org/review/6117 + Change-Id: If7a6f2697be732ae4f94ed8b845fd293c32510f7 + Also: tabs-stops should be 8 + Reviewed-on: https://code.wireshark.org/review/7100 Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit 5b088af -Author: Michael Mann <mmann78@netscape.net> -Date: Sat Dec 27 10:49:26 2014 -0500 - - Eliminate proto_tree_add_text from packet-spice.c - - Also do some cleanup in dissect_spice() and replace g_warning calls. - - Change-Id: I4dc6f6496bb5ae54157aa6f7f27f21c396da623c - Reviewed-on: https://code.wireshark.org/review/6106 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 5f2b998 -Author: Graham Bloice <graham.bloice@trihedral.com> -Date: Sun Dec 28 18:03:49 2014 +0000 - - Minor doc updates, added Windows debugging info - - Change-Id: I7ddd6f8dead5db725c4e5f35778ce4b6f792bda9 - Reviewed-on: https://code.wireshark.org/review/6096 - Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> - -commit e8ec11f -Author: Gerald Combs <gerald@zing.org> -Date: Mon Dec 22 15:51:36 2014 -0800 +commit 936f685 +Author: Gerald Combs <gerald@wireshark.org> +Date: Fri Feb 13 08:36:53 2015 -0800 - Qt: Add a WiresharkDialog convenience class. - - Add WiresharkDialog, a common base class for dialogs centered around - capture files. Make it a parent of Capture File Properties, Traffic - Table, Conversations, and Endpoints. + Qt: Allow shift-double-clicking on a frame link. - Rename CaptureFile::read_only_ to file_closed_. Add methods to - WiresharkApplication for generating consistent window titles. + You can open a new packet window in the GTK+ UI by holding down the + shift key and double-clicking on a frame link in the protocol tree. Add + this behavior to the Qt UI. Document the different ways of opening a new + packet window and update the image. - Change-Id: Idc771556d8192e60f85dddc08fc4757698dee257 - Reviewed-on: https://code.wireshark.org/review/6097 + Change-Id: I55caf6cc8089a6c305fafd47b4870e7c69dbfb10 + Reviewed-on: https://code.wireshark.org/review/7101 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit c1d9d93 -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Mon Dec 29 01:03:54 2014 +0000 +commit 4d5bdf4 +Author: Richard Sharpe <realrichardsharpe@gmail.com> +Date: Sat Jan 24 21:08:06 2015 -0800 - Restore string.h to os_version.c + A dissector for the RSVD Protocol (see [MS-RSVD].pdf). - Change-Id: I810a38c56829d5d3beaccc0171fc76f26ad79b52 - Reviewed-on: https://code.wireshark.org/review/6108 - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> - -commit 85781bb -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Mon Dec 29 00:28:26 2014 +0000 - - Add back string.h to sha1.c and sober128.c + There is still a little more work to do here, especially we should call the + SCSI dissector for handling SCSI CDBs etc ... - Change-Id: Idd8963717eab804f7d76652d1baf029be8b5997f - Reviewed-on: https://code.wireshark.org/review/6105 - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> - -commit 8ae669c -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Mon Dec 29 00:16:03 2014 +0000 - - Restore string.h to md4.c + This is a potential fix for bug 10913. - Change-Id: I1a2c57ea20bcb1fd22c0379f3f43d3589e497c1b - Reviewed-on: https://code.wireshark.org/review/6104 - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> - -commit 30edb91 -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Mon Dec 29 00:11:36 2014 +0000 - - Add string.h back to rc4.c + Ping-Bug: 10913. - Change-Id: Idea9369742373e4a50edb3f391bdabfeeb3a2ca7 - Reviewed-on: https://code.wireshark.org/review/6103 - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> + Change-Id: Ia8ff1a8207bb5b1cd18079086ff8c472ae3f8736 + Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com> + Reviewed-on: https://code.wireshark.org/review/7022 + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 518e48d -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Mon Dec 29 00:08:12 2014 +0000 +commit 8843606 +Author: Gerald Combs <gerald@wireshark.org> +Date: Thu Feb 12 19:31:13 2015 -0800 - Add back string.h + Qt: Try to make some dialogs behave like windows. - Change-Id: Ia61c72c7e8d1ef92ec5a38d534620fc225eef365 - Reviewed-on: https://code.wireshark.org/review/6102 - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> - -commit f215575 -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Sun Dec 28 23:56:13 2014 +0000 - - Add a couple of more needed includes + Initialize WiresharkDialog with a NULL parent. This should make its + subclasses behave like independent windows. - Change-Id: Ie160f81544c6c9b381078b555e91602617cb2700 - Reviewed-on: https://code.wireshark.org/review/6101 - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> + Change-Id: If84609eeba53a92780c0873a1243888998d2b26b + Reviewed-on: https://code.wireshark.org/review/7094 + Petri-Dish: Gerald Combs <gerald@wireshark.org> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 5efc18e -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Sun Dec 28 23:45:56 2014 +0000 +commit 48a95de +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Thu Feb 12 17:23:46 2015 -0500 - Restore string.h as OS X misses it for strlen() + Register the Mongo dissector by name so it can be used with TLS. - Change-Id: If1a968d54eed97fae915b8546d8d7a65a56b82db - Reviewed-on: https://code.wireshark.org/review/6100 - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> + Change-Id: Ic9d688603747312aa29e5af038363f70c3cbae33 + Reviewed-on: https://code.wireshark.org/review/7097 + Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> -commit e3efb80 -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Sun Dec 28 00:25:44 2014 +0000 +commit c1610c7 +Author: AndersBroman <anders.broman@ericsson.com> +Date: Fri Feb 13 14:40:29 2015 +0100 - Deleting unnecessary #includes from wsutil. - + Micro optimization, only do tvb_get_ptr() once for dst and src + respectivly. - Will look at cleaning up and committing script afterwards. - - Change-Id: Id785e581740ab62fe9258ecfcb0926761ad9c527 - Reviewed-on: https://code.wireshark.org/review/6086 - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> + Change-Id: I1cdc5742057830a47ea71769fb54ab8dfdd3de14 + Reviewed-on: https://code.wireshark.org/review/7096 + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 016769d -Author: Hadriel Kaplan <hadriel@128technology.com> -Date: Thu Dec 25 10:17:11 2014 -0500 +commit 91a6e5e +Author: Vincenzo Reale <smart2128@baslug.org> +Date: Fri Feb 13 07:51:47 2015 +0100 - Expose dissector_add_for_decode_as() to Lua + Italian translation update - Allow Lua scripts to add their Protocol's dissector for "Decode as...". - - Bug: 10696 - Change-Id: Ic270cc85eff62ccfc29d8e5fcbb48247cfcd14bd - Reviewed-on: https://code.wireshark.org/review/6050 - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> + Change-Id: Ibf66f25a257051ba12c3fb9687ac57377117138f + Reviewed-on: https://code.wireshark.org/review/7036 + Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> + Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 5e16157 -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Sat Dec 27 15:39:40 2014 +0100 - - p_mul: Added checksum from ACP 142(A) - - Bug: 10807 - Change-Id: Ifd1ea5d67b65a7e7997458785fff95cc471e0dbc - Reviewed-on: https://code.wireshark.org/review/6076 - Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> - Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> - Tested-by: Stig Bjørlykke <stig@bjorlykke.org> + Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> -commit 71c02b2 -Author: Michael Mann <mmann78@netscape.net> -Date: Wed Dec 24 00:06:35 2014 -0500 +commit f0b4b72 +Author: Gerald Combs <gerald@zing.org> +Date: Thu Feb 12 20:13:09 2015 -0800 - Create FT_FCWWN field type. + Qt: Revert g6e88978 for main_status_bar. - Also, convert the "string" hf_ entries that used tvb_fcwwn_to_str as a string to use proto_tree_add_item with FT_FCWWN type. + It made some slot signatures unusable. - Change-Id: I4ca77870499fd8239584a70874998b5d194a7167 - Reviewed-on: https://code.wireshark.org/review/6036 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 8965e90 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Dec 28 16:35:57 2014 +0100 - - Qt Follow window: keep data representation when switching between streams - - Change-Id: I1c7092d33d841e80ce110224f3bd617cb112be61 - Reviewed-on: https://code.wireshark.org/review/6091 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: I0f7cdad9e84a5ffb2bdfe4042ac93b3ea19b4893 + Reviewed-on: https://code.wireshark.org/review/7095 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit f3fd6b5 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sun Dec 28 18:39:30 2014 +0100 +commit 80342e4 +Author: Gerald Combs <gerald@zing.org> +Date: Thu Feb 12 19:03:50 2015 -0800 - The symbol rate in the Cable Delivery System Descriptor is in Mega-Symbols/s + Qt: Make WiresharkDialog act like a window. - Change-Id: I1446500f1c5c89b8ed94c04b04bb6985ae827731 - Reviewed-on: https://code.wireshark.org/review/6095 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - Tested-by: Martin Kaiser <wireshark@kaiser.cx> - -commit 15a9f5d -Author: Graham Bloice <graham.bloice@trihedral.com> -Date: Sat Aug 23 00:21:45 2014 +0100 - - Move Windows build to be VS2013 based using the Community Edition - Drop references to long obsolete compilers. - Added Chocolatey installer instructions for some packages. + Set Qt::Window when we initialize QDialog. This should add a minimize + button to most of the dialogs that need one. - Change-Id: I416d4091b6acaa1ed0d5e586f0427708c4b2d646 - Reviewed-on: https://code.wireshark.org/review/5986 - Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> - Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 1b6da9e -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Dec 28 08:05:15 2014 -0800 - - [Automatic manuf, services and enterprise-numbers update for 2014-12-28] - - Change-Id: Ie1876a971a25a4c8f063ae0fce0c970a4c9efdf2 - Reviewed-on: https://code.wireshark.org/review/6092 + Change-Id: I8595dee9c6a28a4e0a8518213176ba10a6d8dcc6 + Reviewed-on: https://code.wireshark.org/review/7093 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 1d598bb -Author: Michael Mann <mmann78@netscape.net> -Date: Sun Dec 21 12:38:13 2014 -0500 - - Replace ip6_to_str and ip6_guint8_to_str with address_to_str and tvb_ip_to_str. - - Change-Id: I1d258923a7a63539ec8456d3e306bca5016a1e4b - Reviewed-on: https://code.wireshark.org/review/6060 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 9fce4dd -Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Dec 28 02:28:27 2014 -0800 - - If we can't open the GeoIP database, close and unlink the map file. - - We can't write out the full map file, and we return an error, so just - get rid of the file. - - Fixes Coverity CID 1256521. - - Change-Id: Ieee078f760c035d65b2fce199ea472ba915be9c6 - Reviewed-on: https://code.wireshark.org/review/6090 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 120628e -Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Dec 28 02:18:05 2014 -0800 +commit a0498f1 +Author: Gerald Combs <gerald@zing.org> +Date: Thu Feb 12 19:00:59 2015 -0800 - Don't check the same character twice in a row, check it and the next character. + Qt: Double clicking a packet opens the packet window. - Fixes Coverity CID 1260460. + Connect the packet list's doubleClicked signal to the main window's + openPacketDialog slot. - Change-Id: Ic9ed109a863bcf20a5e67e4f52d628011f5e9ba5 - Reviewed-on: https://code.wireshark.org/review/6087 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I5bc20c113fb1f22e2257fc1dbdef76c9920e05d0 + Reviewed-on: https://code.wireshark.org/review/7092 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 63ebe91 -Author: Dario Lombardo <lomato@gmail.com> -Date: Fri Dec 26 23:48:39 2014 +0100 +commit 6e88978 +Author: Gerald Combs <gerald@wireshark.org> +Date: Thu Feb 12 15:35:59 2015 -0800 - Removed duplicated #include lines + Qt: More #include → forward declarations. - Change-Id: I9cafa3cd5c74121168777d8c656e7e94e89efd3c - Reviewed-on: https://code.wireshark.org/review/6065 - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: Ib6de71f801cd3053374b6c867370acd594dcd396 + Reviewed-on: https://code.wireshark.org/review/7089 + Petri-Dish: Gerald Combs <gerald@wireshark.org> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit d094fca -Author: Guy Harris <guy@alum.mit.edu> -Date: Sat Dec 27 15:17:07 2014 -0800 +commit a5652c7 +Author: Gerald Combs <gerald@wireshark.org> +Date: Thu Feb 12 10:17:05 2015 -0800 - Check for pkg-config. + Qt: ElidedLabel doesn't support rich text / HTML. - The configure script uses pkg-config unconditionally, so you need it if - you're going to build Wireshark with the autotools. - - Change-Id: Ibb0e5e37651256c7134303c8176f30a9150af699 - Reviewed-on: https://code.wireshark.org/review/6085 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: Ia5ca9784c60325c01ba5e6378997008f8ef1dd6e + Reviewed-on: https://code.wireshark.org/review/7091 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 73af2d6 -Author: Guy Harris <guy@alum.mit.edu> -Date: Sat Dec 27 15:02:56 2014 -0800 +commit f1d1354 +Author: Gerald Combs <gerald@wireshark.org> +Date: Thu Feb 12 16:11:21 2015 -0800 - We require pkg-config to check for, for example, GLib. - - If the check for pkg-config fails, quit immediately; don't leave the - failure message for later, as the error message in question might not be - as blunt. + Try to fix compilation on OS X. - Change-Id: I530e8b62f5adff228ae8ff6f9798ac538c2ad684 - Reviewed-on: https://code.wireshark.org/review/6084 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I63d1f639bf5fd56aeaea112c797efedca8c0bf6e + Reviewed-on: https://code.wireshark.org/review/7090 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 51e5869 -Author: Guy Harris <guy@alum.mit.edu> -Date: Sat Dec 27 12:56:07 2014 -0800 +commit 931807e +Author: Gerald Combs <gerald@wireshark.org> +Date: Wed Feb 11 15:00:27 2015 -0800 - Get rid of packet data members of header structures. - - Instead, have a special macro using the size of the header structure to - find the offset of the packet data. - - This means that: + Qt: Add the "new packet" window^Wdialog^Wwindow. - 1) you don't have to throw "-{size of data member}" into the - macros that calculate the sizes of the header structures; + Allow persistence across files. Preserve the use of "window" even + though we're really a dialog. - 2) you don't have a bunch of randomly-chosen data field sizes; + Update ByteViewTab and ProtoTree to support multiple instances. - 3) you don't have sizes of 0, which cause problems with - compilers that don't support zero-length arrays; + Remove the need for a cast in frame_data. - 4) you don't have some apparently-incorrect "-{size of data - member}" values (if they're correct, please fix the structure - definitions). - - Change-Id: Iea368b83fa2d184bd6df453d51756e4749714e2c - Reviewed-on: https://code.wireshark.org/review/6082 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit ea6f5a3 -Author: Hadriel Kaplan <hadriel@128technology.com> -Date: Sat Dec 27 13:29:06 2014 -0500 - - Zebra dissector highlights wrong byte for version and is missing some fields - - Bug: 10809 - Change-Id: I916d3ee0644570b689b35575e7277fc7d5ee3396 - Reviewed-on: https://code.wireshark.org/review/6081 - Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - Tested-by: Hadriel Kaplan <hadrielk@yahoo.com> - -commit 25c7e0d -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Dec 27 16:46:32 2014 +0100 - - OpenFlow: fix dissection of async_config_prop structure + Add more forward declarations. - Bug: 10808 - Change-Id: I5ef46cd6b85c415e23dfdbe7a56c8b332eaae5a3 - Reviewed-on: https://code.wireshark.org/review/6078 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: I50d3d9d1455b8ecc158a37218f9e41fe696d5ae2 + Reviewed-on: https://code.wireshark.org/review/7086 + Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 1ae0c4a -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Dec 27 15:42:53 2014 +0100 +commit b3e2c56 +Author: Gerald Combs <gerald@wireshark.org> +Date: Thu Feb 12 13:49:31 2015 -0800 - Fix -z statistics command line parsing + Docbook: Don't build PDF release notes by default. - The string comparison must be done against the length of the registered command, not against the length or the string given as an argument. - Otherwise optional parameters are taken into account. - - Change-Id: Iec4032fc10b00e606770533c5a567d7b49663593 - Reviewed-on: https://code.wireshark.org/review/6075 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 0ea310d -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Dec 27 16:34:54 2014 +0100 - - SRVLOC: fix some fields registration (regression introduced in ga1c6341) + Move the release-notes-*.pdf targets to a release_notes_pdf metatarget + which must be built manually. - Change-Id: I318f4889b94021ece1e61ae080b77b1fb21eae7b - Reviewed-on: https://code.wireshark.org/review/6077 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: I067a4e248e6e68d1ff60aafad5d75c1180536e0f + Reviewed-on: https://code.wireshark.org/review/7088 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit a1c6341 -Author: Michael Mann <mmann78@netscape.net> -Date: Fri Dec 26 21:13:48 2014 -0500 +commit d2aa2c6 +Author: Gerald Combs <gerald@wireshark.org> +Date: Thu Feb 12 12:33:24 2015 -0800 - Eliminate proto_tree_add_text from packet-srvloc.c + WSDG: Start adding Qt material. - Change-Id: I73a2270e259414f21a695d2b279df5b3cac27bb8 - Reviewed-on: https://code.wireshark.org/review/6067 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit c04aebd -Author: Guy Harris <guy@alum.mit.edu> -Date: Sat Dec 27 02:57:22 2014 -0800 - - Declare cur_rt in the narrowest possible scope. + Move some text from README.qt to the Developer's Guide. Add an overview. - Change-Id: I0604d6f9f4bb2c58bb74a9b375f644474b68c28f - Reviewed-on: https://code.wireshark.org/review/6074 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: Ia20ed837939e34871b157566c38cd0c6e590bc38 + Reviewed-on: https://code.wireshark.org/review/7087 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit ca6f849 +commit bdcac17 Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Dec 27 09:17:36 2014 +0100 +Date: Thu Feb 12 09:07:02 2015 +0100 - IP: try to fix OSX 10.5 x86 compilation + Fix crash at startup in SSE4.2 code when running a 32 bits Windows build - packet-ip.c: In function 'dissect_ip': - packet-ip.c:2297: warning: 'cur_rt' may be used uninitialized in this function - packet-ip.c:2297: note: 'cur_rt' was declared here + There is no guarantee that a g_malloc'ed memory block will be aligned on a 128 bits boundary + Instead use a static variable definition (at the cost of exposing the HAVE_SSE4_2 compilation flag in ws_mempbrk.h) - Change-Id: I97fe33d2a01e982f057cce6d68f64378727be2da - Reviewed-on: https://code.wireshark.org/review/6073 + Change-Id: I661bf479a9d458d64c96bafc940c519d29a4780b + Reviewed-on: https://code.wireshark.org/review/7070 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 4536271 -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Dec 26 18:46:10 2014 -0800 - - Don't use a leading - in getopt_long() option strings. - - The behavior of a leading - is platform-dependent. It also means that - non-option arguments are treated in a fashion that we're not handling, - so capture filters given as non-option arguments at the end of the - command line don't work. (The Linux getopt() man page says that a - leading - "is used by programs that were written to expect options and - other argv-elements in any order and that care about the ordering of the - two." We are not such a program.) - - Change-Id: I5610cf90a8218d48f7516abacc367e0affa3b549 - Based-On-A-Change-From: Peter Hatina <phatina@redhat.com> - Reviewed-on: https://code.wireshark.org/review/6071 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 0a0ce2b -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Dec 26 18:21:05 2014 -0800 - - Check for optreset in CMake as well. - - Change-Id: I74aae1d68f48702b0cd1289cdafdfff8d817b5f4 - Reviewed-on: https://code.wireshark.org/review/6068 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit eff91ed -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Fri Dec 26 23:39:48 2014 +0100 - - Fix building of color conversation filter - - Right now eth filter (the last one tried) is always applied - - Change-Id: Ibe5d3c30033bd2d385bd1e68b20388114673cb5c - Reviewed-on: https://code.wireshark.org/review/6064 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit c2c9a09 -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Dec 26 14:37:31 2014 -0800 - - Use getopt_long() for the first pass through the argument list. - - That way: - - 1) we don't have to worry about the system getopt() and our - getopt_long(), on platforms that have getopt() but not - getopt_long() (Solaris prior to Solaris 10, HP-UX, AIX), not - working well together; - - 2) if necessary, we can handle long options in the first pass. - - Switch to using getopt_long() for the *second* pass for the GTK+ version - of Wireshark. - - Use the documented mechanism for resetting the argument parser for the - glibc version of getopt_long(); use the mostly-undocumented-but-at-least- - they-documented-optreset mechanism for the *BSD version. - - (We should look into doing only one pass, saving away arguments that - can't fully be processed in the first pass for further processing after - initializing libwireshark.) - - Change-Id: Ide5069f1c7c66a5d04acc712551eb201080ce02f - Reviewed-on: https://code.wireshark.org/review/6063 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 2c6d2bb -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Fri Dec 26 23:21:35 2014 +0100 - - UDP: fix 'Follow Stream' button from conversations tab - - Add stream index to conversation table - - Change-Id: Id63b2cc0000d89297c8638b9a89315096fc5458b - Reviewed-on: https://code.wireshark.org/review/6062 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit a2beef9 +commit 678a9b6 Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Fri Dec 26 23:09:04 2014 +0100 +Date: Thu Feb 12 17:14:12 2015 +0100 - Fix assertion when applying conversation color + BT ATT: memory given to add_new_data_source() must be allocated in pinfo scope - Packet scoped memory cannot be used here; let's use the pinfo pool - - Change-Id: If76605f7a3021f5900fd46ce7d1c642a518c902f - Reviewed-on: https://code.wireshark.org/review/6061 + Bug: 10952 + Change-Id: I0eb8e6891c35c70c9d405db87824c442caaa2f30 + Reviewed-on: https://code.wireshark.org/review/7085 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit ea6a578 +commit ef21740 Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Fri Dec 26 22:43:55 2014 +0100 +Date: Thu Feb 12 14:32:12 2015 +0100 - Try to fix compilation broken by g3d3f973 + Gryphon: do not use col_set_str with non constant strings - Change-Id: I26833e9a4f7557b5824effaff16b38d2c4367772 - Reviewed-on: https://code.wireshark.org/review/6059 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 3d3f973 -Author: Michael Mann <mmann78@netscape.net> -Date: Sun Dec 21 08:02:26 2014 -0500 - - Replace ip_to_str with [ep_]address_to_str and tvb_ip_to_str. + Fixes an ASAN failure reported by Alexis - Change-Id: I40d0c8253743183aecef252040b7dd6742ae5c71 - Reviewed-on: https://code.wireshark.org/review/5934 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit b68fb9b -Author: Bill Meier <wmeier@newsguy.com> -Date: Wed Dec 24 10:44:03 2014 -0500 - - Fix some dissectors doing termio (fprintf(stderr,..), g_warning()). - - - Use report_...failure() (in most cases). - - Also: Do some misc fixes in certain disectors - - re-arrange order of #includes - - Fixup preferences help text - - Change-Id: I385f6f97257f365f53ce611df02f57f9257dc5f9 - Reviewed-on: https://code.wireshark.org/review/6039 - Petri-Dish: Bill Meier <wmeier@newsguy.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 4cf6583 -Author: Michael Mann <mmann78@netscape.net> -Date: Fri Dec 26 09:44:30 2014 -0500 - - Remove proto_tree_add_text from ZigBee dissectors. - - Change-Id: I0488cb0ab33f2cc6dee227f1bfacec58eafc4190 - Reviewed-on: https://code.wireshark.org/review/6055 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit a442a1c -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Fri Dec 26 19:52:38 2014 +0100 - - WCCP: initialize address table to 0 - - It prevents an uninitialized access later on if an exception is triggered before filling the table - - Bug: 10806 - Change-Id: I8f75fb18cd8d033013c34093f9d6c8762f23452b - Reviewed-on: https://code.wireshark.org/review/6056 + Change-Id: I68e5c55ec4090766ef5f003f44093ce3c268a82a + Reviewed-on: https://code.wireshark.org/review/7082 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit f2224bc -Author: Bill Meier <wmeier@newsguy.com> -Date: Wed Dec 10 01:52:31 2014 -0500 - - rpc: Prevent "malformed" for RPC 'NULL proc' packets. - - Bug: 10646 - Change-Id: Ifb96768969a43c59367b73e7bb940ceeb02cf6b0 - Reviewed-on: https://code.wireshark.org/review/5700 - Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit adb81f3 -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Thu Dec 25 22:34:06 2014 +0000 +commit 7594d96 +Author: Roland Knall <roland.knall@br-automation.com> +Date: Thu Feb 12 10:03:37 2015 +0100 - Deleting unnecessary #includes from dissectors. - Fifth batch (packet-rtp.c -> end). + nmake: Allow Cygwin path to be provided - Will look at cleaning up and committing script afterwards. + I have installed cygwin at a different location then the default + location. Therefore the nmake steps tend to fail, and I will have + to adapt the config.nmake script every time. - Change-Id: I8ed61dc941d98d3f7259a9d1f74e214eb7b4bfa2 - Reviewed-on: https://code.wireshark.org/review/6052 - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> - -commit 9c7c72d -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 22 22:50:49 2014 +0100 - - VoIP Calls: Missing break in switch (CID 1155515) + This patch allows the CYGWIN_PATH variable to be set outside + the build-script - Change-Id: Ie62cd2901c791490fe6685f560815e09b921d03b - Reviewed-on: https://code.wireshark.org/review/6001 + Change-Id: Iaecdd2aa72a0529574fab7e6aeae18fbfd621721 + Reviewed-on: https://code.wireshark.org/review/7078 + Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit e08eba9 -Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Dec 25 13:03:09 2014 -0800 - - Only include <wsutil/os_version_info.h> if we need it. - - Change-Id: Idee0e7205969ac2e7b33c4748a1463a0bfffe0a6 - Reviewed-on: https://code.wireshark.org/review/6051 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit ceeeea0 -Author: Hadriel Kaplan <hadriel@128technology.com> -Date: Mon Dec 22 19:14:49 2014 -0500 +commit 34acb73 +Author: Anish Bhatt <anish@chelsio.com> +Date: Mon Feb 9 18:39:27 2015 -0800 - Lua accessor for Protocol field type gets wrong data + [IS-IS-LSP] Add support for Prefix-SID subTLV - When a Lua dissector/tap accesses the value of a Field of FT_PROTOCOL ftype, the - returned ByteArray contains the wrong data. Also, calling such a field's - tostring() method returns a string of "(unknown)" instead of the hex of the - data. - - Bug: 10801 - Change-Id: I8a0642dc0e41af444d211bbe4106cd21207084a6 - Reviewed-on: https://code.wireshark.org/review/6003 + Bug: 10679 + Change-Id: I4f2627aa22c64593258121a7e70b3f341e025d2e + Reviewed-on: https://code.wireshark.org/review/7048 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - Tested-by: Hadriel Kaplan <hadrielk@yahoo.com> - -commit 2391a43 -Author: Hadriel Kaplan <hadriel@128technology.com> -Date: Wed Dec 24 15:04:01 2014 -0500 - - Bug 10233 - Wireshark crashes if Lua heuristic dissector returns true - - Because call_heur_dissector_direct() didn't set the pinfo->heur_list_name - before calling the heuristic dissector, heur_dissect_lua() would invoke - report_failure(). Unfortunately, calling report_failure() within a dissector - can cause problems because GTK continues invoking timed callbacks while - it displays the modal dialog created by report_failure()... without yet - returning from report_failure(). In such a case, it's possible for - epan_dissect_run() to be called while still within the execution of a - previous call to epan_dissect_run(), which casues an assert since - epan_dissect_run() is not reentrant. - - So this commit both fixes the call_heur_dissector_direct() bug as well - as avoids using report_failure() within heur_dissect_lua(). It also - upadtes the dissector.lua script used in the testsuite to match the one - pubshied on the wiki, since that script's heuristic dissector triggered - the bug. - - Bug: 10233 - Change-Id: If022604347745fadac01c02d370ca1a5d3f88b5b - Reviewed-on: https://code.wireshark.org/review/6040 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> - Tested-by: Hadriel Kaplan <hadrielk@yahoo.com> - -commit de8c81c -Author: Guy Harris <guy@alum.mit.edu> -Date: Thu Dec 25 01:13:24 2014 -0800 - - Use getopt_long(). - - Change-Id: I8ff74de7cedee64bc46d88f23a6d1e771d4a4a10 - Reviewed-on: https://code.wireshark.org/review/6048 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 20503c7 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 24 17:10:40 2014 -0800 - - Check for getopt_long(), not getopt(). - - We support three types of platforms: - - 1) UN*Xes that have both getopt() and getopt_long(); - - 2) UN*Xes that have getopt() but not getopt_long(); - - 3) Windows, which has neither. - - Checking for getopt_long() lets us distinguish between 1) and 2) and - build getopt_long() for them. - - Change-Id: Iaf0f142f9bebaa2eed2128d544ec9786711def45 - Reviewed-on: https://code.wireshark.org/review/6045 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit b6f70ed -Author: Ilya Gavrilov <ilya.dev@gmail.com> -Date: Tue Dec 23 19:48:56 2014 +0300 +commit 60cc8b4 +Author: Dario Lombardo <lomato@gmail.com> +Date: Wed Feb 4 10:25:16 2015 +0100 - NBAP: fix ddi missed for non first macdflow_id in E-DCH channel + Support for looking for incomplete dissectors. - Change-Id: Ib93cac8a4b186114f50ef4a26bdace2d72219644 - Reviewed-on: https://code.wireshark.org/review/6022 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I03e592dd3d54fc0e1c4af09d5d5336dda93f950e + Reviewed-on: https://code.wireshark.org/review/6978 + Reviewed-by: Evan Huus <eapache@gmail.com> + Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 2233ef5 +commit 207b52a Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 24 16:13:11 2014 -0800 +Date: Thu Feb 12 02:25:31 2015 -0800 - Include some files based on whether the functions they define are present. - - Rather than including wsgetopt.c, inet_aton.c, and strptime.c iff we're - building for Windows: + tvb_length is a macro wrapper for tvb_captured_length; use tvbuff_length. - include wsgetopt.c iff we don't have getopt(); + This squelches a compiler warning on some platforms. - include inet_aton.c iff we don't have inet_aton(); - - include strptime.c iff we don't have strptime(). - - Change-Id: Ibd68306ac372a4ae102c3220a94cdf6ecb04e58c - Reviewed-on: https://code.wireshark.org/review/6044 + Change-Id: Ibee5c2fe07fc58e22a860b4c4467a501c2b8a979 + Reviewed-on: https://code.wireshark.org/review/7079 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 153c63d -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 24 15:54:47 2014 -0800 - - Don't use extra variables for ws_mempbrk_sse42.c and popcount.c - - Instead, just add to WSUTIL_FILES as necessary. - - Change-Id: Iecadbd9a66ec54ee5d90aecfbfe5e636ae56e27e - Reviewed-on: https://code.wireshark.org/review/6043 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit c01bad2 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 24 15:36:55 2014 -0800 - - Add -msse4.2 to the compiler flags if it's supported. - - Change-Id: I354c5141f8fbe306a71395622effeb97df97f3ce - Reviewed-on: https://code.wireshark.org/review/6042 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 499a7d0 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Dec 24 10:46:41 2014 +0100 - - TCP: TCP Fast Open Cookie is now standardised - - The kind for TFO is 34 - - Split dissect TFO option in dedicated function (Using also in TCP Option Experimental with Magic 0xf989) - - Change-Id: I18ff9ba110fba708a955f448f272ec7c4a7e264e - Reviewed-on: https://code.wireshark.org/review/6033 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 59bdad3 -Author: Stephen Fisher <sfisher@sdf.org> -Date: Wed Dec 24 15:59:59 2014 -0700 - - packet-git.c says it was copied from packet-pop, but that doesn't mean - packet-git is for "RFC 1939" (POP3), so remove that comment. - - Change-Id: Ia78ea18beb1a13ab0ad1ad5a87f7b5a887fad918 - Reviewed-on: https://code.wireshark.org/review/6041 - Reviewed-by: Stephen Fisher <sfisher@sdf.org> - -commit 1bbe6e6 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Dec 24 10:49:58 2014 +0100 - - TCP: fix indent and reorder Multipath TCP - - Change-Id: I4ebe474f2a2787c350fe8c4a2de5c35d94d9b064 - Reviewed-on: https://code.wireshark.org/review/6032 - Reviewed-by: Matthieu Coudron <mattator@gmail.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 4b6141b -Author: Hadriel Kaplan <hadriel@128technology.com> -Date: Tue Dec 23 16:34:01 2014 -0500 - - GIOP dissector doesn't handle two packets in a row - - Make the GIOP TCP-based dissector correctly handle multiple GIOP - messages in a TCP segment, and when the second is malformed. - - Bug: 10760 - Change-Id: Ie82a1d72a43218e50c6856028a5ef25ad1f0c340 - Reviewed-on: https://code.wireshark.org/review/6025 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit e03ffe2 -Author: Michael Mann <mmann78@netscape.net> -Date: Sun Dec 21 13:51:20 2014 -0500 - - Replace fc_to_str with address_to_str or tvb_fc_to_str. - - Change-Id: I69bf25f5abb9d6ad325f922fab73b6f0cf8ca2ea - Reviewed-on: https://code.wireshark.org/review/6035 - Petri-Dish: Anders Broman <a.broman58@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit d3888ff -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Dec 24 16:42:23 2014 +0100 +commit 7075223 +Author: Michal Labedzki <michal.labedzki@tieto.com> +Date: Mon Feb 9 08:56:28 2015 +0100 - RSVP: fix display of unknown Juniper Attribut + Little tuning of proto_tree_add_bytes_with_length - Get "Trying to fetch an unsigned integer with length" when length > 4 + Change name from proto_tree_add_new_bytes to + proto_tree_add_bytes_with_length and other tweaks + pointed by Peter Wu. - Change-Id: If5e53b826d98f2c30253ea852754f856e1d29088 - Reviewed-on: https://code.wireshark.org/review/6038 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I6058c28a74a154e2882e4eb04558bedcede6f508 + Reviewed-on: https://code.wireshark.org/review/7039 + Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> -commit 762bb18 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Dec 24 16:16:26 2014 +0100 +commit 4359cb8 +Author: Anders Broman <a.broman58@gmail.com> +Date: Thu Feb 12 08:33:21 2015 +0000 - RSVP: Conversations / Endpoint: wrong filter when select a RSVP conversations / endpoint (INVALID == a.x.y.z ...) + Revert ""Hide" hashether_t structure." - Change-Id: I70f6afd41eefddb42829c3d5f890ea67dcd65537 - Reviewed-on: https://code.wireshark.org/review/6037 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 04a1f33 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Dec 24 10:25:32 2014 +0100 - - test suite: (Minor) fix some double space + This reverts commit 297ef07b9b2f5b681234d0c31269996413262cbc. - Change-Id: I7fe7cd7ed471b8fcd2afd5fb4bbc180b580295b3 - Reviewed-on: https://code.wireshark.org/review/6031 + Change-Id: Id47f5fd221b631c95ca71e3f9315f5263bab22de + Reviewed-on: https://code.wireshark.org/review/7077 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit bfa9ddf -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 22 20:56:15 2014 +0100 +commit 53228c4 +Author: Anders Broman <a.broman58@gmail.com> +Date: Thu Feb 12 08:33:02 2015 +0000 - Qt (pref.gui_layout_type): Missing break in switch (CID 1159202 & 1159203) + Revert "Make get_manuf_name return a const string." - Change-Id: I28af99cff5db310ef10258e3054afa7337df1e60 - Reviewed-on: https://code.wireshark.org/review/5996 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 4876016 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 22 20:54:10 2014 +0100 - - Qt (KeyPressEvent): Missing break in switch (CID 1159205, 1159206, 1159208, 1159209) + This reverts commit 797ea88aefc2f45dba7e77d2dcaebe68ac1a4fac. - Change-Id: I40b7c7eefb269570e6a1c5c9ec310fa97840d42d - Reviewed-on: https://code.wireshark.org/review/5995 + Change-Id: I9bc2cef0051d88c6374c6f1868b0250cba3edbd4 + Reviewed-on: https://code.wireshark.org/review/7076 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 2d8ec49 -Author: Stephen Fisher <sfisher@sdf.org> -Date: Tue Dec 23 14:58:38 2014 -0700 - - Move twelve show_version() functions from the varoius programs and - Wireshark UI files into a single one in wsutil. - - Change-Id: I0a64f0cc8106bd681bd185289c36272c4c43baad - Reviewed-on: https://code.wireshark.org/review/6026 - Reviewed-by: Stephen Fisher <sfisher@sdf.org> - -commit 45daef6 -Author: Stephen Fisher <sfisher@sdf.org> -Date: Tue Dec 23 17:55:48 2014 -0700 - - Put a C comment in dummy.cpp so the user knows where dummy.cpp came from - if it is ever created during the build process. - - Change-Id: Ib3131f63c965ae243f25f98f6209e049323d8360 - Reviewed-on: https://code.wireshark.org/review/6030 - Petri-Dish: Stephen Fisher <sfisher@sdf.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Stephen Fisher <sfisher@sdf.org> - -commit 29d02a3 -Author: Enrico Jorns <ejo@pengutronix.de> -Date: Tue Nov 25 10:34:19 2014 +0100 +commit 797ea88 +Author: Michael Mann <mmann78@netscape.net> +Date: Wed Feb 11 22:16:01 2015 -0500 - canopen: Verbosity for INFO column + Make get_manuf_name return a const string. - Display basic information about what is going on in the INFO column to - ease protocol debugging. + Model get_manuf_name after get_ether_name so that a string (either name resolved or colon-separated bytes) is always stored in a hash table. This will make name resolution of addresses perform a little better because it doesn't have to work about the wmem_allocator. - Change-Id: I2a3aba8008bf65ab9e236a3d81335cf723b2edd0 - Reviewed-on: https://code.wireshark.org/review/5521 + Change-Id: I80f465ae0845290255a659ab63310ac3cc35506e + Reviewed-on: https://code.wireshark.org/review/7075 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit a0e9fe5 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 22 20:17:46 2014 +0100 - - TDS: Missing break in switch (CID 280475 & 281377) - - Change-Id: I9416e07f497081f7117e8c3ccb741ea601de9cdd - Reviewed-on: https://code.wireshark.org/review/5993 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit 37773b7 -Author: Stephen Fisher <sfisher@sdf.org> -Date: Tue Dec 23 17:30:21 2014 -0700 - - Insert URLs for finding Wireshark's dependencies in README.bsd - - Change-Id: Idb49181672b83eb4c074409f5b7487cce054833f - Reviewed-on: https://code.wireshark.org/review/6029 - Reviewed-by: Stephen Fisher <sfisher@sdf.org> - -commit bcbfe79 -Author: Stephen Fisher <sfisher@sdf.org> -Date: Tue Dec 23 16:07:38 2014 -0700 - - Update README.bsd, mainly to put just the primary dependencies that - Wireshark needs and remove the others since GTK2/GTK3/Qt require - different things and those may change over time so let those programs - tell the user what they need. - - Change-Id: I64d038564f6151d4a46d986e677f2cdc13ff87f2 - Reviewed-on: https://code.wireshark.org/review/6028 - Reviewed-by: Stephen Fisher <sfisher@sdf.org> - -commit afbdf10 -Author: Stephen Fisher <sfisher@sdf.org> -Date: Tue Dec 23 15:24:57 2014 -0700 - - Change version info string "without locale" to "with default locale" so - it doesn't sound as though something is missing. - - Change-Id: Ifa584357c4613fd898824db011329971c9561c41 - Reviewed-on: https://code.wireshark.org/review/6027 - Reviewed-by: Stephen Fisher <sfisher@sdf.org> - -commit 7d87adf -Author: Stephen Fisher <sfisher@sdf.org> -Date: Tue Dec 23 13:42:35 2014 -0700 - - packet-reload needs conversation.h still - - Change-Id: I75415dfcfa1c63bd9c43b7bedab2ac3873a60326 - Reviewed-on: https://code.wireshark.org/review/6024 - Reviewed-by: Stephen Fisher <sfisher@sdf.org> - -commit 0b6adfc -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Dec 18 22:17:48 2014 +0100 - - Add .mailmap: fix duplicate/wrong e-mail or name in commit log - - It will be reused form generate AUTHORS file - - Change-Id: I43c388df34551b898f15913c2625b1996ace0cbc - Reviewed-on: https://code.wireshark.org/review/5841 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Lukas Emersberger <lukas.emersberger@gmail.com> - Reviewed-by: Michael Tüxen <tuexen@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit 7e8a4b0 -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Tue Dec 23 17:10:40 2014 +0000 - - Deleting unnecessary #includes from dissectors. - Fourth batch (packet-mac-lte.c -> packet-rtp.c). - - Will look at cleaning up and committing script afterwards. - - Change-Id: Id921f07f4b274f0cfb77ce81abe4a285fdb8b644 - Reviewed-on: https://code.wireshark.org/review/6023 - Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> - -commit 9d7709e -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Tue Dec 23 15:15:15 2014 +0000 - - Restore prefs.h for ipv6 too - - Change-Id: Ibdc7098532c1aff7ec6135b8e4460056049f9089 - Reviewed-on: https://code.wireshark.org/review/6020 - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> - -commit 78edcff -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Tue Dec 23 15:02:35 2014 +0000 - - Adding back epan/prefs.h to try to fix build - - Change-Id: Ie532d81817653edfb20b7afefb28be21a627b239 - Reviewed-on: https://code.wireshark.org/review/6019 - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> - -commit 86ed26f -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Tue Dec 23 14:37:44 2014 +0000 - - Deleting unnecessary #includes from dissectors. - Third batch (packet-icmpv6.c -> packet-mac-lte.c). - - Will look at cleaning up and committing script afterwards. - - Change-Id: Ib91e36ad200db01c3000605f6a7a21125b96a640 - Reviewed-on: https://code.wireshark.org/review/6018 - Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> - -commit 377555e -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Tue Dec 23 11:25:10 2014 +0100 - - [column utils] fix warning: unknown command tag name [-Wdocumentation-unknown-command] - - Change-Id: I5a14875b4b61ae7635095bdf9f2ab18dd9dbfc09 - Reviewed-on: https://code.wireshark.org/review/6012 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit c670adc -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 22 20:52:47 2014 +0100 - - DOCSIS: missing break in switch (CID 280485 & 280486) - - Change-Id: I5b756b96ca6c3c48a43948d456bfcb07aab527fd - Reviewed-on: https://code.wireshark.org/review/5994 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 91cc343 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 22 22:49:08 2014 +0100 - - Qt (emitAppSignal): Missing break in switch (CID 1159204) - - Change-Id: Ia2ba40a4fc284dbf3da8e27edf336a4e27cdb4e3 - Reviewed-on: https://code.wireshark.org/review/6000 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 35949f3 -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Tue Dec 23 12:56:29 2014 +0000 - - Restore stdlib.h (should not have been deleted - mispelt in script) - - Change-Id: I43387489ed29beff5a523e78cabcfb9e3ea8a182 - Reviewed-on: https://code.wireshark.org/review/6015 - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> - -commit 28e24ad -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Tue Dec 23 12:37:32 2014 +0000 - - epan/llcsaps.h was needed, so restore include - - Change-Id: I443db244bde04af9397bcb5bfa3a1888b0560bf0 - Reviewed-on: https://code.wireshark.org/review/6014 - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> - -commit 48db254 -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Tue Dec 23 11:34:43 2014 +0000 - - Deleting unneccessary #includes from dissectors. - Second batch (packet-eth.c -> packet-icmpv6.d). - - Will look at cleaning up and committing script afterwards. - - Change-Id: I14295758b81a59115d8c88899f166cc3d5d17594 - Reviewed-on: https://code.wireshark.org/review/6013 - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> - -commit 0e78f7e -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 22 19:44:29 2014 +0100 - - RTPS: Missing break in switch (CID 996922) - - Change-Id: I2b8a12d54414a1b2d878285b8c840de9586fcb5e - Reviewed-on: https://code.wireshark.org/review/5992 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit b87b3db -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 22 19:42:39 2014 +0100 +commit 297ef07 +Author: Michael Mann <mmann78@netscape.net> +Date: Wed Feb 11 20:13:36 2015 -0500 - NetScaler Trace: Missing break in switch (CID 281457, 727776 & 1021060) + "Hide" hashether_t structure. - Change-Id: I575114ba364da1b1d63eea8fc7b48c8c0e0bc99d - Reviewed-on: https://code.wireshark.org/review/5991 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 216cc12 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 22 19:20:15 2014 +0100 - - NASDAQ ITCH: Missing break in switch (CID 280465) + One use in a GUI function isn't really enough to justify making the structure public. - Change-Id: I0f3ef7a39d9659b14ff472d2d3e59565db43ec3e - Reviewed-on: https://code.wireshark.org/review/5990 + Change-Id: I6d70b9bacbc0fa1898150f59c0c69779a6cd5d51 + Reviewed-on: https://code.wireshark.org/review/7074 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 4df2306 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 22 19:16:52 2014 +0100 +commit d3d0a0a +Author: Guy Harris <guy@alum.mit.edu> +Date: Wed Feb 11 14:19:57 2015 -0800 - ISNS: Missing break in switch (CID 280460) + Fix SSE 4.2 checks. - Change-Id: Iaaa56e17e49cd42e18e55e316c691a22bbbdf8f1 - Reviewed-on: https://code.wireshark.org/review/5989 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit f103865 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sun Dec 21 16:15:10 2014 +0100 - - RSVP: RECORD_ROUTE IPv4 Subobject Flags field incorrect decoding + CMake has "normal" and "cache" variables, and unexpected things happen + if you have a normal and a cache variable with the same name. + Apparently, check_c_compiler_flag() currently sets its result variable + as a cache variable, and set(), by default, sets it as a normal + variable. - The Flags field within RSVP RECORD_ROUTE IPv4_Subobject is decoded incorrectly. - Wireshark thinks that 0x10 bit represents Node-ID, but actually the Node-ID is encoded by bit 0x20 (per RFC 4561) + This means that there are two different HAVE_SSE4_2 variables, and the + top-level CMakeLists.txt looks at the cache variable when it creates + config.h; this means that if the nmmintrin.h test fails, config.h still + says we have SSE 4.2. - Issue reported by Alexander Okonnikov + Instead, use separate variables for the "compiler can be made to + generate SSE 4.2 code" test and the "nmmintr.h works" test; that way we + don't have to worry about normal vs. cache variables (and don't have to + worry about CMake changing what type of variable particular + functions/macros set). - Bug:10799 - Change-Id: I48f6aa35c08945aacf8f2bb871a72b5927511948 - Reviewed-on: https://code.wireshark.org/review/5944 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit f1562e2 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Fri Dec 19 12:11:53 2014 +0100 - - NDPS: Missing break in switch (CID 281286) - - Change-Id: I2363370249d7beb2ed8a29987ac2cb602979d0a3 - Reviewed-on: https://code.wireshark.org/review/5988 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit cd55821 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 22 16:29:01 2014 +0100 - - test suite: fix indent (use tabs) and add modelines - - Change-Id: I648d02d41f92c7fd176ce194eee20a2d19643fe0 - Reviewed-on: https://code.wireshark.org/review/5985 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit c3d7080 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 22 16:28:19 2014 +0100 + Change-Id: I618ad402b248f35fffd822974b6a569d4e5d6398 + Reviewed-on: https://code.wireshark.org/review/7073 + Reviewed-by: Guy Harris <guy@alum.mit.edu> - Makefile (epan/dissectors): fix indent (use tabs) - - Change-Id: I72d2dbc05f7cfbd7adf05ed66be81946942cef3b - Reviewed-on: https://code.wireshark.org/review/5984 - Reviewed-by: Anders Broman <a.broman58@gmail.com> +commit 0dbf741 +Author: Jiří Engelthaler <engycz@gmail.com> +Date: Wed Feb 11 13:57:15 2015 +0100 -commit 7208591 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 22 16:27:14 2014 +0100 - - CMake (epan/CMakeList.txt): fix indent (use tabs) + packet-iec104: fix packet information text - Change-Id: I40e05f1e4430eadc480134cd62dd01f978353b67 - Reviewed-on: https://code.wireshark.org/review/5983 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit b5ff13a -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 22 16:24:24 2014 +0100 - - UseLemon (CMake): Fix indent (use space) + Change I6abc157368a78e1abfde672728b88a36ba6e76cc adds break in "switch case" but there was missing break deliberately. Code modified to let break on his place - copied code from the following condition. - Change-Id: I619d64d62d2fb96ab904d5ea15e3c37aa0319540 - Reviewed-on: https://code.wireshark.org/review/5982 + Change-Id: Id008955fbc122c0f8cfe06af2b96f0b643e9417f + Reviewed-on: https://code.wireshark.org/review/7066 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 3d05935 +commit 0cd2582 Author: Bill Meier <wmeier@newsguy.com> -Date: Tue Dec 23 01:01:13 2014 -0500 +Date: Wed Feb 11 11:56:25 2015 -0500 - kerberos: Re-add needed #include <stdio.h> + Prevent two false positive MSVC2013 Code Analysis warnings - Change-Id: I85c0e5f022b5c04df6079e118e376e8d598675aa - Reviewed-on: https://code.wireshark.org/review/6011 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit dd859ea -Author: Bill Meier <wmeier@newsguy.com> -Date: Tue Dec 23 00:32:58 2014 -0500 - - asn1 generated dissectors: cleanup #include usage + Message: "Using uninitialized memory" - Change-Id: I36b2731d67f9345d2fd0c23800bba7d2be94c387 - Reviewed-on: https://code.wireshark.org/review/6008 + Change-Id: Ib7d381beb9f9c1f3ec19a376c0c8c0d5ef85f373 + Reviewed-on: https://code.wireshark.org/review/7069 Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit 17582d3 +commit 3c9c9bc Author: Bill Meier <wmeier@newsguy.com> -Date: Tue Dec 23 00:27:27 2014 -0500 +Date: Wed Feb 11 11:51:56 2015 -0500 - asn1/Makefile.nmake: packet-c1222.c not autogenerated using Windows nmake + capture_dlg.c: Fix (possibly valid) "Using uninitialized memory" MSVC2013 Code Analysis warning - Change-Id: I21628bdd1a08348629350a373f1c20e02c3618f7 - Reviewed-on: https://code.wireshark.org/review/6007 + Change-Id: I849b731420d779b68ab4335eb8d06482ecd649e7 + Reviewed-on: https://code.wireshark.org/review/7068 Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit 1b37f4c -Author: Guy Harris <guy@alum.mit.edu> -Date: Mon Dec 22 21:03:46 2014 -0800 +commit 9db51df +Author: Michael Mann <mmann78@netscape.net> +Date: Tue Feb 10 22:57:47 2015 -0500 - Cmake: check for popcount, and build it from wsutil/popcount.c if missing. + Remove address_to_str_buf from hsrp dissector "heuristics" as its much faster to just compare the IPv4 address as a 32-bit value. - Change-Id: Id646a9f0b1fc6acafa99a78725e3f0ec8a48c170 - Reviewed-on: https://code.wireshark.org/review/6006 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: If5a819b74112e92636d036509cb30ea15b2d5e3d + Reviewed-on: https://code.wireshark.org/review/7067 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 4009231 -Author: Stephen Fisher <sfisher@sdf.org> -Date: Mon Dec 22 17:44:20 2014 -0700 +commit a822d85 +Author: AndersBroman <anders.broman@ericsson.com> +Date: Wed Feb 11 12:27:52 2015 +0100 - Try to fix Windows build for popcount() unresolved external symbol + Try to fix the debian symbols - Change-Id: Ie154caa1967ce4016dd52eefcf757e2e58d7ac68 - Reviewed-on: https://code.wireshark.org/review/6005 - Reviewed-by: Stephen Fisher <sfisher@sdf.org> + Change-Id: I234f42e5488d2044d0c68f499814fe9a51b220dd + Reviewed-on: https://code.wireshark.org/review/7064 + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit ae6df38 -Author: Stephen Fisher <sfisher@sdf.org> -Date: Mon Dec 22 17:18:20 2014 -0700 +commit a837570 +Author: Hadriel Kaplan <hadrielk@yahoo.com> +Date: Fri Feb 6 13:52:37 2015 -0500 - packet-dtls.c still needs conversation.h + Combine SSE and pre-compiled patterns for faster pbrk - Change-Id: I1e6a55c41cbab74790880da2b3691cd7d82bc276 - Reviewed-on: https://code.wireshark.org/review/6004 - Reviewed-by: Stephen Fisher <sfisher@sdf.org> - -commit 3d62d2c -Author: Stephen Fisher <sfisher@sdf.org> -Date: Mon Dec 22 13:50:10 2014 -0700 - - Move popcount() to an optionally built part of wsutil for systems that - provide their own popcount(). + This combines the SSE4.2 instructions usage, with pre-compiled + pattern searching usage, for a faster pbrk search method. - Change-Id: Ic26f3b50cf0bd2b4af0d42e9c27488ebbac1ab33 - Reviewed-on: https://code.wireshark.org/review/5998 - Petri-Dish: Stephen Fisher <sfisher@sdf.org> - Reviewed-by: Stephen Fisher <sfisher@sdf.org> - -commit 59b4ab5 -Author: Guy Harris <guy@alum.mit.edu> -Date: Mon Dec 22 13:51:34 2014 -0800 - - Include <math.h> or <stdlib.h> as necessary to declare functions. - - Various floating-point math functions require <math.h>, and abs() - requires <stdlib.h>. + Testing against large files of HTTP and SIP, there is about + a 5% performance improvement by using pre-"compiled" patterns + for guint8_pbrk() instead of passing it the search string and + having it build the match array every time. + Similar to regular expressions, "compiling" the pattern match array + in advance only once and using the "compiled" patterns for + the searches is faster than compiling it every time. - Change-Id: I6831cfdb17eac3ce129b6800f0fe82fbcfef2d28 - Reviewed-on: https://code.wireshark.org/review/6002 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: Ifcbc14a6c93f32d15663a10d974bacdca5119a8e + Ping-Bug: 10798 + Reviewed-on: https://code.wireshark.org/review/6990 + Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit d541774 -Author: Guy Harris <guy@alum.mit.edu> -Date: Mon Dec 22 13:23:51 2014 -0800 +commit a618f1c +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Tue Feb 10 11:04:48 2015 +0100 - Include <math.h> or <stdlib.h> as necessary to declare functions. + USB: put back interface class when dissecting URB_CONTROL - Various floating-point math functions require <math.h>, and abs() - requires <stdlib.h>. + Also ensure that USB COM dissection is done with the parent tree and not setup one - Change-Id: Iadba9e0d7168bba6e67d9221e757a85960507742 - Reviewed-on: https://code.wireshark.org/review/5999 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 596669f -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Mon Dec 22 19:57:31 2014 +0000 - - First batch of unincludes. Last attempt... - - Change-Id: I3681462aeb98ca62ed3ec5eb226b2553317391a9 - Reviewed-on: https://code.wireshark.org/review/5997 - Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> - Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> - -commit b018128 -Author: Stephen Fisher <sfisher@sdf.org> -Date: Mon Dec 22 11:06:05 2014 -0700 - - Cast a parameter in the kerberos dissector so it compiles without - warnings on NetBSD. - - Change-Id: Id1ab5020fa53656065b0b2438071342eae4f7adb - Reviewed-on: https://code.wireshark.org/review/5987 - Petri-Dish: Stephen Fisher <sfisher@sdf.org> + Change-Id: Iae9f933ff29b3854879375df320a23e623ea785f + Reviewed-on: https://code.wireshark.org/review/7051 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Stephen Fisher <sfisher@sdf.org> + Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> + Tested-by: Martin Kaiser <wireshark@kaiser.cx> -commit 5cdad9f +commit c34ded4 Author: Gerald Combs <gerald@zing.org> -Date: Sun Dec 21 13:23:02 2014 -0800 +Date: Sun Feb 8 12:24:19 2015 -0800 - Qt: Add methods to CaptureFile and WiresharkApplication. + Qt/C++: Change a bunch of includes to forward declarations. - Add isValid, fileTitle, and retapPackets methods to CaptureFile. Add - application name and title separator convenience methods to - WiresharkApplication. + In theory this this should reduce compilation times. On my particular + system it makes no difference but hopefully it will elsewhere. - Convert traffic tables, conversations, and endpoints to use CaptureFile - directly and to let the user know when the capture file is closed. Set - the file dialog titles while we're here. - - Change-Id: I990392786d3833e1e0b3638aa2d34a5ada39fa13 - Reviewed-on: https://code.wireshark.org/review/5957 + Change-Id: I570177d3ca4eec691c82d46b4dbbce74092aac1d + Reviewed-on: https://code.wireshark.org/review/7060 Petri-Dish: Gerald Combs <gerald@wireshark.org> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 30c3d39 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 22 10:49:21 2014 +0000 - - Revert "Move packet-kerberos.c to the dirty dissectors because it generates warnings (at least on NetBSD), presumably due to our use of -Wc++-compat:" - - This reverts commit d4ff430b4dc5cf0e3efaabd2ef53778070def558. - - Change-Id: Icb0907e649555237b4a86f9f651ec4df8d79d99b - Reviewed-on: https://code.wireshark.org/review/5975 - Reviewed-by: Stephen Fisher <sfisher@sdf.org> - -commit 352bd87 -Author: Sergey Avseyev <sergey.avseyev@gmail.com> -Date: Mon Dec 22 17:34:05 2014 +0300 - - packet-couchbase.c: remove field which does not exists - - Change-Id: Ia4a2a6127edbb6a92becf22cd6ee689e5e2a7966 - Reviewed-on: https://code.wireshark.org/review/5981 - Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit 5248c0d -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 22 12:13:34 2014 +0100 - - Fix unknown command tag name [-Wdocumentation-unknown-command] - - Change-Id: I6c2564a86e13d9321001856ba1f51681a9f20976 - Reviewed-on: https://code.wireshark.org/review/5979 - Reviewed-by: Evan Huus <eapache@gmail.com> - -commit ed2df3b -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 22 11:42:58 2014 +0100 +commit 88d62df +Author: Martin Mathieson <martin.r.mathieson@googlemail.com> +Date: Tue Feb 10 17:30:58 2015 +0000 - fix warning: parameter 'list' not found in the function declaration [-Wdocumentation] + Remove unneeded includes from plugins folder - Change-Id: Id6d02f5c1383dd8f231707f519ec1b28fb007079 - Reviewed-on: https://code.wireshark.org/review/5978 - Reviewed-by: Evan Huus <eapache@gmail.com> + Change-Id: Ifdad0fb786a97a6f84a64d442fcca0c20116552f + Reviewed-on: https://code.wireshark.org/review/7059 + Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> + Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> -commit f8720a6 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 22 12:06:36 2014 +0100 +commit d5f0df4 +Author: Martin Mathieson <martin.r.mathieson@googlemail.com> +Date: Tue Feb 10 15:48:57 2015 +0000 - ANSI MAP: Remove from Dirty ASN1 list + Add script to automatically remove includes that appear not be needed - Change-Id: I192c447919ee9c3f430f058c2e5285501af962bf - Reviewed-on: https://code.wireshark.org/review/5977 - Reviewed-by: Evan Huus <eapache@gmail.com> + Change-Id: I5474d8a906e96c688020737ca4bd4c3319ae279f + Reviewed-on: https://code.wireshark.org/review/7058 + Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> -commit 414701d -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 22 11:45:05 2014 +0100 +commit e915db7 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Tue Feb 10 13:49:28 2015 +0100 - ANSI_MAP: Fix unused function (by add to .OMIT list) + Do not iterate over reported length when using tvb_find_line_end - Change-Id: I4e2278d563659db6acc6c02b9e66d58c67939e30 - warning: unused function 'dissect_ansi_map_InvokeData' [-Wunused-function] - warning: unused function 'dissect_ansi_map_ReturnData' [-Wunused-function] - Reviewed-on: https://code.wireshark.org/review/5976 - Reviewed-by: Evan Huus <eapache@gmail.com> - -commit 3cb816c -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 22 11:32:27 2014 +0100 - - PTP: Fix ptp_tree may be used uninitialized in this function [-Werror=maybe-uninitialized] + if captured length < reported length, this will trigger an infinite loop - Change-Id: I0b82782deb568256dafd4c1bf163fd3e74f95545 - Reviewed-on: https://code.wireshark.org/review/5974 - Reviewed-by: Evan Huus <eapache@gmail.com> + Change-Id: I6557b455e7bbff12658a934e5bb13a42c023e133 + Reviewed-on: https://code.wireshark.org/review/7053 + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 67cbafa -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sun Dec 21 18:15:36 2014 +0100 +commit 7369c25 +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Tue Feb 10 12:07:47 2015 +0100 - remove unnecessary integer overflow checks - - ... and don't call THROW() from a dissector + IMAP: do not iterate over reported length when using tvb_find_line_end - If we have a guint32 a and interpret 2*a as gint, we'll always end up - with a negative value if 2*a overflows. Both tvb_get_string_enc() and - proto_tree_add_item() handle this case and throw an exception. + This function can only search in captured length buffer + This fixes an ASAN failure reported by Alexis - Change-Id: Ibb142328837b6a583057531c76d08631fc731848 - Reviewed-on: https://code.wireshark.org/review/5948 + Change-Id: Ib936f918e057423d63ff34a5fc79fed602e56dfc + Reviewed-on: https://code.wireshark.org/review/7052 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 9b3f9b7 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sun Dec 21 20:15:47 2014 +0100 +commit 29be26c +Author: Pascal Quantin <pascal.quantin@gmail.com> +Date: Tue Feb 10 07:09:56 2015 +0100 - Fix The left operand of '!=' is a garbage value issue found by Clang Analyzer + FTAM: get rid of an evil global variable - Change-Id: Ia555fc8eca2a7288c159983578cbc88dc0bebbc2 - Reviewed-on: https://code.wireshark.org/review/5952 + Fixes an ASAN failure reported by Alexis + + Change-Id: Id0ddad6451e22ffc53d42985e9b2071c7388d15b + Reviewed-on: https://code.wireshark.org/review/7049 + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 37940ee -Author: Doug Brown <doug@downtowndougbrown.com> -Date: Sun Dec 21 19:30:46 2014 -0800 +commit 3b29542 +Author: Kevin Grigorenko <kevin.grigorenko@us.ibm.com> +Date: Mon Feb 9 17:20:38 2015 -0800 - Fix AARP AppleTalk address parsing + Add a "Sum" column to the Service Response Time (SRT) window. - AppleTalk addresses are 3 bytes long and stored in AARP packets as 4 bytes. - The high byte should be 0, followed by 2-byte network number, followed by - 1-byte node number. + The Service Response Time (SRT) window currently provides the + columns: Index, Procedure, Calls, Min SRT, Max SRT, and Avg SRT. + A Sum column has been found useful in some customer situations + to understand the total time spent doing a set of procedures. + For example, in one case we were trying to isolate whether most + time was being spent on a client thread or in the act of making + outbound calls. We knew the start and end time of the client call, + so with the "Sum" of time spent in that period, we could isolate + a particular set of procedures driving the slow down. - The previous code was assuming that the high two bytes were the network number, - followed by the 1-byte node number, followed by 0. + Additional changes made in this patch: + * Add " (s)" to Min, Max, Avg, and Sum columns to make it clear + that times are in seconds. + * Refactor out width and height constants used in calls to + gtk_window_set_default_size in most of the SRT users into + #define SRT_PREFERRED_WIDTH and SRT_PREFERRED_HEIGHT. Also + increase the common width of 550 to 650 to account for the + additional column. - Change-Id: I467ec6edac353796db0b96fbac65658d5c5491d3 - Reviewed-on: https://code.wireshark.org/review/5968 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I20f152eecbcd0bbf69f71c6c6b9f9463e8867e23 + Reviewed-on: https://code.wireshark.org/review/7047 + Petri-Dish: Anders Broman <a.broman58@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 7b721a1 +commit 895b013 Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Dec 21 22:42:28 2014 -0800 +Date: Mon Feb 9 11:31:59 2015 -0800 - Squelch a compiler warning. + Use G_GINT64_MODIFIER when formatting g{u}int64 values. - ("Can't happen", but that requires more dataflow analysis than some - compilers do.) + Remove extra trailing blank from output while we're at it. - Change-Id: I5c6acbff64ea88f9b43d5580522bc144465dc9ac - Reviewed-on: https://code.wireshark.org/review/5972 + Change-Id: Ie415afa76a3eaba630ee3d59b177b44de75413a4 + Reviewed-on: https://code.wireshark.org/review/7046 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 998a847 +commit e88a11f Author: Bill Meier <wmeier@newsguy.com> -Date: Sun Dec 21 23:54:35 2014 -0500 +Date: Mon Feb 9 13:42:51 2015 -0500 - plugins: Cleanup #includes + (Trivial) Fix printf-related 'Mismatch on sign' warnings - Change-Id: Ic839f2995532d68308f8b5908c185acc7acaaa9c - Mostly: remove '#include <glib/glib.h>' and certain - other #includes already included in packet.h - Reviewed-on: https://code.wireshark.org/review/5971 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit 971d4e4 -Author: Bill Meier <wmeier@newsguy.com> -Date: Sun Dec 21 23:52:47 2014 -0500 - - stats_tree: g_sprintf()-->g_snprintf(); cleanup #includes. - - Change-Id: I862fed818cd1f14584b082f87b1d4d305cf78687 - Reviewed-on: https://code.wireshark.org/review/5970 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit 94eeaf1 -Author: Bill Meier <wmeier@newsguy.com> -Date: Sun Dec 21 23:50:49 2014 -0500 - - print.c: clean up #includes + Found by MSVC2013 Code Analysis - Change-Id: I0ecf618cc79060d35b5480f3d8e7ebf8575761c4 - Reviewed-on: https://code.wireshark.org/review/5969 + Change-Id: I58063946dd558e98308c87b36eeac0ddbe1a6e79 + Reviewed-on: https://code.wireshark.org/review/7045 Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit 4cb19d4 -Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Dec 21 19:33:10 2014 -0800 - - Use the messageLength field to indicate the message length. - - Check it for sanity (and report errors), and use it to set the length of - the PTP packet tvbuff and the PTP top-level protocol item. - - Bug: 10611 - Change-Id: I9af6aad5f07d405ebb14885dc986a73e430d7bdb - Reviewed-on: https://code.wireshark.org/review/5967 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 859360a -Author: Ebben Aries <exa@fb.com> -Date: Sun Dec 21 19:27:58 2014 -0700 +commit 2078a95 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Fri Feb 6 12:31:46 2015 +0100 - BGP : Update BGP-LS Attribute + Display NEXT_HOP + pgsql,imap: add STARTTLS support - From IANA page: http://www.iana.org/assignments/bgp-parameters/bgp-parameters.xhtml + The PGSQL "STARTTLS" protocol is documented at + http://www.postgresql.org/docs/9.4/static/protocol-flow.html + While at it, convert some tvb_length[_remaining] users. - Change-Id: Ibc85dccee94aa69306c88b48d680e48fede08f2e - Reviewed-on: https://code.wireshark.org/review/5965 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit a5a2565 -Author: sfd <stephen.donnelly@emulex.com> -Date: Mon Dec 22 14:29:41 2014 +1300 - - Removing ptp.v2.an.fcs as this erroneously refers to the Ethernet FCS which is properly handled by the Ethernet dissector. + Tested against pgsql-ssl.pcapng, + Tested against imap-ssl.pcapng, + http://wiki.wireshark.org/SampleCaptures#SSL_with_decryption_keys - Bug: 10611 - Change-Id: I735085edf5c0d2a66c30c940c4b780a2ce8db6d4 - Reviewed-on: https://code.wireshark.org/review/5964 - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: I1a00a6daa7f03de93339c2c13b07b4cfb8cdbd86 + Reviewed-on: https://code.wireshark.org/review/6821 Petri-Dish: Michael Mann <mmann78@netscape.net> - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 8076f29 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Dec 21 16:41:49 2014 -0800 - - Qt: Fix status bar signal. - - Change-Id: Ie935269f6cbe9495b95bcc24b45198fbd284fb35 - Reviewed-on: https://code.wireshark.org/review/5963 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 8228bcf -Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Dec 21 16:15:42 2014 -0800 - - Wrong array. - - Change-Id: I69ceca8be624b13f910997dee3bc6852b61b0162 - Reviewed-on: https://code.wireshark.org/review/5962 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 147ca45 -Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Dec 21 16:09:15 2014 -0800 - - Improve the message for "this field has an integral type" assertions. - - (Along the lines of provious changes.) - - Change-Id: I22d76f22400d4a93242392ff4688acc753eb0039 - Reviewed-on: https://code.wireshark.org/review/5961 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit c30aa11 -Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Dec 21 15:35:14 2014 -0800 - - Register the ORFEntry IP address as an IPv4 address. - - We're adding it with proto_tree_add_ipv4(), so that it's displayed as, - and can be tested as, an IPv4 address. That means that the field for it - must be of type FT_IPv4, *even though it's calculated from an 8-bit - prefix value* - you can't make it an FT_UINT8. - - Change-Id: I7d668fb2a707cdda4ad228afcbdcaf47ee6cba1b - Reviewed-on: https://code.wireshark.org/review/5960 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 48419fc -Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Dec 21 15:17:13 2014 -0800 +commit a58cf52 +Author: Martin Mathieson <martin.r.mathieson@googlemail.com> +Date: Mon Feb 9 14:18:27 2015 +0000 - Improve the message for "this field doesn't have the right type" assertions. + file-jpeg: Allow 'Exif' as identification in first App block, but flag as expert info warning if seen - Give the field name in the message. - - Change-Id: I046c74b451b473c9c87c2980122b025390f82cc8 - Reviewed-on: https://code.wireshark.org/review/5959 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: Id16e0b4fbca3b29b01138a9aea758b8beb8d9ed8 + Reviewed-on: https://code.wireshark.org/review/7042 + Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> -commit 0be413e -Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Dec 21 14:09:28 2014 -0800 +commit e36a2ad +Author: Martin Mathieson <martin.r.mathieson@googlemail.com> +Date: Mon Feb 9 11:48:25 2015 +0000 - Move another helper macro. + Netflow: rework how transport (port) resolution is done, adding support for SCTP - Change-Id: Id3801373526af57146a87abe9698b192074a0fa0 - Reviewed-on: https://code.wireshark.org/review/5958 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I09b2cc3739628b5de706659731e37fa345804254 + Reviewed-on: https://code.wireshark.org/review/7043 + Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> + Reviewed-by: Michael Mann <mmann78@netscape.net> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> -commit 5d30a3c -Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Dec 21 13:44:46 2014 -0800 +commit 929a4f2 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Fri Feb 6 11:43:54 2015 +0100 - Define helper macros before they're used. + ldap: simplify Start TLS handling - The code works if they're defined afterwards, but defining them earlier - makes it a bit clearer that they're helper macros used as components of - the macros we're exporting. + RFC 2830 describes the Start TLS operation as follows: - Change-Id: I326894eea67d2db43fedf4567699cd9eaaa0e004 - Reviewed-on: https://code.wireshark.org/review/5956 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit c96858b -Author: Guy Harris <guy@alum.mit.edu> -Date: Sun Dec 21 13:05:46 2014 -0800 - - Use the "netbios" heuristic dissector list elsewhere. + 1. ExtendedRequest is sent by client with the requestName OID set to + "1.3.6.1.4.1.1466.20037". + 2. Server responds with an ExtendedResponse having a resultCode and + optionally a responseName (OID). - Use find_heur_dissector_list() to find the "netbios" heuristic dissector - list, rather than using code from packet-netbios.c. + The text mentions that the field *must* be set but the definition allows + it to be optional. The previous code then made assumption that once (1) + was seen, then any ExtendedResponse signals an acknowledgement. - Change-Id: Ieeab58d7c6eb32491b026b242c687bd18c4d5cdb - Reviewed-on: https://code.wireshark.org/review/5955 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 9407160 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Dec 21 20:56:33 2014 +0100 - - Do not use packet scoped memory in GUI + That is not entirely correct, a server could reject the request. This + patch corrects that by checking the ExtendedResponse_resultCode for + success, and then uses the new ssl_starttls_ack() helper to kick off + SSL. This simplifies the code a bit. - It will trigger an assertion + Tested against ldap-ssl.pcapng (which has no responseName) from + http://wiki.wireshark.org/SampleCaptures#SSL_with_decryption_keys + The result is the same as before, except that "Protocols in frame" + changed from "...:ldap:ssl:ldap" to "...:ssl:ldap". - Change-Id: I2436c11b45e1505a94256a06ed3ad0c5480e034b - Reviewed-on: https://code.wireshark.org/review/5953 - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: Id7e40c5a50a217c4d3d46f08241d704f19d195dd + Reviewed-on: https://code.wireshark.org/review/6982 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit ccf0573 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Dec 20 23:18:05 2014 +0100 +commit e190253 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Fri Feb 6 12:35:09 2015 +0100 - Qt: rename SummaryDialog class to CaptureFilePropertiesDialog + Fix STARTTLS handling in various dissectors - Change-Id: I79aa63621853ff15b8c568e1c7949fb8fa0caca2 - Reviewed-on: https://code.wireshark.org/review/5929 - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit bcaf1f4 -Author: Gerald Combs <gerald@zing.org> -Date: Sun Dec 21 10:13:00 2014 -0800 - - Qt: Better accordion frame layout. + This patch lets a dissector hand over control to the SSL dissector which + simplifies dissector code ("TCP | App | SSL | App" becomes + "TCP | SSL | App"). - Calling invalidate + activate on the parent layout has better results - than calling adjustSize on the parent widget. + After this patch, all of the affected dissectors will now be dissected + as SSL with its Application Data being treated as the protocol before + STARTTLS. This was previously not the case because the port was not + registered for dissection via ssl_dissector_add. - Change-Id: I844bee49b868d988b0fc93a72687407adf232ef9 - Reviewed-on: https://code.wireshark.org/review/5951 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit bd19532 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Dec 21 19:25:39 2014 +0100 - - Do not use packet scope memory outside packet dissectors + The desegmentation issue within the MySQL dissector is now also gone. + Convert some tvb_length[_remaining] users in pop and smtp as well. - Otherwise it will trigger an assert - Fixes a regression introduced in gf002332 + Tested against mysql-ssl.pcapng and mysql-ssl-larger.pcapng(*1), + Tested against pop-ssl.pcapng (note: only first stream is decrypted, + either the key after negotiation is wrong or there is a bug), + Tested against smtp-ssl.pcapng and smtp2525-ssl.pcapng (with Decode As) + and smtp-ssl.pcapng with filter "tcp.len>0", + Tested against xmpp-ssl.pcapng, + http://wiki.wireshark.org/SampleCaptures#SSL_with_decryption_keys - Change-Id: I0cffa2c952b7eff085a1834ebabfec03342095bd - Reviewed-on: https://code.wireshark.org/review/5950 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 9fbede8 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sun Dec 21 18:26:19 2014 +0100 - - no need for if(tree) + *1) mysql-ssl-larger has MySQL dissector errors for the fragmented + SSL packet, but reassembly seems to work. Needs further + investigation. - Change-Id: Ie06738d99851b35e53effb50b2c109ce50e9c6df - Reviewed-on: https://code.wireshark.org/review/5949 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - -commit 9c03655 -Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Dec 21 08:04:50 2014 -0800 - - [Automatic manuf, services and enterprise-numbers update for 2014-12-21] - - Change-Id: I08b7be1ab911e8f578173a45dc2055a81e8cbffb - Reviewed-on: https://code.wireshark.org/review/5945 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit f002332 -Author: Michael Mann <mmann78@netscape.net> -Date: Fri Dec 19 21:42:14 2014 -0500 - - Replace ether_to_str with either address_to_str or tvb_ether_to_str. - - Change-Id: I8cce9fddbfe950e27e96ea8a5a6d2e0921ff4260 - Reviewed-on: https://code.wireshark.org/review/5933 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Bug: 9515 + Change-Id: I408ef8ff30d9edc8954dab9b3615900666dfa932 + Reviewed-on: https://code.wireshark.org/review/6981 Reviewed-by: Michael Mann <mmann78@netscape.net> -commit cdaa669 -Author: Michael Mann <mmann78@netscape.net> -Date: Fri Dec 19 18:13:17 2014 -0500 - - Replace ax25_to_str and get_ax25_name with address_to_str. - - Change-Id: I74ddb6fc629ef32b217dede7a3ba652cbbf5ab12 - Reviewed-on: https://code.wireshark.org/review/5932 +commit 93ed726 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Thu Feb 5 19:54:52 2015 +0100 + + ssl,dtls,ssl-utils: Prepare for STARTTLS handling + + All STARTTLS-like dissectors (protocols which can switch to SSL/TLS + after a protocol command) currently fail to get called after decryption. + The reason for this is that the port is not registered for SSL + dissection via ssl_dissector_add. Besides this, the MySQL dissector + breaks in the event of multiple segments because it does not properly + set desegmentation. + + The call path TCP | App | SSL | App is a bad, error-prone pattern which + requires duplication of required functionality in dissectors. This patch + enables to bypass the App (TCP | SSL | App) by registering a SSL as + conversation dissector after a STARTTLS switch. + + Logical overview of changes: + + - Move srv_addr, srv_ptype and srv_port to SslSession and adjust the + users. This allows passing SslSession around which will never be null + unlike SslDecryptSession. This is needed for looking up the packet + direction (server or client) before calling a subdissector. + - Add app_handle to store the dissector and last_nontls_frame the + frame that initiated STARTTLS. + - The same app_handle is now used to store the dissector handle from + a ssl association. + - Moved conversation data (SslDecryptSession) to ssl-utils to avoid + code duplication. Merge ssl_session_init into it. The new + ssl_session_get() is needed for STARTTLS frame/handle storage. + - Introduce new "ssl_starttls_ack" function to signal the last non-TLS + packet. + - Ensure that match_uint is set before calling the conversation + dissector. This ensures that dissectors using match_uint to check + the direction of a packet (client vs. server) see the TCP port + instead of the IP proto. At least the MySQL and SMTP dissectors + require such special treatment. + - Move epan/conversation.h outside HAVE_LIBGNUTLS, remove from dtls + (as it is already included by ssl-utils). + - Various comment/debug string updates. Remove outdated comment before + SSL association lookup. + + Besides setting match_uint and caching the app_handle, existing + dissectors should not be affected by this patch. Follow-up patches + will update existing dissectors to use the new ssl_starttls_ack + interface. + + Bug: 9515 + Change-Id: I795d16b6a901e672a5d89e922adc7e5bbcda0333 + Reviewed-on: https://code.wireshark.org/review/6872 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 6f8de87 -Author: Michael Mann <mmann78@netscape.net> -Date: Sun Dec 21 07:27:01 2014 -0500 - - Allow "cba" filter prefix for hf_ fields (missed a Profinet file the first time) - - Change-Id: I3ff65a8f6307a9ee08e173c0b2658d96985e0c45 - Reviewed-on: https://code.wireshark.org/review/5943 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit da22067 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Dec 21 10:28:03 2014 +0100 - - Qt: keep "Copy to clipboard" button active when closing the capture_file_properties_dialog - - As the Capture File Properties window content is kept once the capture is closed, allow to copy it - - Change-Id: I11466e102fcf75a31aaa22225861ad8bf27f89a8 - Reviewed-on: https://code.wireshark.org/review/5942 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit fda12fb -Author: Peter Wu <peter@lekensteyn.nl> -Date: Fri Dec 19 21:26:23 2014 +0100 +commit 5b2a05c +Author: Anish Bhatt <anish@chelsio.com> +Date: Fri Feb 6 02:07:53 2015 -0800 - Fix Python 3 compatibility in LocatePythonModule + [IS-IS LSP] Add support for Adj-SID & LAN-Adj-SID subTLV - Regression introduced with cb345eb4bd0149b4a71d6069f957600a83cc3417. - - Change-Id: I625432ac4572d2449cb6981a158e46c560a81f1a - Reviewed-on: https://code.wireshark.org/review/5883 - Reviewed-by: Maarten Bezemer <maarten.bezemer@gmail.com> + Bug: 10677 + Change-Id: Ia936ee4af6779b2b7dde61f33c490f545060dbe8 + Signed-off-by: Anish Bhatt <anish@chelsio.com> + Reviewed-on: https://code.wireshark.org/review/6980 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit deb49cb -Author: Guy Harris <guy@alum.mit.edu> -Date: Sat Dec 20 23:32:23 2014 -0800 - - Add comments, change structure member name. - - "GSList *" implies a list; call the pointer in a struct - heur_dissector_list "dissectors", to indicate what it's a list *of*. - - Change-Id: Idf5011e08d35d28934cd52f818b945db1cc7f37b - Reviewed-on: https://code.wireshark.org/review/5941 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit a138faf -Author: Guy Harris <guy@alum.mit.edu> -Date: Sat Dec 20 23:25:55 2014 -0800 - - Clean up some error messages. - - Correct one message, change another one from a g_assert() to a g_error() - with descriptive text. - - Change-Id: I667beb08ac1677205a9323ab623ed0a9766bac79 - Reviewed-on: https://code.wireshark.org/review/5940 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 806ebca -Author: Bill Meier <wmeier@newsguy.com> -Date: Sun Dec 21 01:55:48 2014 -0500 +commit 3222cd1 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Sat Feb 7 13:16:59 2015 +0100 - packet-PROTOABBREV.c: Update re #includeusage + ssl-utils: use ALPN hint for improved spdy/http2 recognition - - packet.h should be first Wireshark #include - after config.h and "system" includes. - - '#include <glib.h>' not needed. + This patch improves detection of a SPDY/3.1 in SSL capture. While at it, + add other protocols from the RFC/drafts. - Change-Id: Ibec076818f3f509aabb4d240e939ef719f3798d6 - Reviewed-on: https://code.wireshark.org/review/5939 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit ce211a4 -Author: Bill Meier <wmeier@newsguy.com> -Date: Sun Dec 21 01:41:34 2014 -0500 - - Cleanup use of #includes in a few recently committed dissectors. + spdy was tested against a private capture from spdy/3.1 communication + between Chromium 40 and ssl.gstatic.com. + http2 was tested against http2-16-ssl.pcapng from + http://wiki.wireshark.org/SampleCaptures#SSL_with_decryption_keys - Change-Id: Ie66d4c3f0c5d0037cac65ff39e4dedcedff462f1 - Reviewed-on: https://code.wireshark.org/review/5938 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit b5d7b7a -Author: Bill Meier <wmeier@newsguy.com> -Date: Sat Dec 20 16:23:59 2014 -0500 - - Cleanup use of #includes in non-generated epan/dissector/*.c - - Specifically: - - Set packet.h to be the first wireshark #include after - config.h and "system" #includes. - packet.h added as an #include in some cases when missing. - - Remove some #includes included (directly/indirectly) in - packet.h. E.g., glib.h. - (Done only for those files including packet.h). - - As needed, move "system" #includes to be after config.h and - before wireshark #includes. - - Rework various #include file specifications for consistency. - - Misc. - - Change-Id: Ifaa1a14b50b69fbad38ea4838a49dfe595c54c95 - Reviewed-on: https://code.wireshark.org/review/5923 + Change-Id: I111efae34d614b7d8e37eaaa686b391d332753dd + Reviewed-on: https://code.wireshark.org/review/7000 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Bill Meier <wmeier@newsguy.com> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 14cff7b -Author: Gerald Combs <gerald@zing.org> -Date: Sat Dec 20 20:33:45 2014 -0800 +commit 702618f +Author: Peter Wu <peter@lekensteyn.nl> +Date: Sat Feb 7 10:02:13 2015 +0100 - Qt: Don't clear the capture file properties. - - Don't clear the contents of the capture file properties dialog when the - capture closes. Retaining the contents lets users compare the properties - for multiple files. + Fix use-after free in RTP player - Change-Id: I6bf684e7bd996f22032ec3d0adcddc343bb17992 - Reviewed-on: https://code.wireshark.org/review/5937 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 35571f8 -Author: Gerald Combs <gerald@zing.org> -Date: Sat Dec 20 20:06:43 2014 -0800 - - Qt: Fix accordion frame height calculation. + Clicking "Decode" in the RTP player triggered an ASAN + heap-use-after-free in update_progress_bar(). Explicitly set + progress_bar to NULL to prevent this. - Change-Id: I32d2ea2ff34544e285b52e4e35e035306c33d3aa - Reviewed-on: https://code.wireshark.org/review/5935 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: Ice3105a11642a1cc5a54b8fbdf7dbf0ed430d965 + Ping-Bug: 10714 + Reviewed-on: https://code.wireshark.org/review/6999 + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 2b006ad -Author: Guy Harris <guy@alum.mit.edu> -Date: Sat Dec 20 20:13:28 2014 -0800 +commit d56a3c9 +Author: Lev Stipakov <lstipakov@gmail.com> +Date: Sun Feb 8 17:21:18 2015 +0200 - Have a heur_dissector_list_t be an opaque handle. - - This allows dissector lists to be looked up by name, so they can be - shared by multiple dissectors. - - (This means that there's no "udplite" heuristic dissector list, but - there shouldn't be one - protocols can run atop UDP or UDPLite equally - well, and they share a port namespace and uint dissector table, so they - should share a heuristic dissector table as well.) + This adds support for P_DATA_V2 OpenVPN packets. - Change-Id: Ifb2d2c294938c06d348a159adea7a57db8d770a7 - Reviewed-on: https://code.wireshark.org/review/5936 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 8179800 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Dec 20 22:27:54 2014 +0100 - - Qt: fix a crash when closing a file while capture file properties window is open + On the wire P_DATA_V2 is same as P_DATA-V1 plus 3 bytes "peer-id" value + after opcode. Client-side support has been added since OpenVPN 2.3.6, + server side is in master branch and will appear in 2.4. - refresh_button_ and copy_comment_button_ are not used neither initialized, get rid of them - Also clear text areas and disable buttons + Peer-id is especially useful for mobile clients (they often float + between 3G/Wi-Fi) and in general for Wi-Fi clients (solves UDP NAT + timeout issue). - Change-Id: I418d712313041dcf4f15aceee01497f01ae74918 - Reviewed-on: https://code.wireshark.org/review/5927 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: Ic5d2e05e62c27bed18c2368a1bbc5c7bf4d358f1 + Reviewed-on: https://code.wireshark.org/review/7023 + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 86d1b54 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Dec 20 23:30:12 2014 +0100 - - Qt: disable Capture File Properties toolbar icon by default - - Otherwise it can be opened by clikcing on the icon just after launching Wireshark - Also update tooltip to match the exact dialog name - - Change-Id: I5ce5e0c24f3dfb44c2303c78114102c5c03ccc88 - Reviewed-on: https://code.wireshark.org/review/5930 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit cadf1a5 +commit 8ff944d Author: Michael Mann <mmann78@netscape.net> -Date: Thu Dec 18 22:12:55 2014 -0500 +Date: Sun Feb 8 20:36:03 2015 -0500 - Remove profinet_type from packet_info structure. + Add fixed length function for address types. - Profinet I/O and DCOM CBA had completely separate uses for the profinet_type member, so it's okay to separate them with different proto ids tracking the proto_data. + This allows for even more cleanup with respect to how address types are handled, including removing address_to_str.c. Most of the functionality was folded into address_types.c, but the remainder was just dispersed because it didn't make sense to keep the file. - Change-Id: I7b9c01b8d4f74d51fe9f9ef2f957479dff0a7157 - Reviewed-on: https://code.wireshark.org/review/5852 + Change-Id: Id4e9391f0c3c26eff8c27b362e4f7a1970d718b4 + Reviewed-on: https://code.wireshark.org/review/7038 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> -commit d7fd00d -Author: Luke Mewburn <luke@mewburn.net> -Date: Sun Dec 21 01:05:07 2014 +1100 +commit 2875cd3 +Author: Michael Mann <mmann78@netscape.net> +Date: Sun Feb 8 16:36:07 2015 -0500 - MIPv6: simplify fixed point degrees conversion + Eliminate the hf member out of the address structure. - * Simplify the conversion of degrees from 24 bit fixed point to a float. - Avoids strict-aliasing warning by gcc 4.4. - * Add reference to RFC 6757. - * Correct spelling of 'convert' in degrees_convert_fixed_to_float(). + Using the new address type registration, dissectors can create their own address types with their own (column) filters attached to them, eliminating the need for an address to keep track of a hf_ field. - Change-Id: Icb680d009fdd960e8668fa3020060799d6a74c2f - Reviewed-on: https://code.wireshark.org/review/5913 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Change-Id: I2bbec256a056f403a7ac9880d5d76a0b2a21b221 + Ping-Bug: 7728 + Reviewed-on: https://code.wireshark.org/review/7037 Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 210aaf1 -Author: Guy Harris <guy@alum.mit.edu> -Date: Sat Dec 20 15:00:57 2014 -0800 - - Use "" rather than <> for includes; that might fix ABI check failures. - - Change-Id: I80e291031e4e8e347422e4a1e636d2ce40efc5c2 - Reviewed-on: https://code.wireshark.org/review/5931 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit ac69a6d -Author: Gerald Combs <gerald@zing.org> -Date: Sat Dec 20 14:11:31 2014 -0800 +commit 2042385 +Author: Michael Mann <mmann78@netscape.net> +Date: Sun Feb 8 13:49:57 2015 -0500 - Qt: Use an accordion frame in the welcome screen. + Add "column filter string" support to address types. - Place the recent files list in an accordion frame so that showing and - hiding is more visually smooth. + Information about dissector (filter) fields should be kept in a dissector as much as possible. Supporting "column filter string" also allows other dissectors to create their own "address types" with different column filters (because AT_ETHER isn't always an "Ethernet" address). - Change-Id: Ifdc534a33aa9f93949c9f919cfe0765fbfcde750 - Reviewed-on: https://code.wireshark.org/review/5924 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit d11e94b -Author: Gerald Combs <gerald@wireshark.org> -Date: Sat Dec 20 14:08:04 2014 -0800 - - Remove debugging code. + This feature also allowed a few "dissector specific" address types to be moved to their own dissector. - Change-Id: If3a64a6914ae8ce2521c85766df6f733a13ca7e1 - Reviewed-on: https://code.wireshark.org/review/5926 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: Ie9024af4db62bc2ee4f8c9d28a1d807f706f45bf + Ping-Bug:7728 + Reviewed-on: https://code.wireshark.org/review/7029 + Petri-Dish: Michael Mann <mmann78@netscape.net> + Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit b4e90bd -Author: Stig Bjørlykke <stig@bjorlykke.org> -Date: Sat Dec 20 20:09:00 2014 +0100 +commit 4497bb4 +Author: Michael Mann <mmann78@netscape.net> +Date: Sat Feb 7 22:15:55 2015 -0500 - Fix filter test for multifield custom column - - This adds support for "field||field" without spaces. + Add address type registration. - Change-Id: Ia738d6642d12a188d1629bbdd9701cc8f8bb7a68 - Reviewed-on: https://code.wireshark.org/review/5922 - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - Tested-by: Michal Labedzki <michal.labedzki@tieto.com> - -commit 8b24471 -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Dec 19 16:27:57 2014 -0800 - - Qt: Revert back to an all-in-one main window. + Now address types are setup just like field types and must be registered with a structure that provides its string representation (and more things in the future). Address types that are limited to a single dissector are registered by the dissector. More "common" ones are globally registered. There are still a few that really belong in a dissector, but have other dependencies currently not accounted for in the address type support. - Switch back to having everything on the main window similar to GTK+. - It's more cluttered but this way but you don't have to navigate the task - selector to get to the recent files and help links. + Many of the "address to string" conversions that involved g_sprintf have be changed to use more "performance friendly" methods (some at the cost of needing to_str-int.h) - Retain the "Capture", "Open", and "Learn" imperative text. Move "Open" - to the top as suggested by Michal. + Leaving all comments regarding this "solution" in address_to_str.c in until all have been implemented - Change-Id: Iaf7d93f9caf686b5cbeb640e5e5f95ecb46f7f2d - Reviewed-on: https://code.wireshark.org/review/5896 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I494f413e016b22859c44675def11135f228796e0 + Reviewed-on: https://code.wireshark.org/review/7019 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 2b621e2 +commit 3b81c36 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Fri Dec 19 11:42:19 2014 +0100 +Date: Sat Feb 7 21:54:39 2015 +0100 - 802.11: VHT NDP announcement frame is no correctly decode when there is FCS + DNS: LOC Precision missing units - The FCS at the end of the frame is decoded as additional STA info fields which does not seem correct. + The DNS packet's 3rd additional RR is a LOC RR. + In the LOC RR, Wireshark marks the Size field with meters unit. + However, the Horizontal and Vertical Precision fields have no units - Issue reported by Sudheer - Bug:10786 - Change-Id: Idffaa41cd7c79ad4c9937e7f32aa2444c1b9033f - Reviewed-on: https://code.wireshark.org/review/5849 + Issue reported by Boaz + + Bug:10940 + Change-Id: If177757d2bba6ea012a320aceaea2f8d8e50155c + Reviewed-on: https://code.wireshark.org/review/7014 Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 851909d -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Dec 20 18:39:51 2014 +0100 +commit 0a2832c +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Sun Feb 8 20:31:49 2015 +0100 - FCoIB / Infiniband SDP: prevent a crash when 'enable manual settings' is set without filling address field + WMEM (allocator): fix warning: redeclaration of already-defined enum '_wmem_allocator_type_t' is a GNU extension [-Wgnu-redeclared-enum] - Bug: 10796 - Change-Id: Ifdb7804ec5e1146b08f00e54647d802a69d52113 - Reviewed-on: https://code.wireshark.org/review/5914 - Tested-by: Pascal Quantin <pascal.quantin@gmail.com> - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: Ied0428324c14f248bf6857fd288b4fb5d4591230 + Reviewed-on: https://code.wireshark.org/review/7033 + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 326e496 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sat Dec 20 18:40:45 2014 +0100 +commit 58f8076 +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Sun Feb 8 20:28:48 2015 +0100 - no need for if (tree) + Menubar (GTK): fix warning: no previous prototype for ‘set_menus_capture_start_sensitivity’ [-Wmissing-prototypes] - Change-Id: I0749f8e10d6f8d97b85da6bb52b0ab336ba06c38 - Reviewed-on: https://code.wireshark.org/review/5919 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> + Change-Id: I11c805b285d277ecb963622385154c310f6d1c67 + Reviewed-on: https://code.wireshark.org/review/7032 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 7d18248 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sat Dec 20 18:41:16 2014 +0100 +commit 3c10841 +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Sun Feb 8 20:28:20 2015 +0100 - hide the hf_msmms_data item, not the NULL item + USB HID: fix no previous prototype for 'dissect_usb_hid_get_report_descriptor' [-Wmissing-prototypes] - Change-Id: If92c9bc281f44de8f3b1de71005240755748403a - Reviewed-on: https://code.wireshark.org/review/5918 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> + Change-Id: Icb7fec658f895e91069e51bab50d57a0a93f5cba + Reviewed-on: https://code.wireshark.org/review/7031 + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 7b2ae71 -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Fri Dec 19 09:21:20 2014 +0100 +commit 0310132 +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Mon Oct 27 23:00:54 2014 +0100 - Fix filter valid/invalid test for multifield custom type + Multicast Stream: Move mcast_stream.[ch] to ui - Check for "or" or "||" (also ignore whitespaces) - and check both arguments of this operator to be - fieldname (character check), then check whole filter is valid - for dfilter compiler. + Preparation to add Multicast Stream Dialog on Qt (Add extern C...) - Change-Id: I412b5dc1fca16fcd2b640aa74af81167300fd11e - Reviewed-on: https://code.wireshark.org/review/5848 - Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> + Change-Id: Ic8bc39a18dba607d6da116df799de7847ce8e4c8 + Reviewed-on: https://code.wireshark.org/review/6984 + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Tested-by: Michal Labedzki <michal.labedzki@tieto.com> - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Michael Mann <mmann78@netscape.net> -commit abd90c3 -Author: Guy Harris <guy@alum.mit.edu> -Date: Sat Dec 20 09:47:01 2014 -0800 +commit d7ee095 +Author: Martin Kaiser <wireshark@kaiser.cx> +Date: Sun Feb 8 20:15:42 2015 +0100 - Fix handling of 3-component OS version numbers. - - Get rid of doubled square brackets (what were those for?), and match - dots in the version number with "\.", so we only match dots. - - This fixes the handling of version numbers such as 10.10.1. + [ZVT] start dissecting the registration apdu - (A 2-component version number doesn't match, but that's OK - the sed - command doesn't use -n, so that just means it's unchanged by the - command.) - - Change-Id: I3046133de732c80410592272d1f7b961a64d9289 - Reviewed-on: https://code.wireshark.org/review/5915 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: Ic8f93913396de3d97cdba4473e6837056c8250a6 + Reviewed-on: https://code.wireshark.org/review/7030 + Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> + Tested-by: Martin Kaiser <wireshark@kaiser.cx> -commit 9ba9cd8 -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Sep 9 16:42:58 2014 -0400 +commit 3b6998d +Author: Bill Meier <wmeier@newsguy.com> +Date: Sun Feb 8 12:42:32 2015 -0500 - Qt: Add a CaptureFile class. - - Wrap the capture_file struct in a QObject which translates cf_cb_* and - capture_cb_* events into signals. Move the global cfile to - capture_file.cpp. + riemann: Minor cleanup - Don't use a void pointer for the capture file struct. + Mostly: Rename a number of macros to be RIEMANN_... - Change-Id: Ic5d5efb4bb1db64aa0247245890e5669b1da723a - Reviewed-on: https://code.wireshark.org/review/5885 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I2b8beb5f9241a0a2a380b8a38222ef07beb1703c + Reviewed-on: https://code.wireshark.org/review/7028 + Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit 2bb8255 +commit 4c1c76a Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Dec 16 14:36:04 2014 -0800 +Date: Sun Feb 8 08:05:49 2015 -0800 - Consolidate RTP stream structs. - - Consolidate the three different RTP stream structs in ui/rtp_stream.h, - ui/gtk/rtp_player.c, and ui/voip_calls.c into one. Make the member names - a bit more consistent. Document what each GList contains. Use nstime_t - for timestamps since that's what we get from the frame data. Use g_new0 - to initialize our structs. + [Automatic manuf, services and enterprise-numbers update for 2015-02-08] - Change-Id: I2b3f8f2051394a6a98a5c7bc49c117f07161d031 - Reviewed-on: https://code.wireshark.org/review/5843 - Petri-Dish: Gerald Combs <gerald@wireshark.org> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Change-Id: Ib8a2e297ccf561f782f2bd462269f180e9155b19 + Reviewed-on: https://code.wireshark.org/review/7025 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 79b5bb4 -Author: Guy Harris <guy@alum.mit.edu> -Date: Sat Dec 20 00:57:20 2014 -0800 - - Fix typo. - - One position off on the keyboard and everything falls apart. - - Change-Id: I00909ca3344642d3eeaae0d8563403b56cc62f79 - Reviewed-on: https://code.wireshark.org/review/5912 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit a61f6e4 -Author: Guy Harris <guy@alum.mit.edu> -Date: Sat Dec 20 00:23:05 2014 -0800 - - When checking for floorl(), include math.h. - - It's not being found with MSVC, but is apparently present; perhaps - math.h does something magic, e.g. defining it as a macro, so try using - check_symbol_exists with "math.h". - - Change-Id: Idaecac641fb0b87d399807d8bf1fcb74e7251a4e - Reviewed-on: https://code.wireshark.org/review/5911 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 4b8639f -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Dec 19 21:18:27 2014 -0800 - - Add a check for floorl(). - - Also, we don't use NEED_STRPTIME_H, we use HAVE_STRPTIME. - - Change-Id: I330e8ce408c05b74c50f3369691283e35e68505c - Reviewed-on: https://code.wireshark.org/review/5910 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 4d3c7b5 -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Dec 19 21:09:18 2014 -0800 - - Don't bother with __builtin_floorl(). - - At least as I read the GCC documentation, if GCC supports a builtin - floorl() at all, it will always treat floorl() and - __builtin_floorl() the same (it's reserved in C90 and defined in C99, so - nobody should ever write C code assuming floorl() won't be treated in - that afshion). - - In addition, the GCC 3.3.6 manual says nothing about __builtin_floorl(), - so it probably won't help to use it. If it appears to help, there's - probably something else going on. - - Also, GCC appears not to like "#ifdef (__GNUC__)", as the parentheses - mean it's testing an expression, not a macro name. - - Change-Id: Ib88b52c366d7f3b1637bb408fb18d04b67c27e4b - Reviewed-on: https://code.wireshark.org/review/5909 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit caf4cc6 -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Dec 19 20:45:18 2014 -0800 +commit 14c37af +Author: Bill Meier <wmeier@newsguy.com> +Date: Sat Feb 7 22:44:10 2015 -0500 - Use AC_SEARCH_LIBS() for math functions. + dwarf: fix bug found by MSVC2013 Code Analysis - Use it to check whether we need -lm for various math functions - - including floorl(). Let it handle adding -lm, rather than having that - in the various _LDADD macros. + The following doesn't quite do what it might seem to be doing: - Change-Id: Ic5d24ec35e060306351f4981c92e26879e597d81 - Reviewed-on: https://code.wireshark.org/review/5908 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 1a051af -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Dec 19 20:22:08 2014 -0800 - - Include <math.h> to declare floor(). + *value |= (byte & 0x7F) << shift; //guint64 *value // guint8 byte - Change-Id: I39de31c3e38b83aaec76396048e6960f609bc63e - Reviewed-on: https://code.wireshark.org/review/5907 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 07fb8cf -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Dec 19 20:11:12 2014 -0800 - - Remove trailing white space. + The warning from MSVC2013: + Arithmetic overflow: 32-bit value is shifted, then cast to 64-bit + value. Results might not be an expected value - Change-Id: I0777945a5234cf380e2f3bc2461cc638c316f499 - Reviewed-on: https://code.wireshark.org/review/5906 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I06e196559ec0e84da77d8866355ae7f86ba43f73 + Reviewed-on: https://code.wireshark.org/review/7020 + Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit b445b3d -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Dec 19 19:44:03 2014 -0800 +commit f494abd +Author: Evan Huus <eapache@gmail.com> +Date: Sat Feb 7 22:03:38 2015 -0500 - Rename wsutil/floor.[ch] to wsutil/floorl.[ch]. - - That better indicates what they do - they don't supply floor(), as - that's a standard math.h feature dating back before C89, they supply - floorl(). + qnet6: don't calculate crc if length is negative - Change-Id: Ib1278c51cdfc57680c28c51de87eafb2cb50c8eb - Reviewed-on: https://code.wireshark.org/review/5905 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Bug: 10941 + Change-Id: I8c844487fa8ed1fb93ad9f69315fe1559238c845 + Reviewed-on: https://code.wireshark.org/review/7018 + Reviewed-by: Evan Huus <eapache@gmail.com> -commit b925c35 +commit 3066d6b Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Dec 19 19:36:21 2014 -0800 +Date: Sat Feb 7 14:51:06 2015 -0800 - We assume all versions of MSVC have floorl(). + Don't call the Bluetooth code's UUID type "uuid_t". - If not, we'll have to play some games in config.nmake. + uuid_t is a data type provided by a number of environments, thanks to + the Open Software Fuundation; calling the Bluetooth code's data type, + which includes an actual OSF-style UUID as a member, "uuid_t" can lead + to confusion and *does* lead to compile errors on platforms where, for + better or worse, system headers such as <unistd.h> define uuid_t (and + are included by, for example, Qt headers). - Change-Id: I1dbc5d4ef41ede0e596dbe40b4e139e0f6c39dba - Reviewed-on: https://code.wireshark.org/review/5904 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 1088629 -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Dec 19 18:59:55 2014 -0800 - - If we don't have GCC, fall back on using floor(). - - Add the closing brace for the function body while we're at it. + Just rename it "bluetooth_uuid_t". - Change-Id: I73170fdc0885972dce531b553ff8601cceea182e - Reviewed-on: https://code.wireshark.org/review/5902 + Change-Id: Ic742723913ba4105cd3269dd24fc821147285176 + Reviewed-on: https://code.wireshark.org/review/7017 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit b736896 -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Dec 19 18:53:31 2014 -0800 +commit 96527e2 +Author: Bill Meier <wmeier@newsguy.com> +Date: Sat Feb 7 16:23:12 2015 -0500 - Handle floorl() the same way we handle other not-on-all-platforms functions. + riemann: Fix bug found by MSVC203 Code Analysis - Use AC_CHECK_FUNC() for it, define FLOORL_LO to floorl.lo if we *don't* - have it, add FLOORL_LO to the list of items conditionally built in - libwsutil, and include "wsutil/floor.h" only if HAVE_FLOORL is *not* - defined, as that means it's *not* supplied by the platform and thus - *not* declared in <math.h>. + The following doesn't quite do what it might seem to be doing: + guint64 num; + guint8 b; + num |= ((b & 0x7f) << shift); - Also, use the standard export stuff in wsutil/floor.h. + The warning from MSVC2013: + Arithmetic overflow: 32-bit value is shifted, then cast to 64-bit + value. Results might not be an expected value - Change-Id: Ic24aa69f65f2d15450d8b84b0c2b0c58f38edebe - Reviewed-on: https://code.wireshark.org/review/5901 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 201a7e7 -Author: Stephen Fisher <sfisher@sdf.org> -Date: Fri Dec 19 19:28:59 2014 -0700 - - Change more variables from si_code to mtp3_si_code to avoid conflicts - with a #define in a NetBSD header file. - - Change-Id: I2136db207cb4707571920b373708fcb63505131c - Reviewed-on: https://code.wireshark.org/review/5900 - Reviewed-by: Stephen Fisher <sfisher@sdf.org> - -commit 556f9a5 -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Dec 19 18:00:50 2014 -0800 - - Include floor.c and floor.h in the source tarball. - - Change-Id: Iabc0403643a05eaa7dbd525a94bc720d100d54d5 - Reviewed-on: https://code.wireshark.org/review/5899 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: Ic8c939355b54317f0b459c60342f3cb5dfa29624 + Reviewed-on: https://code.wireshark.org/review/7015 + Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit 2f44afe -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Dec 19 17:56:17 2014 -0800 +commit 22b4619 +Author: Gerald Combs <gerald@zing.org> +Date: Sat Feb 7 12:56:03 2015 -0800 - Use ENCTYPE_NULL in the krb5_crypto_init() call. + Add the profile name to the Coloring Rules window title. - That appears to be a name supplied both by MIT and Heimdal Kerberos. - Using it makes it a bit clearer what the code is doing, and might avoid - type clash warnings if it's the right type (e.g., if it's a member of an - enum, as it is in Heimdal, and the corresponding argument to - krb5_crypto_init() is of the same type, the types will match). - - Change-Id: I81b79223f789b8d1ec47180b7636ac1d83e03681 - Reviewed-on: https://code.wireshark.org/review/5898 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 2376953 -Author: Stephen Fisher <sfisher@sdf.org> -Date: Fri Dec 19 17:44:37 2014 -0700 - - Another missing change + Matches GTK+ behavior. - Change-Id: Icaaaeda75f411ecc7cf3027440c8af2b85021be3 - Reviewed-on: https://code.wireshark.org/review/5897 - Reviewed-by: Stephen Fisher <sfisher@sdf.org> + Change-Id: I3dedb1532b5e14cc18a3ff34fd5be89438912834 + Reviewed-on: https://code.wireshark.org/review/7012 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 71fc2f8 -Author: Stephen Fisher <sfisher@sdf.org> -Date: Fri Dec 19 17:27:30 2014 -0700 +commit 6dd1296 +Author: Gerald Combs <gerald@zing.org> +Date: Sat Feb 7 11:21:17 2015 -0800 - Another missing change, to include floor.h + WSUG: Update the Packet Colorization section. - Change-Id: Ice962bb9d62ab99f225228bf1e78850947eea625 - Reviewed-on: https://code.wireshark.org/review/5895 - Reviewed-by: Stephen Fisher <sfisher@sdf.org> + Change-Id: I0f880293bd185e202d230f0db1a6bc4cbe6cfbfb + Reviewed-on: https://code.wireshark.org/review/7011 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit df1f919 -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Dec 19 16:20:42 2014 -0800 +commit 4282304 +Author: Martin Kaiser <wireshark@kaiser.cx> +Date: Sat Feb 7 19:58:40 2015 +0100 - Don't use g_slist_free_full(). - - It's only in GLib 2.28 or later, but we don't require 2.28. + set protocol to USBHID for get descriptor request and response + if they're dealing with HID descriptors - Instead, have col_custom_field_ids_free() do what g_slist_free_full() does - - and more. - - Change-Id: I15768cfd2d26c847470b02ea6c51830dabcaa7ee - Reviewed-on: https://code.wireshark.org/review/5894 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: Ia529fe373653ddf18e05e8ad148a2f5b5686fa95 + Reviewed-on: https://code.wireshark.org/review/7010 + Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> -commit dba361b -Author: Stephen Fisher <sfisher@sdf.org> -Date: Fri Dec 19 16:19:25 2014 -0700 +commit 5457865 +Author: Martin Kaiser <wireshark@kaiser.cx> +Date: Sat Feb 7 19:47:37 2015 +0100 - Add a missing line related to previous two commits + use the value string for HID descriptor type - (I messed up my local git repo using git branches and stash/stash pops, - sorry for all of the extra commits for one change) - - Change-Id: Ib031ae7d57ba9ea4b19fe13121643799e7563046 - Reviewed-on: https://code.wireshark.org/review/5893 - Reviewed-by: Stephen Fisher <sfisher@sdf.org> + Change-Id: I19544eeccd5206de88fe480f9b02bc57fcc278bd + Reviewed-on: https://code.wireshark.org/review/7009 + Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> -commit aa0a040 -Author: Stephen Fisher <sfisher@sdf.org> -Date: Fri Dec 19 16:11:33 2014 -0700 +commit 1a5b5fa +Author: Martin Kaiser <wireshark@kaiser.cx> +Date: Sat Feb 7 19:31:33 2015 +0100 - Add missing files from last commit + remove the offset parameter from dissect_usb_standard_setup_request() - Change-Id: I4a6dd1b60893d19b91f5bc0f85be9ee99cd3eb5e - Reviewed-on: https://code.wireshark.org/review/5892 - Reviewed-by: Stephen Fisher <sfisher@sdf.org> + Change-Id: Iaf339310c3b606885e945d10cffc1956ce24578a + Reviewed-on: https://code.wireshark.org/review/7008 + Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> + Tested-by: Martin Kaiser <wireshark@kaiser.cx> -commit 47dc4e7 -Author: Stephen Fisher <sfisher@sdf.org> -Date: Fri Dec 19 23:03:14 2014 +0000 +commit 8bf6516 +Author: Martin Kaiser <wireshark@kaiser.cx> +Date: Mon Jan 19 08:02:26 2015 +0100 - Revert "Provide a floorl() function (which is currently only able to call GCC's __builtin_floorl() function) for systems which don't provide one." because I left off the new wsutil/floor.[ch] files + dissect a get descriptor request and response for the HID report descriptor - This reverts commit e2586ec36d0d924b933d2127e809918b980cb413. + treat those two messages as class-specific control messages, handle them + inside the USB HID dissector - Change-Id: Ie38b7f32b2d21e3beba5173eec22ca12b7f5da91 - Reviewed-on: https://code.wireshark.org/review/5891 - Reviewed-by: Stephen Fisher <sfisher@sdf.org> - -commit e2586ec -Author: Stephen Fisher <sfisher@sdf.org> -Date: Fri Dec 19 15:54:04 2014 -0700 - - Provide a floorl() function (which is currently only able to call GCC's - __builtin_floorl() function) for systems which don't provide one. - - Change-Id: Ie0140ff195f0eae525c7bd70c7c3e23039fde569 - Reviewed-on: https://code.wireshark.org/review/5889 - Reviewed-by: Stephen Fisher <sfisher@sdf.org> + Change-Id: I42d201df4a8fdb94c947b6118c0b50945c306423 + Reviewed-on: https://code.wireshark.org/review/7006 + Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> + Tested-by: Martin Kaiser <wireshark@kaiser.cx> -commit e7d2c8d -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Dec 19 14:07:29 2014 -0800 +commit 5403478 +Author: Martin Kaiser <wireshark@kaiser.cx> +Date: Thu Feb 5 22:37:54 2015 +0100 - Get rid of some accidentally-checked-in debugging stuff. + refactor the dissection of USB setup requests - Change-Id: Iea54df783cdff2424d23ecfba8f219dae42d0c83 - Reviewed-on: https://code.wireshark.org/review/5888 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit f4ffbbb -Author: Guy Harris <guy@alum.mit.edu> -Date: Fri Dec 19 14:06:04 2014 -0800 - - Throw some casts at compiler warnings. + pass the data only to one subsequent dissection function + either we have a standard request or a non-standard request that can be + handled by a class dissector (we used to do both at the same time, + this makes the output difficult to read) - Change-Id: I609fcba0b015599f98edb1b3927edb5684bcf2b1 - Reviewed-on: https://code.wireshark.org/review/5887 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: Ia46239b2b9e121c9ca165cc56d0b271345d7962e + Reviewed-on: https://code.wireshark.org/review/7005 + Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> + Tested-by: Martin Kaiser <wireshark@kaiser.cx> -commit d4ff430 -Author: Stephen Fisher <sfisher@sdf.org> -Date: Fri Dec 19 14:51:26 2014 -0700 - - Move packet-kerberos.c to the dirty dissectors because it generates - warnings (at least on NetBSD), presumably due to our use of - -Wc++-compat: - - ../../asn1/kerberos/packet-kerberos-template.c: In function - 'read_keytab_file': - ../../asn1/kerberos/packet-kerberos-template.c:497:10: warning: request - for implicit conversion from 'gpointer' to 'struct enc_key_t *' not - permitted in C++ - ../../asn1/kerberos/packet-kerberos-template.c:518:21: warning: request - for implicit conversion from 'gpointer' to 'char *' not permitted in C++ - ../../asn1/kerberos/packet-kerberos-template.c: In function - 'decrypt_krb5_data': - ../../asn1/kerberos/packet-kerberos-template.c:570:3: warning: enum - conversion when passing argument 3 of 'krb5_crypto_init' is invalid in - C++/usr/include/krb5/krb5-protos.h:1208:1: note: expected 'krb5_enctype' - but argument is of type 'int' - ../../asn1/kerberos/packet-kerberos-template.c:581:13: warning: request - for implicit conversion from 'gpointer' to 'guint8 *' not permitted in - C++ - ../../asn1/kerberos/packet-kerberos-template.c:596:13: warning: request - for implicit conversion from 'gpointer' to 'char *' not permitted in C++ - - Change-Id: I17c10fc1df2685ec2e2c1b00cd3b81f62e09c829 - Reviewed-on: https://code.wireshark.org/review/5886 - Reviewed-by: Stephen Fisher <sfisher@sdf.org> - -commit 0df4eec -Author: Stephen Fisher <sfisher@sdf.org> -Date: Fri Dec 19 13:26:22 2014 -0700 - - Add parenthesis around some generated code so it compiles. This new - code only shows up when the X11 dissector is updated from the latest - xcbproto & mesa, which I will commit real soon now (RSN). - - Change-Id: Ic750df3b4406f107fd850ade891ee093054c8d6d - Reviewed-on: https://code.wireshark.org/review/5882 - Reviewed-by: Stephen Fisher <sfisher@sdf.org> - -commit fbd6caa -Author: Stephen Fisher <sfisher@sdf.org> -Date: Fri Dec 19 11:31:07 2014 -0700 - - Take out parenthesis around faq.txt rule so it works when automake - chooses Korn shell instead of Bourne shell. It still works with the - Bourne shell in my testing. - - Change-Id: I00bfed22fb0d9bb183637ea5fb111904b8536949 - Reviewed-on: https://code.wireshark.org/review/5880 - Reviewed-by: Stephen Fisher <sfisher@sdf.org> - -commit 962fa21 -Author: Michael Mann <mmann78@netscape.net> -Date: Thu Dec 18 16:31:43 2014 -0500 +commit a097659 +Author: Martin Kaiser <wireshark@kaiser.cx> +Date: Sun Feb 1 18:08:15 2015 +0100 - Replace uses of proto_get_frame_protocols with proto_is_frame_protocol when only one protocol is desired. + change try_dissect_next_protocol() such that its parameter is the + top-most tree on which it operates - Also use proto_get_frame_protocols in main_menubar.c instead of doing it "manually". + this gives callers more control over where things are displayed - Change-Id: Ie7a365c538700f2cebdd1e3d253f2fd9b189f5cf - Reviewed-on: https://code.wireshark.org/review/5851 - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: I8cdc07b4f3569bca728781fb709e2a2bb37c433b + Reviewed-on: https://code.wireshark.org/review/7004 + Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> + Tested-by: Martin Kaiser <wireshark@kaiser.cx> -commit 398c2cee -Author: Stephen Fisher <sfisher@sdf.org> -Date: Fri Dec 19 10:01:55 2014 -0700 +commit 1648d6e +Author: Martin Kaiser <wireshark@kaiser.cx> +Date: Sun Feb 1 16:37:47 2015 +0100 - Skip over the new 'switch' field in xproto/src/xinput.xml so we can - re-generate the x11 dissector again without the script breaking. + new function is_usb_standard_setup_request() to check if a request is a + standard setup request - Change-Id: I6d24cf098f370f4c1ff191052e2ea67b7875b33a - Reviewed-on: https://code.wireshark.org/review/5878 - Reviewed-by: Stephen Fisher <sfisher@sdf.org> - -commit c11085a -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Fri Dec 19 11:57:19 2014 +0100 - - ISIS: Fix warning: '@return' command used in a comment that is attached to a function returning void [-Wdocumentation] + it's not sufficient to look at the type bits in the request type field - Change-Id: I7f20311125e369cc90df808772323e8e98f8c94e - Reviewed-on: https://code.wireshark.org/review/5850 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit f94eb27 -Author: Stephen Fisher <sfisher@sdf.org> -Date: Mon Dec 8 10:06:56 2014 -0700 - - Bring pkg.m4 in from pkgconfig version 0.28 so we can use the - PKG_PROG_PKG_CONFIG macro to try searching for pkg-config even when - it isn't installed. Without this (and without pkg-config installed) - the configure script is broken. With it, it gives a message saying - pkg-config isn't found. + use the new function where we checked the type bits before - Change-Id: I4c5af4cedd8c1927c1e00dd6b42faef3f31b84d4 - Reviewed-on: https://code.wireshark.org/review/5671 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I65b901dca91607a4dad4e4296b3f3a877aebf346 + Reviewed-on: https://code.wireshark.org/review/7003 + Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> + Tested-by: Martin Kaiser <wireshark@kaiser.cx> -commit 1f03180 -Author: Michael Mann <mmann78@netscape.net> -Date: Wed Dec 17 21:55:52 2014 -0500 +commit 13f6bce +Author: Michal Labedzki <michal.labedzki@tieto.com> +Date: Tue Jan 6 10:47:33 2015 +0100 - Use new color_dissector_filters.[ch] to refactor (color) conversation generation in GTK menus. + Bluetooth: ATT: Use proto_tree_add_new_bytes for UUID128 - Change-Id: I5868a40b71a989a3a1522cb091064bb0aaec6daf - Reviewed-on: https://code.wireshark.org/review/5828 - Reviewed-by: Michael Mann <mmann78@netscape.net> - Petri-Dish: Michael Mann <mmann78@netscape.net> + Change-Id: I018b3e125bcbb6908276dd2b3b9f66def9aa745b + Reviewed-on: https://code.wireshark.org/review/6907 + Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 792c01a -Author: Gerald Combs <gerald@wireshark.org> -Date: Thu Dec 18 13:56:47 2014 -0800 - - Bluetooth: Remove unused value strings. - - Remove bluetooth_type_vals and bluetooth_direction_vals. - - Change-Id: I2d39a59fc815f06d1a5cd5ab838e2bde37597469 - Reviewed-on: https://code.wireshark.org/review/5842 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - -commit d3a4d92 -Author: Stephen Fisher <sfisher@sdf.org> -Date: Thu Dec 18 21:16:16 2014 -0700 - - Put a colon after the error message and before the field the error - is referring to for clarity. - - Change-Id: I7930e851647c847335b91435c7b0871c6db2defe - Reviewed-on: https://code.wireshark.org/review/5847 - Reviewed-by: Stephen Fisher <sfisher@sdf.org> - -commit 23987b4 -Author: Stephen Fisher <sfisher@sdf.org> -Date: Thu Dec 18 20:49:50 2014 -0700 - Add a comment to each of these scripts to say that - epan/dissectors/README.X11 has instructions for running them. - - Change-Id: Id3c1df1bf1f50b19372b9a0470822da9ca6504f7 - Reviewed-on: https://code.wireshark.org/review/5846 - Reviewed-by: Stephen Fisher <sfisher@sdf.org> - -commit b000ada -Author: Jeff Morriss <jeff.morriss.ws@gmail.com> -Date: Thu Dec 18 21:31:05 2014 -0500 - - Finish renaming si_code to mtp3_si_code. - - I5e183b997768c87f275569343afa69ca542aba46 missed a spot. - - Change-Id: I0970f7e50719e71efc824bbb07a6c2a69c66e991 - Reviewed-on: https://code.wireshark.org/review/5845 - Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> - -commit acbef26 -Author: Michael Mann <mmann78@netscape.net> -Date: Wed Dec 17 21:59:56 2014 -0500 +commit 617c733 +Author: Michal Labedzki <michal.labedzki@tieto.com> +Date: Tue Jan 6 10:46:17 2015 +0100 - Remove main-menubar-ui.xml because it's not used. + Add proto_tree_add_new_bytes() - Noticed it because it had some really old menu information in it. Much of which is now programmatically done. + Version to add as generated field, without tvb offset, length. - Change-Id: I0a24227df48c00310bc3223f72ba71c00b2c9fc7 - Reviewed-on: https://code.wireshark.org/review/5829 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> - -commit 07eef05 -Author: Stephen Fisher <sfisher@sdf.org> -Date: Thu Dec 18 17:46:27 2014 -0700 - - Rename si_code variable to mtp3_si_code to avoid conflicts with NetBSD's - si_code #define in sys/siginfo.h - - Change-Id: I5e183b997768c87f275569343afa69ca542aba46 - Reviewed-on: https://code.wireshark.org/review/5844 - Reviewed-by: Stephen Fisher <sfisher@sdf.org> - -commit 577e6a1 -Author: Michael Mann <mmann78@netscape.net> -Date: Thu Dec 18 14:40:15 2014 -0500 - - Allow "cba" filter prefix for hf_ fields. Seems like something with "pn" or (abbreviated) Profinet would make more sense (with dissectors to match), but trying to satisfy pre-commit check. - - Change-Id: I1db5314fdc77ab7b909c955415f66f24da7d2a0a - Reviewed-on: https://code.wireshark.org/review/5838 - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: If4c7aebcbf1b47faa483bcbd40995eff3ccb99f0 + Reviewed-on: https://code.wireshark.org/review/6906 + Tested-by: Michal Labedzki <michal.labedzki@tieto.com> + Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> -commit 71d13b3 +commit 722ce56 Author: Bill Meier <wmeier@newsguy.com> -Date: Thu Dec 18 11:53:03 2014 -0500 - - proto.c: Add hint to 'DISSECTOR_ASSERT(hf->bitmask != 0)' to show field name. - - Change-Id: Ie578a73742901c1837802da17c0aaf2e58d48c6f - Reviewed-on: https://code.wireshark.org/review/5835 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit f299f73 -Author: Maarten Bezemer <maarten.bezemer@gmail.com> -Date: Thu Dec 18 15:42:53 2014 +0100 - - Add new cmake.in files to the distribution - - Change-Id: I685b9376342087182cc0dc8d9b8ed8e17a5ff8e7 - Reviewed-on: https://code.wireshark.org/review/5833 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit e2d7b56 -Author: AndersBroman <anders.broman@ericsson.com> -Date: Thu Dec 18 12:33:03 2014 +0100 - - Add new cmake files to the distribution - - Change-Id: Iae5ffac472c6d013cf5dd37310278f203a04f8d3 - Reviewed-on: https://code.wireshark.org/review/5831 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 361ea82 -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Wed Dec 17 11:38:49 2014 +0100 +Date: Fri Feb 6 15:44:05 2015 -0500 - Add support for multifields in custom column + btatt: fix bug ("Labeled code is unreachable"); - You can now add column with Custom type with more than one field - by using OR "||" splitter. + Introduced in gca3fe28; + Found by MSVC2013 Code Analysis - Bug: 9695 - - Change-Id: Ia82a91e7a35b867647d36cb9626e3870f46c0d85 - Reviewed-on: https://code.wireshark.org/review/5804 - Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I4c754dfacca492b53debdaf82557e4fe91698460 + Reviewed-on: https://code.wireshark.org/review/6991 + Reviewed-by: Bill Meier <wmeier@newsguy.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> -commit f5cd215 +commit fb00452 Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Fri Dec 12 11:24:44 2014 +0100 +Date: Thu Jan 22 12:27:23 2015 +0100 - Bluetooth: Add generic Bluetooth dissector + Bluetooth/GUI: ATT: Add Server Attribute Table - Bluetooth dissector is used to add ability to filter all bluetooth - payload from capture files (there are many transport like: - hci_h4, hci_h1, hci_usb, hci_mon, btle). Also it is used to placeholder for - all data tree used to store additional informations like bd_addrs, names, etc. - Finally it is used to be one point for Bluetooth - Endpoints/Conversation filtering what is enabled now. + It is a GUI+QT feature that introduce Bluetooth menu and + "ATT Server Attributes" that present all handle+UUID pairs + as table. User may copy cell value, row, selected rows or whole + table within header. On activate user will go to packet that + introduce UUID for specified handle. - Also add Master/Slave Role and Connection Mode tracking. - - Change-Id: I67048080fb8ee16fa0f4ec429c1257de81ddd737 - Reviewed-on: https://code.wireshark.org/review/5771 - Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: If17e53aff5feb89ededc740a595ba5882b90be5e + Reviewed-on: https://code.wireshark.org/review/6911 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> -commit 4a467ff +commit 2ff79dd Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Fri Dec 12 11:11:00 2014 +0100 +Date: Thu Feb 5 09:18:53 2015 +0100 - Bluetooth: BTLE: Add src/dst addresses when they are known - - Generally where it is not connection then on LinkLayer protocol level - addresses for Source and Destination device are known. + Bluetooth: ATT: Fix Running Walking Sensor field name - Change-Id: Id67703edc08df73d4c7a2f66ee8f4d6810a867c9 - Reviewed-on: https://code.wireshark.org/review/5776 - Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Change-Id: I595c169e476cf86aa77ca926f4ce0d5d0e4aecd1 + Reviewed-on: https://code.wireshark.org/review/7002 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> -commit ee4a7f2 +commit 7610a69 Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Tue Dec 9 18:55:44 2014 +0100 +Date: Sat Feb 7 17:24:48 2015 +0100 - DisplayFilter: Check also another fields with the same name + Bluetooth: ATT: Fix not missing break - This adds possibility to have two fields with the same abbrev name - but different type, for example FT_ETHER and FT_STRING. - That allows to compare each one to find a valid field. + "Break" is not missing, "error opcode" is part of opcode "Error Response" + that is needed to fetch request data. - Change-Id: I8b2a1708ac9648b7a4289777c72a0f3b18f3d8f8 - Reviewed-on: https://code.wireshark.org/review/5702 - Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Change-Id: I35432b22fae492a93332a8787213dd8fcf796e3b + Reviewed-on: https://code.wireshark.org/review/7001 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> -commit a73b89b -Author: Maarten Bezemer <maarten.bezemer@gmail.com> -Date: Wed Dec 17 15:03:56 2014 +0100 +commit 1eec034 +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Fri Feb 6 17:25:18 2015 +0100 - Use LocatePythonModule to locate asn2wrs.py + Bluetooth: ATT: Missing break in switch (CID 1268199) - This reuses existing functionality and thereby making FindAsn2Wrs.cmake obsolete, resulting in a reduction of the cmake module maintaince load - - Change-Id: Ic6ae53e65236246c0cbe86f8c2f066a2d034e0b9 - Reviewed-on: https://code.wireshark.org/review/5805 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Change-Id: I562f1b8c1d39586c2a3f25363e89e81587176c58 + Reviewed-on: https://code.wireshark.org/review/6987 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit cb345eb -Author: Maarten Bezemer <maarten.bezemer@gmail.com> -Date: Sun Nov 16 16:07:45 2014 +0100 +commit 1ecd0ad +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Fri Feb 6 17:08:26 2015 +0100 - Use LocatePythonModule to find make-dissector-reg.py in order to make UseMakeDissectorReg.cmake more generally (out-of-source) usable. - Add make-dissector-reg.py to the Debian packages. + Bluetooth: ATT: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - Making it possible to generate out-of-source wireshark plugins. - - Change-Id: I0bbe5b46205d39e229d31812341540b26a7336d6 - Reviewed-on: https://code.wireshark.org/review/5802 + Change-Id: Id323b783e2931ad9b4e08727df91c8e0138d35c1 + Reviewed-on: https://code.wireshark.org/review/6986 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 0885d29 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 17 20:03:47 2014 -0800 - - Make sure err_info is always set, and print it iff it's non-null. - - Change-Id: Ib5c600c491a3d8adcfa91c00fa9445283610545b - Reviewed-on: https://code.wireshark.org/review/5830 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 6011a04 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 17 16:41:21 2014 -0800 - - WTAP_ERR_UNWRITABLE_ errors aren't returned by reads or open-for-reading. - - Check for them *only* on opening for writing and writes. - - Change-Id: I4b537d511ec04bcfc81f69166a2b9a2ee9310067 - Reviewed-on: https://code.wireshark.org/review/5827 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit aa27e66 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 17 16:31:49 2014 -0800 - - Rename WTAP_ERR_REC_TYPE_UNSUPPORTED to WTAP_ERR_UNWRITABLE_REC_TYPE. - - That indicates that it's a problem specific to *writing* capture files; - we've already converted some errors to that style, and added a new one - in that style. - - Change-Id: I8268316fd8b1a9e301bf09ae970b4b1fbcb35c9d - Reviewed-on: https://code.wireshark.org/review/5826 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 51522b3 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 17 16:02:50 2014 -0800 +commit 2c65b33 +Author: Peter Wu <peter@lekensteyn.nl> +Date: Sat Feb 7 00:49:31 2015 +0100 - Handle "I can't map this for that file format" better. - - For cases where record (meta)data is something that can't be written out - in a particular file format, return WTAP_ERR_UNWRITABLE_REC_DATA along - with an err_info string. + Fix RTP crash on RTP analysis attempt - Report (and free) that err_info string in cases where - WTAP_ERR_UNWRITABLE_REC_DATA is returned. + The tap listener was handling rtpstream_tapinfo_t* types while other + users was expecting a GList* instead. Fix this and avoid future + confusion by replacing void* pointers. - Clean up some other error reporting cases, and flag with an XXX some - cases where we aren't reporting errors at all, while we're at it. - - Change-Id: I91d02093af0d42c24ec4634c2c773b30f3d39ab3 - Reviewed-on: https://code.wireshark.org/review/5823 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Ping-Bug: 10714 + Change-Id: I66f62eaaed4a529714264bbf4e7ad1e72b46ce5a + Reviewed-on: https://code.wireshark.org/review/6997 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 8ce0f12 -Author: Maarten Bezemer <maarten.bezemer@gmail.com> -Date: Wed Dec 17 11:06:19 2014 +0100 +commit 6f22eb6 +Author: Gerald Combs <gerald@zing.org> +Date: Fri Feb 6 16:42:16 2015 -0800 - Resync Debian symbols - Fix wrong symbol for proto_tree_add_bitmask_with_flags + Qt: Fix coloring rules reordering. - Change-Id: I6804aab8f4394653fbeb2b6343d20d43eaa2b93e - Reviewed-on: https://code.wireshark.org/review/5803 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I8bf36fffb3e3fc19c10c5f07db951cc5a4253556 + Reviewed-on: https://code.wireshark.org/review/6998 + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 1a56990 -Author: Graham Bloice <graham.bloice@trihedral.com> -Date: Wed Dec 17 15:42:57 2014 +0000 +commit c8cad99 +Author: Gerald Combs <gerald@wireshark.org> +Date: Wed Feb 4 16:36:19 2015 -0800 - Fix zbee errors introduced by change 5565, commit df639f509e812fff3c5eb4bdf4f77988c6ec122b + Qt: Add the Coloring Rules dialog. - Reworked zbee_mfr_code_names to be in monotonic order. - Fixed implicit shortening of time value with a cast. + Merge in the old ColorDialog which was a placeholder for + color_filter_add_cb. - Change-Id: I629948fbe32543fd2672bbc40af790333b970b10 - Reviewed-on: https://code.wireshark.org/review/5808 - Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I48d188509f480b8514122b4011ac9d8790fcca10 + Reviewed-on: https://code.wireshark.org/review/6996 + Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> - -commit db4232a -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 17 12:38:48 2014 -0800 - - This code is used in Wireshark, not TShark; fix messages. - - Change-Id: I3c6b7686de478e42eeeb9c51c8bdb5b6843666af - Reviewed-on: https://code.wireshark.org/review/5814 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit e00f585 -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 17 11:53:13 2014 -0800 - - Fix another incorrect message for WTAP_ERR_UNSUPPORTED. - - WTAP_ERR_FILE_UNKNOWN_FORMAT is reported if the file is in a format that - libwiretap doesn't know about (either because it's not a capture file at - all or because it's a capture file in a format it doesn't support). - WTAP_ERR_UNSUPPORTED is for files in a *known* format that are using - features or file format elements (record type, link-layer header type, - etc.) that libwireshark doesn't support. Fix another copy-and-pasteo - causing WTAP_ERR_UNSUPPORTED to be reported with a message appropriate - for WTAP_ERR_FILE_UNKNOWN_FORMAT. - - Change-Id: Ib35e2a6b6c62517887e0386f0fed1795db335439 - Reviewed-on: https://code.wireshark.org/review/5810 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 97cc005 -Author: zeuz <czingerl@gmail.com> -Date: Tue Dec 16 19:23:55 2014 +0100 - - Artnet3 and OEM Codes Update - - Improved handling of status bits - - Using bitfields where applicable - - Unified capitalization of hex values - - Using TFS instead of bits for status flags - - Added universe ID calculation from Address/Net/Port - - Added RDM PID decoding (values in packet-rdm.c) - - Added Poll/PollReply/Toc/Rdm support for Artnet3 (15bit universe) - - Updated manufacturer list from ESTA website - - Updated OEM codes from Art-Net SDK - - Change-Id: I33edbfa754cb37391614f7cf4d6d4a9b11bcd52d - Reviewed-on: https://code.wireshark.org/review/5755 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 2018404 -Author: zeuz <czingerl@gmail.com> -Date: Tue Dec 16 19:08:53 2014 +0100 +commit b3f3dd8 +Author: Gerald Combs <gerald@wireshark.org> +Date: Fri Feb 6 10:36:27 2015 -0800 - RDM: Made PID array global (can be reused in packet-artnet.c) - Fixed deprecated API warning + Qt: Fix preference change behavior. - Change-Id: I761181baf9f5ae31a8a3807eb27d791d8868dcde - Reviewed-on: https://code.wireshark.org/review/5786 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 2d6adb2 -Author: Evan Huus <eapache@gmail.com> -Date: Wed Dec 17 13:00:25 2014 -0500 - - zbee-zcl: swap honeywell codes + Main window: - they were out of order for the extended value-string, I suspect honeywell1 and - honeywell2 had just been put in backwards + Keep track of our current layout and only change it if the preferences + change. This keeps the panes from resizing. - Change-Id: I4aacf27ba8aa20c137731f1ad652380cd5af5562 - Reviewed-on: https://code.wireshark.org/review/5809 - Reviewed-by: Evan Huus <eapache@gmail.com> - -commit 24965c6 -Author: Maarten Bezemer <maarten.bezemer@gmail.com> -Date: Wed Dec 17 16:25:17 2014 +0100 - - Fix missing space + Re-select the current packet if the layout changes so that the proto + tree and byte view aren't left in an invalid state. This fixes a crash + similar to bug 10896. - Change-Id: Ia56ff1d78d584ca062a714aac097c05034279e34 - Reviewed-on: https://code.wireshark.org/review/5807 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit e4b4647 -Author: AndersBroman <anders.broman@ericsson.com> -Date: Wed Dec 17 16:24:40 2014 +0100 - - [MIP] Add refreence to 3GPP2 documents for 3GPP2 CVSE GRE_KEY_EXT + Search frame: - Change-Id: I24d77e3602afba4c522648a3fabd7672c7c1f736 - Reviewed-on: https://code.wireshark.org/review/5806 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit a13bbfc -Author: AndersBroman <anders.broman@ericsson.com> -Date: Mon Dec 15 15:00:04 2014 +0100 - - [TCP] Don't attempt reassembly on retransmitted segments. + Get rid of an invalid error message. Update coding style. - Change-Id: I140227416435589a8b83ccb440625ccb90d0673e - Reviewed-on: https://code.wireshark.org/review/5772 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 6b7a395 -Author: Ganesh Nawsupe <ganesh991@gmail.com> -Date: Fri Dec 12 11:50:21 2014 +0530 - - Adding fix to convert latitude/longitude degrees to floating point format from fixed point format + I don't think any of these fix bug 10921 since Xiaochuan seems to get a + crash immediately upon opening the dialog. - Change-Id: Ibcfeae69e4f60423c87a0fdb8666192a1ca5dc0c - Reviewed-on: https://code.wireshark.org/review/5726 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> + Change-Id: I0e880a50d3c9ac1c6ae6a01034b05fd2249444f4 + Reviewed-on: https://code.wireshark.org/review/6989 + Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit a3510cc +commit 3b3ce87 Author: Bill Meier <wmeier@newsguy.com> -Date: Tue Dec 16 18:02:33 2014 -0500 +Date: Fri Feb 6 16:46:19 2015 -0500 - mip: Fix Rev Revocation [Ack] Flags dissection bugs. + qnet6: Fix a bug found by MSVC2013 Code Analysis. + + wrongo: + 2 * 2 + 4 * 5 + (khdr.msgtype & QNET_KIF_CRED) ? (4 * 4 + 4 * 7) : 0 - Change-Id: Ia1eb397ee6aba8211b1091636e4ac4f51c95cc2b - Reviewed-on: https://code.wireshark.org/review/5791 + Change-Id: I79117a34528642a81d0c80427a8e41d733bef10d + Reviewed-on: https://code.wireshark.org/review/6995 Reviewed-by: Bill Meier <wmeier@newsguy.com> - Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 8ccdc07 +commit ff6d503 Author: Bill Meier <wmeier@newsguy.com> -Date: Thu Dec 11 16:56:22 2014 -0500 - - mip: fix (what appear to be) bugs in CVSE GRE key extension dissection - - Change-Id: I43dc48de62eda3a62bef4bf4a40fd18cb45751f3 - Reviewed-on: https://code.wireshark.org/review/5733 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit d99fe21 -Author: AndersBroman <a.broman@bredband.net> -Date: Tue Dec 16 23:46:59 2014 +0100 - - Update to V12.5.0 - - Bug: 10782 - - Change-Id: I5fd4ec14279411682d8a23f5e0f503180113f093 - Reviewed-on: https://code.wireshark.org/review/5790 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit df639f5 -Author: Chris Brandson <chris.brandson@gmail.com> -Date: Fri Nov 7 14:11:02 2014 -0800 - - Fixed bug in ZigBee (zbee) decryption, added Key Establishment cluster and moved IAS, Thermostat and Poll clusters out of the ZCL foundation dissector. - - Removed attrID and cmdID ZCL cluster functions. - Bug in ZCL HVAC attribute registration. - Fixed bug in ZCL command ID field registration. - Update Manufacturer Codes and Profile Ids to ZigBee-053874r26 Oct 2014 - Fixed broken fragmented ZigBee packet collection and reassembly - Use protocol fields for Thermostat schedule transitions. - Added support for Key Establishment Cluster (CBKE) at SE 1.2a - Updated Message cluster to SE 1.2a spec - Added attribute reporting status which is common to all SE 1.2a clusters - Added SE 1.2a tunnel cluster support - ZigBee Smart Energy (SE) decryption appears to have been broken for some time. For SE you do not know the Link Key until after successful completion of Key Establishment and then manually enter it into preferences. Entry in preferences was broken such that when the new Link Key was entered all existing link keys would be lost. This lead to the loss of the Network Key as well when the Transport Key message was re-processed without the Pre-Configured Link Key. The Link Key 'key ring' has been moved to the UAT post-update callback so that it will always be updated correctly after changes to the link keys in preferences - The attribute reporting status attribute which is common to all SE clusters was accidentally shared, now each cluster has it's own instance - ZigBee security added key display for decrypted packets - ZigBee Security Preferences fixed UAT type for Label so key label is editable again - Added definition for Retail Service profile - Added dissection for profile-wide (General Command Frame) commands when the profile is unknown - Added zbee-zcl-misc.c to precommit check whitelist as it contains ias and hvac clusters avoiding proliferation of too many small files - - Change-Id: I53d85ba9d782db6a0e7e78c51b0bc7cdcdbca3ad - Reviewed-on: https://code.wireshark.org/review/5565 - Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit c5b7207 -Author: Maarten Bezemer <maarten.bezemer@gmail.com> -Date: Wed Nov 12 13:43:14 2014 +0100 - - Install cmake files to make them available for out of source builds - - Change-Id: I2cb4018f0214b6c0bdccfd1e83c7a7f22a818e8b - Reviewed-on: https://code.wireshark.org/review/5256 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit cc8ed84 -Author: Maarten Bezemer <maarten.bezemer@gmail.com> -Date: Wed Nov 12 13:39:07 2014 +0100 +Date: Fri Feb 6 14:04:01 2015 -0500 - Invoke asn2wrs.py using a custom command + qnet6: Cleanup - A custom target is defined to be always invalid, so asn2wrs.py is always invoked. - A custom command is able to convert input file(s) into output file(s), the actual command is only invoked in the provided dependencies are changed. - As an advantage the dependencies are correct, so cmake is able to determine when the output file is required, so it can be build in time. + - Remove some boilerplate comments; + - Use a consistent indent style (gnu); + - Use a consistent format for hf[] entries; + - Whitespace; + - Long lines; + - Rename a generic macro; - Change-Id: I84be5d408cfc87cf88d67b6073bea439febbe712 - Reviewed-on: https://code.wireshark.org/review/5255 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit a1d4c0a -Author: Maarten Bezemer <maarten.bezemer@gmail.com> -Date: Wed Nov 12 13:32:41 2014 +0100 - - Do not force the output directory - - For out of source builds, the output directory should not point to wireshark source locations. - By default it does point to the wireshark source directory (to stay compatible with the build in dissectors). - When the A2W_OUTPUT_DIR variable is set to "_EMPTY_" the output lcoation argument (-O) is not invoked. - Use A2W_FLAGS to set an output location for out of source builds (or use A2W_OUTPUT_DIR, which has the same result) - - Change-Id: I48b7486fcda982f0dce57cde3beacb99f946abd9 - Reviewed-on: https://code.wireshark.org/review/5254 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit fb01f59 -Author: Maarten Bezemer <maarten.bezemer@gmail.com> -Date: Tue Nov 11 17:11:11 2014 +0100 - - Use FindAsn2Wrs to find asn2wrs.py - - A first step to make it possible to reuse the UseAsn2Wrs for out of source builds. - - Change-Id: Iefb34f943e06db3d6afed55ab69d3f26aa9d633d - Reviewed-on: https://code.wireshark.org/review/5253 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit c083f50 -Author: Maarten Bezemer <maarten.bezemer@gmail.com> -Date: Wed Nov 12 13:02:17 2014 +0100 - - Install GLib cmake helper files - - GLib is always/mostly required when building wireshark plugins. These cmake fiels help finding the install glib components - - Change-Id: Ie59b50bf8c53c367d4bf89f53db5ae31e97e0575 - Reviewed-on: https://code.wireshark.org/review/5252 - Petri-Dish: Anders Broman <a.broman58@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit d2eddde -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 17 00:47:31 2014 -0800 - - Report WTAP_ERR_UNSUPPORTED correctly. - - WTAP_ERR_FILE_UNKNOWN_FORMAT is reported if the file is in a format that - libwiretap doesn't know about (either because it's not a capture file at - all or because it's a capture file in a format it doesn't support). - WTAP_ERR_UNSUPPORTED is for files in a *known* format that are using - features or file format elements (record type, link-layer header type, - etc.) that libwireshark doesn't support. Fix some copy-and-pasteos - causing WTAP_ERR_UNSUPPORTED to be reported with a message appropriate - for WTAP_ERR_FILE_UNKNOWN_FORMAT. - - Change-Id: Ic675ffd501c52838d8944a6c61e1b01041b73098 - Reviewed-on: https://code.wireshark.org/review/5799 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit ddcc2ae -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 17 00:29:31 2014 -0800 - - Rename WTAP_ERR_UNSUPPORTED_FILE_TYPE to WTAP_ERR_UNWRITABLE_FILE_TYPE. - - That makes it clearer what the problem is, and that it should only be - returned by the dump code path, not by the read code path. - - Change-Id: I22d407efe3ae9fba7aa25f08f050317549866442 - Reviewed-on: https://code.wireshark.org/review/5798 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit dbdcae8 -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Dec 16 22:40:45 2014 -0800 - - Rename WTAP_ERR_UNSUPPORTED_ENCAP to WTAP_ERR_UNWRITABLE_ENCAP. - - That makes it clearer what the problem is, and that it should only be - returned by the dump code path, not by the read code path. - - Change-Id: Icc5c9cff43be6c073f0467607555fa7138c5d074 - Reviewed-on: https://code.wireshark.org/review/5797 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 40f69b2 -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Dec 16 22:22:29 2014 -0800 - - Use WTAP_ERR_UNSUPPORTED for input file stuff we can't handle. - - WTAP_ERR_UNSUPPORTED_ENCAP means "I can't *write* that particular - encapsulation type to a file of this format", which mainly means "that - file format simply can't handle packets of that type"; - WTAP_ERR_UNSUPPORTED means "this file can't currently be supported by - Wireshark, as there's some feature in the file - such as a file or - per-packet encapsulation type - that we don't (yet) handle". - - Change-Id: I53cadf9913d20efb2bccb29f61877b71d53807be - Reviewed-on: https://code.wireshark.org/review/5794 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit b56d4d0 -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Dec 16 22:08:03 2014 -0800 - - Clean up the "unknown per-packet encapsulation" message. - - Report the file name, report the frame number as unsigned (which it is), - and make it look more like other error messages. - - Change-Id: Ia5281da1c94d55c745da8a8b20dafdb74dd13f92 - Reviewed-on: https://code.wireshark.org/review/5793 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit 625ba02 -Author: Guy Harris <guy@alum.mit.edu> -Date: Tue Dec 16 21:29:41 2014 -0800 - - Clean up handling of files without a known encapsulation. - - Fail with an "unsupported encapsulation" error for MTP2 and SSCOP, - rather than just returning "unknown encapsulation", and fail with that - if the encapsulation isn't filled in as well, although that might be a - deeper problem. - - (Not that people should be handing text output files from K12 analyzers - anyway - they should hand us RF5 files and, if we can't handle their - file, file a bug and give us the file so we can further reverse-engineer - the format.) - - Change-Id: I6bbd5f81787d69bd3b41eaedf2893d179f11ad6a - Reviewed-on: https://code.wireshark.org/review/5792 - Reviewed-by: Guy Harris <guy@alum.mit.edu> - -commit ad299df -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Tue Dec 16 22:42:48 2014 +0100 - - HiSLIP: disable heuristic dissector by default - - It is too weak (just checking that the 2 first bytes of TCP segment are "HS") to be always activated - - Change-Id: Iffda96046cc687004f403dd4d8e735375790b07b - Reviewed-on: https://code.wireshark.org/review/5789 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit f400252 -Author: Gerald Combs <gerald@wireshark.org> -Date: Tue Dec 16 11:03:46 2014 -0800 - - Disable the MDS Header ethertype preference. - - If you encounter a frame with an all-zeroes ethertype it's very likely - due to buggy hardware or software. Don't try to dissect it as MDS - Header traffic. - - Change-Id: Ie08d6aba2dcb82e4e49d6dbe96a2a3639e3cafc4 - Bug: 8256 - Reviewed-on: https://code.wireshark.org/review/5788 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: Ic2edcf8a8c0151d63a0d0ad901ddea9d7443ad19 + Reviewed-on: https://code.wireshark.org/review/6994 + Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit 972d347 -Author: Maarten Bezemer <maarten.bezemer@gmail.com> -Date: Wed Nov 12 12:56:26 2014 +0100 +commit 49c27d3 +Author: Bill Meier <wmeier@newsguy.com> +Date: Fri Feb 6 16:18:30 2015 -0500 - Add Wireshark_LIBRARY variable + cfdp: Fix bug ("Labeled code is unreachable") - This variable can be used to obtain the wireshark library(ies) (from the correct location). + Found by MSVC2013 Code Analysis - Change-Id: I90cd5b098eb746ac573a2c611113287b06c3b82b - Reviewed-on: https://code.wireshark.org/review/5251 - Petri-Dish: Michael Mann <mmann78@netscape.net> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> + Change-Id: If8138ff3eab7daa1da728781314f8024e36545be + Reviewed-on: https://code.wireshark.org/review/6992 + Reviewed-by: Bill Meier <wmeier@newsguy.com> -commit 6ee78f3 -Author: Peter Wu <peter@lekensteyn.nl> -Date: Fri Nov 28 15:52:07 2014 +0100 +commit 501d996 +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Wed Feb 4 10:13:50 2015 -0500 - http: properly calculate end of chunked response - - It was previously assumed that the remainder of a packet contains a - chunked-body response. This does not have be the case, and if the - assumption is violated, then the dissector would add multiple parts to a - single "De-chunked entity body". + Further simplify the LSA-Update processing: the always-present forwarding block + can be considered TOS 0. - This patch properly calculates the end of a chunked-body response, - taking the optional trailer-part into account and adjusting the size of - the chunked-body data as needed. + Use similar logic in LSA-Summary processing. - The CRLF in last-chunk that was previously dissected as "Chunk Boundary" - is the last CRLF that closes chunked-body, it is not part of last-chunk - (as it has no chunk-data to terminate). - - A new header field is added for this trailer-part (RFC 7230 sec. 4.1). - - Bug: 10707 - Change-Id: Ifef1cc7dd0443edca4198eb1c27f58719f85fa9f - Reviewed-on: https://code.wireshark.org/review/5526 - Reviewed-by: Peter Wu <peter@lekensteyn.nl> - Reviewed-by: Evan Huus <eapache@gmail.com> - Petri-Dish: Evan Huus <eapache@gmail.com> + Ping-Bug: 6302 + Change-Id: I0a74b95f6c4413ebce240e6e1b46c7e88311713a + Reviewed-on: https://code.wireshark.org/review/6951 + Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> -commit db93414 -Author: zeuz <czingerl@gmail.com> -Date: Tue Dec 16 15:34:29 2014 +0100 - - RDM: Mode verbose decoding of parameter IDs. - -> I don't see why they were uint8; ANSI E1.33 and ANSI E1.20 use uint16 - - Change-Id: Ia2c024b503d6a4b8c18020699bdc676a8459dcbd - Reviewed-on: https://code.wireshark.org/review/5783 - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit 1cbf951 +commit 8b095bc Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sun Dec 14 19:59:38 2014 +0100 +Date: Fri Feb 6 17:04:02 2015 +0100 - HTTP2: Update to draft-16 - - Also update HTTP Header Compression (to draft-10) - - No framing change on HTTP2 draft-16 + Multicast Stream (GTK): fix crash when try to select a stream - Change-Id: I7f8ffd7ab37bc22fd6fbe156b0bf52543025e3a8 - Reviewed-on: https://code.wireshark.org/review/5782 + Change-Id: Iaaa9445ae99b37cfb1865251d50f38375f3eb272 + Reviewed-on: https://code.wireshark.org/review/6985 + Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> -commit ce68707 -Author: Maarten Bezemer <maarten.bezemer@gmail.com> -Date: Tue Nov 11 14:41:01 2014 +0100 +commit 55eb35a +Author: Petr Gotthard <petr.gotthard@centrum.cz> +Date: Fri Feb 6 09:50:40 2015 +0100 - Add cmake helper files for finding wireshark + AMQP: Fix one warning from Clang Code Analysis - These files make it possible to use the cmake command find_package(Wirehark) to obtain information about the wireshark installation. + Since 'values' is always 'length/4', we can have it as 'gint' and avoid + the Clang warning concerning the while cycle. + >> cannot optimize loop, the loop counter may overflow [-Wunsafe-loop-optimizations] - Change-Id: I5af7c4e7b53b99cd473e04905a92bac267cd9b83 - Reviewed-on: https://code.wireshark.org/review/5235 + Change-Id: I4342f9e3fcd5df7779f41414ab6f789fe402e3af + Reviewed-on: https://code.wireshark.org/review/6979 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Michael Mann <mmann78@netscape.net> - -commit ec28d87 -Author: Marc Fournier <marc.fournier@camptocamp.com> -Date: Tue Dec 16 07:13:45 2014 +0100 - - Riemann: attach metric_d field to parent event - - Bug: 10781 - Change-Id: I93ad2704f200afb303f3638fe0af65693d4c8f52 - Reviewed-on: https://code.wireshark.org/review/5781 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit 8d1a555 -Author: Yann Lejeune <ylejeune@netyl.org> -Date: Sat Dec 13 01:01:33 2014 +0100 - - ISIS LSP: Add Segment Routing Algorithm Sub TLV dissection - - This commit implements a part of draft-ietf-isis-segment-routing-extensions: - - 3.2. SR-Algorithm Sub-TLV - - Change-Id: Ibb419de234bf5a199f8067989b1321064fa93983 - Ping-Bug: 10520 - Reviewed-on: https://code.wireshark.org/review/5742 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> + Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 84c6c74 -Author: Yann Lejeune <ylejeune@netyl.org> -Date: Fri Dec 12 22:32:50 2014 +0100 +commit eb85555 +Author: Petr Gotthard <petr.gotthard@centrum.cz> +Date: Thu Feb 5 18:01:54 2015 +0100 - ISIS LSP: Add Segment Routing Capabilities Sub-TLV dissection - - This commit implements a part of draft-ietf-isis-segment-routing-extensions: - - 3.1 Routing Capabilities Sub-TLV - - 2.3 SID/Label Sub-TLV + AMQP: Add more COL_INFO description for some packets/frames. - Change-Id: I3ee5e6d949cc6add412da761ffc55ef3101ddb97 - Ping-Bug: 10520 - Reviewed-on: https://code.wireshark.org/review/5739 + Change-Id: If70dc3972d99d34d8e37dd26045076e515fd4d2c + Reviewed-on: https://code.wireshark.org/review/6968 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit e709a34 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sat Dec 13 19:50:06 2014 +0100 - - exit if the key wasn't found in the parameters list - - Bug: 10761 - Change-Id: I072cd3a68d852cb8dc57b9b9f807f792caba7259 - Reviewed-on: https://code.wireshark.org/review/5750 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - Tested-by: Martin Kaiser <wireshark@kaiser.cx> - -commit 9187456 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 15 19:09:57 2014 +0100 - - MP4: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang > 3.3 - - Change-Id: I0befc8846b9af43e1563adb369ba4d332775ef76 - Reviewed-on: https://code.wireshark.org/review/5778 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - Tested-by: Martin Kaiser <wireshark@kaiser.cx> - -commit 82e6304 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Mon Dec 15 19:12:24 2014 +0100 - - MP4: fix Unused entry: epan/dissectors/file-mp4.c, hf_mp4_stsd_entry_cnt - - Change-Id: I95f0ab387570c0c56e19990cb9b9063051bb792f - Reviewed-on: https://code.wireshark.org/review/5779 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - -commit fafa686 -Author: Evan Huus <eapache@gmail.com> -Date: Tue Dec 9 21:35:01 2014 -0500 - - Enable case-insensitive string dissector tables - - Permit passing TRUE as the parameter during table registration to achieve that - effect. - - Use it in RTP media type table. - - Bug: 10708 - Change-Id: I892fb1a421d349f0c05197dec90f14fc34ad6b97 - Reviewed-on: https://code.wireshark.org/review/5695 - Reviewed-by: Evan Huus <eapache@gmail.com> - Petri-Dish: Evan Huus <eapache@gmail.com> + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 27095f9 -Author: Gerald Combs <gerald@wireshark.org> -Date: Mon Dec 15 09:24:01 2014 -0800 - - Add Bug 10488 (multiple capture files) to the release notes. - - Change-Id: I405b2ecd3cbf33cbf882430686e29d2c8723e2b5 - Reviewed-on: https://code.wireshark.org/review/5777 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit c504772 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Mon Dec 15 16:26:31 2014 +0000 +commit 0b0f7fa +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Wed Feb 4 10:32:02 2015 -0500 - Revert "Bluetooth: BTLE: Add src/dst addresses when they are known" + More emem removal. - This reverts commit a89c17fb52ec1270076abd82e6e5cd56d94fa682. + Remove emem's 8-byte-memory-alignment configure check as well as references + to all the environment variables emem used. - Change-Id: I99029d72b82aaec1b398dffee0beec30829a3939 - Reviewed-on: https://code.wireshark.org/review/5775 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit dab9f76 -Author: AndersBroman <anders.broman@ericsson.com> -Date: Mon Dec 15 15:45:20 2014 +0100 - - [ISUP] Add dissection of Japan TTC EMERGENCY CALL INDICATOR - - Change-Id: I63cdb7eead49207cf66ea36d1da966d1bbec4320 - Reviewed-on: https://code.wireshark.org/review/5774 + Change-Id: I897aec9e9c68e064454561e7a9f066b18892ec66 + Reviewed-on: https://code.wireshark.org/review/6950 + Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit a89c17f -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Fri Dec 12 11:11:00 2014 +0100 - - Bluetooth: BTLE: Add src/dst addresses when they are known - - Generally where it is not connection then on LinkLayer protocol level - addresses for Source and Destination device are known. - - Change-Id: I28da88381a26826ad4897b56da993909130683d3 - Reviewed-on: https://code.wireshark.org/review/5768 - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - -commit afacb1c -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Sun Nov 16 13:20:04 2014 +0100 - - Bluetooth: Fix CRC Init length in Ubertooth - - Change-Id: If4292c85598e2449eff54d6680274edc3c3e4fa2 - Reviewed-on: https://code.wireshark.org/review/5770 - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - -commit 79d6a15 -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Wed Dec 3 11:06:49 2014 +0100 - - Bluetooth: BTLE: SN, NESN should be numbers not booleans - - SN = Sequence Number, so it is not bool. - - Change-Id: I0691b17150bbbdd34a0e7cbe3cb90058c9183ff7 - Reviewed-on: https://code.wireshark.org/review/5769 - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - -commit 657e42b -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Mon Nov 17 19:26:12 2014 +0100 - - cmake: Do not hide possible options for other platforms - - Change-Id: I408620cb39a25a4104e9ea562f6512f4196ae32f - Reviewed-on: https://code.wireshark.org/review/5766 - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - -commit fddbbdd -Author: Michal Labedzki <michal.labedzki@tieto.com> -Date: Sun Nov 16 13:18:50 2014 +0100 - - Translates: Update Polish translation - - Also fix typo. - - Change-Id: If494e7ae8e24cf394b4c67208799e6fb358cf8f0 - Reviewed-on: https://code.wireshark.org/review/5767 - Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> - -commit 6919734 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Sun Dec 14 19:48:43 2014 +0100 +commit 881ff5d +Author: Gerald Combs <gerald@wireshark.org> +Date: Wed Feb 4 12:18:37 2015 -0800 - HTTP2: Update nghttp2 lib (0.6.7) + Remove gethostbyaddr and gethostbyaddr2. - lot of change but it is majority reindent change (Using clang-format) + They've been deprecated for a very long time. Replace them with + getaddrinfo. Note that we might not want to do synchronous name + resolution at all. - Change-Id: Idcd0fa79ca977e25d69eb80a89d3c61d228885e9 - Reviewed-on: https://code.wireshark.org/review/5764 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit 9815dc1 -Author: maisheri <maisheri.hitesh@gmail.com> -Date: Sun Dec 14 01:44:20 2014 +0530 - - Add support for EAPOL-MKA (802.1x-2010) + Add HAVE_GETADDRINFO to the KfW win-mac.h collision list. - Use by MACSec - - Change-Id: I27eee40ddc476435aecd57711c1b3597c2049901 - Reviewed-on: https://code.wireshark.org/review/5751 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit 16f38e9 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Dec 14 17:03:08 2014 +0100 - - Kerberos: import KRB5_AD_WIN2K_PAC dissection from old non ASN.1 based dissector - - Bug: 10539 - Change-Id: I06d1179210bdcc63800ef9580bb274c714a77c6e - Reviewed-on: https://code.wireshark.org/review/5761 - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: If59ce8a038776eadd6cd1794ed0e2dad8bf8a22c + Reviewed-on: https://code.wireshark.org/review/6958 + Reviewed-by: Gerald Combs <gerald@wireshark.org> + Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit e9f9683 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sun Dec 14 18:57:03 2014 +0100 - - GSM SMS: fix dissection of Character Set IE - - Also do not display a 8bits data SMS as an expert error - Those 2 points led me to a wrong analysis yesterday - - Change-Id: Ib319e2ef8f0e7297cd2e119b6d0d98638e6a3d61 - Reviewed-on: https://code.wireshark.org/review/5763 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 44e14b7 -Author: Gerald Combs <gerald@zing.org> -Date: Sun Dec 14 09:49:02 2014 -0800 +commit d6ebb82 +Author: Jeff Morriss <jeff.morriss.ws@gmail.com> +Date: Thu Feb 5 21:31:06 2015 -0500 - Qt: Defer startup messages. - - Wait until we've completely started up to show accumulated warnings and - errors. + (Trivial) Reformat some. - Replace three periods with an ellipsis. - - Change-Id: Ic3b268836e4e4429786c5eba4862cbc0458a19b5 - Reviewed-on: https://code.wireshark.org/review/5762 - Reviewed-by: Gerald Combs <gerald@wireshark.org> + Change-Id: I1bed28c33d1942b9d8ee8ef341d7017d2df21f37 + Reviewed-on: https://code.wireshark.org/review/6977 + Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> -commit 85ed008 +commit 61e3bdc Author: Gerald Combs <gerald@wireshark.org> -Date: Sun Dec 14 08:04:53 2014 -0800 +Date: Thu Feb 5 16:58:57 2015 -0800 - [Automatic manuf, services and enterprise-numbers update for 2014-12-14] + WSDG: Wrap a line. - Change-Id: Ic1cf4600f35ca5e573c88e758971c578489ab673 - Reviewed-on: https://code.wireshark.org/review/5758 + Change-Id: I21e573c3800a245cbdae4fcb4d4cfaf36f3a0abd + Reviewed-on: https://code.wireshark.org/review/6976 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 1725eee -Author: Bill Meier <wmeier@newsguy.com> -Date: Sat Dec 13 16:26:07 2014 -0500 - - Use ENC_BIG_ENDIAN when fetching FT_U?INT8 fields ... - - Change-Id: Ie8cb993bb9dd3e8dbfa1876a4e731bca10ee0507 - Reviewed-on: https://code.wireshark.org/review/5754 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit 5992ef4 -Author: Bill Meier <wmeier@newsguy.com> -Date: Sat Dec 13 15:17:21 2014 -0500 - - plugins: replace ENC_NA by ENC_..._ENDIAN when fetching integral types - - Change-Id: I3958bbd0eadd4472a003ea272e596026ad8731d1 - Reviewed-on: https://code.wireshark.org/review/5753 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit 94d7e8d -Author: Bill Meier <wmeier@newsguy.com> -Date: Sat Dec 13 14:59:26 2014 -0500 - - Use ENC_LITTLE_ENDIAN when fetching FT_U?INT8 fields ... - - (for some dissectors which fetch all other integral fields using - ENC_LITTLE_ENDIAN). - - Change-Id: Ica72a68ac560f2920d61e0769de83130557c46fd - Reviewed-on: https://code.wireshark.org/review/5752 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit ff46ac5 -Author: Bill Meier <wmeier@newsguy.com> -Date: Sat Dec 13 12:36:23 2014 -0500 - - rfid-pn532.c: Use FT_UINT24 to display complete hex value for three 3-byte fields. - - Specifically: the fields are fetched as 3 bytes, but had a - type, display of FT_UINT8, BASE_HEX so only that the LO byte was - displayed. - - Change-Id: I06ea7b9527ae788be7f19278e8ba4dc2d34b2777 - Reviewed-on: https://code.wireshark.org/review/5747 - Reviewed-by: maisheri <maisheri.hitesh@gmail.com> - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit ae844d9 -Author: Bill Meier <wmeier@newsguy.com> -Date: Sat Dec 13 13:51:33 2014 -0500 - - gsm_sms: Use ENC_BIG_ENDIAN when fetching FT_U?INT8 fields - - Change-Id: If41cf6c10e4af8554cd8f6a69bd8654ad7262c85 - Reviewed-on: https://code.wireshark.org/review/5749 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit f412c9a -Author: Bill Meier <wmeier@newsguy.com> -Date: Sat Dec 13 12:52:20 2014 -0500 - - Use ENC_BIG_ENDIAN when fetching FT_U?INT8 fields ... - - (for some dissectors which fetch all other integral fields using - ENC_BIG_ENDIAN). - - Change-Id: Ic18e3172aad76af12b12d6732c88497be22aed56 - Reviewed-on: https://code.wireshark.org/review/5748 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit 7592d39 +commit 3badc30 Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Dec 13 18:15:52 2014 +0100 +Date: Thu Feb 5 23:20:54 2015 +0100 - GSM SMS: fix 'msg_class' may be used uninitialized in this function warning + QNET6: do not use col_set_str with non constant strings - Change-Id: Ie1c53929df2dfec1b4935ca1088f375c666d3b36 - Reviewed-on: https://code.wireshark.org/review/5746 + Change-Id: I63e965d819413299bf3e9a400b80ded23225598a + Reviewed-on: https://code.wireshark.org/review/6975 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 21d6ed4 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sat Dec 13 18:10:58 2014 +0100 - - fix compile error - - packet-gsm_sms.c: In function 'dis_field_dcs': - packet-gsm_sms.c:694:12: error: 'msg_class' may be used uninitialized in - this function [-Werror=maybe-uninitialized] - cc1: all warnings being treated as errors - make[5]: *** [libdissectors_la-packet-gsm_sms.lo] Error 1 - - I suppose that 0xff is an invalid message class and therefore a - reasonable default value. - - Change-Id: Iab3d3f50144b24bee4972063c2170d7a9f9b7c25 - Reviewed-on: https://code.wireshark.org/review/5745 - Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> - Tested-by: Martin Kaiser <wireshark@kaiser.cx> - -commit 758ec16 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Dec 13 17:38:30 2014 +0100 +commit b3e8269 +Author: cbontje <cbontje@gmail.com> +Date: Thu Feb 5 12:51:51 2015 -0700 - GSM SMS: fix (U)SIM Data Download Class 2 dissection + SEL Protocol Maintenance (2/2) - Change-Id: Id4ea574e34c0bd35bc757fdc68d0e6b72129ef04 - Reviewed-on: https://code.wireshark.org/review/5744 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 80d44af -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Sat Dec 13 17:27:28 2014 +0100 - - dissector_try_uint(_new) and dissector_try_string now return the number of bytes consumed + - Complete internal cleanup of 'fastser' -> 'fastmsg' syntax + - Includes all variables, comments and filter values - Change-Id: I528ad736caee1f29e2f0abfc0afcca6587d74eca - Reviewed-on: https://code.wireshark.org/review/5743 + Change-Id: Ib58e470c9552387cb8c1d8c68fa1574cf7aa1691 + Reviewed-on: https://code.wireshark.org/review/6974 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit cc12c72 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Fri Dec 12 23:37:05 2014 +0100 - - Riemann: add support for TCP transport - - Bug: 10770 - Change-Id: I101d0152f41c0ab3d7f0fa0ccab6dec3b9e68f0d - Reviewed-on: https://code.wireshark.org/review/5741 - Reviewed-by: Evan Huus <eapache@gmail.com> - Petri-Dish: Evan Huus <eapache@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> -commit 5d6eb80 -Author: Martin Mathieson <martin.r.mathieson@googlemail.com> -Date: Fri Dec 12 16:53:05 2014 +0000 - - Use g_direct_ functions for hash tables where possible - - Change-Id: Ie364cbdcf500d7a04e64d7adcdd03bd1926dda86 - Reviewed-on: https://code.wireshark.org/review/5736 - Reviewed-by: Evan Huus <eapache@gmail.com> - -commit b0cdee6 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Dec 10 16:26:42 2014 +0100 - - DNS: Remove whitespace on DNS Col info before type name - - Change-Id: I33a9a54a318a1a3ea106f4531db4e79a6b6d42ac - Reviewed-on: https://code.wireshark.org/review/5716 - Reviewed-by: Evan Huus <eapache@gmail.com> - -commit 33c26a0 +commit 1fdc6f4 Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Fri Dec 12 22:20:35 2014 +0100 +Date: Thu Feb 5 12:45:50 2015 +0100 - doc: remove some references to the now defunct python support + QNX6: avoid deferencing a null pointer - Change-Id: Ibba3168516ef28ad050f5f70045acf3935f2b233 - Reviewed-on: https://code.wireshark.org/review/5738 + Bug: 10920 + Change-Id: Ibf3539c188431d2514c523c094d1e2d86b77f0b5 + Reviewed-on: https://code.wireshark.org/review/6967 + Reviewed-by: Evan Huus <eapache@gmail.com> + Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> -commit 56697c2 -Author: Gerald Combs <gerald@wireshark.org> -Date: Fri Dec 12 12:35:31 2014 -0800 - - Qt: Add name resolution menu items. - - Change the text from "Enable for" to "Resolve". Make the tooltips more - descriptive. List them in OSI model order. - - Change-Id: Ie671ba9d55c609ce475f1681add0ad7d975f19cd - Reviewed-on: https://code.wireshark.org/review/5737 - Reviewed-by: Gerald Combs <gerald@wireshark.org> - -commit 2898f13 -Author: Bill Meier <wmeier@newsguy.com> -Date: Thu Dec 11 15:21:28 2014 -0500 +commit 3f480c6 +Author: cbontje <cbontje@gmail.com> +Date: Thu Feb 5 12:49:58 2015 -0700 - cip: Access FT_UINT16 hf_cip_sc_create_instance with proper encoding-arg. + The 'mbrtu' dissector should be registered with RTAC Serial, not the 'modbus' one. - Specifically: Use ENC_LITTLE_ENDIAN (not ENC_NA) to match all - other integral fetches in the cip dissector. + (This error was missed by me when confirming recent changes to the RTAC + serial dissector and fixes decoding of RTAC serial Modbus captures.) - Change-Id: I5d330084168493f53135dbb97674a2dba9ed7477 - Reviewed-on: https://code.wireshark.org/review/5732 - Reviewed-by: Bill Meier <wmeier@newsguy.com> + Change-Id: I2df609f88263e90ae4815722ff76b6a0b988a01e + Reviewed-on: https://code.wireshark.org/review/6973 Reviewed-by: Michael Mann <mmann78@netscape.net> -commit 64cb510 -Author: Bill Meier <wmeier@newsguy.com> -Date: Thu Dec 11 18:37:07 2014 -0500 +commit 99761aa +Author: Guy Harris <guy@alum.mit.edu> +Date: Thu Feb 5 11:03:11 2015 -0800 - Change ENC_NA to ENC_BIG_ENDIAN for all fetches of integral type fields. + Remove endif() left over from previous change. - Change-Id: Ia4f5735c61eedcbe8354eabd5da05d02e167f25e - Reviewed-on: https://code.wireshark.org/review/5734 - Reviewed-by: Bill Meier <wmeier@newsguy.com> + Change-Id: Ia5781bcb55b2cf2e5ab2bc8c6587348ffe62a5c2 + Reviewed-on: https://code.wireshark.org/review/6972 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 29c1b58 -Author: Bill Meier <wmeier@newsguy.com> -Date: Thu Dec 11 14:21:09 2014 -0500 +commit 572b30a +Author: Guy Harris <guy@alum.mit.edu> +Date: Thu Feb 5 10:22:52 2015 -0800 - rsvp: Convert encoding-arg ENC_NA to ENC_BIG_ENDIAN for all integer fields + Get rid of the temporary OS X-specific hack. - Change-Id: Ib0f863f08a3ef420832cc05e988b5bc64ff0b121 - Reviewed-on: https://code.wireshark.org/review/5731 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit 76c5568 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Fri Dec 12 16:26:53 2014 +0100 - - Riemann: fix compilation + Hopefully Gerald's change will fix this annoyance once and for all. - Change-Id: I0cf069860715fd6781a613478c29a7e7ed224733 - Reviewed-on: https://code.wireshark.org/review/5735 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit 8e96830 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Fri Dec 12 15:19:58 2014 +0100 - - LPP: avoid doing an out of bound access in case the PER decoding gives an invalid value - - Bug: 10773 - Change-Id: I4fcde84d7be1e42729b6ec0763064e9885951468 - Reviewed-on: https://code.wireshark.org/review/5729 - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> + Change-Id: I547b221a670f1435fa86cb96b084cfa5b788c57f + Reviewed-on: https://code.wireshark.org/review/6971 + Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit a2a6e31 -Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Fri Dec 12 10:14:26 2014 +0100 +commit d138011 +Author: Gerald Combs <gerald@wireshark.org> +Date: Thu Feb 5 09:48:39 2015 -0800 - Riemann: fix "Decode as" feature + WSDG: Fixup admonition block formatting. - the UDP port value check seems useless when the port is configured in the preferences, and prevents "Decode as" to work as expected - - Change-Id: I5a059d05a9e980c2c60d8f84deae1b5bd9d466d3 - Reviewed-on: https://code.wireshark.org/review/5727 - Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com> - Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - -commit bd4d291 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Nov 26 16:59:22 2014 +0100 - - Qt: Move Follow TCP, UDP, SSL to a Follow folder (like when right click) + We tend to clobber the reader with admon blocks. Make the preceding and + succeeding ones normal paragraphs. - Change-Id: I24213aa4f9f134a05b1344e160e5688ce9c495cf - Reviewed-on: https://code.wireshark.org/review/5508 + Change-Id: I0c70af93feb586d2e8f6120e2842fab52379b76f + Reviewed-on: https://code.wireshark.org/review/6970 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 1ce64e7 +commit 410a8d1 Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Dec 10 16:50:56 2014 -0800 +Date: Thu Feb 5 09:22:37 2015 -0800 - CMake: Make it easier to generate the release notes & NEWS. + CMake: Make copy_data_files depend on html_docs. - Add convenience targets for generating the release notes and the NEWS - file. Make sure we don't run multiple instances of a2x + AsciiDoc at the - same time. + Semi-blind attempt to fix what appears to be a race condition on the OS + X x86 buildbot. - Add the docbook directory to the build by default unless we're running - Windows. Explain why we don't yet build docs on Windows. Make each - docbook makefile target optional. - - Split the ENABLE_GUIDES option into ENABLE_HTML_GUIDES and - ENABLE_PDF_GUIDES. Add a default "all_guides" target if either is on. - Remove the Debian patch that hacked around the PDF requirement. - - Copy ws.css to the docbook build directory. Don't build PDF release - notes. I'm not sure we ever used them and I don't want to install Java - and FOP just to make a release. - - Change-Id: Ia2f710000c17f9e0b4b514fd373d9a5902889553 - Reviewed-on: https://code.wireshark.org/review/5712 - Petri-Dish: Gerald Combs <gerald@wireshark.org> + Change-Id: I379c7dec26c2bca092d0c9a49465ee56a01d15ec + Reviewed-on: https://code.wireshark.org/review/6969 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 425bc30 -Author: Bill Meier <wmeier@newsguy.com> -Date: Thu Dec 11 14:01:10 2014 -0500 +commit dff82e6 +Author: Richard Sharpe <realrichardsharpe@gmail.com> +Date: Sun Feb 1 11:50:10 2015 -0800 - eth,mp2t: Rename ei[] filter names duplicating hf[] filter names. + Update the Windows build documentation with some common traps that stop people + from building as well as a hint about downloading the vcredist_xYY.exe file. - Change-Id: I1a9e8344866ce5a5bbd48b07c49baa398ce161f7 - Reviewed-on: https://code.wireshark.org/review/5724 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit 8f56378 -Author: Bill Meier <wmeier@newsguy.com> -Date: Thu Dec 11 13:50:17 2014 -0500 - - rsvp: Fix dup display-filter name possibly leading to crash if used. - - Change-Id: I8b903fb1137800a84473a82cff9c45f965cb869f - Reviewed-on: https://code.wireshark.org/review/5723 - Reviewed-by: Bill Meier <wmeier@newsguy.com> - -commit 0ef1aef -Author: Yann Lejeune <ylejeune@netyl.org> -Date: Wed Dec 10 23:15:07 2014 +0100 - - BGP: add support of RFC6368 - Internal BGP as the Provider/Customer Edge - Protocol for BGP/MPLS IP Virtual Private Networks (VPNs). - - Bug: 10762 - Change-Id: Ifbe2af639ee5a2d96ec3546708060cadcc349df2 - Reviewed-on: https://code.wireshark.org/review/5664 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit 9036f09 -Author: Yann Lejeune <ylejeune@netyl.org> -Date: Wed Dec 10 22:36:36 2014 +0100 - - BGP: extract the bgp path attribute dissection to a dedicated function. - - Change-Id: I228f1402007d8570bfdeb0105ce5e89c48357481 - Reviewed-on: https://code.wireshark.org/review/5721 - Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> - -commit 7d905be -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Dec 11 11:36:34 2014 +0100 - - GSM BSSMAP LE: fix indent (use tabs) - - Change-Id: Ic05a52d095fd581150fc69ca8d2a0e05eaddf81a - Reviewed-on: https://code.wireshark.org/review/5722 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 772fbfb -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Dec 11 11:32:48 2014 +0100 - - GSM a BSSMAP : fix warning: no previous prototype for 'dissect_bssmap' [-Wmissing-prototypes] - - Change-Id: Ibc03864498cb88e93cb3f774d1f4987aa10dd32e - Reviewed-on: https://code.wireshark.org/review/5720 - Reviewed-by: Anders Broman <a.broman58@gmail.com> + Change-Id: I6ae9a045939a77ba2c9584f05124fdc8f355f11c + Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com> + Reviewed-on: https://code.wireshark.org/review/6916 + Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> -commit 230ce30 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Dec 11 11:32:25 2014 +0100 +commit 48aa669 +Author: AndersBroman <anders.broman@ericsson.com> +Date: Thu Feb 5 10:18:36 2015 +0100 - GSM bssmap le: fix warning: no previous prototype for 'dissect_bssmap_le' [-Wmissing-prototypes] + CAPWAP: Fix a typo. - Change-Id: Ifa8c7a15dfb37cf1dbd2f539dd0bbc87e6da1aea - Reviewed-on: https://code.wireshark.org/review/5719 + Change-Id: I19031eac4d26a5620dc05f2632c403d82d7a4ab2 + Reviewed-on: https://code.wireshark.org/review/6966 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit def4313 +commit fb9dc13 Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Thu Dec 11 11:27:39 2014 +0100 +Date: Thu Feb 5 09:33:45 2015 +0100 - 6lowpan : fix warning: no previous prototype for 'lowpan_context_free' [-Wmissing-prototypes] + MySQL: fix assert when the Connect Attrs capability is set, but no attributes - Change-Id: I3fa66aa0713a0455639b04ecf129f48baa8c096f - Reviewed-on: https://code.wireshark.org/review/5718 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit b7f8cd8 -Author: Martin Kaiser <wireshark@kaiser.cx> -Date: Sun Dec 7 19:47:54 2014 +0100 - - skip the extra field in the gzip header - it consists of two bytes xsize + xsize bytes of data + From + <http://dev.mysql.com/doc/internals/en/connection-phase-packets.html#packet-Protocol::HandshakeResponse> + (emphasis mine): - use an unsigned type for xsize + Starting with MySQL 5.6.6 the client **may** send attributes if CLIENT_CONNECT_ATTRS is set: - fail gracefully if the field is present but truncated + Does this mean that the capability *may* be set, but the list of attributes can be empty? - tvb_length_remaining > tvb_captured_length_remaining + Issue reported by Peter Wu - Change-Id: I7f5138743c2d88abdd4f5f18d3c0292612ddb559 - Reviewed-on: https://code.wireshark.org/review/5654 + Ping-Bug:10351 + Change-Id: Ib83c27f4a15341f791c443471d7a3bdbd942aef4 + Reviewed-on: https://code.wireshark.org/review/6965 Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 5570f8e -Author: AndersBroman <anders.broman@ericsson.com> -Date: Thu Dec 11 10:30:08 2014 +0100 +commit 2bcd38f +Author: Evan Huus <eapache@gmail.com> +Date: Wed Feb 4 22:30:20 2015 -0500 - [SIP] Try to fix another corner case of reassembly. + ethercat: add default case in FoeFormatter + + Should probably fix an unintialized memory access caught by valgrind, although I + can't reproduce it because out-of-tree plugins are still broken. - Change-Id: I38a80ebcadf0ef6d7fada692753188f2a6c3515b - Reviewed-on: https://code.wireshark.org/review/5717 + Bug: 10919 + Change-Id: Ib8c46e13922f25260ca0e8886368f5ce24e3d0b0 + Reviewed-on: https://code.wireshark.org/review/6962 + Reviewed-by: Guy Harris <guy@alum.mit.edu> Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 339df3d -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 10 20:15:36 2014 -0800 +commit 8bad9ed +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Thu Feb 5 07:52:48 2015 +0100 - Add a heur_dissector_table_foreach() function. + CAPWAP : fix warning about wrong type after proto_tree_add_bitmask(_with_flags) change - This is, for heuristic dissector tables, the equivalent of - dissector_table_foreach() for keyed dissector tables. + Warn Dissector bug, protocol CAPWAP-CONTROL, in packet 1: proto.c:7802: field capwap.control.message_element.wtp_frame_tunnel_mode is not of an FT_{U}INTn type + Warn Dissector bug, protocol CAPWAP-CONTROL, in packet 2: proto.c:7802: field capwap.control.message_element.ac_descriptor.security is not of an FT_{U}INTn type + ... - Change-Id: I4b2f870e1c1179fda1adddd93930b83aaaaf8763 - Reviewed-on: https://code.wireshark.org/review/5715 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Change-Id: I03f70ca664d99771ad27457052e6df11f9d5ad9e + Reviewed-on: https://code.wireshark.org/review/6964 + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 151164d -Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 10 19:04:50 2014 -0800 +commit 8ffaec9 +Author: Alexis La Goutte <alexis.lagoutte@gmail.com> +Date: Thu Feb 5 07:48:28 2015 +0100 - Give dissector_all_heur_tables_foreach_table() a sort function. - - This makes it a bit more like dissector_all_tables_foreach_table. + CAPWAP: Don't try to dissect fragment packet (Only display are "Data") - Improve comments and clean up whitespace while we're at it. + Issue reported by Massimo Vellucci - Change-Id: I5147427f864add285e3bb6cb35ad9fa83bea516c - Reviewed-on: https://code.wireshark.org/review/5714 - Reviewed-by: Guy Harris <guy@alum.mit.edu> + Bug:10918 + Change-Id: I7f3b15536f66496d975696b3ff29fbc5b77ee5a8 + Reviewed-on: https://code.wireshark.org/review/6963 + Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit 9855bef +commit 5b62526 Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 10 17:50:34 2014 -0800 +Date: Wed Feb 4 16:46:24 2015 -0800 - Make the type of the second argument to a DATFunc_heur_table explicit. + OK, try cmake -E copy. - It's always pased a heur_dissector_list_t *, so give it that type, - rather than having it be a generic pointer. + It didn't fail with cp, so maybe that's just random luck, or maybe the + built-in copy functions have an issue, or maybe just copy_if_different + has an issue (64-bit inode number issues?). Try just copy, and see what + happens. - Change-Id: Ia6a045bb1b96c2f6ef3e23f27928e0b52f7cfb9f - Reviewed-on: https://code.wireshark.org/review/5713 + Change-Id: I84abf3846af9305c19ad4a78d5c9df31b1e1e61e + Reviewed-on: https://code.wireshark.org/review/6961 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 144855c +commit a2e48c6 Author: Guy Harris <guy@alum.mit.edu> -Date: Wed Dec 10 16:21:41 2014 -0800 +Date: Wed Feb 4 15:56:15 2015 -0800 - Fix a comment. + On OS X, temporarily use cp to install some files. + + The 32-bit OS X build is failing rather often due to cmake -E + copy_if_different failing to copy wireshark.html, and to call cmake's + copy functions completely crappy at reporting errors is to insult + software that's merely completely crappy at reporting errors. Try using + cp in the hopes that it'll actually tell us *WHY* the copy is failing + and see if we can fix it. - Change-Id: I46885d028fe9ff5254baefc15283626b9bdb6bce - Reviewed-on: https://code.wireshark.org/review/5711 + Change-Id: I723150c52c2ec0fe704d54191ef27fb6caf47fba + Reviewed-on: https://code.wireshark.org/review/6960 Reviewed-by: Guy Harris <guy@alum.mit.edu> -commit 2f8030f +commit 86d24b0 Author: Pascal Quantin <pascal.quantin@gmail.com> -Date: Wed Dec 10 19:57:56 2014 +0100 +Date: Wed Feb 4 22:35:24 2015 +0100 - LCSAP: fix dissection of negative longitude and latitude + LPP: upgrade dissector to v12.3.0 - Bug: 10767 - Change-Id: I4ab0ffd3bd22f1884895f3118673b433d980de2f - Reviewed-on: https://code.wireshark.org/review/5704 + Change-Id: Ibc2aa3127efcfbae33e6f3729d0e1e427db1c0fe + Reviewed-on: https://code.wireshark.org/review/6959 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> - Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> - Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 088e5fe -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Dec 10 20:33:38 2014 +0100 - - GPRSCDR: Remove from Dirty ASN1 list - - Change-Id: I0d19836aa63ac77a1b19aec0ae66921bf4770005 - Reviewed-on: https://code.wireshark.org/review/5707 - Reviewed-by: Anders Broman <a.broman58@gmail.com> - -commit 0980dd5 -Author: Alexis La Goutte <alexis.lagoutte@gmail.com> -Date: Wed Dec 10 20:23:07 2014 +0100 - - GPRSCDR: fix warning: 'dissect_gprscdr_MBMSInformation' defined but not use - - Change-Id: I4bdbaeb3c1e3327af6f5e3de22ebcd4472b9f3e7 - Reviewed-on: https://code.wireshark.org/review/5706 - Reviewed-by: Anders Broman <a.broman58@gmail.com> -commit dc289d7 +commit 40d06bd Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Dec 10 11:55:04 2014 -0800 +Date: Wed Feb 4 13:07:50 2015 -0800 - Update the release notes. + Don't clobber PROJECT_VERSION_EXTENSION. - Add a note about HiDPI / retina. Remove the Kerberos known problem. + PROJECT_VERSION_EXTENSION was updated to match g528a857 config.nmake. + Try to preserve it if it's set. - Change-Id: I452bc5ed9db51f7bf32b25eab39371fafd3102aa - Reviewed-on: https://code.wireshark.org/review/5708 + Change-Id: I48edfcd149ef5adafff7ece68e0d43a9cdec0b59 + Reviewed-on: https://code.wireshark.org/review/6957 Reviewed-by: Gerald Combs <gerald@wireshark.org> -commit 3f08a85 +commit 52b4059 Author: Gerald Combs <gerald@wireshark.org> -Date: Wed Dec 10 11:15:16 2014 -0800 +Date: Wed Feb 4 13:00:52 2015 -0800 - 1.99.1 → 1.99.2. + 1.99.2 → 1.99.3. - Change-Id: Ie2e9e81ce1b1d876ae550fc0c17c4367aaa35d98 - Reviewed-on: https://code.wireshark.org/review/5705 + Change-Id: Id03d0243f20b33873a92be7444b61952d0b18638 + Reviewed-on: https://code.wireshark.org/review/6956 Reviewed-by: Gerald Combs <gerald@wireshark.org> @@ -1,4 +1,4 @@ - Wireshark 1.99.2 Release Notes + Wireshark 1.99.3 Release Notes This is an experimental release intended to test new features for Wireshark 2.0. @@ -15,6 +15,19 @@ What's New New and Updated Features The following features are new (or have been significantly updated) + since version 1.99.2: + * Qt port: + + Several bugs have been fixed. + + You can now open a packet in a new window. + + The Bluetooth ATT Server Attributes dialog has been added. + + The Coloring Rules dialog has been added. + + Many translations have been updated. Chinese, Italian and + Polish translations are complete. + + General user interface and usability improvements. + + Automatic scrolling during capture now works. + + The related packet indicator has been updated. + + The following features are new (or have been significantly updated) since version 1.99.1: * Qt port: + The welcome screen layout has been updated. @@ -82,14 +95,19 @@ What's New New Protocol Support (LISP) TCP Control Message, AllJoyn Reliable Datagram Protocol, Android - ADB, Android Logcat text, ceph, corosync/totemnet, corosync/totemsrp, - Couchbase, CP "Cooper" 2179, DJI UAV Drone Control Protocol, Dynamic - Source Routing (RFC 4728), Elasticsearch, ETSI Card Application Toolkit - - Transport Protocol, Generic Network Virtualization Encapsulation - (Geneve), GVSP, HCrt, HiQnet, IPMI Trace, iSER, KNXnetIP, MACsec Key - Agreement - EAPoL-MKA, MCPE (Minecraft Pocket Edition), OptoMMP, RakNet - games library, Riemann, S7 Communication, Shared Memory Communications - - RDMA, Stateless Transport Tunneling, and ZVT Kassenschnittstelle + ADB, Android Logcat text, BGP Monitoring Prototol (BMP), ceph, + corosync/totemnet corosync cluster engine ( lowest + levelencryption/decryption protocol), corosync/totemsrp corosync + cluster engine ( totem single ring protocol), Couchbase, CP "Cooper" + 2179, DJI UAV Drone Control Protocol, Dynamic Source Routing (RFC + 4728), Elasticsearch, ETSI Card Application Toolkit - Transport + Protocol, Generic Network Virtualization Encapsulation (Geneve), GVSP + GigE Vision (TM) Streaming Protocol, HCrt, HiQnet, IPMI Trace, iSER, + KNXnetIP, MACsec Key Agreement - EAPoL-MKA, MCPE (Minecraft Pocket + Edition), OptoMMP, QNEX6 (QNET), RakNet games library, Remote Shared + Virtual Disk - RSVD, Riemann, S7 Communication, Secure Socket Tunnel + Protocol (SSTP), Shared Memory Communications - RDMA, Stateless + Transport Tunneling, and ZVT Kassenschnittstelle Updated Protocol Support @@ -177,7 +195,7 @@ Frequently Asked Questions A complete FAQ is available on the [19]Wireshark web site. __________________________________________________________________ - Last updated 2015-02-04 18:54:49 UTC + Last updated 2015-03-05 18:06:26 UTC References diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc index 4f6df7dd42..a20ae25cf0 100644 --- a/docbook/release-notes.asciidoc +++ b/docbook/release-notes.asciidoc @@ -30,9 +30,11 @@ since version 1.99.2: ** You can now open a packet in a new window. ** The Bluetooth ATT Server Attributes dialog has been added. ** The Coloring Rules dialog has been added. -** Many translations have been updated. +** Many translations have been updated. Chinese, Italian and Polish + translations are complete. ** General user interface and usability improvements. ** Automatic scrolling during capture now works. +** The related packet indicator has been updated. The following features are new (or have been significantly updated) since version 1.99.1: diff --git a/make-version.pl b/make-version.pl index d88578b633..5dfa72291f 100755 --- a/make-version.pl +++ b/make-version.pl @@ -91,12 +91,12 @@ my %version_pref = ( "format" => "git %Y%m%d%H%M%S", # Normal development builds - "pkg_enable" => 1, - "pkg_format" => "-%#", + #"pkg_enable" => 1, + #"pkg_format" => "-%#", # Development releases - #"pkg_enable" => 0, - #"pkg_format" => "", + "pkg_enable" => 0, + "pkg_format" => "", ); my $srcdir = "."; my $info_cmd = ""; |