From: Gerald Combs Date: Wed, 4 Feb 2015 19:01:58 +0000 (-0800) Subject: Build 1.99.2. X-Git-Url: http://git.samba.org/?p=metze%2Fwireshark%2Fwip.git;a=commitdiff_plain;h=b2db3bfd3bf684da5c1deb37c4a42f32a43238ad Build 1.99.2. Change-Id: If4a4fb9009da61bd67a8577f17c9e0dedcb6de6d Reviewed-on: https://code.wireshark.org/review/6955 Reviewed-by: Gerald Combs --- diff --git a/ChangeLog b/ChangeLog index a1bfdcf073..964657afeb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11573 +1,13118 @@ -commit a971768 -Author: Michael Mann -Date: Mon Dec 8 21:40:24 2014 -0500 +commit a748e83 +Author: Gerald Combs +Date: Wed Feb 4 08:53:44 2015 -0800 - Refactor "color" conversation filters + Qt: Add "Copy As..." to the Protocol Hierarchy stats. - Have dissectors register their desire to be part of "color" conversation filters and have the GUI use that registered list. GUI actually using API will come in a separate commit. + This implementation is slightly different compared to other dialogs + since we have nested items. - Change-Id: I5ffe922d97894fe7bf3182056b76ab5839a9461a - Reviewed-on: https://code.wireshark.org/review/5658 - Reviewed-by: Michael Mann - Petri-Dish: Michael Mann + 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 + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs + +commit a8cc331 +Author: Gerald Combs +Date: Wed Feb 4 09:44:40 2015 -0800 + + Update the release notes. + + Change-Id: Id4fc195e54dba19f697d20d2085f2e1f922c8ced + Reviewed-on: https://code.wireshark.org/review/6954 + Reviewed-by: Gerald Combs + +commit febc842 +Author: Evan Huus +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 + +commit 150dd22 +Author: AndersBroman +Date: Wed Feb 4 15:55:05 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. + + Change-Id: Ib7261ef199d7a3aedaed14e7f869af8b64c21c92 + Reviewed-on: https://code.wireshark.org/review/6948 Reviewed-by: Anders Broman -commit e050ad2 -Author: Michael Mann -Date: Sat Dec 6 15:39:26 2014 -0500 +commit d9e82b7 +Author: AndersBroman +Date: Wed Feb 4 14:04:27 2015 +0100 - Eliminate some proto_tree_add_text in packet-bgp.c + [INAP] Add dissection of Cause + Ping-Bug:10910 + Change-Id: I131d81b0d6332cc72e7b32dc81cb7fec4ca3d407 + Reviewed-on: https://code.wireshark.org/review/6947 + Reviewed-by: Anders Broman + +commit 0a6d1f9 +Author: gal +Date: Tue Feb 3 15:55:05 2015 +0000 + + Support for P3 over RTSE. + + Resolve mixed space/tab issue in the RTSE and BER dissectors and included modelines in both templates. - Change-Id: I05fabe9786125e2167fe4010733f61000d0e7914 - Reviewed-on: https://code.wireshark.org/review/5670 + Change-Id: I4b75bad94ed111d0faee205e026b2322b7dafbd1 + Reviewed-on: https://code.wireshark.org/review/6932 Reviewed-by: Michael Mann - Reviewed-by: Matthieu Texier + +commit 9875181 +Author: AndersBroman +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 + +commit 94011c1 +Author: AndersBroman +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 -commit d4476b1 +commit 9f78bf6 Author: Guy Harris -Date: Wed Dec 10 00:39:13 2014 -0800 +Date: Tue Feb 3 23:39:05 2015 -0800 - Expose find_heur_dissector_list(). + Use QNX_PC_ for QNX's pathconf parameter values. - We already have find_dissector_table(); expose - find_heur_dissector_list() as well, so that heuristic dissector lists - can be shared. + 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). - Change-Id: I3f50413b8b10fd3129fcdc2344cb1447f0946ce9 - Reviewed-on: https://code.wireshark.org/review/5701 + Change-Id: I04291eccb818a290eb44eadb17a56ed684285a70 + Reviewed-on: https://code.wireshark.org/review/6944 Reviewed-by: Guy Harris -commit bd8d2f5 -Author: Sergey Avseyev -Date: Wed Dec 10 04:19:55 2014 +0300 +commit f2cb59a +Author: Alexis La Goutte +Date: Tue Jun 17 17:03:11 2014 +0200 - packet-couchbase.c: dissect more DCP commands + Add QNX' QNET protocol - Change-Id: I0e06c89cdda3c1f8e98412fd20737ff6afd26666 - Reviewed-on: https://code.wireshark.org/review/5694 - Reviewed-by: Sergey Avseyev + no ethertype 0x8203-0x8205 support in trunk. + 0x8204 is QNX OS VER 6's qnet ethernet protocol number. + + Bug:3934 + Change-Id: I52555b568c3a304f1512fe25f949330b46f49a93 + Reviewed-on: https://code.wireshark.org/review/6363 + Reviewed-by: Alexis La Goutte + +commit 0f353c9 +Author: Alexis La Goutte +Date: Thu Jan 8 17:35:58 2015 +0100 + + HTTP2: Add tap for HTTP2 dissector + + Change-Id: Ib13d9391b64dad19321a4399c95b95d7fb791284 + Reviewed-on: https://code.wireshark.org/review/6421 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann - Petri-Dish: Michael Mann + Reviewed-by: Alexis La Goutte + +commit ef929ad +Author: Jeff Morriss +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 + Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman -commit c46fa33 -Author: Sergey Avseyev -Date: Thu Dec 4 13:22:22 2014 +0300 +commit 8efe6b7 +Author: Alexis La Goutte +Date: Wed Jan 28 17:59:48 2015 +0100 - Riemann protocol dissector + RADIUS: Sync with FreeRADIUS Master - Homepage: http://riemann.io/ + commit 852f15c72d41c637865776d5b80097e8ffbbb444 + Author: Alan T. DeKok + Date: Mon Jan 26 13:08:21 2015 -0500 - Sample capture: - http://files.avsej.net/riemann-sample.pcapng + As found on the net - Protocol definition: - https://github.com/aphyr/riemann-java-client/blob/master/src/main/proto/riemann/proto.proto + commit 53bf263d6ca9010acdc004bada894b1bfe0ed676 + Author: Tobias Hachmer + Date: Mon Jan 26 13:45:04 2015 +0100 - Implementor's guide: - http://riemann.io/howto.html#write-a-client + add perle dictionary - Bug: 10758 - Change-Id: I28634453423127fe647eb92e48072a90a7f5d232 - Reviewed-on: https://code.wireshark.org/review/5620 - Reviewed-by: Pascal Quantin - Petri-Dish: Pascal Quantin - Tested-by: Petri Dish Buildbot - Reviewed-by: Alexis La Goutte + Change-Id: I15dd8705277f3a0cedd2ea12a7cac9974dadf3c0 + Reviewed-on: https://code.wireshark.org/review/6835 + Petri-Dish: Alexis La Goutte Reviewed-by: Anders Broman -commit 1f8b16e -Author: Pascal Quantin -Date: Wed Dec 10 07:41:23 2014 +0100 +commit bee4fb0 +Author: Alexis La Goutte +Date: Tue Feb 3 09:14:45 2015 +0100 - ICQ: fix icq.meta_user.found_authorization field registration + CAPWAP: Use proto_tree_add_bitmask(_with_flags) - Change-Id: I8c39073b8d1237f8af7f7061f331b3d59ae81142 - Reviewed-on: https://code.wireshark.org/review/5699 - Reviewed-by: Pascal Quantin + Change-Id: I39ff2e15b91981111f8de091e6e5dfb7586b4599 + Reviewed-on: https://code.wireshark.org/review/6937 + Reviewed-by: Michael Mann + Reviewed-by: Anders Broman -commit f64f7c6 -Author: Pascal Quantin -Date: Wed Dec 10 07:37:23 2014 +0100 +commit 7ced085 +Author: Michael Mann +Date: Tue Feb 3 17:15:23 2015 -0500 - NFS: do not duplicate field name in blurb + emem is dead! Long live wmem! - Change-Id: I565823e2ba3c712506710f911e118cd48c895523 - Reviewed-on: https://code.wireshark.org/review/5698 - Reviewed-by: Pascal Quantin + Change-Id: Iddd1200e62bf3200cb1a68408378dd9d47120b77 + Reviewed-on: https://code.wireshark.org/review/6939 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Reviewed-by: Evan Huus + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman -commit 4af7482 +commit 90a76e0 Author: Michael Mann -Date: Sat Dec 6 12:57:33 2014 -0500 +Date: Tue Feb 3 23:27:01 2015 -0500 - Eliminate proto_tree_add_text from packet-icq.c + Convert val_to_str -> val_to_str_wmem. + + This is mostly for GUI usage, but a few dissectors needed some "non-packet scope" conversions. - Change-Id: I2f4bcd8c4a6cf534bb5b6b5c5aa7e21075968ee3 - Reviewed-on: https://code.wireshark.org/review/5696 + val_to_str officially now uses wmem_packet_scope() + + Change-Id: Ic9413eeb3406d7a7683222b86709f3675d628d81 + Reviewed-on: https://code.wireshark.org/review/6933 Reviewed-by: Michael Mann Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Alexis La Goutte + Reviewed-by: Evan Huus + Reviewed-by: Anders Broman -commit c449b43 -Author: Bill Meier -Date: Tue Dec 9 23:48:46 2014 -0500 +commit 74547db +Author: Alexis La Goutte +Date: Tue Feb 3 08:45:41 2015 +0100 - nfs: expert...() shouldn't be called under 'if(tree)' + MySQL: Add Server ext caps and Auth Plugin Length to Server Greeting - Change-Id: I4f8c55ea4194d1246ea19368e0f5890ad1248f47 - Reviewed-on: https://code.wireshark.org/review/5697 - Reviewed-by: Bill Meier + Ping-Bug: 10346 + Change-Id: I1b2bd3e9b1dc01118c48c6e159c9a06d4daa061b + Reviewed-on: https://code.wireshark.org/review/6936 + Reviewed-by: Michael Mann + Reviewed-by: Anders Broman -commit dff05c9 -Author: Tigran Mkrtchyan -Date: Sun Nov 9 10:58:43 2014 +0100 +commit c256bbe +Author: Alexis La Goutte +Date: Tue Feb 3 08:32:13 2015 +0100 - nfs: decode dCache NFS file handle + MySQL: Use proto_tree_add_bitmask(with_flags) - add support for dCache NFS/pNFS - project page: http://www.dcache.org + 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) - Bug: 10765 - Change-Id: I24a88419ec070305e609d1b49b44994a464eb098 - Signed-off-by: Tigran Mkrtchyan - Reviewed-on: https://code.wireshark.org/review/5236 + Ping-Bug: 10346 + Change-Id: I6543363a337d7bbfddba6dd699697a257a2cbb49 + Reviewed-on: https://code.wireshark.org/review/6935 Reviewed-by: Michael Mann - Petri-Dish: Michael Mann - Reviewed-by: Bill Meier + Reviewed-by: Anders Broman -commit 8375a66 -Author: J. Bruce Fields -Date: Thu Oct 30 14:53:07 2014 -0400 +commit 18bc353 +Author: Alexis La Goutte +Date: Mon Feb 2 09:46:36 2015 +0100 - nfs: fix failure to parse EXCHANGE_ID arguments + MySQL: Add support of AuthSwitchRequest/AuthSwitchResponse + + Bug: 10351 - The exchange_id spo_must_enforce/spo_must_allow bitmaps are exceeding - this arbitrary MAX_BITMAPS constant, causing EXCHANGE_ID parsing to - fail. + Ping-Bug: 10346 + + Change-Id: I730080a0aef293c3c8119f6c762ee246227bd07a + Reviewed-on: https://code.wireshark.org/review/6915 + Reviewed-by: Alexis La Goutte + Petri-Dish: Alexis La Goutte + Reviewed-by: Daniël van Eeden + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman + +commit 66fc81b +Author: cbontje +Date: Mon Feb 2 10:09:58 2015 -0700 + + SEL Protocol Maintenance (1/2) - Even in the case of attributes we may need more than 4 words soon, even - if we don't I'm not sure if it's actually illegal to zero-pad them out - to something longer, and even if that is illegal I don't think it's - really helpful of wireshark to stop parsing. + - Clean up naming conventions & variables + - 'SEL Protocol' is the entire protocol suite + - 'Fast SER' is a function code of 'Fast Message' sub-type - Keep the constant just as a sanity check but make it really large. + 'selfm' will remain the protocol name in Wireshark so no major architecture naming changes are anticipated - Ping-Bug: 10649 - Change-Id: I3dff3ebde2d7f74f8cbe60a92c853463da66ae6a - Reviewed-on: https://code.wireshark.org/review/5144 - Reviewed-by: Evan Huus + Change-Id: Idc5117dcede0b61c61c0c64d5cd20199535ed471 + Reviewed-on: https://code.wireshark.org/review/6919 + Reviewed-by: Alexis La Goutte + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann -commit e4b0141 -Author: Gerald Combs -Date: Tue Dec 9 16:54:17 2014 -0800 +commit 9e1ddb5 +Author: Jeff Morriss +Date: Tue Feb 3 21:12:07 2015 -0500 - Qt: Obey main toolbar icon preferences. + Only set HAVE_LUA if we, er, have Lua. - Remove the preferences for the filter toolbar and mark them GTK+-only. + Change-Id: Idb6f1dfa06c2b4e5d9e1f77743f13b4e0a6d8afe + Reviewed-on: https://code.wireshark.org/review/6942 + Reviewed-by: Jeff Morriss + +commit 89e6f4c +Author: Gerald Combs +Date: Tue Feb 3 08:39:14 2015 -0800 + + Qt: Add the Protocol Hierarchy statistics dialog. - Change-Id: Ie48b19aee29a1cfcea4c41ca6c08ddbba3102377 - Reviewed-on: https://code.wireshark.org/review/5693 + Change-Id: I6872e323daca4798c638d764873f54c4c0dc0006 + Reviewed-on: https://code.wireshark.org/review/6934 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs -commit c1d4a08 -Author: Guy Harris -Date: Tue Dec 9 15:14:22 2014 -0800 +commit 342ba90 +Author: Gerald Combs +Date: Tue Feb 3 17:13:49 2015 -0800 - Add media playback icons. + Minor WSDG updates. - Change-Id: I5a9ba1314b0c93098e7b802618f73c7fca608b04 - Reviewed-on: https://code.wireshark.org/review/5692 - Reviewed-by: Guy Harris + Change-Id: I847af9ef7f18b271a5a2dc8da6c5817735a8c856 + Reviewed-on: https://code.wireshark.org/review/6941 + Reviewed-by: Gerald Combs -commit 34cd063 -Author: Pascal Quantin -Date: Tue Dec 9 23:46:05 2014 +0100 +commit 4fe8ca0 +Author: Jeff Morriss +Date: Fri Jan 23 07:36:50 2015 -0500 - LTE RRC: upgrade dissector to v12.3.0 + Simplify how we find Lua and expand the places we look. - Change-Id: Iac974bf505bed270fc1f9409a7d61c80ebca17a5 - Reviewed-on: https://code.wireshark.org/review/5691 - Reviewed-by: Pascal Quantin + 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 -commit 4921e55 -Author: Gerald Combs -Date: Tue Nov 18 16:21:42 2014 -0800 +commit 0e74e8b +Author: Guy Harris +Date: Tue Feb 3 16:25:01 2015 -0800 - Qt: Initial VoIP Calls dialog. + Decorate declarations with G_GNUC_PRINTF() as appropriate. - Add Telephony menu items for VoIP Calls and SIP Flows. Put VoIP Calls at - the top, since that seems to be the primary item. + 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 + +commit deabe64 +Author: Gerald Combs +Date: Tue Feb 3 16:02:52 2015 -0800 + + Don't build app_bundle by default. - Add configure-time checks for QtMultimediaWidgets in anticipation of - adding a VoIP playback dialog. + As it turns out, building the app bundle makes wireshark-gtk unusable. - Add an icon for the playback button. (Yes, I've been avoiding - GNOME-level gratuitous icons so far but this is one of the rare - occiasions where it makes sense.) + Change-Id: Ic3608f0a485c3ec4ea21fbc2e7194553eda8c806 + Reviewed-on: https://code.wireshark.org/review/6938 + Reviewed-by: Gerald Combs + +commit b8f040c +Author: Dario Lombardo +Date: Mon Feb 2 10:37:17 2015 +0100 + + Dumpcap: avoid collecting stats on nf* interfaces. - Add a help link define for the VoIP calls dialog. + On Linux nf* interfaces don't collect stats properly and don't allows multiple connections. - Change-Id: I5d0799685c598ad9af76fe9667f8ea7d14b66050 - Reviewed-on: https://code.wireshark.org/review/5674 - Petri-Dish: Gerald Combs - Tested-by: Petri Dish Buildbot + Change-Id: I69d8f343017d77bda313de7d2c501fab542f2e9b + Bug: 10886 + Reviewed-on: https://code.wireshark.org/review/6796 Reviewed-by: Gerald Combs -commit 3147087 -Author: Gerald Combs -Date: Tue Dec 9 13:22:20 2014 -0800 +commit 9b22a2f +Author: Dario Lombardo +Date: Thu Jan 8 09:44:15 2015 +0100 - Fix ranlib "has no symbols" errors in the codecs directory. + Updates in it translation. - Don't build the G.722 or G.726 codecs for now. Each are wrapped in - "#ifdef HAVE_SPANDSP", which we don't define. + This fixes also the "duplicate messages" error. - Conditionally compile the SBC codec. + Change-Id: Iec93d82d4776c4f9805c5bfa2b2453c22b0e24e8 + Reviewed-on: https://code.wireshark.org/review/6929 + Petri-Dish: Graham Bloice + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit 33bdb21c +Author: Bill Meier +Date: Tue Feb 3 11:58:28 2015 -0500 + + xtp: Don't call col_...() under 'if (tree)' - Change-Id: I5f09ff66514f967d4f0611c943b4e6a975b8994b - Reviewed-on: https://code.wireshark.org/review/5690 - Reviewed-by: Gerald Combs + Change-Id: Ie80476e919b5ba0a2e5f036c654a5379b91ddd32 + Reviewed-on: https://code.wireshark.org/review/6931 + Reviewed-by: Bill Meier -commit f66de3a +commit a2eec54 Author: Gerald Combs -Date: Tue Dec 9 11:24:59 2014 -0800 +Date: Tue Feb 3 08:56:42 2015 -0800 - Fix filename matching. + BT ATT: Fix what appears to be a value string mismatch. - Change-Id: I2bdfd3ad2798ed1443d06c42b05c9962b8e8041d - Reviewed-on: https://code.wireshark.org/review/5689 + Change-Id: I440ed41c659bed9dcee43d8388ad780015971611 + Reviewed-on: https://code.wireshark.org/review/6930 Reviewed-by: Gerald Combs -commit bcaa5d8 -Author: Gerald Combs -Date: Wed Nov 12 14:24:16 2014 -0800 +commit b635997 +Author: Michael Mann +Date: Mon Feb 2 19:58:29 2015 -0500 - Qt: Update and rename the summary dialog. + 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(). - Go back to a single view similar to the GTK+ UI. Apply layouts using Qt - Designer. + Removed const from val_to_str[_ext]_wmem return value since it's not really constant. - Rename the menu item and class to "Capture File Properties". It's not - really a summary if it contains details such as "marked average bits - per second". We might want to move this to a "Properties" item under - the "File" menu similar to other applications. + 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 + +commit e942973 +Author: Michal Labedzki +Date: Wed Jan 28 17:14:48 2015 +0100 + + Bluetooth/USB HID: Move boot form of reports from bthid to usbhid - Add the GTK+ summary icon (for now) to the toolbar and open the - properties dialog on clicking. + Then call it as new dissectors from bthid and btatt. + In future they will be used in usbhid, because they are part of HID. - Singleton dialogs delenda est[1]. Let the user open as many summaries on - as many capture files as he or she wishes. Also, global cfile delenda - est[2]. + Change-Id: I9cb545f3079c27945b17bf8791ba4e3736c29e7c + Reviewed-on: https://code.wireshark.org/review/6912 + Petri-Dish: Michal Labedzki + Tested-by: Petri Dish Buildbot + Reviewed-by: Michal Labedzki + +commit 8417fbf +Author: Guy Harris +Date: Mon Feb 2 23:51:36 2015 -0800 + + Initialize the entire UUID. - Don't blindly include QtGui. Add specific components instead. + Squelches a compiler warning. - Use consistent method names, variable names, and patterns. Try to - document what "consistent" means. + Change-Id: I050710dd296f7fe7d315f881b0edf43699d2fa91 + Reviewed-on: https://code.wireshark.org/review/6928 + Reviewed-by: Guy Harris + +commit ca3fe28 +Author: Michal Labedzki +Date: Wed Jan 7 12:16:15 2015 +0100 + + Bluetooth: ATT: Dissect almost all attributes - Adjust the way we display some statistics to match the summary bar, e.g. - displayed = captured if we don't have a filter applied. + Change-Id: Ia388c07150d9664327daf2d1990b4465b5f4ae28 + Reviewed-on: https://code.wireshark.org/review/6910 + Petri-Dish: Michal Labedzki + Tested-by: Petri Dish Buildbot + Reviewed-by: Michal Labedzki + +commit 60b9be9 +Author: Michal Labedzki +Date: Tue Jan 6 18:42:38 2015 +0100 + + Bluetooth: ATT: Dissect Read Multiple Response - [1] Not really. - [2] Yes, really. + Change-Id: Ifcbde05389901bd66355e42540f3850bfd55def5 + Reviewed-on: https://code.wireshark.org/review/6909 + Reviewed-by: Michal Labedzki + +commit db068ff +Author: Michal Labedzki +Date: Tue Jan 6 14:06:18 2015 +0100 + + Bluetooth: ATT: Decode some HOGP attributes - Change-Id: I11793b1d79dd0c3f70414ac8592b86181da59916 - Reviewed-on: https://code.wireshark.org/review/5274 - Reviewed-by: Gerald Combs + Change-Id: I169f767b699a2f95e5a1553f1380f0b88cd7c67d + Reviewed-on: https://code.wireshark.org/review/6908 + Reviewed-by: Michal Labedzki -commit 9681bdd -Author: Michael Mann -Date: Fri Dec 5 19:41:12 2014 -0500 +commit 73579dd +Author: Michal Labedzki +Date: Mon Jan 5 13:36:45 2015 +0100 - Eliminate proto_tree_add_text from packet-ppp.c. + Bluetooth: ATT: Dissection stage 3: Assign UUID to Handle - Some of the conversions to proto_tree_add_xxx calls involved using explicit sizes instead of the "option length", so there is skipping of the "byte highlighting" of the type + length bytes. + Add possibility to dissect attributes by UUID assigned to handle. - Change-Id: Ibfe09a089fb33ba43121de079aca81742d48db4c - Reviewed-on: https://code.wireshark.org/review/5636 - Reviewed-by: Michael Mann - Petri-Dish: Michael Mann + Change-Id: I0e510bf902492f87e0eaee339d82609c37e12741 + Reviewed-on: https://code.wireshark.org/review/6905 + Reviewed-by: Michal Labedzki + +commit 8ba3d6f +Author: Michal Labedzki +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 + +commit 33f1256 +Author: Jeff Morriss +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 Tested-by: Petri Dish Buildbot - Reviewed-by: Christopher Maynard + Reviewed-by: Anders Broman -commit 74172ae -Author: Pascal Quantin -Date: Sun Dec 7 20:54:05 2014 +0100 +commit 00f7bc4 +Author: Gerald Combs +Date: Mon Feb 2 16:22:31 2015 -0800 - LTE: Update MAC and RLC dissectors to Release 12 + Qt: Fix IO Graph capture file closing. - Change-Id: I036a0d1180b6481e8cc27210ed44eda4ba078a27 - Reviewed-on: https://code.wireshark.org/review/5659 - Reviewed-by: Martin Mathieson - Petri-Dish: Alexis La Goutte - Reviewed-by: Pascal Quantin + 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 -commit 58fc89a -Author: Guy Harris -Date: Tue Dec 9 00:54:34 2014 -0800 +commit 9d7f5c7 +Author: Alexis La Goutte +Date: Mon Feb 2 22:28:59 2015 +0100 - Fix copy-and-pasteo. + ISIS: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - Change-Id: I181129595c7259f5c0af5308f0ca0190dce67eb7 - Reviewed-on: https://code.wireshark.org/review/5687 - Reviewed-by: Guy Harris + Change-Id: I58debb32cc7a4aa476961eda342f1cd90884c800 + Reviewed-on: https://code.wireshark.org/review/6921 + Reviewed-by: Michael Mann -commit e5757d1 -Author: Irene Ruengeler -Date: Fri Dec 5 10:04:29 2014 +0100 +commit 383caa7 +Author: Alexis La Goutte +Date: Mon Feb 2 22:28:25 2015 +0100 - Fix GTK warning in EXTCAP parts + AMQP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - Change-Id: I3a4d9baf3592db1394d1177a19014cbef9140759 - Reviewed-on: https://code.wireshark.org/review/5628 - Petri-Dish: Alexis La Goutte - Reviewed-by: Alexis La Goutte - Tested-by: Petri Dish Buildbot - Reviewed-by: Irene Ruengeler + Change-Id: Ie55dd06b6c4d6f77012e8e13079279ded2997907 + Reviewed-on: https://code.wireshark.org/review/6920 + Reviewed-by: Michael Mann -commit 301a5b7c -Author: Michael Mann -Date: Thu Nov 27 23:18:32 2014 -0500 +commit ec618b5 +Author: Alexis La Goutte +Date: Sun Feb 1 20:13:13 2015 +0100 - Eliminate proto_tree_add_text from some dissectors. + HTTP2: Fix offset for heuristic - Change-Id: I44cc6b70ec4dfc565934da499f46fca60a4ded93 - Reviewed-on: https://code.wireshark.org/review/5524 + With >= draft-14, length is encoded in 3 octets (2 octets before) + + Bug: 10908 + Change-Id: I061570186206548fafcc39a8df0ba6bafe8576a0 + Reviewed-on: https://code.wireshark.org/review/6883 + Reviewed-by: Pascal Quantin Reviewed-by: Michael Mann - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman -commit 1952fef +commit 71fd34d +Author: Gerald Combs +Date: Mon Feb 2 14:32:28 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. + + Show how to install Cygwin and Python using Chocolatey. + + MAC = Media Access Control (among other things). Mac = Macintosh. + + Change-Id: Ic6aabacdd3a86b4e8ca556cc6f3daa62c3e5986b + Reviewed-on: https://code.wireshark.org/review/6924 + Reviewed-by: Gerald Combs + +commit 37a2cd0 Author: Alexis La Goutte -Date: Fri Dec 5 07:42:34 2014 +0100 +Date: Mon Feb 2 22:58:41 2015 +0100 - SCTP: Missing break in switch (CID 1135556) + AMQP: fix declaration of 'index' shadows a global declaration - Change-Id: I00939bb9699493fe7af21497d9e9c013cc3d2e62 - Reviewed-on: https://code.wireshark.org/review/5650 - Reviewed-by: Jeff Morriss - Reviewed-by: Anders Broman + St*** Mac OS X buildbot... + + Part 2 (Oups...) + + Change-Id: I082d73d4581365d7152aca764e4dfe599ce12c64 + Reviewed-on: https://code.wireshark.org/review/6923 + Reviewed-by: Alexis La Goutte -commit 283e5c1 +commit 0b2c8b0 Author: Alexis La Goutte -Date: Wed Dec 3 16:46:46 2014 +0100 +Date: Mon Feb 2 22:46:08 2015 +0100 - GVSP: Missing break in switch (CID 1247683 & 1247684) + AMQP: fix declaration of 'index' shadows a global declaration - Change-Id: Ibd3aef4101126f02453bab10cd5ca31e716334de - Reviewed-on: https://code.wireshark.org/review/5617 - Reviewed-by: W Moxam - Reviewed-by: Anders Broman + St*** Mac OS X buildbot... + + Change-Id: I5efff34ce818f52fb6414191c58b5cabb388ba26 + Reviewed-on: https://code.wireshark.org/review/6922 + Reviewed-by: Alexis La Goutte -commit fbf08cf -Author: Guy Harris -Date: Mon Dec 8 20:04:23 2014 -0800 +commit c96b3ac +Author: Petr Gotthard +Date: Sat Jan 31 16:52:51 2015 +0100 - Nothing to free there. + AMQP 0-9-1: Fix dissection of field types. - pcapng_read_block() never sets *err_info if it returns - PCAPNG_BLOCK_NOT_SHB - that happens on an EOF, a short read, or on a - successful read of something that doesn't look like an SHB. + 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 - Change-Id: I23ad6aa1c95d800b068a798a4aad1d70d07ac281 - Reviewed-on: https://code.wireshark.org/review/5686 - Reviewed-by: Guy Harris + 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 + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit 9f4bf6a +Author: Pascal Quantin +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 + Reviewed-by: Pascal Quantin + +commit e102c34 +Author: Graham Bloice +Date: Mon Feb 2 16:11:40 2015 +0000 + + Minor doc changes for Windows build + + Further removal of older style build environment. + + Change-Id: I499ba50f55620ad627de3dc4316051985d00a7f5 + Reviewed-on: https://code.wireshark.org/review/6918 + Reviewed-by: Graham Bloice + +commit 6db0a35 +Author: Michael Mann +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 + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit bdaef53 +Author: Michal Labedzki +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 + +commit 003e337 +Author: Alexis La Goutte +Date: Mon Feb 2 09:57:23 2015 +0100 + + Fix some indent typo (after g2bf7878e) + + Change-Id: I44769f127f32ffd8a97b1579f371501f4aa9832a + Reviewed-on: https://code.wireshark.org/review/6913 + Reviewed-by: Anders Broman + +commit 6521771 +Author: Michal Labedzki +Date: Sun Jan 18 10:44:04 2015 +0100 + + Bluetooth: Simplify to "UnknownDirection" in Info column when direction is unknown + + Change-Id: Ibad679c0b6c95d65389ce087f65b8f31cf3acd68 + Reviewed-on: https://code.wireshark.org/review/6903 + Petri-Dish: Michal Labedzki + Reviewed-by: Michal Labedzki + +commit 1786cfe +Author: Michal Labedzki +Date: Mon Jan 19 14:27:29 2015 +0100 + + Bluetooth: Advertising Data: Fix Service Data entry + + Service Data entry is defined as UUID (16, 32 or 128) and + rest of payload is specific service data. + + Bug: 10859 + Change-Id: Ibaee075a66a144dfc52ed70614677c73a88d6a2c + Reviewed-on: https://code.wireshark.org/review/6902 + Petri-Dish: Michal Labedzki + Reviewed-by: Michal Labedzki + +commit 578c2be +Author: Michal Labedzki +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 + +commit ef6f6f0 +Author: Michal Labedzki +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 + +commit c4f08ec +Author: Michal Labedzki +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 + +commit 359ff31 +Author: Michal Labedzki +Date: Mon Dec 29 11:07:22 2014 +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 + + Change-Id: If3ee24f617f7e6683049558f7a6d68e346e7c92f + Reviewed-on: https://code.wireshark.org/review/6898 + Reviewed-by: Michal Labedzki + +commit 2cae320 +Author: Gerald Combs +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 + +commit 3947091 +Author: Guy Harris +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 + +commit 17b228b +Author: Bill Meier +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 + +commit 50e8415 +Author: Bill Meier +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 + +commit 351e7d5 +Author: Gerald Combs +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 + +commit 70912c8 +Author: Graham Bloice +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 + +commit ff16cfe +Author: Graham Bloice +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 + +commit a300227 +Author: Petr Gotthard +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 + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit df468f5 +Author: Pascal Quantin +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 + Reviewed-by: Evan Huus + +commit dc6482b +Author: Michael Mann +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 + +commit 6284040 +Author: Peter Wu +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 + +commit c7717ae +Author: Guy Harris +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 + +commit 4424d6a +Author: Guy Harris +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 + +commit 90233ff +Author: Guy Harris +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 + +commit cca2cde +Author: Guy Harris +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 + +commit ee9d0f9 +Author: Guy Harris +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 + +commit a984dbf +Author: Guy Harris +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 + +commit e76e140 +Author: Gerald Combs +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 + +commit 9a3676a +Author: Gerald Combs +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 + +commit f61c969 +Author: Gerald Combs +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 + +commit eda485e +Author: Bill Meier +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 + +commit 7b929e2 +Author: Bill Meier +Date: Fri Jan 30 13:48:32 2015 -0500 + + rtp: cleanup + + - Remove dead initializers; + - Localize some vars; + - Whitespace + + Change-Id: Ie98667de736f2928ce1a2e4986917e4b0457866f + Reviewed-on: https://code.wireshark.org/review/6861 + Reviewed-by: Bill Meier + +commit 1ec66f0 +Author: Bill Meier +Date: Fri Jan 30 13:14:36 2015 -0500 + + rtps: Cleanup + + - Remove dead initializers; + - Localize some variables; + - Whitespace. + + Change-Id: I876dfd88b2c3fe6a8056090f508c868f4a3cf653 + Reviewed-on: https://code.wireshark.org/review/6860 + Reviewed-by: Bill Meier + +commit cc66f68 +Author: Evan Huus +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 + Tested-by: Petri Dish Buildbot + Reviewed-by: Evan Huus + +commit 5e3936e +Author: Pascal Quantin +Date: Thu Jan 29 21:20:48 2015 +0100 + + BSSGP: ensure that all Optional / Conditional Information Elements are treated as such + + Bug: 10903 + Change-Id: I8f6b970a6988fd4e700203304586c8e53dd5696b + Reviewed-on: https://code.wireshark.org/review/6845 + Reviewed-by: Anders Broman + Petri-Dish: Alexis La Goutte + Reviewed-by: Pascal Quantin + +commit 14a869c +Author: Pascal Quantin +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 + Petri-Dish: Alexis La Goutte + Reviewed-by: Pascal Quantin + +commit a614212 +Author: Pascal Quantin +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 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit 78755c7 +Author: Hadriel Kaplan +Date: Thu Jan 29 18:55:15 2015 -0500 + + Disable SSE4.2 _ws_mempbrk_sse42 only for older Apple compilers + + 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. + + Bug: 10798 + Change-Id: I051ca003610c07f7d75cc19b20ff823fe4c1ce05 + Reviewed-on: https://code.wireshark.org/review/6851 + Petri-Dish: Hadriel Kaplan + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit 2bf7878 +Author: Gerald Combs +Date: Wed Jan 14 17:25:56 2015 -0800 + + 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. + + Add a help URL for RTP analysis (which needs to be split into streams + + analysis). + + Fix RTP stream packet marking. + + Change-Id: Ifb8192ff701a933422509233d76461a46e459f4f + Reviewed-on: https://code.wireshark.org/review/6852 + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs + +commit 6824cee +Author: Alexis La Goutte +Date: Thu Jan 29 12:09:34 2015 +0100 + + CAPWAP: Add support of Cisco Vendor Specific Element + + Change-Id: I62886bda3220d9aa3a5b3aee8b40063a8bb7745d + Reviewed-on: https://code.wireshark.org/review/6843 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit fd1bc6d +Author: Dario Lombardo +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 + Reviewed-by: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit aaa3d23 +Author: Dario Lombardo +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 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 67b069e +Author: Gerald Combs +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 + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs + +commit 2edf8bb +Author: Pascal Quantin +Date: Thu Jan 29 13:55:00 2015 +0100 + + SDP: check that media format starts with a digit before trying to identify media type + + Bug: 10899 + Change-Id: I92319a668ae795247d4021f32d629f5000ceb395 + Reviewed-on: https://code.wireshark.org/review/6841 + Petri-Dish: Pascal Quantin + Reviewed-by: Anders Broman + Reviewed-by: Pascal Quantin + +commit 0ba51cc +Author: Alexis La Goutte +Date: Sat Jan 17 16:11:06 2015 +0100 + + IS-IS: Add subTLV Bandwidth Constraints (22) used by IS Reachability + + Change-Id: I7e1d29270aede25268bb75a2b5fc9448dbc1cc9b + Reviewed-on: https://code.wireshark.org/review/6585 + Reviewed-by: Alexis La Goutte + +commit 9a366b0 +Author: Hadriel Kaplan +Date: Thu Jan 29 13:06:03 2015 -0500 + + Disable SSE4.2 _ws_mempbrk_sse42 due to bug 10798 + + This is a (possibly) temporary change to master to + disable _ws_mempbrk_sse42 to see if that fixes bug + 10798. + + Ping-Bug: 10798 + Change-Id: I2e438ff299f55709c66a37634d2a7e799c513ac9 + Reviewed-on: https://code.wireshark.org/review/6844 + Petri-Dish: Hadriel Kaplan + Reviewed-by: Evan Huus + Reviewed-by: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Hadriel Kaplan + Tested-by: Hadriel Kaplan + +commit 0137f92 +Author: Evan Huus +Date: Thu Jan 29 10:01:38 2015 -0500 + + addr_resolv: correctly scope returned memory + + *_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. + + Bug: 10901 + Change-Id: I337c8b6f9dfece966964c09023679b3e24648e48 + Reviewed-on: https://code.wireshark.org/review/6842 + Reviewed-by: Michael Mann + Reviewed-by: Evan Huus + +commit 25f1df4 +Author: Guy Harris +Date: Wed Jan 28 13:04:14 2015 -0800 + + "%l[doux]" doesn't mean "64-bit integer". + + 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). + + Change-Id: I0444f7f396969824f1040c06a67753718c32881b + Reviewed-on: https://code.wireshark.org/review/6838 + Reviewed-by: Guy Harris + +commit 49a7e97 +Author: Guy Harris +Date: Wed Jan 28 12:56:19 2015 -0800 + + 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. + + Change-Id: I5a8bd21bdf632ada9013e616c5fc4e8bd14c9698 + Reviewed-on: https://code.wireshark.org/review/6837 + Reviewed-by: Guy Harris + +commit 9e647a9 +Author: Petr Gotthard +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. + + Change-Id: Ie39cb40dca3d9f778ef2c04cbef24c968a91ec6c + Reviewed-on: https://code.wireshark.org/review/6791 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + Reviewed-by: Alexis La Goutte + +commit 6940a97 +Author: Guy Harris +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 + +commit 83678a0 +Author: Alexis La Goutte +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 + +commit f011af2 +Author: Anders +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 + +commit d7538cb +Author: Pascal Quantin +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 + Reviewed-by: Pascal Quantin + Reviewed-by: Alexis La Goutte -commit 7b1c3ab +commit 15c895d Author: Guy Harris -Date: Mon Dec 8 19:57:21 2014 -0800 +Date: Wed Jan 28 01:47:31 2015 -0800 - Manually fix a pidl bug - that field should be an FT_STRING. + Make the USB header information an enumerated type. - No, I don't know why it's making it FT_NONE; it's a bit of a weird data - type, with a string inside a structure. + It's not really a bitset, it's a choice of one of four types of USB + pseudo-header. Make it an enum. - Change-Id: I27a6d7577ef4a9f4da8ddad2cad97ad097135e90 - Reviewed-on: https://code.wireshark.org/review/5685 + Change-Id: I4ea994e1606c23e0a0f08b1b61357eea40a2535e + Reviewed-on: https://code.wireshark.org/review/6830 Reviewed-by: Guy Harris -commit 5c29704 -Author: Guy Harris -Date: Mon Dec 8 19:24:33 2014 -0800 +commit 53a5e4f +Author: Pascal Quantin +Date: Tue Jan 27 16:59:30 2015 +0100 - LDAP's DirSyncFlags are a bitfield, so show it as an unsigned integer in hex. + win32: fix detection of Windows 10 Technical Preview - Change-Id: I2a06b13528ad7dfc587bfb9c1333d4f7a497614e - Reviewed-on: https://code.wireshark.org/review/5684 - Reviewed-by: Guy Harris + The version number changed from 6.4 to 10.0 + + Change-Id: Ie749c97e8335f77d414d80edbd69373bd9a1cdad + Reviewed-on: https://code.wireshark.org/review/6820 + Petri-Dish: Pascal Quantin + Reviewed-by: Pascal Quantin -commit 3d95c62 +commit 946856a Author: Guy Harris -Date: Mon Dec 8 17:30:04 2014 -0800 +Date: Wed Jan 28 01:17:04 2015 -0800 - Don't try to look in a non-existent hash table. + Move tests out of try_dissect_linux_usb_pseudo_header_ext(). - We only create hash tables if somebody puts a handler in one, so we need - to check whether the hash table exists first, to avoid run-time warnings. + 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. - Change-Id: I739d2d808935e651b11bd44b258f168a42ca4b7c - Reviewed-on: https://code.wireshark.org/review/5683 + 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 -commit f34bcb7 +commit f090ebb Author: Guy Harris -Date: Mon Dec 8 16:13:39 2014 -0800 +Date: Tue Jan 27 21:23:55 2015 -0800 - Don't put bitmasks under an FT_NONE. + Add documentation URLs for the Linux USB and USBPCAP pseudo-headers. - Change-Id: I172c68d233e3887a94c0835234613dfd483ee5af - Reviewed-on: https://code.wireshark.org/review/5682 + Change-Id: If5cecfeb66b3caca6478206f2fcb2f617ef02b46 + Reviewed-on: https://code.wireshark.org/review/6828 Reviewed-by: Guy Harris -commit 260af59 -Author: Guy Harris -Date: Mon Dec 8 16:06:11 2014 -0800 +commit 3aab6fc +Author: Gerald Combs +Date: Tue Jan 27 09:25:29 2015 -0800 - Values in a value_string_ext *must* be sorted. + Qt: Update packet list freeze/thaw behavior. - Change-Id: I0c2bcd81955375abf3af24e42c70bea0bb960083 - Reviewed-on: https://code.wireshark.org/review/5681 - Reviewed-by: Guy Harris + 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 + Reviewed-by: Gerald Combs -commit 32e1ff9 -Author: Guy Harris -Date: Mon Dec 8 15:36:26 2014 -0800 +commit 9976422 +Author: Dario Lombardo +Date: Tue Jan 27 14:34:35 2015 +0100 - Don't put bitmasks under an FT_NONE. - - proto_tree_add_bitmask() requires that the field under which it's - putting the bitmasks be an FT_INTn or FT_UINTn, so that it can determine - the length of the field. + Added json heuristic to Dropbox LAN sync Discovery Protocol. - Arguably, proto_tree_add_bitmask() should, instead, take a length - argument, just as other proto_tree_add_ routines do, and, arguably, we - should perhaps not even have FT_UINTn and FT_INTn, just FT_UINT and - FT_INT, with the display width for hex and octal (leading zeroes) - determined by the actual length of the field or something such as that, - or as part of the field that also contains the base. + Change-Id: I0d649ddc0f1539616eca0322ba54a7735338c738 + Reviewed-on: https://code.wireshark.org/review/6817 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + +commit d3261b2 +Author: Bill Meier +Date: Tue Jan 27 12:55:05 2015 -0500 + + Comment out various 'if(tree)' - But, even with that, we might want to require an FT_UINTn or FT_INTn - anyway, at least in cases where the value of the field as a whole is - interesting. + col..._() and/or expert...() should not be called under 'if(tree)' - Change-Id: I4dff8fb1686a30b7d145c089dd1be7f96ecf23e0 - Reviewed-on: https://code.wireshark.org/review/5680 - Reviewed-by: Guy Harris + Change-Id: I57efe44794977d3f93e4764642b091044a125c0c + Reviewed-on: https://code.wireshark.org/review/6826 + Reviewed-by: Bill Meier -commit ffcacae -Author: Guy Harris -Date: Mon Dec 8 15:25:50 2014 -0800 +commit 75858d7 +Author: Bill Meier +Date: Tue Jan 27 12:01:43 2015 -0500 - Have different MTP2 dissectors for different metadata and CRC. + rtps: Remove various 'if(tree)' - Have separate MTP2 dissectors for: + col_...() and expert_...() should not be called under 'if(tree)' - MTP2 frames with no pseudo-header and no CRC; + Change-Id: I2f1a8345ff18c0174bcd81b37179aa2d5ee74aca + Reviewed-on: https://code.wireshark.org/review/6825 + Reviewed-by: Bill Meier + +commit 678cf27 +Author: Alexis La Goutte +Date: Tue Jan 27 15:14:47 2015 +0100 + + NETROM: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - MTP2 frames with a pseudo-header and no CRC; + Change-Id: Ie534cbd4fb592d18f27039c654ba08e1beb7edff + Reviewed-on: https://code.wireshark.org/review/6819 + Reviewed-by: Anders Broman + +commit 2e10308 +Author: Alexis La Goutte +Date: Tue Jan 27 15:13:46 2015 +0100 + + HCrt: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - MTP2 frames with no pseudo-header and a CRC; + Change-Id: I453c9b068a53292ab63cd3416569eea7d66361ba + Reviewed-on: https://code.wireshark.org/review/6818 + Reviewed-by: Anders Broman + +commit 7dfda88 +Author: Alexis La Goutte +Date: Mon Jan 26 19:53:49 2015 +0100 + + WIMAX: fix no previous prototype for ... [-Wmissing-prototypes] - and call the appropriate dissector in the appropriate places. + Also comment the unused function wimax_decode_sub_dl_ul_map - While we're at it, get rid of a global variable - pass the "use extended - sequence numbers" flag down through the dissection code path, rather - than having it as a global. + Part 2... - Change-Id: Id8da1fbe3529e3ffadd5c30646cbc922f506a01f - Reviewed-on: https://code.wireshark.org/review/5679 - Reviewed-by: Guy Harris + Change-Id: I1836aa2851156e4f756c5697f86a142625d697c9 + Reviewed-on: https://code.wireshark.org/review/6810 + Reviewed-by: Anders Broman -commit 8a446e9 -Author: Balint Reczey -Date: Sat Nov 15 09:44:22 2014 +0100 +commit ceb8d95 +Author: Hadriel Kaplan +Date: Sun Jan 25 14:30:13 2015 -0500 - Add missing build-dependencies for the Debian package + Lua: Expose tcp_dissect_pdus() to Lua - They are libparse-yapp-perl and libsbc-dev. + Provide a way for Lua-based dissectors to invoke tcp_dissect_pdus() + to make TCP-based dissection easier. - Change-Id: I474179bb805acb87f8bf316730d63eb294e10a69 - Reviewed-on: https://code.wireshark.org/review/5322 - Petri-Dish: Michal Labedzki - Reviewed-by: Balint Reczey + Bug: 9851 + Change-Id: I91630ebf1f1fc1964118b6750cc34238e18a8ad3 + Reviewed-on: https://code.wireshark.org/review/6778 + Reviewed-by: Alexis La Goutte + Reviewed-by: Hadriel Kaplan + Tested-by: Hadriel Kaplan -commit d87a952 -Author: Gerald Combs -Date: Mon Dec 8 14:09:33 2014 -0800 +commit 9bbc337 +Author: Dario Lombardo +Date: Tue Jan 13 15:13:27 2015 +0100 - It's a reasonable expectation that we will have C++ style comments in - ui/qt. + Added HPFEEDS stats_tree. - Change-Id: Iedbf2a2d3cbfee00912e6e883928836932dea566 - Reviewed-on: https://code.wireshark.org/review/5678 - Reviewed-by: Gerald Combs + Change-Id: I256fd5395b062fa954ebd60598721323ea1d7ff1 + Bug: 10875 + Reviewed-on: https://code.wireshark.org/review/6713 + Petri-Dish: Alexis La Goutte + Reviewed-by: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann -commit 08e624f -Author: Gerald Combs -Date: Mon Dec 8 13:41:02 2014 -0800 +commit c80aa10 +Author: Alexis La Goutte +Date: Tue Jan 27 11:53:05 2015 +0100 - Remove an unnecessary include. + HCrt fix no previous prototype for 'proto_register_hcrt' [-Wmissing-prototypes] - Change-Id: I55332c21ea66ee7d564c2b338cba524ea774b19c - Reviewed-on: https://code.wireshark.org/review/5677 - Reviewed-by: Gerald Combs + Change-Id: Idca780885263c068ba31bbccb6009e75221b3adf + Reviewed-on: https://code.wireshark.org/review/6816 + Reviewed-by: Anders Broman -commit d5f771c -Author: Guy Harris -Date: Mon Dec 8 11:40:35 2014 -0800 +commit 32cbf79 +Author: Alexis La Goutte +Date: Mon Jan 26 08:15:35 2015 +0100 - Use correct expression in a "length too short" message. + Qt: Add checkable for Find Packet icon - Doesn't change the behavior of the code, but makes it more consistent. - - Change-Id: I6f07fbbb4c7d14d8a46ecfd1c419d951c356fd77 - Reviewed-on: https://code.wireshark.org/review/5672 - Reviewed-by: Guy Harris + Change-Id: Idd3c0b1893a9e0f8bc329e9157baaccd10de7378 + Reviewed-on: https://code.wireshark.org/review/6814 + Reviewed-by: Anders Broman -commit 0bd79c5 -Author: Hannes Mezger -Date: Mon Dec 8 11:20:16 2014 +0100 +commit b5a3907 +Author: Alexis La Goutte +Date: Mon Jan 26 08:46:34 2015 +0100 - Fix full name of NodeId namespace index field, was a copy&pase error + Packet List (Qt): fix extra ‘;’ [-Wpedantic] - Change-Id: I7b1eea9965880e35c65f04406ff756d245b568d4 - Reviewed-on: https://code.wireshark.org/review/5668 - Reviewed-by: Alexis La Goutte + Change-Id: I3ac80a13da91452de4c857abfd6f2661b00e2f5d + Reviewed-on: https://code.wireshark.org/review/6815 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann -commit 52df6ef -Author: AndersBroman -Date: Wed Dec 3 12:36:18 2014 +0100 +commit 77227d4 +Author: Alexis La Goutte +Date: Mon Jan 26 08:00:43 2015 +0100 - Try to improve reassembly when SIP PDU starts in the middle of a segment - and continues trough the next segment(s). + GTK: Fix multispace on main title bar - Change-Id: I8efe69361fda0c60ec6544cc6bbe28c91f07207c - Reviewed-on: https://code.wireshark.org/review/5583 + Change-Id: I275a586c16621fdfabede23f6a1d03c8d8556b3f + Reviewed-on: https://code.wireshark.org/review/6813 Reviewed-by: Anders Broman -commit f16376e -Author: Maarten Bezemer -Date: Thu Nov 27 15:09:52 2014 +0100 +commit 5e309d6 +Author: Alexis La Goutte +Date: Mon Jan 26 07:48:55 2015 +0100 - Fix showing error dialog when calling vsimple_error_message_box() + CAPWAP: fix double space on AC Software version - SimpleDialog requires a parent, when none is provided (as there is no parent available during startup), the error message is queued and displayed after MainWindow is available. - Calling SimpleDialog::exec() directly returns if no parent is set (hence the dialog is not shown) + Change-Id: Ibe9715a1c2bf31e31ddda5ad2ad62fc0eda8164c + Reviewed-on: https://code.wireshark.org/review/6812 + Reviewed-by: Anders Broman + +commit ec7ff4e +Author: Alexis La Goutte +Date: Mon Jan 26 08:48:57 2015 +0100 + + GTK: fix no previous prototype for ... [-Wmissing-prototypes] - This resulted in silently ignoring error messages that were shown using vsimple_error_message_box(), as this function did not provide a parent (and the queue messages were not dequeued anymore as the MainWindow was already available) + Add by commit g43f09e67b (Remove unneeded includes from ui folder) - Change-Id: I2f4c1b4926c196ab40b035161cec530105396537 - Reviewed-on: https://code.wireshark.org/review/5519 - Reviewed-by: Michael Mann + Change-Id: I66eb113430bde97e18bb3d2b00f6bac46a01797e + Reviewed-on: https://code.wireshark.org/review/6809 + Reviewed-by: Anders Broman -commit e172ebb -Author: Michael Mann -Date: Sat Nov 29 15:58:56 2014 -0500 +commit a9aba94 +Author: Alexis La Goutte +Date: Mon Jan 26 08:45:36 2015 +0100 - Add proto_tree_add_bitmask_with_flags. + GTK: fix no previous prototype for ... [-Wmissing-prototypes] - It's proto_tree_add_bitmask with the ability to control the data appended to header. + Add by commit g43f09e67b (Remove unneeded includes from ui folder) - Change-Id: Icce97437ba7cfc9158ec204a837da8db8138424a - Reviewed-on: https://code.wireshark.org/review/5533 - Reviewed-by: Michael Mann + Change-Id: I7c9d9e2bbd76d062f96422c74ee8eb8c6ecd328b + Reviewed-on: https://code.wireshark.org/review/6808 + Reviewed-by: Anders Broman -commit 75cdf92 +commit 11d25fa Author: Alexis La Goutte -Date: Fri Dec 5 09:02:37 2014 +0100 +Date: Mon Jan 26 08:17:06 2015 +0100 - 802.11: fix indent (use 2 spaces) and modelines for 802.11 h file + CATTP: fix no previous prototype for 'proto_register_cattp' [-Wmissing-prototypes] - Change-Id: If886809d9eeb900bb94c045413ff1295519b8311 - Reviewed-on: https://code.wireshark.org/review/5641 - Reviewed-by: Michael Mann + Change-Id: Ifedb45d95d622c6df29f6917918015676f506831 + Reviewed-on: https://code.wireshark.org/review/6807 + Reviewed-by: Anders Broman -commit f47bc26 -Author: Alexis La Goutte -Date: Tue Nov 25 12:23:52 2014 +0100 +commit c0c2b45 +Author: Roland Knall +Date: Mon Jan 26 15:08:18 2015 +0100 - CAPWAP: Add some IEE802.11 Message Element Type (RFC5416) + epl: Add Manufacturer subdissector - * IEEE 802.11 Antenna (1025) - * IEEE 802.11 Direct Sequence Control (1028) - * IEEE 802.11 MAC Operation (1030) - * IEEE 802.11 MIC Countermeasures (1031) - * IEEE 802.11 Multi-Domain Capability (1032) - * IEEE 802.11 Station (1036) - * IEEE 802.11 Supported Rates (1040) - * IEEE 802.11 Tx Power (1041) - * IEEE 802.11 Tx Power Level (1042) - * IEEE 802.11 WTP Radio Configuration (1046) + Allow manufacturer specific plugins, which will only + be called for certain service IDs which are manufacturer + specific as defined by the POWERLINK specification. - Enhance 802.11 Rate Set (1034) + 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). - Change-Id: Ib37bc4081e75af051d80d023ddba689ecd9bf9ff - Reviewed-on: https://code.wireshark.org/review/5481 - Reviewed-by: Michael Mann + Also, all values for the ID fields have been changed to + range_string + + Change-Id: Ibfb9c035c16bce5322b13c42f30daf14e096712a + Reviewed-on: https://code.wireshark.org/review/6793 + Reviewed-by: Roland Knall + Reviewed-by: Anders Broman -commit 58b7277 -Author: Alexis La Goutte -Date: Fri Dec 5 09:00:13 2014 +0100 +commit 4fb2ec0 +Author: Joe Fowler +Date: Fri Jan 23 22:17:50 2015 -0500 - 802.11: Add ieee80211_supported_rates_vals_ext to be exported + SMC-R: fix incorrect dissection of non-SMCR packet. Failover + Validation bit definition is missing - It will be reused by CAPWAP dissector (* Rates Message Element) + dissect_smcr_tcp_heur() passes incorrect length to tvb_memeql(), + resulting in incorrectly identifying a packet as SMC-R. - Change-Id: I60ce12f382a35cdc2747baf23e2e3c30a305a8bd - Reviewed-on: https://code.wireshark.org/review/5640 - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Added Failover Validation bit. + + Bug: 10887 + Change-Id: I9f33389bd974b4c410a6b077d0d133221c77ee0d + Reviewed-on: https://code.wireshark.org/review/6765 + Reviewed-by: Anders Broman -commit 212ba58 -Author: Guy Harris -Date: Sun Dec 7 12:17:48 2014 -0800 +commit ee320ef +Author: Evan Huus +Date: Mon Jan 26 22:35:12 2015 -0500 - Add checks for non-null-terminated strings. + qt: clear tree and bytes when no packet selected - Change-Id: Iaad2d2f76e5d554800ba2c79d5c01f4b9da6fa0b - Reviewed-on: https://code.wireshark.org/review/5660 - Reviewed-by: Guy Harris + Otherwise trying to interact with them will cause all sorts of funny crashes. + + 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 -commit 5f79940 -Author: Alexis La Goutte -Date: Fri Dec 5 07:56:36 2014 +0100 +commit a835c85 +Author: Gerald Combs +Date: Mon Jan 26 11:38:33 2015 -0800 - Endpoint: wrong filter when select a SCTP endpoint (INVALID == a.x.y.z ...) + Pcapng: Don't fetch past the end of a GArray. - Change-Id: I396e9af7971ee8be6fc9548162ff37fe704f0289 - Reviewed-on: https://code.wireshark.org/review/5651 - Reviewed-by: Michael Mann + 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 + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs -commit 42cdc2b -Author: Alexis La Goutte -Date: Sun Dec 7 19:51:16 2014 +0100 +commit 5845f29 +Author: Bill Meier +Date: Mon Jan 26 13:58:01 2015 -0500 - dcerpc: Missing break in switch (CID 280449 & 280450 & 284051) + rtp: Don't call col_...() under 'if (tree)' - Change-Id: I68fa9650c234c0f1fb8464b464a781b54f2c728c - Reviewed-on: https://code.wireshark.org/review/5657 - Reviewed-by: Michael Mann + Change-Id: I7d75e8d02aeaa67155ec52dd0167d1692286b951 + Reviewed-on: https://code.wireshark.org/review/6800 + Reviewed-by: Bill Meier -commit 9d8cb74 -Author: Alexis La Goutte -Date: Sun Dec 7 19:48:17 2014 +0100 +commit 717b5a2 +Author: Bill Meier +Date: Mon Jan 26 13:31:15 2015 -0500 - iec104: Missing break in switch (CID 280459) + rtmpt: Remove 'if (tree)' - Change-Id: I6abc157368a78e1abfde672728b88a36ba6e76cc - Reviewed-on: https://code.wireshark.org/review/5656 - Reviewed-by: Michael Mann + Setting a var under 'if (tree)' and then using it later (not under 'if (tree)') to affect col_...()/expert_...() is not OK. + + Change-Id: I144b5fa50b4550cd14c604970f5d84dbf13f3e90 + Reviewed-on: https://code.wireshark.org/review/6799 + Reviewed-by: Bill Meier -commit fd087fb -Author: Alexis La Goutte -Date: Sun Dec 7 19:46:53 2014 +0100 +commit c9579d0 +Author: Pascal Quantin +Date: Mon Jan 26 16:20:16 2015 +0100 - AFS: Missing break in switch (CID 280434 & 280435) + 3GPP: upgrade 2G/3G NAS dissector to v12.8.0 and NAS EPS dissector to v12.7.0 - Change-Id: Ia0a39f7e4670d74325ddc40b34cd56ca018c0bde - Reviewed-on: https://code.wireshark.org/review/5655 - Reviewed-by: Michael Mann + Change-Id: I770506762074b50d40b4f4742d8316368f14b4de + Reviewed-on: https://code.wireshark.org/review/6794 + Petri-Dish: Pascal Quantin + Reviewed-by: Anders Broman + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin -commit a68a3da -Author: Martin Kaiser -Date: Sun Dec 7 19:36:32 2014 +0100 +commit d5f0f25 +Author: Anders +Date: Mon Jan 26 16:50:06 2015 +0100 - make our counting a bit clearer + Add Cmakefiles missing from the distribution. - Change-Id: Ie64573f5a0b6e921a5011e487eea8e55f72b9a0b - Reviewed-on: https://code.wireshark.org/review/5653 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + Change-Id: I77333bb1ca4b0fdfa2db095aab2e4e663c029dd3 + Reviewed-on: https://code.wireshark.org/review/6797 + Reviewed-by: Anders Broman -commit e456dec -Author: Martin Kaiser -Date: Sun Dec 7 19:27:57 2014 +0100 +commit d50b27f +Author: Evan Huus +Date: Sun Jan 25 09:18:00 2015 -0500 - don't initialize variables if the first thing we do is assign a - different value to them + gsm-rlcmac: use wmem_new0 for a struct - Change-Id: I719db9180b2ba5f21653086f2697ca9bac68d6b1 - Reviewed-on: https://code.wireshark.org/review/5652 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + Fixes "Conditional jump or move depends on uninitialised value" from Valgrind. + + 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. + + Bug: 10891 + Change-Id: Ia29dd625b46b3b76ff521b4203148fe8b0c59ec3 + Reviewed-on: https://code.wireshark.org/review/6769 + Petri-Dish: Evan Huus + Reviewed-by: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Evan Huus -commit ade2bef -Author: Martin Kaiser -Date: Sat Dec 6 18:28:37 2014 +0100 +commit abf5703 +Author: Michael Mann +Date: Sat Jan 24 18:34:53 2015 -0500 - make sure that we don't read past the end of the compressed buffer + Register EtherNet/IP dissector for "external" use (like SSL) - Bug: 10757 - Change-Id: I30054c4a75ec86ea603cf78b702be5255c35f549 - Reviewed-on: https://code.wireshark.org/review/5642 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + Change-Id: Ic918c27f36569572523a17abb172b94cc32f2e3b + Reviewed-on: https://code.wireshark.org/review/6786 + Reviewed-by: Michael Mann -commit 1bc8791 +commit d465682 Author: Michael Mann -Date: Fri Dec 5 19:42:47 2014 -0500 +Date: Sun Jan 25 17:32:40 2015 -0500 - Eliminate proto_tree_add_text from packet-telnet.c + Roll functionality of h225-persistentdata module into packet-h225.c - Change-Id: I0e8610f381e650f2c5b3f78ea927b727ec9ac62a - Reviewed-on: https://code.wireshark.org/review/5637 + Change-Id: I19b2a1b19e1e77a6456e2310daf64ddff572b0d2 + Reviewed-on: https://code.wireshark.org/review/6788 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann -commit afa5558 -Author: Gerald Combs -Date: Sun Dec 7 08:05:11 2014 -0800 +commit 155fc8f +Author: Michael Mann +Date: Sat Jan 24 18:55:55 2015 -0500 - [Automatic manuf, services and enterprise-numbers update for 2014-12-07] + Move #defines of epan/greproto.h to packet-gre.h - Change-Id: Ice8195b09120fb21144e504289a64fd5af84775b - Reviewed-on: https://code.wireshark.org/review/5647 - Reviewed-by: Gerald Combs + Change-Id: I5de4c34e2acafbe47a8ca3f07040a774e72d0d3e + Reviewed-on: https://code.wireshark.org/review/6787 + Reviewed-by: Michael Mann -commit de61f06 +commit d015eff Author: Guy Harris -Date: Sat Dec 6 15:59:07 2014 -0800 +Date: Sun Jan 25 14:37:44 2015 -0800 - The packet encapsulation is in pkt_encap, not rec_type. + Update another comment to reflect reality. - rec_type is the type of record (which isn't necessarily a packet; future - work on libwiretap will let it return non-packet data); if it's a packet - (REC_TYPE_PACKET), then pkt_encap contains the "link-layer" - encapsulation for the packet (in quotes because it may contain metadata - not transmitted over the network). - - Change-Id: I6f32b02f4466df6d7b07dbdc9d77e881830ac749 - Reviewed-on: https://code.wireshark.org/review/5645 + Change-Id: I9747b746ed7c38ed3aa78f19ae20b61e142b94cc + Reviewed-on: https://code.wireshark.org/review/6785 Reviewed-by: Guy Harris -commit 22da8a3 -Author: Michael Mann -Date: Sat Dec 6 16:21:07 2014 -0500 +commit fcac03d +Author: Guy Harris +Date: Sun Jan 25 14:34:07 2015 -0800 - Remove annex_a_used from packet_info structure. + Update a comment to reflect reality. - Change-Id: I660caa8283aecff5060c6ed476f316bc5793373e - Reviewed-on: https://code.wireshark.org/review/5643 - Reviewed-by: Michael Tüxen + Change-Id: I6376ce5eab43443314e73116161a24111f8c46d7 + Reviewed-on: https://code.wireshark.org/review/6784 + Reviewed-by: Guy Harris -commit 6d4c0ed +commit 88e22bde Author: Guy Harris -Date: Fri Dec 5 20:53:39 2014 -0800 +Date: Sun Jan 25 14:31:39 2015 -0800 - Don't go past the end of the "extra data". - - The "extra data", according to the RF5 API manual I have, is "hardware - parameters", so change some names. - - Report an error if the variable parts of the configuration event record - run past the record length. - - Report an error if the hardware parameters are too short. + Remove some references to SVN. - For the purportedly DS0 hardware parameters, don't assume they'll be - long enough for the mask; they might not be. + 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. - Change-Id: Ib63d042e4ede32216fb474c4ecdba84db1387abc - Reviewed-on: https://code.wireshark.org/review/5638 + Change-Id: If25d81dae747f9825f7e3e5e937749f078f63d27 + Reviewed-on: https://code.wireshark.org/review/6783 Reviewed-by: Guy Harris -commit 8c190d6 -Author: Alexis La Goutte -Date: Wed Dec 3 16:39:58 2014 +0100 +commit be798e1 +Author: Bill Meier +Date: Sun Jan 25 15:51:01 2015 -0500 - RPKI-RTR: Missing break in switch (CID 1233099) + pana, gsm_abis_oml, rsl, netrom: Remove 'if (tree)' - Change-Id: I01f01ce51fb1c9deb857ef01696b406b97dca3a9 - Reviewed-on: https://code.wireshark.org/review/5616 - Reviewed-by: Michael Mann + Thou shalt call col_...() and/or a dissector under 'if(tree)' + + Change-Id: Ibe62bc8229cb759d5f8b092aa7143d8e2f799037 + Reviewed-on: https://code.wireshark.org/review/6781 + Reviewed-by: Bill Meier -commit 646d52e -Author: Alexis La Goutte -Date: Wed Dec 3 16:48:48 2014 +0100 +commit 065304c +Author: Bill Meier +Date: Sun Jan 25 12:04:14 2015 -0500 - PCEP: Missing break in switch (CID 1247685) + applemidi: col_...() shouldn't be called under 'if(tree)' - Change-Id: Id001a6c1e116fdabfd51c354832ca68f50e65e7d - Reviewed-on: https://code.wireshark.org/review/5618 - Reviewed-by: Michael Mann + Change-Id: I6ae8e122f1d1e7200255b51d2017b4375045c797 + Reviewed-on: https://code.wireshark.org/review/6780 + Reviewed-by: Bill Meier -commit a5fe0d4 -Author: Alexis La Goutte -Date: Thu Dec 4 10:57:16 2014 +0100 +commit c107896 +Author: Guy Harris +Date: Sun Jan 25 13:50:37 2015 -0800 - BT obex: Missing break in switch (CID 1132031) + Replace "GIT" with "VCS" in make-version.pl and files it manipulates. - Change-Id: I6b8fc8db006bc3b8f8f4bac019cb7e240931d3b5 - Reviewed-on: https://code.wireshark.org/review/5619 - Reviewed-by: Michal Labedzki - Reviewed-by: Michael Mann + 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. + + Change-Id: Ie4914b16fea8ce800582729260c5e9b9cf1111f4 + Reviewed-on: https://code.wireshark.org/review/6779 + Reviewed-by: Guy Harris -commit bb00570 +commit a3f3d0b Author: Guy Harris -Date: Fri Dec 5 15:46:58 2014 -0800 +Date: Sun Jan 25 12:50:05 2015 -0800 - Fix some copy-and-pasteos in error messages. + Don't say "Git Rev" if the VCS being used isn't Git. - Change-Id: I1fe3434e69a08aae3d7413067275b3d7ee1552f5 - Reviewed-on: https://code.wireshark.org/review/5634 + Change-Id: Ibd298b9665214e8af137a05ffb0c0aee67af91bf + Reviewed-on: https://code.wireshark.org/review/6777 Reviewed-by: Guy Harris -commit 4510306 +commit bba51b6 Author: Guy Harris -Date: Fri Dec 5 13:14:31 2014 -0800 +Date: Sun Jan 25 12:14:58 2015 -0800 - Get rid of a trailing blank. + Get rid of unused is_release preference. - Change-Id: I0cf6d04f5075ba1f064c40f4b39b32b6976b54c7 - Reviewed-on: https://code.wireshark.org/review/5633 + Change-Id: I458f1d398b4eb566dd73e879ea3236a4de67da63 + Reviewed-on: https://code.wireshark.org/review/6776 Reviewed-by: Guy Harris -commit b98c570 +commit 2f713a6 Author: Guy Harris -Date: Fri Dec 5 13:04:59 2014 -0800 +Date: Sun Jan 25 12:01:54 2015 -0800 - Fix varargs handling in col_{add,append}_lstr(). + Update some comments to reflect reality. - We do multiple va_start() calls using the first string in the list of - strings; do *not* use the first-string argument to iterate over all the - argument strings, as that means that only the first va_start() call will - do the right thing, use a separate variable. - - Bug: 10755 - Change-Id: Ic4a6c24f911e335d147883a25d30289628836875 - Reviewed-on: https://code.wireshark.org/review/5630 + Change-Id: I230e3914bcd902dd481b59637f5ea21afc496978 + Reviewed-on: https://code.wireshark.org/review/6775 Reviewed-by: Guy Harris -commit 18fabb4 -Author: Jeff Morriss -Date: Tue Dec 2 09:40:46 2014 -0500 +commit aec1bcf +Author: Hadriel Kaplan +Date: Sat Jan 24 15:58:30 2015 -0500 - Strengthen association matching when we haven't seen the INIT/INIT-ACK. + Lua can free tvbuffs too early - The fact that the vtag matches the initiate tag doesn't mean much if both are 0 - (uninitialized). + 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. - Also leave in some (commented-out) debug to make debugging this stuff easier - in the future. - - Change-Id: Id007de8bf9d2d4e0bb18309ed3e2572fedda45f1 - Reviewed-on: https://code.wireshark.org/review/5571 - Reviewed-by: Jeff Morriss + Bug: 10888 + Change-Id: I3e9db671c3f2a7cab9e258aca17f3be8acaf2417 + Reviewed-on: https://code.wireshark.org/review/6768 + Petri-Dish: Hadriel Kaplan + Tested-by: Petri Dish Buildbot + Reviewed-by: Evan Huus + Reviewed-by: Hadriel Kaplan + Tested-by: Hadriel Kaplan -commit 0867344 -Author: Stephen Fisher -Date: Thu Dec 4 16:59:43 2014 -0700 +commit 716f9a3 +Author: Gerald Combs +Date: Sun Jan 25 08:06:13 2015 -0800 - Look for python3 in addition to python in configure script. + [Automatic manuf, services and enterprise-numbers update for 2015-01-25] - Change-Id: I77ff22aabdbbbf7376483b53d8795e7fbf0c0433 - Reviewed-on: https://code.wireshark.org/review/5627 - Reviewed-by: Stephen Fisher + Change-Id: Ic9c4903a49473c40f66dcf650f59d6a498bb9c05 + Reviewed-on: https://code.wireshark.org/review/6772 + Reviewed-by: Gerald Combs -commit d5a4cc3 -Author: Stephen Fisher -Date: Thu Dec 4 13:15:41 2014 -0700 +commit 5003654 +Author: Bill Meier +Date: Sun Jan 25 09:53:25 2015 -0500 - Make autogen.sh look for "python3" if "python" isn't found before - giving up. + Cleanup: - Change-Id: Id109c78f90da71c54c7b4fd6df20cc153248f46f - Reviewed-on: https://code.wireshark.org/review/5623 - Reviewed-by: Stephen Fisher + 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 -commit 3b7c165 -Author: Martin Kaiser -Date: Thu Dec 4 22:49:42 2014 +0100 +commit b91df34 +Author: Bill Meier +Date: Sat Jan 24 17:09:36 2015 -0500 - use the same data types as in i2c_phdr + v52: Fix a minor bug introduced in gc71e88e; plus ... - Change-Id: Ic0abcf8173a690a1dc0cd250f5e8770eb92a5aa9 - Reviewed-on: https://code.wireshark.org/review/5626 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + 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 -commit 5d95067 -Author: Martin Kaiser -Date: Thu Dec 4 22:38:16 2014 +0100 +commit 5280188 +Author: Dario Lombardo +Date: Mon Jan 12 14:31:16 2015 +0100 - simplify dissect_i2c() + Added HCrt (Hotline Command-Response Transaction) Dissector. - Change-Id: I67dd6ae5dc48b297e5c04aba2fe53e3e159d2611 - Reviewed-on: https://code.wireshark.org/review/5625 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + Bug: 10853 + Change-Id: Ieddb98b16e47906ba187cf03669b02a3ad397d60 + Reviewed-on: https://code.wireshark.org/review/6533 + Reviewed-by: Bill Meier -commit 73f48a0 -Author: Martin Kaiser -Date: Thu Dec 4 22:25:39 2014 +0100 +commit b2a5f15 +Author: Evan Huus +Date: Sat Jan 24 13:01:30 2015 -0500 - dont't manually throw a ReportedBoundsError if the packet is empty - use tvb_captured_length() instead of tvb_length() + RTPS: Memset entire buffer - Change-Id: I7e7efd69515fc3e30c986ac5d9a56b4db1931c10 - Reviewed-on: https://code.wireshark.org/review/5624 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + 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 -commit 70ca52c -Author: Pascal Quantin -Date: Thu Dec 4 14:38:35 2014 +0100 +commit cf142c6 +Author: Gerald Combs +Date: Sat Jan 24 10:28:56 2015 -0800 - 3GPP: upgrade 2G/3G NAS dissector to v12.7.0 and NAS EPS dissector to v12.6.0 + Get Wireshark to compile with afl-gcc. - Change-Id: I1e5bc5d28cb956b333c302b1cb18335b59d096a8 - Reviewed-on: https://code.wireshark.org/review/5621 - Reviewed-by: Anders Broman - Reviewed-by: Pascal Quantin + Fix errors found by American Fuzzy Lop's afl-gcc + (http://lcamtuf.coredump.cx/afl/): + + peektagged.c: + error: 'fileVersion' may be used uninitialized in this function + + packet-h223.c: + error: variable 'circuit_id' might be clobbered by 'longjmp' or 'vfork' + + 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 -commit ab3c182 -Author: Jeff Morriss -Date: Thu Dec 4 09:54:08 2014 -0500 +commit 7ed097c +Author: Gerald Combs +Date: Fri Jan 23 13:29:52 2015 -0800 - There's no need to talk about update-alternatives here. + Fix an uninitialized variable warning. - Our "make install" process does nothing with 'alternatives'. Our RPMs do use - alternatives but they do the necessary update-alternatives stuff already. + Change-Id: I3a5c211db767e1980a8c1f2fd706139c0bf6f943 + Reviewed-on: https://code.wireshark.org/review/6764 + Reviewed-by: Gerald Combs + +commit b714da2 +Author: Gerald Combs +Date: Fri Jan 23 12:09:51 2015 -0800 + + CMake: Make sure DATAFILE_DIR exists. - (If someone wants to set up Linux "make install"s to use alternatives it would - make sense to put these notes to the user back in.) + Create DATAFILE_DIR when we're building an application bundle. Hopefully + this will fix the build error on the OS X x86 builder. - Change-Id: Ib7f4655a222ccaee83830a97b213656856cee73e - Reviewed-on: https://code.wireshark.org/review/5622 - Reviewed-by: Jeff Morriss + Change-Id: I57414bcd87ab21958ae8131a8cd77951b29e02f7 + Reviewed-on: https://code.wireshark.org/review/6763 + Reviewed-by: Gerald Combs -commit b2fcbb2 -Author: Jeff Morriss -Date: Wed Dec 3 22:12:52 2014 -0500 +commit 21dfda6 +Author: Gerald Combs +Date: Fri Jan 23 09:18:29 2015 -0800 - Add a MIME type for Tektronix rf5 files and register Wireshark for that type of - file. + Qt: Remove windowIcon property from our .ui files. - The magic matching comes from wiretap/k12.c. + 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.) - (Yes, I just made the application/x-tektronix-rf5 MIME type up.) + Move the setWindowIcon call from ge990d1b to the top of the MainWindow + constructor and enable it everywhere. - Change-Id: Iafd7300aa7f2664bb06e1330caede10785c21d68 - Reviewed-on: https://code.wireshark.org/review/5607 - Reviewed-by: Jeff Morriss + Change-Id: I4e9765200bb3676c4faa8e0ab1505ce02fb64870 + Reviewed-on: https://code.wireshark.org/review/6762 + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs -commit a919566 -Author: Steve Karg -Date: Wed Dec 3 13:30:42 2014 -0600 +commit d8d2d8e +Author: Martin Mathieson +Date: Fri Jan 23 15:09:50 2015 +0000 - BACnet: fix dissection of exception-schedule property. + jpeg: Add handling for comment marker - The exception schedule special-event disection already used matched - open-close tags and only needed to check for an unmatched close tag - to exit when used with ReadPropertyMultiple service. + Change-Id: I10ad7021f6535d65d88faf734fb5800e4415a811 + Reviewed-on: https://code.wireshark.org/review/6759 + Reviewed-by: Martin Mathieson + +commit cce3ad2 +Author: Petr Gotthard +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. - Bug: 10691 - Change-Id: I54f2f6f3f470138a6a88f84c62fd15b07ea74c37 - Reviewed-on: https://code.wireshark.org/review/5593 - Petri-Dish: Alexis La Goutte - Tested-by: Petri Dish Buildbot + Change-Id: I94f8ef73e2432543ae3965da3789f27e872951ea + Reviewed-on: https://code.wireshark.org/review/6685 Reviewed-by: Alexis La Goutte + Reviewed-by: Anders Broman + +commit b32e39e +Author: Gerald Combs +Date: Tue Jan 20 12:26:14 2015 -0800 -commit f27c345 -Author: Michele Baldessari -Date: Wed Dec 3 20:14:33 2014 +0100 + 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 + +commit f5c0bd2 +Author: Alexis La Goutte +Date: Fri Jan 23 09:56:28 2015 +0100 + + 802.11: Fix encoding for VHT NDP STA Info + + Using little endian for encoding + + Ping-Bug: 10786 + Change-Id: Ic2a7f52ccbba32a801c102df4e5aa0a792654602 + Reviewed-on: https://code.wireshark.org/review/6755 + Reviewed-by: Anders Broman + +commit bab7447 +Author: Alexis La Goutte +Date: Sun Dec 7 14:30:50 2014 +0100 - Add resource-id parsing to the X11 errors that return it + CAPWAP: Add support of Fortinet Vendor Specific Element - - Rename BadColor to BadColormap as the former does not exist in the X11 - specs - - Parse the bad resource id field in case of the following errors: - BadColormap, BadWindow, BadPixmap, BadCursor, BadFont, BadDrawable, - BadGC and BadIDChoice + Based from FortiAP/WiFi 5.2.x - Change-Id: I5b23d32189e1a8bb291c656cf6383a85b3e89642 - Reviewed-on: https://code.wireshark.org/review/5592 + Change-Id: Ia78d15d54db01939a3d91947db39e35b3abc2519 + Reviewed-on: https://code.wireshark.org/review/5646 + Petri-Dish: Alexis La Goutte Reviewed-by: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman -commit b8a2364 -Author: Guy Harris -Date: Thu Dec 4 00:03:03 2014 -0800 +commit e990d1b +Author: Gerald Combs +Date: Thu Jan 22 16:48:17 2015 -0800 - Don't do the desktop integration stuff if we're not building Wireshark. + Try to fix the jaggy taskbar icon. - Wireshark is the desktop app; if we're not building it (i.e., we're only - building the command-line TShark), we don't need any desktop files. + Possibly related to https://bugreports.qt.io/browse/QTBUG-19441. - Change-Id: Id8244b417fd53c9d55b4d77fe3ad748c98868ad7 - Reviewed-on: https://code.wireshark.org/review/5615 - Reviewed-by: Guy Harris + Change-Id: Idf7ff8a247f459ce465907760ca0ebeaff2cffa8 + Reviewed-on: https://code.wireshark.org/review/6746 + Reviewed-by: Anders Broman -commit c02417f -Author: Guy Harris -Date: Wed Dec 3 23:56:10 2014 -0800 +commit 888229b +Author: Hadriel Kaplan +Date: Thu Jan 22 22:40:01 2015 -0500 - Don't do all the fd.o desktop integration stuff on OS X. + Make netlink dissector register the attribute length header field info - It doesn't need it, so don't install those files, or uninstall them, or - suggest running various unnecessary commands after the installation - finishes. + 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. - Change-Id: Ieecab22884723670f47f2fc7cc1ac827f48c1967 - Reviewed-on: https://code.wireshark.org/review/5614 - Reviewed-by: Guy Harris + Bug: 10884 + Change-Id: Iaa4e556d5bbe87b72a0cdca2fbf397fa95e074cc + Reviewed-on: https://code.wireshark.org/review/6751 + Reviewed-by: Hadriel Kaplan + Petri-Dish: Hadriel Kaplan + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman -commit 6e5d84f -Author: Bill Meier -Date: Wed Dec 3 15:22:39 2014 -0500 +commit 407b703 +Author: Hadriel Kaplan +Date: Fri Jan 23 00:04:18 2015 -0500 - Rename some filter names to fix cases of duplicate filter names. + Fix some WsLua documentation errors - Note: Use of most of these filter names could have caused a Wireshark crash. + 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. - Change-Id: I393402a25dd26d174baff77f4706f6d5f43a94ae - Reviewed-on: https://code.wireshark.org/review/5610 - Reviewed-by: Bill Meier + Change-Id: I7912488c6da5b5ae72933e4c5ce49f8fbf0b0e34 + Reviewed-on: https://code.wireshark.org/review/6753 + Reviewed-by: Hadriel Kaplan + Petri-Dish: Hadriel Kaplan + Reviewed-by: Anders Broman -commit f8c0bff +commit 8d1a984 Author: Bill Meier -Date: Wed Dec 3 15:19:36 2014 -0500 +Date: Fri Jan 23 00:24:46 2015 -0500 - mac-lte: Rename expert filter name to fix conflict with same name in hf[] + Remove incorrect 'if (tree)' - Change-Id: I906a195b3c6a1e68f273decc9c443a233af4f9be - Reviewed-on: https://code.wireshark.org/review/5609 - Reviewed-by: Bill Meier - -commit d519617 -Author: Bill Meier -Date: Wed Dec 3 14:14:53 2014 -0500 - - mausb: Rename expert filter names to fix dup filter names. + 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_...() - Change-Id: Id650c3aff6d073b05e844574ffbde8fec4368f49 - Reviewed-on: https://code.wireshark.org/review/5608 + Change-Id: I89f7d453f2d6eaa40d51cbd794ed2c9be7e549de + Reviewed-on: https://code.wireshark.org/review/6754 Reviewed-by: Bill Meier -commit 245bdd1 +commit 5a23a02 Author: Guy Harris -Date: Wed Dec 3 18:37:50 2014 -0800 +Date: Thu Jan 22 19:33:37 2015 -0800 - Put a bunch of suggestions in post-install/post-uninstall hooks. - - This covers a bunch of commands that might have to be run after "make - install". ("might" - none are needed on OS X, for example, as it's a - different desktop and its dynamic loader doesn't have a cache that you - have to manually update whenever you install a new shared library.) + Add .dirstamp - it's apparently some autotools thing. - Change-Id: I21e1728bdde26a7ab1585fdfb54f63fdc1c25dd6 - Reviewed-on: https://code.wireshark.org/review/5606 + Change-Id: I3303744858d807b1472c2e53ff6d886270664be2 + Reviewed-on: https://code.wireshark.org/review/6752 Reviewed-by: Guy Harris -commit 1ffe32b -Author: Jeff Morriss -Date: Wed Dec 3 16:59:08 2014 -0500 +commit 19a8eaf +Author: Guy Harris +Date: Thu Jan 22 13:04:15 2015 -0800 - Fix building of RPMs and get RPM builds working with a prefix other than /usr again. + Use luaL_{check,opt}integer() rather than luaL_{check,opt}int(). - (Change I567269d8e45e6543d9e39dbedc49830adf7edb9f made the desktop files - install outside of /usr/share/ .) + 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. - RPMs now build and work regardless of the prefix but the desktop integration stuff - only works if the prefix is /usr or (if you're lucky) /usr/local . + It sounds as if the Lua developers are deprecating luaL_{check,opt}int(): - Change-Id: If20e0127a044eac1ba099f959a90d068c4bb2ae5 - Reviewed-on: https://code.wireshark.org/review/5600 - Reviewed-by: Jeff Morriss + http://osdir.com/ml/general/2014-10/msg46568.html + + Change-Id: I2d0b649dcd57ede124f31d39f7945f342ae9b18f + Reviewed-on: https://code.wireshark.org/review/6744 + Petri-Dish: Guy Harris + Reviewed-by: Guy Harris + Reviewed-by: Hadriel Kaplan + Petri-Dish: Hadriel Kaplan + Tested-by: Petri Dish Buildbot + Tested-by: Hadriel Kaplan -commit 44e2716 -Author: Jeff Morriss -Date: Wed Dec 3 20:02:04 2014 -0500 +commit 2eaa467 +Author: Evan Huus +Date: Thu Jan 22 20:53:24 2015 -0500 - Tell the loader where to find our libraries if we're being installed - someplace other than /usr . + oids: fix memory leak - Change-Id: I42cbe98bcfc0e8ba2aa08f651044db051d31205c - (cherry picked from commit 25d9695cb3536b672f4cd8bc280e2a3c816a0d8a) - Conflicts: - packaging/rpm/SPECS/wireshark.spec.in - Reviewed-on: https://code.wireshark.org/review/5605 - Reviewed-by: Jeff Morriss + 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 -commit f0bd311 -Author: Gerald Combs -Date: Wed Dec 3 16:05:29 2014 -0800 +commit 612e286 +Author: Guy Harris +Date: Thu Jan 22 17:51:48 2015 -0800 - CMake: Don't cache LUA_LIBRARIES. + Fix test script to test Lua Pinfo, and fix problem it found. - Don't cache the LUA_LIBRARIES variable. This matches the behavior of the - other library modules and fixes a compilation problem on my machine - where /usr/local/lib/liblua.dylib wasn't showing up in the various - build.make and link.txt files. + 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: Ib75ef303f2e67b266a246621718d0ea2ab885dca - Reviewed-on: https://code.wireshark.org/review/5603 - Reviewed-by: Gerald Combs + Change-Id: Iccdccd265dd550e41640af3acd607362f1f2f02e + Reviewed-on: https://code.wireshark.org/review/6747 + Reviewed-by: Guy Harris -commit 0d20456 +commit 5b55288 Author: Jeff Morriss -Date: Wed Dec 3 17:54:45 2014 -0500 +Date: Thu Jan 22 14:39:55 2015 -0500 - Make a note that cmake needs to install the freedesktop integration files too. + Add a changelog entry for the license tag change (I82de1bc4ffcb1e962b1a35dc58aaa87aca04ed5e). - Change-Id: I5eeeb2fa32e8f90bc56f0515e0fc9f6c5f88eb79 - Reviewed-on: https://code.wireshark.org/review/5602 + Change-Id: I5e715579be9b415cd0fd957c66c7bd82319c88b3 + Reviewed-on: https://code.wireshark.org/review/6743 Reviewed-by: Jeff Morriss -commit 7ef5abc -Author: Jeff Morriss -Date: Wed Dec 3 17:05:00 2014 -0500 +commit 96f9746 +Author: Bill Meier +Date: Thu Jan 22 12:05:57 2015 -0500 - Don't run gtk-update-icon-cache when uninstalling the Qt package. But do run - it when installing the gnome package. + pppoe: col_...()/expert...() shouldn't be under 'if (tree)' - Change-Id: I0bbd9c0edc3fb6fe0e672aa3dbea5ba23d847d87 - Reviewed-on: https://code.wireshark.org/review/5598 - Reviewed-by: Jeff Morriss + Change-Id: I93726546d86af677153b6b2d46fc072851a33460 + Reviewed-on: https://code.wireshark.org/review/6741 + Reviewed-by: Bill Meier -commit c86d1d2 -Author: Pascal Quantin -Date: Wed Dec 3 20:48:08 2014 +0100 +commit f38a63a +Author: Stefan Metzmacher +Date: Tue Sep 23 23:11:25 2014 +0200 - FC: fix dissection when packets are captured with Fibre Channel FC-2 encapsulation type + packet-smb2: implement SMB2 NegotiateContexts - This is broken since ga9dd765 - - Bug: 10751 - Change-Id: Id4f282d9e0104bfa2314e2348aedf31233a671bd - Reviewed-on: https://code.wireshark.org/review/5594 - Reviewed-by: Pascal Quantin - Petri-Dish: Pascal Quantin + Change-Id: I0a2c7ffa2490196989dce96b659337b4fee92c7e + Signed-off-by: Stefan Metzmacher + Reviewed-on: https://code.wireshark.org/review/6711 + Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte -commit 0a30f68 -Author: Martin Kaiser -Date: Sat Nov 29 19:00:58 2014 +0100 +commit 48c90d1 +Author: Stefan Metzmacher +Date: Tue Sep 23 23:12:29 2014 +0200 - start dissecting the stsz box + packet-smb2: fix getting the dataoffset in dissect_smb2_write_request() - Change-Id: Ia8fce9307bae33c44d630af403980d162afd88c2 - Reviewed-on: https://code.wireshark.org/review/5597 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + It's 2 byte only so we need to use tvb_get_letohs(). + + Change-Id: Idbab6428f4242abbbff089d7e1d1bf4cc86930b1 + Signed-off-by: Stefan Metzmacher + Reviewed-on: https://code.wireshark.org/review/6710 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte -commit 2f39f2e -Author: Martin Kaiser -Date: Sat Nov 29 18:50:59 2014 +0100 +commit 97d0f36 +Author: Stefan Metzmacher +Date: Wed Jan 21 08:17:19 2015 +0100 - BOX_TYPE_STZ2 + packet-smb2: correctly dissect dcerpc traffic over different named pipe handles - Change-Id: I4eadf2b613b7803c81593e517408631f8375ab2c - Reviewed-on: https://code.wireshark.org/review/5596 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + Change-Id: Id98d1c7e28d88f6cd50f5ef770eec95e57008458 + Signed-off-by: Stefan Metzmacher + Reviewed-on: https://code.wireshark.org/review/6709 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte -commit ee48194 -Author: Martin Kaiser -Date: Sat Nov 29 12:58:20 2014 +0100 +commit 749c68c +Author: Stefan Metzmacher +Date: Wed Jan 21 08:14:23 2015 +0100 - start dissecting the mvhd box + packet-dcerpc: change transportsalt to guint64 - Change-Id: I66c1973daa89690f6aaa10891408e93e886875ea - Reviewed-on: https://code.wireshark.org/review/5595 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + This will be able to hold also SMB2 file ids and maybe other stuff in future. + + Change-Id: Ib55895a346b7dc6562291730693453728c99fe91 + Signed-off-by: Stefan Metzmacher + Reviewed-on: https://code.wireshark.org/review/6708 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte -commit b088ca5 +commit 87e691f Author: Guy Harris -Date: Wed Dec 3 11:03:23 2014 -0800 +Date: Thu Jan 22 03:05:34 2015 -0800 - Squelch some "can't happen in reality" warnings. + Remove a mysterious comment that no longer applies. - (I guess newer versions of GCC/Clang know that dissect_eh_frame() is - never called with a segment_size of 0, so the loop is traversed at least - once. NOTE: if it ever *is* called with a segment_size of 0, then - that's a genuine bug and needs to be fixed.) + 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. - Also, segment_size is used; no need to mark it as unused. - - Change-Id: I63b7a580a853b55f22494de73b4c4e6f9a387647 - Reviewed-on: https://code.wireshark.org/review/5591 + Change-Id: I414ddaff43c96304f49b81bdbd135d85536c17dc + Reviewed-on: https://code.wireshark.org/review/6739 Reviewed-by: Guy Harris -commit db462ce -Author: AndersBroman -Date: Wed Dec 3 12:57:38 2014 +0100 +commit 39a984e +Author: Bastien Bailly +Date: Thu Jan 22 09:50:37 2015 +0100 - Try to please the buildboots by plasing th '#' at the begining of the - line. + GTP: Bad bytes read for extended rnc id value - Change-Id: Ie17e83504e7fbccb71190b3fdbfb6ad3507a806e - Reviewed-on: https://code.wireshark.org/review/5584 + offset+=2; is missing and bytes used for extended rnc id value are the same that for rnc id value. + + Bug:10877 + Change-Id: I2830191e434812d42ab625e7a6e0478a191b7d95 + Signed-off-by: Alexis La Goutte + Reviewed-on: https://code.wireshark.org/review/6738 Reviewed-by: Anders Broman -commit c4602e1 -Author: Peter Wu -Date: Tue Nov 25 15:16:48 2014 +0100 - - elf: fix .eh_frame parsing, add expert info for bad CIE length - - Fixes, matching LSB 4.1[1] and the AMD64 ABI[2]: - - Multiple CIE entries can exist after the first one. Introduce a CFI - subtree and add CIE and FDE records below it. Merge comon parsing - functionality of CIE/FDE. A CIE terminator is treated specially, and - added instead of a CFI subtree. - - Validate the header length before using it to avoid a dissector - assert. This condition is triggered by a binary produced by a buggy - gold linker[3]. - - Add two expert items: one to detect an invalid CIE length (too small - or too large) and one to detect a segment which is larger than the - CFI records (to catch the gold linker bug[3] where the segment begins - with zeroes). - - Do not overload the elf.eh_frame.length field with the value of the - Extended Length, instead use elf.eh_frame.extended_length (likewise - for FDE). - - Stop tracking the subsection size with another variable - (remaining_length), just store the end of the entry. - - Fix typos in descriptions, improved / shortened field descriptions. - - Tested with the 'bad' and 'good' binary from bug 10726 as well as the - 'a' binary from bug 8818 (which introduced this code). Decodes properly. - - [1]: https://refspecs.linuxfoundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/ehframechpt.html - [2]: http://www.x86-64.org/documentation/abi.pdf - [3]: https://sourceware.org/bugzilla/show_bug.cgi?id=17639 - - Bug: 10726 - Change-Id: I523600b8141bd8953ae468051a57357ab199a258 - Reviewed-on: https://code.wireshark.org/review/5488 - Petri-Dish: Michal Labedzki - Tested-by: Michal Labedzki +commit f8fa70f +Author: Marko Hrastovec +Date: Wed Jan 21 15:03:43 2015 +0100 + + Decoding of Asterix categories 063 and 065 extended to item decoding. + + Categories 063 and 065 were decoded only partially. Now the dissector + dissects all the items in these two categories. + + Change-Id: Ib8fd1d18327cbea668600f7376a6b83a270909a2 + Reviewed-on: https://code.wireshark.org/review/6714 + Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot - Reviewed-by: Michal Labedzki + Reviewed-by: Alexis La Goutte -commit c69ccab +commit dadf2c1 Author: Guy Harris -Date: Wed Dec 3 01:06:02 2014 -0800 +Date: Thu Jan 22 00:32:28 2015 -0800 - Install the other desktop files with "make install" as well. - - (And remove them with "make uninstall".) + Lua 5.3.0 is now out; install it. (It has better 64-bit integer support.) - Change-Id: I76b554bf1a1272813d61c8d2c96cda0a152eebb5 - Reviewed-on: https://code.wireshark.org/review/5582 + Change-Id: I99cad6bd6c5646bfbaddfdde317673cf749766a8 + Reviewed-on: https://code.wireshark.org/review/6737 Reviewed-by: Guy Harris -commit 08c0247 -Author: Maarten Bezemer -Date: Fri Nov 28 16:53:04 2014 +0100 +commit 2cd0472 +Author: Guy Harris +Date: Thu Jan 22 00:30:47 2015 -0800 - Support dissecting REAL (BER) data values + Un-install and re-install if the installed and specified versions differ. - Both exponent and 'integer N' values are limited: - * max exponent is 3 octets/24-bits - * max integer N is 8 octets/64-bit + 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. - Tested with zero value/length, integers, doubles, positive and negative numbers all using the Basic Encoding Rules (BER) - - Change-Id: If92e1b3e209c42909b8cb76e6f50b8e6cd1da0da - Reviewed-on: https://code.wireshark.org/review/5527 - Reviewed-by: Michael Mann - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman + Change-Id: I32021c7be8cdc277ad51c9f11cfdb57e3bb542c4 + Reviewed-on: https://code.wireshark.org/review/6736 + Reviewed-by: Guy Harris -commit e55fe95 -Author: AndersBroman -Date: Wed Dec 3 09:55:08 2014 +0100 +commit 5a928c2 +Author: Guy Harris +Date: Thu Jan 22 00:18:40 2015 -0800 - Make dissect_sip_tcp() a new style dissector. + Remove autotools packages if something they depend on changes. - Change-Id: I773f6738b3ed507e1ce031ee308d16de4bdeb7d4 - Reviewed-on: https://code.wireshark.org/review/5580 - Reviewed-by: Anders Broman + Uninstall automake if autoconf is going to be changed; remove libtool if + autoconf or automake is going to be changed. + + Change-Id: I4aced967cb7bed197d3f1a4be851a0bc78c8f12d + Reviewed-on: https://code.wireshark.org/review/6735 + Reviewed-by: Guy Harris -commit fb0999a +commit 2cc9474 Author: Guy Harris -Date: Wed Dec 3 00:21:59 2014 -0800 +Date: Wed Jan 21 20:15:05 2015 -0800 - Use $(srcdir) when installing image/wsicon.svg. - - We're not necessarily running from the top-level source directory. + When uninstalling a library, first uninstall what depends on it. - Change-Id: I0bb815275f85630e5316bf593f4ac098d9475308 - Reviewed-on: https://code.wireshark.org/review/5579 + Change-Id: I80a719acd90e225b28ca16a24ca74030498a5a42 + Reviewed-on: https://code.wireshark.org/review/6734 Reviewed-by: Guy Harris -commit d6d55b2 +commit 0fbb25f Author: Guy Harris -Date: Wed Dec 3 00:18:01 2014 -0800 +Date: Wed Jan 21 20:05:23 2015 -0800 - Uninstall the icons with "make uninstall". + Rename install_libpixman to install_pixman, to match uninstall_pixman. - Just in case not all shells expand {list}, create the apps/icons and - apps/mimetypes directories separately; that makes it a bit clearer in - any case. - - Change-Id: I25b3426a17a2ca7e1ce3ce1f7f9e1c650db511a7 - Reviewed-on: https://code.wireshark.org/review/5578 + Change-Id: If71895cae49000ff4a4b5bb8211f0b21feed82bc + Reviewed-on: https://code.wireshark.org/review/6733 Reviewed-by: Guy Harris -commit b5a52ee +commit b7db12e Author: Guy Harris -Date: Tue Dec 2 22:21:13 2014 -0800 +Date: Wed Jan 21 18:40:49 2015 -0800 - Get rid of trailing blank. + Do tests in the order the comment before them implies. - Change-Id: Ia0eecbbe1ff1778d5c34338e042c0518895663b4 - Reviewed-on: https://code.wireshark.org/review/5577 + Change-Id: Ie82ce54915866bdf635da832dd2f4c4ae1f2937e + Reviewed-on: https://code.wireshark.org/review/6732 Reviewed-by: Guy Harris -commit cff44e5 +commit 64108f4 Author: Guy Harris -Date: Tue Dec 2 22:19:01 2014 -0800 +Date: Wed Jan 21 18:30:26 2015 -0800 - Always install icons, and install them under $(datadir). + Give PortAudio a versioned -done file. - We always install them because of bug 10737. + If there's an unversioned -done file, make it a versioned file under the + assumption that the requested version is what's installed. - We install them under $(datadir) because that's where we should install - our data - if your desktop environment can't find the icons there, - either it's broken (file a bug) or misconfigured (fix the configuration - or, if you didn't configure it, file a bug). + Create a versioned file when installing. Use the installed version when + uninstalling, and remove the versioned file. - Bug: 10737 - Change-Id: I567269d8e45e6543d9e39dbedc49830adf7edb9f - Reviewed-on: https://code.wireshark.org/review/5576 + Change-Id: Ic21e0f139bb35df8f159a5ba7732706357a099fb + Reviewed-on: https://code.wireshark.org/review/6731 Reviewed-by: Guy Harris -commit c681091 -Author: Bill Meier -Date: Tue Dec 2 17:34:29 2014 -0500 +commit 0426236 +Author: Jeff Morriss +Date: Tue Jan 20 20:41:49 2015 -0500 - Fix instances of duplicate display-filter-names with incompatible types. + Get us building with the subdir-objects automake option. - Change-Id: I3b5afb8a59f6443624708b9fecfdcbe93dad59ef - Note: Some of the filters, when/if used, could have caused Wireshark crashes. - Reviewed-on: https://code.wireshark.org/review/5575 - Reviewed-by: Bill Meier - -commit 43e759e -Author: Pascal Quantin -Date: Tue Dec 2 22:18:55 2014 +0100 - - L2TP: add dissection of H bits + subdir-objects will be enabled unconditionally in automake-2.0 and + automake-1.14 gives us warnings about the upcoming change. - As requested in https://ask.wireshark.org/questions/38280/l2tp-dmpt-header-h-bit + Rework I1b3c517f08d3c752ee03cb89482ee4951ceb5bf3 (and + I416f2d3611fb61659b9a7f7285e5f54a354fbe7d) to give wslua/make-reg.pl the directory of + the source files rather than the full path to each. - Change-Id: If6cb61c720505e547432e87faf2a36bb4ec6e7c5 - Reviewed-on: https://code.wireshark.org/review/5574 - Reviewed-by: Pascal Quantin - -commit 5abfc60 -Author: Alexis La Goutte -Date: Tue Dec 2 16:09:26 2014 +0100 - - Couchbase: fix missing comma... + In echld don't use sources in the top-level directory in libechld: it breaks + distclean with subdir-objects turned on. - Change-Id: Ic86e07b434e693d2f0fbd9518a23ed49cf49f24d - Reviewed-on: https://code.wireshark.org/review/5572 - Reviewed-by: Alexis La Goutte + Bug: 10648 + Change-Id: I404b074f1558376064c35d8fc96aea7e3d042a76 + Reviewed-on: https://code.wireshark.org/review/6697 + Petri-Dish: Jeff Morriss + Tested-by: Petri Dish Buildbot + Reviewed-by: Jeff Morriss -commit d5aa8a4 -Author: Alexis La Goutte -Date: Tue Dec 2 15:32:34 2014 +0100 +commit d93a90b +Author: Guy Harris +Date: Wed Jan 21 18:09:30 2015 -0800 - Couchbase: fix Extended value string 'opcode_vals' forced to fall back to linear search + Make the individual install_ and uninstall_ functions idempotent. - entry 85, value 128 [0x80] < previous entry, value 245 [0xf5] + Move the "do I want this and, if so, is it already installed?" checks + into the install_ functions. - Change-Id: I14bbe276eef5fdaa70561764ac4e6f2e174ceabe - Reviewed-on: https://code.wireshark.org/review/5570 - Reviewed-by: Alexis La Goutte - -commit f6a4f32 -Author: Stig Bjørlykke -Date: Mon Dec 1 15:00:13 2014 +0100 - - cms: Handle media_type pkcs7-mime and pkcs7-signature + Move the "is this already installed?" checks into the uninstall_ + functions, and have them clear the appropriate installed version + variable when finished. - Change-Id: I7db4e67ffe99a9f3b41d0b507d9837e0237d4547 - Reviewed-on: https://code.wireshark.org/review/5558 - Reviewed-by: Michael Mann + 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 -commit 077b45e -Author: Stig Bjørlykke -Date: Mon Dec 1 15:13:25 2014 +0100 +commit 33c1858 +Author: Guy Harris +Date: Wed Jan 21 16:27:09 2015 -0800 - imf: Added base64 content encoding support + Pull the installs into a function. - Change-Id: I668b9c3dfcac83c698e83d4111af8bd19ec8076c - Reviewed-on: https://code.wireshark.org/review/5559 - Reviewed-by: Michael Mann + Call it install_all to avoid collision with the OS's install command, if + any; rename the uninstall function to uninstall_all to match. + + Change-Id: I9383424ff3910f04244493569fed3e5bc5d3d99d + Reviewed-on: https://code.wireshark.org/review/6729 + Reviewed-by: Guy Harris -commit 485399a -Author: Sergey Avseyev -Date: Tue Nov 18 21:11:22 2014 +0300 +commit 16f2147 +Author: Guy Harris +Date: Wed Jan 21 16:17:07 2015 -0800 - Update Couchbase dissector + Pull the install and uninstall sequences into functions. - * Include DCP port to the list default ports - * Parse payloads for DCP commands: - * OPEN_CONNECTION - * ADD_STREAM - * STREAM_REQUEST - * Reorganize if conditions to cases - * Update list of known commands + 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. - Change-Id: Id37b5c61f0d1084628c6286fd6e4ad722e1d6d99 - Reviewed-on: https://code.wireshark.org/review/5388 - Petri-Dish: Alexis La Goutte - Reviewed-by: Alexis La Goutte - Reviewed-by: Sergey Avseyev - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Change-Id: I5e7def9983b587ba7c3276a9d5762db340a04802 + Reviewed-on: https://code.wireshark.org/review/6728 + Reviewed-by: Guy Harris -commit 9c05b7f -Author: AndersBroman -Date: Tue Dec 2 12:53:46 2014 +0100 +commit f7d9334 +Author: Bill Meier +Date: Wed Jan 21 16:55:47 2015 -0500 - Make it possible to register an OID dissector to dissect - ManagementExtension. + isakmp: col_...() shouldn't be called under 'if (tree)' - Change-Id: I52c626b0d7a63214ccecf13d62e0a2850c2dee07 - Reviewed-on: https://code.wireshark.org/review/5569 - Reviewed-by: Anders Broman + Change-Id: I6fa497ca99e2ad3b675697fd28eeafd61190a17c + Reviewed-on: https://code.wireshark.org/review/6726 + Reviewed-by: Bill Meier -commit 987383d -Author: Pascal Quantin -Date: Mon Dec 1 17:21:41 2014 +0100 +commit bc5c484 +Author: Bill Meier +Date: Wed Jan 21 15:49:12 2015 -0500 - 6LoWPAN: use manually managed memory for the stateful address decompression preferences + Remove some dead initializers - Bug: 10747 - Change-Id: I9d1b7ce2782f7cd133ab3ba02b0dd43afab3e145 - Reviewed-on: https://code.wireshark.org/review/5560 - Petri-Dish: Pascal Quantin - Reviewed-by: Evan Huus - Reviewed-by: Pascal Quantin + Change-Id: I16c88b5e8f6e79a0d9b33b9c3c4d94f77ecfdfa2 + Reviewed-on: https://code.wireshark.org/review/6723 + Reviewed-by: Bill Meier -commit f260f9a -Author: Matthieu Texier -Date: Mon Dec 1 23:48:44 2014 +0100 +commit b0f37ba +Author: Bill Meier +Date: Wed Jan 21 15:33:36 2015 -0500 - BGP: Incorrect decoding AS numbers when mixed AS size + vcdu: minor cleanup - Fix AS Path Heuristic + - 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. - Issue reported by Jon - - Bug: 10742 - Change-Id: Ie5e4108bd93464a2d1076dcc4f322171ea8e68cb - Reviewed-on: https://code.wireshark.org/review/5564 - Reviewed-by: Alexis La Goutte + Change-Id: Ic7b27e2cd321c9d307c01cc4afdb0fc4c6d3cd55 + Reviewed-on: https://code.wireshark.org/review/6722 + Reviewed-by: Bill Meier -commit 5eec6bb -Author: Stig Bjørlykke -Date: Mon Dec 1 14:57:07 2014 +0100 +commit 0671965 +Author: Bill Meier +Date: Wed Jan 21 15:12:40 2015 -0500 - multipart: Handle multipart/signed + usb-hid: fix 2 minor bugs and some dead initializers - Change-Id: I39742dcce79fc41344c64e5266304c8c120aeb7c - Reviewed-on: https://code.wireshark.org/review/5557 - Reviewed-by: Anders Broman - -commit 325014a -Author: Stig Bjørlykke -Date: Mon Dec 1 14:47:02 2014 +0100 - - multipart: Don't include boundary in preamble. + One bug was introduced in g4d58904 - Change-Id: I2d2fd28462b974e4ad656e36f2562633d0743962 - Reviewed-on: https://code.wireshark.org/review/5556 - Reviewed-by: Anders Broman + Change-Id: I16a5e83f11f48038945e957c7e6ce9d50b4aec46 + Reviewed-on: https://code.wireshark.org/review/6721 + Reviewed-by: Bill Meier -commit 9441909 +commit 32ab59f Author: Bill Meier -Date: Mon Dec 1 23:08:50 2014 -0500 - - dftest: load plugins so plugin display filters can also be tested. - - Change-Id: Ideab88b525cf58b05502f11fb1cf0f58b2864c42 - Reviewed-on: https://code.wireshark.org/review/5566 +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 -commit d643325 +commit 009ca9f Author: Bill Meier -Date: Mon Dec 1 12:13:03 2014 -0500 +Date: Wed Jan 21 11:41:34 2015 -0500 - alljoyn: Rename some filters; Fix some filter types. - - Details: - - Rename various "alljoyn.header..." display filter - names releated to the alljoyn "message header" - to "alljoyn.mess_header..." to distinguish - the fields from actual alljoyn "header" fields. - This also fixes the duplicate use of the display - filter name "alljoyn.header". - - Don't use FT_PROTOCOL for a field type. + srvloc: fix a very minor bug - Change-Id: Id4e78f36716cf6064638aecd5faf561bcbc88b46 - Reviewed-on: https://code.wireshark.org/review/5561 - Petri-Dish: Bill Meier - Tested-by: Petri Dish Buildbot - Reviewed-by: Joe Huffman + Change-Id: I822602c569fd6241757ceb558224c255937f3130 + Reviewed-on: https://code.wireshark.org/review/6719 Reviewed-by: Bill Meier -commit 05c1aa2 -Author: Yann Lejeune -Date: Mon Dec 1 19:08:31 2014 +0100 +commit 3dc1b4e +Author: Bill Meier +Date: Wed Jan 21 11:38:33 2015 -0500 - BGP: fix dissection of BGP community tag + ieee802154: (trivial) proto_item_set_len() takes a 'proto_item *' - The offset used for BGP community tag dissection is a wrong one. - - Bug: 10746 - Change-Id: I1d1d443568bb97a0b3b95a312762ac0a3102326a - Reviewed-on: https://code.wireshark.org/review/5562 - Reviewed-by: Alexis La Goutte + Change-Id: I83945ccf73e2c8f355a3ff843271d35143758b1d + Reviewed-on: https://code.wireshark.org/review/6718 + Reviewed-by: Bill Meier -commit 6d207fe -Author: Michael Mann -Date: Mon Nov 24 10:10:12 2014 -0500 +commit e1f4f53 +Author: Dario Lombardo +Date: Wed Jan 21 15:00:56 2015 +0100 - Remove private_data member from packet_info structure. - - Dissectors should pass data directly to their subdissectors through the data parameter (of new-style dissectors). This avoids unintentional "trampling" from other dissectors trying to "share" private_data member. + HPFEEDS: cleanup in the dissector code. - Change-Id: I2efef5c8dfeef64588ba3ac6e695b469238c6468 - Reviewed-on: https://code.wireshark.org/review/5487 - Petri-Dish: Michael Mann - Reviewed-by: Michael Mann + Change-Id: Ia675fb703811c4b6be6a278d9396a917dfcf982d + Reviewed-on: https://code.wireshark.org/review/6715 + Reviewed-by: Alexis La Goutte -commit e77507b -Author: Michael Mann -Date: Mon Dec 1 00:18:41 2014 -0500 +commit fb1e149 +Author: Gerald Combs +Date: Wed Jan 21 08:41:19 2015 -0800 - Use proto_tree_add_bitmask for groups of proto_tree_add_boolean. + NSIS: Simplify wireshark.nsi. - Part 3 of many, but this concludes the strict conversion to proto_tree_add_bitmask. Patches to follow with use proto_tree_add_bitmask_xxx (some functions still need to be written) + Replace a pile-o-ifdefs with generated include files. This should make + it easier to add an NSIS target to CMake. - Change-Id: Ic2435667c6a7f1d40602124e5044954d2a296180 - Reviewed-on: https://code.wireshark.org/review/5553 - Reviewed-by: Michael Mann - Petri-Dish: Michael Mann - Reviewed-by: Anders Broman - -commit 542439e -Author: Alexis La Goutte -Date: Mon Dec 1 10:29:29 2014 +0100 - - SNA: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + Drop ICONV_DIR and ADNS_DLL. We haven't used either for quite a while. - Change-Id: I7a491488e67890c6cde98beec6a4935b10505afb - Reviewed-on: https://code.wireshark.org/review/5555 - Petri-Dish: Alexis La Goutte + Change-Id: I71b08cccdb9fe2b2a166b63848a9ded5ebc5f873 + Reviewed-on: https://code.wireshark.org/review/6717 + Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman + Reviewed-by: Gerald Combs -commit 0415df8 -Author: Marko Hrastovec -Date: Mon Dec 1 09:43:26 2014 +0100 +commit 163071e +Author: Pascal Quantin +Date: Wed Jan 21 10:06:33 2015 +0100 - Asterix: fix Coverity scan (1025624 & 1025625: Missing break in switch) - + GSM SIM: for a FETCH command, a Le of 0 means 256 bytes - Two comments are added to the code to notify Coverity scan that breaks are not put in switch statement intentionally. - - Change-Id: Ie391790ee7365da56ddf0bf7b19042c9a11efddd - Reviewed-on: https://code.wireshark.org/review/5554 - Reviewed-by: Alexis La Goutte + Change-Id: Ia8969747c215a5ba7e9242b6266114b0e9e00859 + Reviewed-on: https://code.wireshark.org/review/6712 + Reviewed-by: Pascal Quantin -commit 4f9af86 -Author: Michael Mann -Date: Sun Nov 30 12:51:30 2014 -0500 +commit 17a1748 +Author: Josip Medved +Date: Tue Jan 20 23:42:17 2015 -0800 - Use proto_tree_add_bitmask for groups of proto_tree_add_boolean. + Updated NSN dictionary with vendor-specific Sy application AVPs. - Part 2 of many - - Change-Id: I50815e7738b011382392f3078a7107d3d9eec4ec - Reviewed-on: https://code.wireshark.org/review/5542 - Reviewed-by: Michael Mann - Petri-Dish: Michael Mann + Change-Id: I4cd9bd7f7219e4d9ff1bb8a71fab32439a8a9a35 + Reviewed-on: https://code.wireshark.org/review/6705 Reviewed-by: Anders Broman -commit 86c659c -Author: Michael Mann -Date: Sun Nov 30 15:53:45 2014 -0500 +commit 6c728d5 +Author: Guy Harris +Date: Wed Jan 21 01:00:43 2015 -0800 - Improve checkfiltername.pl for pre-commit script. - - 1. Bugfix grep statement checking if file is "autogenerated" - 2. Add to the list of "whitelist" duplicates. Many more were found after #1 was changed. + Support Sun^WOracle C's -xldscope=hidden for hiding externals. - Change-Id: Idea764c0c8b5fa4f30c9acaab9ba10340834d4f5 - Reviewed-on: https://code.wireshark.org/review/5547 - Petri-Dish: Evan Huus - Reviewed-by: Evan Huus - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Change-Id: Id9c852f384a4450b82c8d596f4628d1ccbcf95bc + Reviewed-on: https://code.wireshark.org/review/6707 + Reviewed-by: Guy Harris -commit 90977c7 -Author: Michael Mann -Date: Sun Nov 30 16:17:26 2014 -0500 +commit 2ee0ea0 +Author: Pascal Quantin +Date: Tue Jan 20 23:22:40 2015 +0100 - Update display filter names per checkfiltername.pl + IEEE 802.15.4: fix display of 64 bits address (broken in gecaa1f8) - Change-Id: I7694a6f8d8ccec3109fb86ccefee5798de57757d - Reviewed-on: https://code.wireshark.org/review/5548 - Petri-Dish: Michael Mann - Reviewed-by: Evan Huus + Change-Id: I1fc117ac6522b4df53ceafb635aeb3b1f34a54d3 + Reviewed-on: https://code.wireshark.org/review/6695 + Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Reviewed-by: Pascal Quantin -commit cd14ff3 -Author: Peter Wu -Date: Sat Nov 29 19:32:30 2014 +0100 +commit ed413e9 +Author: Jeff Morriss +Date: Tue Jan 20 21:44:49 2015 -0500 - qt: use qstring_strdup + Link only the GUIs with SBC (if we have SBC). The other programs don't + (yet) use libcodec. - Replaces the more verbose `g_strdup(foo.toUtf8().constData())` by - `qstring_strdup(foo)`. While at it, plug a minor memleak in - MainWindow dialogs. + Also, there's no need to explicitly call pkg-config to get SBC's + CFLAGS and LIBS: PKG_CHECK_MODULES does that for you. - Change-Id: I32b53f972b4e3998ac9beabd98647a381b7b42e3 - Reviewed-on: https://code.wireshark.org/review/5531 - Petri-Dish: Gerald Combs + Change-Id: Ia7aa84bb81b8223773661ae2dc663731acaf6c6b + Reviewed-on: https://code.wireshark.org/review/6700 + Petri-Dish: Jeff Morriss Tested-by: Petri Dish Buildbot - Reviewed-by: Gerald Combs + Reviewed-by: Anders Broman -commit 0cf2f74 -Author: Guy Harris -Date: Sun Nov 30 17:03:20 2014 -0800 +commit 46fabdc +Author: Jeff Morriss +Date: Tue Jan 20 22:00:24 2015 -0500 - Squelch another compiler warning. + Make the license tag in the RPM more specific: Wireshark is GPLv2+. - Change-Id: Ib79bb30e67dacdda2e87f39438c4a836632d55bd - Reviewed-on: https://code.wireshark.org/review/5552 - Reviewed-by: Guy Harris + Change-Id: I82de1bc4ffcb1e962b1a35dc58aaa87aca04ed5e + Reviewed-on: https://code.wireshark.org/review/6701 + Reviewed-by: Anders Broman -commit cc0b083 +commit bc86257 Author: Guy Harris -Date: Sun Nov 30 17:00:04 2014 -0800 +Date: Tue Jan 20 23:27:08 2015 -0800 - Squelch a compiler warning. + Also support -xarch=sse_42 in the Sun C compiler for x86(-64). - Change-Id: Ic904f9b8551353192e872cb896f198572da83e27 - Reviewed-on: https://code.wireshark.org/review/5551 + Change-Id: Ib6d0ae9c237b96568e2522d2077b311b3ac5af2e + Reviewed-on: https://code.wireshark.org/review/6706 Reviewed-by: Guy Harris -commit ff18b35 +commit db6f733 Author: Guy Harris -Date: Sun Nov 30 16:57:09 2014 -0800 +Date: Tue Jan 20 20:39:09 2015 -0800 - Fix compile error. + 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: I858248e252a09f4348e7ab88bef81c8452f39051 - Reviewed-on: https://code.wireshark.org/review/5550 + Change-Id: I53858130c025e094ed8d0d975451961506fb1a39 + Reviewed-on: https://code.wireshark.org/review/6704 Reviewed-by: Guy Harris -commit 18f0109 -Author: Peter Wu -Date: Sat Nov 29 19:29:26 2014 +0100 +commit 41cbbc2 +Author: Guy Harris +Date: Tue Jan 20 20:32:27 2015 -0800 - qt: fix use-after-free pattern - - qstring.toUtf8() returns a QByteArray object and .constData() returns - a pointer inside that object. It is not safe to store this pointer as - it will become invalid after the statement. Store a const reference - instead. (Due to scoping differences, some are copy-assigned though.) - - In the UAT dialog, strlen(bytes.constData()) has also been replaced by - bytes.size() as an optimization. + Don't set SSE4_2_FLAG to -msse4.2 unless -msse4.2 works. - Caught by ASAN. - - Change-Id: Ie09f999a32d0ef1abaa1e658b9403b74bedffc37 - Reviewed-on: https://code.wireshark.org/review/5528 - Petri-Dish: Gerald Combs - Tested-by: Petri Dish Buildbot - Reviewed-by: Gerald Combs + Change-Id: I54eca86d53dc0e4015a15491b9adfdfe9ef9e346 + Reviewed-on: https://code.wireshark.org/review/6703 + Reviewed-by: Guy Harris -commit 846bb53 +commit 8a0bd92 Author: Guy Harris -Date: Sun Nov 30 16:30:19 2014 -0800 +Date: Tue Jan 20 19:17:36 2015 -0800 - Add a Buffer to wtap_pkthdr to hold file-type-specific packet metadata. + 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. - For example, this can be used for pcap-ng options not mapped to - file-type-independent metadata values. + This matches what we do in autotools. - Change-Id: I398b324c62c1cc1cc61eb5e9631de00481b4aadc - Reviewed-on: https://code.wireshark.org/review/5549 + Change-Id: I474d53d2fe7e2628faca7309efd7155b63bd7eab + Reviewed-on: https://code.wireshark.org/review/6702 Reviewed-by: Guy Harris -commit 35b1bc5 -Author: Pascal Quantin -Date: Sun Nov 30 20:29:34 2014 +0100 +commit 8051657 +Author: Jeff Morriss +Date: Mon Jan 12 15:16:03 2015 -0500 - win32: use target file format when checking if it supports comments + Modernize the description of Wireshark given in the RPM info. - Bug: 10656 - Change-Id: Ib74f213630d6d382118c09b3cbf998b28cbc045e - Reviewed-on: https://code.wireshark.org/review/5544 - Reviewed-by: Pascal Quantin + 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 + Reviewed-by: Niels de Vos + Reviewed-by: Jeff Morriss -commit 6c7af1d +commit 64f4287 Author: Guy Harris -Date: Sun Nov 30 11:27:18 2014 -0800 +Date: Tue Jan 20 18:46:10 2015 -0800 - Change some names to make them the same in multiple lists. + Get rid of trailing blank. - Change-Id: I20ca39f69052b4134147577ae5be74c05b4d5e48 - Reviewed-on: https://code.wireshark.org/review/5543 + Change-Id: Ia1bbd632fe00cfe6b919aacc0cd198953211fe7f + Reviewed-on: https://code.wireshark.org/review/6699 Reviewed-by: Guy Harris -commit 10046cc -Author: Gerald Combs -Date: Sun Nov 30 08:05:01 2014 -0800 - - [Automatic manuf, services and enterprise-numbers update for 2014-11-30] - - Change-Id: I582091ce31fdd9e961b1000c2b58ef6cb2adca0d - Reviewed-on: https://code.wireshark.org/review/5539 - Reviewed-by: Gerald Combs - -commit 090a046 +commit bf23953 Author: Guy Harris -Date: Sat Nov 29 16:57:20 2014 -0800 +Date: Tue Jan 20 18:44:17 2015 -0800 - Update to reflect current reality. + Only turn -msse4.2 on for ws_mempbrk_sse42.c, and don't always build it. + + Move all the SSE 4.2 stuff to wsutil/CMakeLists.txt. + + 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. - Change-Id: I6defd7ffe92e9e07f4ff41166449d5a086800846 - Reviewed-on: https://code.wireshark.org/review/5538 + 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.) + + Change-Id: I979b37a37e4b88b3af11e2275e89441118c8ce0a + Reviewed-on: https://code.wireshark.org/review/6698 Reviewed-by: Guy Harris -commit e28a847 +commit f215102 Author: Guy Harris -Date: Sat Nov 29 15:01:34 2014 -0800 +Date: Tue Jan 20 16:29:06 2015 -0800 - Fix tfshark.c to match changes to epan/print.[ch]. + 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. - Change-Id: I765cd0dbb5451b578ccabd221afc477a6559e60c - Reviewed-on: https://code.wireshark.org/review/5537 + Bug: 10792 + Change-Id: I1b77c2a092360a86bc7012d29642ff3303b60812 + Reviewed-on: https://code.wireshark.org/review/6696 Reviewed-by: Guy Harris -commit 81ab601 -Author: Guy Harris -Date: Sat Nov 29 14:43:22 2014 -0800 +commit 5f70fd6 +Author: Bill Meier +Date: Tue Jan 20 16:44:10 2015 -0500 - Clean up routine names, don't pass capture_file into libwireshark. + dsi: fix a trivial bug - Give all routines in epan/print.c that write a particular format a name - beginning with write_{formatname}. - - If routines write columns, rather than the raw protocol tree, don't give - it a name containing proto_tree. - - Get rid of empty preamble/finale routines. + Change-Id: Ieafbd148211154a465ab1ce8fe36d2110882c458 + Reviewed-on: https://code.wireshark.org/review/6694 + Reviewed-by: Bill Meier + +commit d2d699a +Author: Michael Mann +Date: Tue Jan 20 10:05:06 2015 -0500 + + Move all SigComp functionality to the SigComp dissector. - For CSV, the preamble routine writes out column titles, so call it - write_csv_column_titles(). + While it does make packet-sigcomp.c much bigger, there's no reason for it to be in epan directory. - For C arrays, the body routine writes out raw hex data, so call it - write_carrays_hex_data(). + Change-Id: I2d78c32de1d56e76578e610d4df586b5610d1b49 + Reviewed-on: https://code.wireshark.org/review/6682 + Reviewed-by: Alexis La Goutte + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 160af3c +Author: Pascal Quantin +Date: Tue Jan 20 22:20:54 2015 +0100 + + HTTP2: fix test failure on Solaris SPARC - capture_file isn't a structure defined by libwireshark, so don't make it - an argument passed into libwireshark. + Do not make any assumption on the endianness: not all hosts running Wireshark are little endian - Change-Id: I5a7e04de9382cf51a59d9d9802f815b8b3558332 - Reviewed-on: https://code.wireshark.org/review/5536 - Reviewed-by: Guy Harris + Change-Id: I8792904f7000b4f2b9e44ffe41f350ba8b4932d4 + Reviewed-on: https://code.wireshark.org/review/6693 + Reviewed-by: Pascal Quantin -commit 05516b0 -Author: Michael Mann -Date: Sat Nov 29 15:41:12 2014 -0500 +commit 74ed8b5 +Author: Alexis La Goutte +Date: Mon Jan 19 13:10:59 2015 +0100 - Use proto_tree_add_bitmask for groups of proto_tree_add_boolean. + Add DNS stats to release-notes - Part 1 of many + Remove in NEWS by gca174999 - Change-Id: I77a5789ac23388e6a5f8098dc398592f39638124 - Reviewed-on: https://code.wireshark.org/review/5532 - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Change-Id: I000b7d6421db247dcafacfa73ef049e938d42cc5 + Reviewed-on: https://code.wireshark.org/review/6650 + Reviewed-by: Alexis La Goutte + Reviewed-by: Jeff Morriss -commit e399382 +commit 0169cc8 Author: Bill Meier -Date: Sat Nov 29 17:01:30 2014 -0500 +Date: Tue Jan 20 15:26:54 2015 -0500 - Rename some hf[] display filter names to fix dups. + Remove some dead initializers - Change-Id: Ibe932bc37e03194f1801ec4eed4da1ff31370de3 - Reviewed-on: https://code.wireshark.org/review/5535 + Change-Id: I0478fa5c476a1914ae0c18feafc7720dd3111d84 + Reviewed-on: https://code.wireshark.org/review/6690 Reviewed-by: Bill Meier -commit 1aeab74 +commit eefd529 Author: Bill Meier -Date: Sat Nov 29 17:00:07 2014 -0500 +Date: Tue Jan 20 15:23:50 2015 -0500 - ieee80211; Rename some hf[] display filter names to fix dups and for clarity. + bpdu: Fix minor bug introduced in g188aa9a - Change-Id: Ibcca2d7f85130b4a5a74808d88735513cfc0b580 - Reviewed-on: https://code.wireshark.org/review/5534 + Change-Id: Ibce8848dded5896223af117a85bc0b6e321160e8 + Reviewed-on: https://code.wireshark.org/review/6689 Reviewed-by: Bill Meier -commit 785ef83 -Author: Guy Harris -Date: Sat Nov 29 07:26:42 2014 +0000 +commit 2c312b6 +Author: Bill Meier +Date: Tue Jan 20 14:47:23 2015 -0500 - Revert "Add QNX' QNET protocol" - - This reverts commit 72b91a56f86e3bbab700900366f81dc8c353b91d. - - value_string_ext tables ***MUST*** be sorted numerically, otherwise the code prints warnings such as the ones in - - http://buildbot.wireshark.org/trunk/builders/Ubuntu%2014.04%20x64/builds/1419/steps/test.sh/logs/stdio - - Fix this and resubmit. + acn: col_...() shouldn't be called under 'if (tree)' - Change-Id: I448025bb7b19a607e992831202ed31d243ce70d8 - Reviewed-on: https://code.wireshark.org/review/5530 - Reviewed-by: Guy Harris + Change-Id: I4d7d1826391b0ac12ef6ad184e7c79d279db5e28 + Also: remove some dead initializers. + Reviewed-on: https://code.wireshark.org/review/6688 + Reviewed-by: Bill Meier -commit 1429986 -Author: Guy Harris -Date: Fri Nov 28 23:10:44 2014 -0800 +commit c0a403a +Author: Bill Meier +Date: Tue Jan 20 14:18:53 2015 -0500 - Sadly, index() was the name of a routine in V7, so.... + 6lowpan: Fix a few minor bugs; Also: Misc - Change-Id: Id83899de08e0ad8e5664dddfb6ca268e7d0bd54d - Reviewed-on: https://code.wireshark.org/review/5529 - Reviewed-by: Guy Harris + (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 -commit 72b91a5 -Author: Alexis La Goutte -Date: Tue Jun 17 17:03:11 2014 +0200 +commit f63628d +Author: Gerald Combs +Date: Tue Jan 20 09:43:33 2015 -0800 - Add QNX' QNET protocol + CMake: Use wrapper scripts instead of symlinks. - no ethertype 0x8203-0x8205 support in trunk. - 0x8204 is QNX OS VER 6's qnet ethernet protocol number. + When building an application bundle, create wrapper scripts at the top + level instead of symlinking to each executable. - Bug:3934 - Change-Id: I5f3e910876bb7fb86de2111f856d026fdf220917 - Reviewed-on: https://code.wireshark.org/review/2954 - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Change-Id: I080e43de545a709b29c1d6b6c6ec416e5a5a8247 + Reviewed-on: https://code.wireshark.org/review/6683 + Reviewed-by: Evan Huus + Reviewed-by: Gerald Combs -commit 8e17fd6 -Author: cbontje -Date: Thu Nov 20 15:13:37 2014 -0700 +commit 5268d7f +Author: Bill Meier +Date: Tue Jan 20 12:51:08 2015 -0500 - Add optional user Fast SER preference for SEL Fast Message Protocol + cattp: Minor tweaks and whitespace changes - * Also cleanup description of remaining preferences + Change-Id: I128318ffb385930f00675030227e0048306a9f4c + Reviewed-on: https://code.wireshark.org/review/6684 + Reviewed-by: Bill Meier + +commit 6e6a129 +Author: Gerald Combs +Date: Sun Jan 18 13:27:13 2015 -0800 + + CMake: Set an output directory for plugins. - See Bug 10719 + 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. - Change-Id: I81faba77d8b88b24c65156f5139067233869154b - Reviewed-on: https://code.wireshark.org/review/5416 - Reviewed-by: Pascal Quantin - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2 + Reviewed-on: https://code.wireshark.org/review/6640 + Reviewed-by: Gerald Combs -commit ca95800 +commit af3924a Author: Alexis La Goutte -Date: Thu Nov 27 16:23:58 2014 +0100 +Date: Thu Jan 8 17:04:05 2015 +0100 - Endpoint: wrong filter when select a TCP endpoint (INVALID == a.x.y.z ...) + HTTP2: Add HPACK decode to test suite - Change-Id: If56209f1274245f54100d0acfaf14098c8df4582 - Reviewed-on: https://code.wireshark.org/review/5520 - Reviewed-by: Michael Mann + Change-Id: Ic84942b78a795974d6e2023751245ad98b8f1142 + Reviewed-on: https://code.wireshark.org/review/6415 + Reviewed-by: Tatsuhiro Tsujikawa + Reviewed-by: Anders Broman -commit f1b37bc +commit b2e172a Author: Alexis La Goutte -Date: Thu Nov 27 12:29:13 2014 +0100 +Date: Tue Jan 13 10:41:32 2015 +0100 - Endpoint: wrong filter when select a UDP endpoint (INVALID == a.x.y.z ...) + DHCP/BOOTP: Option 125 Suboption: (5) fix display Modem Capabilities - Change-Id: Ie46d6c201df0b0164a8bf96c02d6430734fd2948 - Reviewed-on: https://code.wireshark.org/review/5518 - Petri-Dish: Alexis La Goutte - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + 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 -commit 3355ed6 -Author: Peter Wu -Date: Tue Nov 25 19:40:12 2014 +0100 +commit f3cbee6 +Author: Evan Huus +Date: Mon Jan 19 11:55:01 2015 -0500 - elf: fix FDE Count formatting + NCP2222: fix possible buffer-overflow - Displays the FDE Count as a number, not a series of bytes. + Caught by ASAN (thanks Alexis!) - Change-Id: I60dd426cb5305a5001a8200578008b7c4a99c64e - Reviewed-on: https://code.wireshark.org/review/5489 - Reviewed-by: Peter Wu - Petri-Dish: Michal Labedzki - Tested-by: Petri Dish Buildbot - Reviewed-by: Michal Labedzki + Change-Id: Ibbe2c405ba1a3ba0d5a5b9ffff9e95282526028b + Reviewed-on: https://code.wireshark.org/review/6652 + Reviewed-by: Anders Broman -commit e8cda3b -Author: Pascal Quantin -Date: Tue Nov 25 23:14:50 2014 +0100 +commit 1af7b97 +Author: Dario Lombardo +Date: Mon Jan 19 23:12:25 2015 +0100 - TCP: move Windows Scaling and SCPS checks after options decoding + Bug fix in json dissector that made the heuristic fail. - This was changed in g8881f3f in an attempt to avoid throwing an exception when decoding the options field - - Bug: 10514 - Change-Id: Ia4b49f484d6255090c5a6e425a9716b48ccc4cb5 - Reviewed-on: https://code.wireshark.org/review/5495 + Change-Id: Iff53cfd8fd9d760b04c638c87f8a44587b268cd7 + Reviewed-on: https://code.wireshark.org/review/6674 Reviewed-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman -commit afcdff0 -Author: Alexis La Goutte -Date: Thu Nov 27 11:11:18 2014 +0100 +commit 11e557a +Author: Matthieu Texier +Date: Thu Jan 15 18:24:20 2015 +0100 - Endpoint dialog (Qt): Add missing text to translate + ISIS: Making a segregated function for sub-tlv used by multiple tlv - Change-Id: I375b348b6d6e35c212f76fc73135990a93560a75 - Reviewed-on: https://code.wireshark.org/review/5517 + Change-Id: Ifda28dea4b5282ea01a51cdcb3297aeeeb2a848d + Reviewed-on: https://code.wireshark.org/review/6550 Reviewed-by: Anders Broman -commit a67d0d2 -Author: Michael Mann -Date: Thu Nov 27 22:33:22 2014 -0500 +commit 8c15ac4 +Author: Guy Harris +Date: Mon Jan 19 18:32:42 2015 -0800 - Eliminate proto_tree_add_text from packet-sna.c. - - Also convert many of the proto_tree_add_boolean calls into proto_tree_add_bitmask. + Possibility -> certainty. - Change-Id: I1fb2f943abed28434a2aadc48eb7e9ffb766f463 - Reviewed-on: https://code.wireshark.org/review/5523 - Reviewed-by: Michael Mann - Petri-Dish: Michael Mann - Reviewed-by: Anders Broman + Change-Id: I03440a9b4ca13399aa14f3baaabd7aa40a843f28 + Reviewed-on: https://code.wireshark.org/review/6678 + Reviewed-by: Guy Harris -commit 3f85761 -Author: Alexis La Goutte -Date: Wed Nov 26 20:08:07 2014 +0100 +commit f16e8fb +Author: Gerald Combs +Date: Mon Jan 19 13:33:01 2015 -0800 - RADIUS: Sync with FreeRADIUS Master - - commit 30dac6d3dc87aaaa9c29ecdb33874fa57c2bcbc6 - Author: Alan T. DeKok - Date: Tue Nov 25 16:45:45 2014 -0500 - - as found on the net + pdb_zip_package: Enable multithreaded compression. - commit ee79c59d3a1cae76fcb1940710d9a0f7fbdf8427 - Author: Arran Cudbard-Bell - Date: Thu Nov 13 17:39:46 2014 -0500 - - Add memcached rlm_cache_driver - - commit 6277960bc830891123b00400af56912e51d4d311 - Author: Alan T. DeKok - Date: Tue Oct 28 17:01:49 2014 -0400 - - Add FreeRADIUS-Response-Delay-USec - - Change-Id: I705d0e852d38eaace4f71cfc0a38ecdd41c0b58f - Reviewed-on: https://code.wireshark.org/review/5510 - Petri-Dish: Alexis La Goutte - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman + Change-Id: If72c65663abb7e3bf1a436d1ecb5eb84f67ad3f8 + Reviewed-on: https://code.wireshark.org/review/6677 + Reviewed-by: Gerald Combs -commit 8839d7b +commit c3ad53f Author: Guy Harris -Date: Thu Nov 27 16:07:16 2014 -0800 +Date: Mon Jan 19 16:47:55 2015 -0800 - Make the ENTTEC dissector reject packets that don't look like ENTTEC packets. + Fix one item. - This should avoid questions like + 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. - https://ask.wireshark.org/questions/38198/what-is-enttec-in-a-pcap-file + Change-Id: Ib2d5f370d50fee07479c4ffe6f90ba4a91c7f271 + Reviewed-on: https://code.wireshark.org/review/6676 + Reviewed-by: Guy Harris + +commit 7c69079 +Author: Gerald Combs +Date: Mon Jan 19 13:33:01 2015 -0800 + + CMake: Add a pdb_zip_package target. - It also splits DMX-over-UDP and DMX-over-TCP into separate dissectors, - as + Add a "pdb_zip_package" target similar to the NMake pdb_zip target. - 1) DMX-over-TCP has only config packets, DMX-over-UDP has the - others; + Change-Id: I23d114a63fa05f722ee90b77ea458d9e496e5bf9 + Reviewed-on: https://code.wireshark.org/review/6673 + Reviewed-by: Gerald Combs + +commit bea25fa +Author: Guy Harris +Date: Mon Jan 19 13:10:22 2015 -0800 + + The times in question are local, not UTC. - 2) that would let us do reassembly, if necessary, for - DMX-over-TCP. + Revert to the older code, but just show the time as "Not representable" + if gmtime() fails. - Change-Id: I2606c814693028c7ba2bbc458e45c853372baaf3 - Reviewed-on: https://code.wireshark.org/review/5522 + Change-Id: I435facc042e3ca35fb07292a4b2657ccdfd02abb + Reviewed-on: https://code.wireshark.org/review/6672 Reviewed-by: Guy Harris -commit a30f3d5 -Author: Alexis La Goutte -Date: Wed Nov 26 16:38:30 2014 +0100 +commit 58d9ca8 +Author: Martin Kaiser +Date: Sun Jan 11 16:46:36 2015 +0100 - Qt: Add long option for -R (--read-filter) and -Y (--display-filter) + add some more apdus to the apdu table - Change-Id: Id535c04493f6c6df88006d922ee43cff9f4b70a1 - Reviewed-on: https://code.wireshark.org/review/5507 + Change-Id: Id5e5efea46e9ff6196607e56f0212fb083e8635c + Reviewed-on: https://code.wireshark.org/review/6670 Reviewed-by: Martin Kaiser -commit b4b6a5d -Author: Enrico Jorns -Date: Fri Sep 26 12:07:03 2014 +0200 +commit 6c02abf +Author: Martin Kaiser +Date: Sun Jan 11 15:14:21 2015 +0100 - canopen: LSS dissection + start dissecting the ZVT authentication apdu - Dissection of Layer setting services (LSS) sub-protocol - according to CiA 305. + add a length paramenter to the body dissection functions in the apdu table - Change-Id: I24ca1827b25c30a672fb31cad390b3c1486102f4 - Reviewed-on: https://code.wireshark.org/review/5516 - Petri-Dish: Alexis La Goutte - Tested-by: Petri Dish Buildbot - Reviewed-by: Alexis La Goutte + Change-Id: I4abbd9078fd36385a816963ab042f443e3c26b60 + Reviewed-on: https://code.wireshark.org/review/6669 + Reviewed-by: Martin Kaiser -commit 608d83c -Author: Maarten Bezemer -Date: Thu Nov 27 11:24:40 2014 +0100 +commit 4fc8286 +Author: Martin Kaiser +Date: Sun Jan 11 13:41:27 2015 +0100 - LEX and YACC are required + display the control field text in the info col - When building both LEX (flex) and YACC (bison or yacc) are required to generate C files from l(ex) and y(acc) files + Change-Id: I3dc0f58b4861a08be687214cae9c6681ebcac286 + Reviewed-on: https://code.wireshark.org/review/6668 + Reviewed-by: Martin Kaiser + +commit c846af1 +Author: Martin Kaiser +Date: Sun Jan 11 12:45:39 2015 +0100 + + continue the dissection of ZVT APDUs - Change-Id: I8892a05eb437d0bef613b68f681225df2cb2c6b4 - Reviewed-on: https://code.wireshark.org/review/5515 - Petri-Dish: Graham Bloice - Tested-by: Petri Dish Buildbot - Reviewed-by: Graham Bloice + 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 -commit 121d9ae -Author: Guy Harris -Date: Thu Nov 27 00:15:24 2014 -0800 +commit 71d83aa +Author: Martin Kaiser +Date: Mon Jan 19 07:04:48 2015 +0100 - Note that this document is a bit old. + tvb_length() -> tvb_captured_length() - Change-Id: Ie9a45acf1d3bc116d73b6430b058ffdcabead42b - Reviewed-on: https://code.wireshark.org/review/5514 - Reviewed-by: Guy Harris + Change-Id: I520b38ed37b2d16d9a15f57b8e83b0b59c9a528c + Reviewed-on: https://code.wireshark.org/review/6666 + Reviewed-by: Martin Kaiser -commit 4469346 +commit 0dcb91d Author: Bill Meier -Date: Wed Nov 26 20:41:16 2014 -0500 +Date: Mon Jan 19 15:38:29 2015 -0500 - Fix a number of dup hf[] filter-names probably mostly resulting from cut/paste errs + synphasor: (trivial) Do dissector_add_uint("rtacser.data",...) only once + + and not each time prefs are changed. + + Also: do minor whitespace changes. - Change-Id: Id658b9e1803b2f5b92e711a3ce981ff602333d98 - Reviewed-on: https://code.wireshark.org/review/5513 + Change-Id: I04bfc212e288473a78113e8b124ce4a13ad74ad1 + Reviewed-on: https://code.wireshark.org/review/6663 Reviewed-by: Bill Meier -commit c28f280 +commit 5fa13c6 Author: Bill Meier -Date: Wed Nov 26 18:18:57 2014 -0500 +Date: Mon Jan 19 15:32:45 2015 -0500 - Fix a number of dup hf[] filter-names probably resulting from cut/paste errs. + README.dissector: Minor update re date/time display. - Change-Id: I9242300b2ace3155c1506b584a90f073100a305e - Reviewed-on: https://code.wireshark.org/review/5512 + Change-Id: Iae467efeccd2e51ea66aab029100c958de7d374e + Reviewed-on: https://code.wireshark.org/review/6662 Reviewed-by: Bill Meier -commit cc893ab -Author: Pascal Quantin -Date: Wed Nov 26 23:01:48 2014 +0100 +commit 7a81add +Author: Bill Meier +Date: Mon Jan 19 15:19:46 2015 -0500 - XML: pass XML structure to caller through p_(add|get)_proto_data functions + synphasor: prevent possible crash; gmtime() can return NULL; - Since ge3a04bb data parameter is used for the media-type string + Don't do manual conversion of a time-field to UTC using gmtime(). + Use the standard Wireshark mechanisms. - Bug: 10729 - Change-Id: I3df640079a8bf57f4bd86a1baa08cbf9a3a7e1b3 - Reviewed-on: https://code.wireshark.org/review/5511 - Reviewed-by: Pascal Quantin - Reviewed-by: Michael Mann + Change-Id: I2eaee074a590ecab492336bb6ad794bdd036f699 + Reviewed-on: https://code.wireshark.org/review/6661 + Reviewed-by: Bill Meier -commit c2913d2 -Author: Enrico Jorns -Date: Thu Sep 25 12:53:26 2014 +0200 +commit 7e1d73d +Author: Bill Meier +Date: Mon Jan 19 15:15:45 2015 -0500 - canopen: Enhanced SDO decoding - - * Move sdo dissection to separate function - - Added dissect_sdo() function to handle the more complex SDO dissection. - - * SDO command specifier decoding - - Decoding of both client and server command specifier for SDO transfers - according to CiA 301 Chaper 7.2.4.3. - - Note: Fully decoding block transfer frames is more complex and not supported - yet. + dmp, gmhdr, vssmonitoring: prevent possible crashes; - * basic SDO abort code decoding + gmtime()/localtime() can return NULL. - SDO abort codes as specified in CiA 301 Chapter 7.2.4.3.17 (Table 22). + Change-Id: If0589261429ee15d0c07972a99d94f9fe83626f6 + Reviewed-on: https://code.wireshark.org/review/6660 + Reviewed-by: Bill Meier + +commit d1cace9 +Author: Bill Meier +Date: Mon Jan 19 15:03:23 2015 -0500 + + smb-pipe: prevent possible crash; gmtime() can return NULL. - * Basic value ranges for object dict index parameter + For FT_ABSOLUTE_TIME fields: - Object dict ranges as specified in CiA 301 7.4.1 (Table 41) + Instead of calling gmtime()/mktime() to convert a time to UTC time + which is then displayed using proto_tree_add_time(), - * cs-based multiplexer and data decoding + Use ABSOLUTE_TIME_UTC as the 'display' value for the field and then + display the field using proto_tree_add_item(). - A data width of 4 byte is valid only for expedited transfer and a - multiplex value is present only in initialisation messages. + Change-Id: I1926c40de76a86072437902cb7621d3873827b11 + Reviewed-on: https://code.wireshark.org/review/6659 + Reviewed-by: Bill Meier + +commit b41065e +Author: Alexis La Goutte +Date: Mon Jan 19 21:28:52 2015 +0100 + + BGP: EVPN - Route Type 4 - "Invalid length of IP Address" - "Expert Info" shows a false error - This patch now handles also normal sdo segment data. + Wrong offset (14 -> 20) to get IP Address Legnth - Reference: CiA 301, Chapter 7.2.4.3.3 and 7.2.4.3.6 + Issue Reported by Rui + Bug: 10873 - Change-Id: I37005894082d62eed1ddd85e09e3676aa3af8222 - Reviewed-on: https://code.wireshark.org/review/5504 + Change-Id: Ib7aa80ac78028a2c8d548f4030278166be9ed0cc + Reviewed-on: https://code.wireshark.org/review/6657 Reviewed-by: Alexis La Goutte - Petri-Dish: Alexis La Goutte - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann - -commit d77c5a5 -Author: Stephen Fisher -Date: Wed Nov 26 10:09:03 2014 -0700 - - Update the URL for the CPUID instruction documentation. - - Change-Id: I9729b3aa11027783a3557468743e91e180a6de8d - Reviewed-on: https://code.wireshark.org/review/5509 - Reviewed-by: Stephen Fisher -commit a159ced +commit 9fd5078 Author: Alexis La Goutte -Date: Wed Nov 26 15:20:27 2014 +0100 +Date: Mon Jan 19 21:28:04 2015 +0100 - WCCP: Remove uneeded check (pinfo & info_tree) + BGP: fix field bgp.evpn.nlri.mpls_ls is not of type FT_STRING, FT_STRINGZ, or FT_STRINGZPAD - Remove also some false positive Dereference of null pointer - - Change-Id: I09687993531827c6e4f5178f3414ddd9a2702038 - Reviewed-on: https://code.wireshark.org/review/5506 - Petri-Dish: Alexis La Goutte - Reviewed-by: Evan Huus - Tested-by: Petri Dish Buildbot + Change-Id: Ida14611dee9eb01e1eab13a96c15ab3d759ed1cd + Reviewed-on: https://code.wireshark.org/review/6656 Reviewed-by: Alexis La Goutte -commit a2c2f87 -Author: Michael Mann -Date: Sat Nov 22 16:15:17 2014 -0500 +commit ab8a13d +Author: Guy Harris +Date: Mon Jan 19 12:26:06 2015 -0800 - Remove the use of pinfo->private_data from dissectors that just save it to restore it. + Don't mix declarations and code - it's not legal C90. - Change-Id: I13197cc48068bb35ee12a7023cfe5f76bbc4e264 - Reviewed-on: https://code.wireshark.org/review/5486 - Petri-Dish: Michael Mann - Reviewed-by: Michael Mann + Change-Id: I1a89c729255560d596e4d7701468cca3e9000357 + Reviewed-on: https://code.wireshark.org/review/6655 + Reviewed-by: Guy Harris -commit 449bc19 -Author: Martin Kaiser -Date: Sat Nov 22 12:58:43 2014 +0100 +commit c0fd539 +Author: Pascal Quantin +Date: Mon Jan 19 20:50:12 2015 +0100 - Qt: support the -R option to set a read filter on the command line - - rename display_filter to read_filter in some places to make it clear - what it's used for + ZigBee: fix dissection of epoch time in OTA cluster - modify MainWindow::openCaptureFile() so that a read filter can be set - when the file name is passed in cf_path, not only when it's chosen from - a file selection dialogue - - don't display the read filter string in the filter toolbar - - Change-Id: Ie8dc94cbd1ff7e61ce1e2a55518a28297daa5d51 - Reviewed-on: https://code.wireshark.org/review/5446 - Reviewed-by: Alexis La Goutte + Bug: 10872 + Change-Id: I25275ecb76cc03774ab210fb33a3bef5b1982585 + Reviewed-on: https://code.wireshark.org/review/6653 + Reviewed-by: Pascal Quantin -commit 691f647 +commit de4164f Author: AndersBroman -Date: Wed Nov 26 13:36:03 2014 +0100 +Date: Mon Jan 19 15:24:47 2015 +0100 - [MGCP] When changing tvb_length(tvb) -> tvb_reported_length(tvb) it turns - out that tvb_new_subset(tvb, tvb_sectionbegin, sectionlen, -1) causes a - problem as reported_length is set to -1, set it to sectionlen. + 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: I650d3fa1390be5add66ed44d0f70929b9eb0aad6 - Reviewed-on: https://code.wireshark.org/review/5505 + Change-Id: Ibad9d4e2544e5b3924e10c68f02e072b0012226f + Reviewed-on: https://code.wireshark.org/review/6651 Reviewed-by: Anders Broman -commit ab8cad28 -Author: Michael Mann -Date: Sat Nov 22 11:54:54 2014 -0500 +commit c8bca4f +Author: Josip Medved +Date: Mon Jan 19 00:33:22 2015 -0800 - Remove sccp_info member from packet_info structure. - - sccp_msg_info_t* is now passed from SCCP dissector to its subdissectors through dissector data parameter. + Updated company name from Nokia Siemens Networks to Nokia Solutions and Networks. - Change-Id: Iab4aae58f8995e844f72e02e9f2de36e83589fc0 - Reviewed-on: https://code.wireshark.org/review/5442 + Change-Id: I93782facc2e3f9ff6358cf617968fac30bac1f7a + Reviewed-on: https://code.wireshark.org/review/6647 + Reviewed-by: Alexis La Goutte + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman -commit 7c47503 -Author: Bill Meier -Date: Tue Nov 25 13:49:12 2014 -0500 +commit 1b5a965 +Author: Alexis La Goutte +Date: Mon Jan 19 09:46:36 2015 +0100 - openflow: Use (what appear to be the) correct filter names for a few fields. + JSMN : fix typo (it will be fix make distcheck) - Change-Id: I2acd93d99942601b34c85177d21bbc2c4a4e2633 - Reviewed-on: https://code.wireshark.org/review/5492 - Reviewed-by: Anders Broman + Change-Id: I188be77b77a5a52b233d482d6d8ea8b97adc00db + Reviewed-on: https://code.wireshark.org/review/6649 + Reviewed-by: Alexis La Goutte -commit 5464bc6 -Author: Enrico Jorns -Date: Thu Oct 2 16:09:38 2014 +0200 +commit 48e90da +Author: Alexis La Goutte +Date: Mon Jan 19 08:38:16 2015 +0100 - canopen: Improve NMT error control and SYNC message dissection - - 1. Also show Reserved/Toggle bit of NMT error control + Fix make dist on Ubuntu buildbot - In case of the node guarding protocol this bit is used as a toggle bit. - In case of the hearbeat protocol this bit is reserved. + Change-Id: Id3a5ed08fb8b7c721f8eeabbba723a9de0d47b0f + Reviewed-on: https://code.wireshark.org/review/6648 + Reviewed-by: Alexis La Goutte + +commit f90a10a +Author: Josef Baumgartner +Date: Tue Oct 21 13:12:18 2014 +0200 + + epl: Rework POWERLINK (EPL) dissector - Reference: CiA 301 (rev 4.2.0), Chap. 7.2.8.3.2 + 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. - 2. Show optional 'counter' parameter of SYNC messages if available + 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. - Reference: CiA 301 (rev 4.2.0), Chap. 7.2.5.3.1 + 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. - Change-Id: I5dc0ab65e95fec4846a9c8bd8972ef2eba664ee2 - Reviewed-on: https://code.wireshark.org/review/5484 - Reviewed-by: Alexis La Goutte + 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 Petri-Dish: Anders Broman - Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman -commit a559f2a -Author: Evan Huus -Date: Tue Nov 25 20:27:07 2014 -0500 +commit f53be88 +Author: Dario Lombardo +Date: Fri Jan 2 21:33:49 2015 +0100 - dec-dnart: use pinfo-scoped memory for addresses - - They may be accessed during the print phase, at which point packet-scope memory - has already been freed. + JSON dissector changed into heuristic dissector. - Bug: 10724 - Change-Id: Ifcf5fc0c0857614edf85349b12dfe605abf6fef7 - Reviewed-on: https://code.wireshark.org/review/5497 - Reviewed-by: Evan Huus - -commit e843c67 -Author: Evan Huus -Date: Tue Nov 25 20:16:05 2014 -0500 - - wccp: use pinfo-scope memory for addresses + 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. - They may be accessed during the print phase, at which point packet-scope memory - has already been freed. + HPFEEDS dissector has also been changed in order to leverage the new json dissector. - Bug: 10720 - Change-Id: Ia2b160fd9de4ccaa3a4b8d9cb70fb9b32d4e08a0 - Reviewed-on: https://code.wireshark.org/review/5496 - Reviewed-by: Evan Huus + Bug: 10834 + Change-Id: Ib1df2a699982dbdd2b5418e97edbdb5cbd9c8978 + Reviewed-on: https://code.wireshark.org/review/6350 + Petri-Dish: Alexis La Goutte + Reviewed-by: Alexis La Goutte + Reviewed-by: Michael Mann -commit 85ca1cf -Author: Alexis La Goutte -Date: Tue Nov 25 12:39:53 2014 +0100 +commit 119416e +Author: Luke Mewburn +Date: Tue Dec 23 18:32:34 2014 +1100 - conversation_table: fix indent (use 4spaces) and add modelines info + TCAP: support dialogue confirmation - Change-Id: I76784f0252dcd095a3016ed014632e2a5c09265b - Reviewed-on: https://code.wireshark.org/review/5483 - Reviewed-by: Evan Huus - -commit f449be8 -Author: Alexis La Goutte -Date: Tue Nov 25 12:37:59 2014 +0100 - - conversation_table: fix warning when generate documentation (doxygen) + 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. - epan/conversation_table.h:335: warning: The following parameters of add_hostlist_table_data(conv_hash_t *ch, const address *addr, guint32 port, gboolean sender, int num_frames, int num_bytes, hostlist_dissector_info_t *host_info, port_type port_type_val) are not documented: - parameter 'host_info' - parameter 'port_type_val' + 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. - Change-Id: I6c3b29750c856eb2665981553fcb8eecd8fe34ee - Reviewed-on: https://code.wireshark.org/review/5482 - Reviewed-by: Evan Huus + Also fix compile warning with DEBUG_TCAPSRT. + + Bug: 10841 + Change-Id: Ibe75e3940e757727357b20be10f9c195c5888fdd + Reviewed-on: https://code.wireshark.org/review/6446 + Petri-Dish: Alexis La Goutte + Reviewed-by: Alexis La Goutte + Reviewed-by: Michael Mann -commit 2ebaa59 -Author: Gerald Combs -Date: Mon Nov 24 14:51:13 2014 -0600 +commit c4297e6 +Author: Diederik de Groot +Date: Sun Jan 18 00:23:33 2015 +0100 - Consolidate sequence analysis code. - - Move scattered code for seq_analysis_info_t creation and destruction to - tap-sequence-analysis.[ch]. + 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 - Change-Id: I87c14b1c83105a48d0ab149a3abba71e2a2fe21f - Reviewed-on: https://code.wireshark.org/review/5479 - Petri-Dish: Gerald Combs + Change-Id: I062c31777a4193de3d5c44b0ba733dd9d1702352 + Reviewed-on: https://code.wireshark.org/review/6602 + Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot - Reviewed-by: Gerald Combs + Reviewed-by: Michael Mann -commit 5b360a9 -Author: Yaniv Kaul -Date: Tue Nov 25 21:24:23 2014 +0100 +commit 199cb06 +Author: Sergio Moreno Mozota +Date: Sat Jan 17 23:24:22 2015 -0500 - SCSI: type and scope fields are ignored in some SCSI persistent reserve service actions + RTP: Parse problem in dissect_rtp_hext_rfc5215_onebyte - Bug: 10727 - Change-Id: Id34f57b2a0b89867eec1b0a13db2eba037835804 - Reviewed-on: https://code.wireshark.org/review/5493 - Reviewed-by: Pascal Quantin + some commercial IPTV streamers send bogus info in the extension headers, add some sanity check to skip the erroneous bytes. + + Bug: 10513 + Change-Id: I6f20073a00ed0f791fa99701534360d304060053 + Reviewed-on: https://code.wireshark.org/review/6606 + Petri-Dish: Alexis La Goutte Reviewed-by: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann -commit e2ef6c4 -Author: Stephen Fisher -Date: Tue Nov 25 14:44:03 2014 -0700 +commit e333e4c +Author: Michael Mann +Date: Sat Jan 17 14:11:29 2015 -0500 - Add on to the dummy.cpp hack that forces wireshark to be linked with a - c++ compiler to automatically create a dummy.cpp file and remove it when - make clean is issued. This allows make tags to work again since the - file isn't missing. + Convert OID APIs to use wmem. - Change-Id: I17191ad2acc281734fa12da4d347fd3116018f67 - Reviewed-on: https://code.wireshark.org/review/5494 - Petri-Dish: Stephen Fisher - Tested-by: Petri Dish Buildbot - Reviewed-by: Stephen Fisher + 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. + + Change-Id: I4595e00f93bf9ab8cf2493fe0432b91960f55a3f + Reviewed-on: https://code.wireshark.org/review/6592 + Petri-Dish: Michael Mann + Reviewed-by: Evan Huus + Reviewed-by: Guy Harris + Reviewed-by: Michael Mann -commit e2132f9 -Author: Bill Meier -Date: Tue Nov 25 00:43:06 2014 -0500 +commit 59155d1 +Author: Guy Harris +Date: Sun Jan 18 17:48:53 2015 -0800 - openflow: Minor changes + Eliminate ep_strdup(), as it's no longer used. - - Remove unneeded/undefined forward declarations; - - Create/use some extended value-strings; - - Do some whitespace changes. + Also, remove some no-longer-existent functions from checkAPIs.pl. - Change-Id: I7961864f0e404e141d2887584751116011f8d941 - Reviewed-on: https://code.wireshark.org/review/5490 - Reviewed-by: Bill Meier + Change-Id: I2bf11e3ec03a34f9e89d58d560e340d76fd3ddc1 + Reviewed-on: https://code.wireshark.org/review/6645 + Reviewed-by: Guy Harris -commit 2015398 +commit 5162b7f Author: Bill Meier -Date: Tue Nov 25 12:53:43 2014 -0500 +Date: Sun Jan 18 18:41:37 2015 -0500 - proto.c: proto_registrar_dump_values(): don't skip "same name" fields. + smpp: Prevent crash if invalid date/time field. - It appears that Wireshark allows (and currently has) fields with the - same name with differing "strings" content. + gmtime()/localtime() can return NULL; - Change-Id: Iddac5a2c9f456a97ea676f2007f43d786482eebd - Reviewed-on: https://code.wireshark.org/review/5491 + Bug 10868 + Change-Id: I496bab62555c7741b3d159726e74a3d14c4b51cb + Reviewed-on: https://code.wireshark.org/review/6644 Reviewed-by: Bill Meier -commit 152b0c9 -Author: Michael Mann -Date: Sat Nov 22 19:24:06 2014 -0500 +commit b2b640f +Author: Guy Harris +Date: Sun Jan 18 15:48:22 2015 -0800 - Remove support for pinfo->private_data in "data-text-lines", "data-l1-events" and "urlencoded-form" dissectors. Data must be passed from parent through dissectors data parameter. + Reflect the disappearance of the seasonal allocator. - Change-Id: I24ab56ce7d99f8ed670f4a50453223d4e6a46983 - Reviewed-on: https://code.wireshark.org/review/5463 - Petri-Dish: Michael Mann - Reviewed-by: Anders Broman + Change-Id: I1c76bf9eed516aa9afbc04b1b9236a04b0b1988c + Reviewed-on: https://code.wireshark.org/review/6643 + Reviewed-by: Guy Harris -commit e3a04bb -Author: Michael Mann -Date: Sat Nov 22 20:47:59 2014 -0500 +commit 4cea624 +Author: Guy Harris +Date: Sun Jan 18 15:46:23 2015 -0800 - Ensure dissector data parameter is used instead of pinfo->private_data when passing data between dissectors using the "media_type" subdissector. + This currently requires emem.h. - Change-Id: I82cbfed770b41404bc42cb6a4413db07d04dffdc - Reviewed-on: https://code.wireshark.org/review/5462 - Reviewed-by: Michael Mann - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman + Change-Id: I55cca8de9be07fbec4e771c0f6d50075fc75bef8 + Reviewed-on: https://code.wireshark.org/review/6642 + Reviewed-by: Guy Harris -commit 7f22ce7 -Author: Alexis La Goutte -Date: Mon Nov 24 19:50:11 2014 +0100 +commit ae92cd4 +Author: AndersBroman +Date: Sun Jan 18 16:38:35 2015 +0100 - pre-commit tools: Add arg option to specify the commit id to be checked - - If no commit id specify, it is HEAD + [Qt] Run windeployqt for Qt versions greater than 5.2 - Thanks to Michal for the help :-) - - Change-Id: Ibf579aed47c7574f9a01d868ae0d55bbe789a8a2 - Reviewed-on: https://code.wireshark.org/review/5474 - Reviewed-by: Michal Labedzki - Reviewed-by: Evan Huus + Change-Id: I3c7e7ed35ffead280c1ac394a4ef8172a89fe3a6 + Reviewed-on: https://code.wireshark.org/review/6622 + Reviewed-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Reviewed-by: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman -commit b01ff09 -Author: Enrico Jorns -Date: Tue Nov 25 10:08:05 2014 +0100 +commit 5970223 +Author: Guy Harris +Date: Sun Jan 18 14:16:55 2015 -0800 - canopen: Fixed tree expansion + Put back ep_alloc0(), accidentally deleted in the removal of the se_ stuff. - Previously the COB-ID and Type subtree also used the main ett_canopen - variable. This made control of subtree expansion impossible as both - parent and subtree nodes shared the same state. + (The se_ stuff wasn't as contiguous as I thought.) - Change-Id: I3dabf7f399e83bfcfbf78bc0e633e3696776c043 - Reviewed-on: https://code.wireshark.org/review/5480 - Reviewed-by: Alexis La Goutte + Also fix some comments to no longer refer to #defines for se_ stuff. + + Change-Id: Ibc53e6f0f135bee9795f98550d5242e8e58afb16 + Reviewed-on: https://code.wireshark.org/review/6641 + Reviewed-by: Guy Harris -commit c39776c -Author: Stephen Fisher -Date: Mon Nov 24 12:01:46 2014 -0700 +commit 820c795 +Author: Guy Harris +Date: Sun Jan 18 13:30:21 2015 -0800 - Remove unused ui_simple_dialog.h from qt Makefile.common + This file currently does need emem.h. - Change-Id: I366a52a037462cb059565365ea1eec5be228078f - Reviewed-on: https://code.wireshark.org/review/5475 - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman + Change-Id: I27e709470d92d4be32ae42a3f4672f2070eaf65e + Reviewed-on: https://code.wireshark.org/review/6639 + Reviewed-by: Guy Harris -commit a600ef6 -Author: Michael Mann -Date: Sat Nov 22 18:17:20 2014 -0500 +commit 7940bbc +Author: Guy Harris +Date: Sun Jan 18 13:26:12 2015 -0800 - Have media dissector take its "media type parameter" from dissector data parameter instead of pinfo->private_data. + Nobody uses se_ allocations, so remove the code for them. - Change-Id: I0a0cb0b4838bc4e55a759fb6031355892c220c8e - Reviewed-on: https://code.wireshark.org/review/5461 - Reviewed-by: Michael Mann - Petri-Dish: Michael Mann - Reviewed-by: Anders Broman + Don't check for se_ routines in checkAPIs; the failure to compile or + link will suffice to catch attempts to use them. + + 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 + Reviewed-by: Guy Harris -commit 518bb10 -Author: Michael Mann -Date: Mon Nov 24 10:26:00 2014 -0500 +commit d2d4cf2 +Author: Guy Harris +Date: Sun Jan 18 13:10:18 2015 -0800 - Remove use of pinfo->private_data since it's not used anywhere. + Remove a couple more apparently-no-longer-necessary emem.h includes. - Change-Id: Ibb47fd1a0d498cc9791ca31ee625395905a7e999 - Reviewed-on: https://code.wireshark.org/review/5464 - Reviewed-by: Michael Mann - Petri-Dish: Michael Mann - Reviewed-by: Anders Broman + Change-Id: I007a904613653b60a5b1a4fdc8261bc1480e41c6 + Reviewed-on: https://code.wireshark.org/review/6637 + Reviewed-by: Guy Harris -commit 392dae5 -Author: Joe Fowler -Date: Tue Nov 18 13:13:46 2014 -0500 +commit 050bc7d +Author: Guy Harris +Date: Sun Jan 18 13:02:15 2015 -0800 - Add new dissector for Shared Memory Communications over RDMA protocol (SMC-R) + Update some comments to reflect reality. - RFC draft http://www.ietf.org/id/draft-fox-tcpm-shared-memory-rdma-05.txt - used as reference for packet dissection. + Get rid of references to ep_ and se_ allocation in code that now uses + wmem allocation instead. - A small change was made to packet-infiniband, to add the Queue Number to the - info column. This allows for easy indentification of session traffic for a - particular QP. + Fix API documentation of conversation_table.h routines to reflect that + as well - some APIs changed to pass wmem scopes. - Also: infiniband: tvb_length() --> tvb_captured_length() + 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. - Bug: 10715 - Change-Id: I774ceffaa5c271cb6a28ab4ed21e53cd42f2547b - Reviewed-on: https://code.wireshark.org/review/5386 - Petri-Dish: Bill Meier - Tested-by: Petri Dish Buildbot - Reviewed-by: Bill Meier + Change-Id: Ife1ec675a9322fd0f0be306a9d639ec17aad1c7a + Reviewed-on: https://code.wireshark.org/review/6636 + Reviewed-by: Guy Harris -commit 363b87a -Author: Martin Kaiser -Date: Sat Nov 22 11:59:50 2014 +0100 +commit 929d41c +Author: Evan Huus +Date: Sun Jan 18 12:15:26 2015 -0500 - Qt: support the -Y option to set an initial display filter + Replace the last THROW ep_ calls with wmem - Change-Id: I7627265b876c6994b163df1c5b037f4dae2f6d42 - Reviewed-on: https://code.wireshark.org/review/5445 - Reviewed-by: Evan Huus - -commit e899c3e -Author: Michael Mann -Date: Sun Nov 23 23:06:34 2014 -0500 - - Eliminate proto_tree_add_text from some dissectors. + They (should) all be strictly within the context of dissection, so can just + become packet_scope. - Change-Id: Iadd80aab291e5de714891a9f3c79edeca19e9b93 - Reviewed-on: https://code.wireshark.org/review/5458 + Change-Id: Iaaa733628132f3ee3f1597f3df956e44080734f6 + Reviewed-on: https://code.wireshark.org/review/6631 + Petri-Dish: Evan Huus Reviewed-by: Michael Mann - Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus -commit 4f8a6ec -Author: Matthieu Coudron -Date: Tue Nov 18 19:33:53 2014 +0100 +commit 212eb17 +Author: Evan Huus +Date: Sun Jan 18 12:08:39 2015 -0500 - TCP: fix wrongly set base_seq when ISN is 0 and tcp_relative_seq is - enabled + replace DISSECTOR_ASSERT ep strings with wmem - tcp_analysis::base_seq could be set several times when the - TCP ISN was set to 0, thus inducing some undesired wraps such as 0-1 + 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. - Bug: 10713 - Change-Id: I69a0dfe677e93bf51015bf7a39ebf888631b12a4 - Reviewed-on: https://code.wireshark.org/review/5387 - Reviewed-by: Michael Mann - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot + Change-Id: I2684fb902da78d50aca5f4644df66c060caff625 + Reviewed-on: https://code.wireshark.org/review/6629 Reviewed-by: Evan Huus -commit d5713e2 -Author: Alexis La Goutte -Date: Wed Nov 19 21:34:20 2014 +0100 +commit 44e7ce5 +Author: Guy Harris +Date: Sun Jan 18 12:18:38 2015 -0800 - hostlist_table (GTK): Fix Dereference of null pointer found by Clang analyzer + Remove some apparently-unnecessary includes of emem.h. - Change-Id: If74dc38b2a9724b9d924092796db5b6beb97043c - Reviewed-on: https://code.wireshark.org/review/5400 - Reviewed-by: Evan Huus + Change-Id: Ib7d1b587b439ff21ec6b7f1756ce6ccf25b66f80 + Reviewed-on: https://code.wireshark.org/review/6635 + Reviewed-by: Guy Harris -commit 159626c -Author: Maarten Bezemer -Date: Mon Nov 24 16:30:52 2014 +0100 +commit 7abb103 +Author: Gerald Combs +Date: Thu Jan 15 13:07:48 2015 -0800 - Update debian symbols + CMake: Copy data files to the run directory. - * register_tap_ui is removed in a21436eaed - * wtap_read_bytes(_or_eof) are introduced in 670ebda4a6 + 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: If815c686d57310f0d87f965b5b5c2a71b651cbad - Reviewed-on: https://code.wireshark.org/review/5465 - Petri-Dish: Michael Mann + Change-Id: Iade74946dd5ed2c54239036aa4970f9ffc4681a4 + Reviewed-on: https://code.wireshark.org/review/6561 + Reviewed-by: Graham Bloice + Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Reviewed-by: Gerald Combs -commit 059c257 -Author: Stephen Fisher -Date: Mon Nov 24 16:50:10 2014 -0700 +commit 24954d6 +Author: Bill Meier +Date: Sun Jan 18 14:45:30 2015 -0500 - Allow html version of man pages to be found when running from build - directory (they're in doc/ of the build directory). + proto.c: Update some comments to reflect reality - Change-Id: I425fa847952cf9f74a948a89c0048077dfcf0ae2 - Reviewed-on: https://code.wireshark.org/review/5478 - Reviewed-by: Stephen Fisher + Change-Id: I0f82666cb233688d94d6f3a2c45d7490a7f79bec + Reviewed-on: https://code.wireshark.org/review/6634 + Reviewed-by: Bill Meier -commit 1cdf644 -Author: Alexis La Goutte -Date: Fri Nov 21 11:24:50 2014 +0100 +commit e601e01 +Author: Guy Harris +Date: Sun Jan 18 11:46:28 2015 -0800 - A21: fix warning: no previous prototype for function ... [-Wmissing-prototypes] + Remove some apparently-unnecessary includes of emem.h. - Second try... ;-) + Also update a comment to no longer speak of ep_ allocation, and add an + include of to ui/profile.c, which was formerly relying on the + include of emem.h to drag it in. - Remove also double space - - Change-Id: I77aa269c1abae18b4fb9daec6cc0ac862cf4ab9f - Reviewed-on: https://code.wireshark.org/review/5421 - Petri-Dish: Anders Broman - Reviewed-by: Anders Broman + Change-Id: I08926699ee96cf66672836b6ee3bbb405b507ce8 + Reviewed-on: https://code.wireshark.org/review/6633 + Reviewed-by: Guy Harris -commit 605a6ae -Author: Alexis La Goutte -Date: Mon Nov 24 21:12:55 2014 +0100 +commit 233dc64 +Author: Guy Harris +Date: Sun Jan 18 11:33:27 2015 -0800 - Mate: Fix indent (use tabs) + Remove some apparently-unnecessary includes of emem.h. - Change-Id: I9a02e4a063dc4fc173ff9b7596acd7f9ceba7aa7 - Reviewed-on: https://code.wireshark.org/review/5477 - Reviewed-by: Anders Broman + Change-Id: Id50ce3e707056cca8f30052f05c451ce431b39b5 + Reviewed-on: https://code.wireshark.org/review/6632 + Reviewed-by: Guy Harris -commit e02c03b -Author: Stephen Fisher -Date: Mon Nov 24 12:07:59 2014 -0700 +commit 71c21a6 +Author: Michael Mann +Date: Fri Jan 16 12:35:14 2015 -0500 - Change capitalization of "DNS UDP [p]orts" to match "DNS TCP ports" in prefs + Remove seasonal memory from address resolution. - Change-Id: Ib0bffc6d5e4bd6b68f48a843b4b4cab7422aceb7 - Reviewed-on: https://code.wireshark.org/review/5476 - Reviewed-by: Stephen Fisher + 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 + Reviewed-by: Evan Huus + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann -commit 4b57edb -Author: Alexis La Goutte -Date: Mon Nov 24 18:11:30 2014 +0100 +commit 90fc37e +Author: Martin Kaiser +Date: Sun Jan 18 18:08:07 2015 +0100 - MIPv6: Enhance ANI dissection + make things a bit easier to read... - * Fix wrong length for Operator Identifier - * Display Latitude and longitude in Degrees + Change-Id: I3499c2f9e07a960f8bdf83973693bdeb4fb4ebd9 + Reviewed-on: https://code.wireshark.org/review/6630 + Reviewed-by: Martin Kaiser + +commit 1722d2a +Author: Martin Kaiser +Date: Sun Jan 18 17:28:16 2015 +0100 + + remove trans_info parameter from dissect_usb_hid_report_item() - Bug:10712 - Change-Id: Idf6ba63db3ff16710fd0de7a7fd2233148cbaf4a - Reviewed-on: https://code.wireshark.org/review/5473 - Reviewed-by: Alexis La Goutte + Change-Id: I04eba644be7dd3e64b67c7d42c596bcdcf6a1942 + Reviewed-on: https://code.wireshark.org/review/6628 + Reviewed-by: Martin Kaiser -commit 15f6f56 -Author: Alexis La Goutte -Date: Mon Nov 24 18:34:19 2014 +0000 +commit 4399319 +Author: Martin Kaiser +Date: Sun Jan 18 17:16:15 2015 +0100 - Revert "Allow "(g)make tags" to work again" + clean up the functions that dissect the hid requests - This reverts commit 6b8fe87ef48abb95dd303871d0835c153cf8c891. + Change-Id: Ie4d52b62824a8c0c777ffce3988fbe1fd4e5b4a4 + Reviewed-on: https://code.wireshark.org/review/6627 + Reviewed-by: Martin Kaiser + +commit 9ba910f +Author: Martin Kaiser +Date: Sun Jan 18 17:07:41 2015 +0100 + + remove redundant (and unused) paramter usb_trans_info - Change-Id: Ie4f681186c1555e6ab966e7db687035f7fc5e60f - Reviewed-on: https://code.wireshark.org/review/5472 - Reviewed-by: Alexis La Goutte + Change-Id: Ibb683f6d42125b13417aceb06949102a9821d626 + Reviewed-on: https://code.wireshark.org/review/6626 + Reviewed-by: Martin Kaiser -commit 6b8fe87 -Author: Stephen Fisher -Date: Thu Nov 20 10:35:45 2014 -0700 +commit 2441a23 +Author: Gerald Combs +Date: Sun Jan 18 08:04:40 2015 -0800 - Allow "(g)make tags" to work again + [Automatic manuf, services and enterprise-numbers update for 2015-01-18] - Change-Id: Idcff82aceedbf42652741564e06ca53984078361 - Reviewed-on: https://code.wireshark.org/review/5413 - Petri-Dish: Alexis La Goutte - Reviewed-by: Stephen Fisher + Change-Id: If1c72e3b58ced6b9b86a584d96f632b2433751e8 + Reviewed-on: https://code.wireshark.org/review/6623 + Reviewed-by: Gerald Combs -commit 2baac34 -Author: Alexis La Goutte -Date: Mon Nov 24 18:18:00 2014 +0100 +commit 0d92b99 +Author: Pascal Quantin +Date: Sun Jan 18 15:20:57 2015 +0100 - CPHA : tvb_length -> tvb_reported_length + ISUP: add dissection of generic number qualifier indicator - Change-Id: I49a7ffb1fcff71d49593ab009036f21c3ae6a2d0 - Reviewed-on: https://code.wireshark.org/review/5471 + Bug: 10865 + Change-Id: Ib4cd60f570250490d5417c692f487711a65536b1 + Reviewed-on: https://code.wireshark.org/review/6620 + Reviewed-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman -commit 1f5dbb0 -Author: Alexis La Goutte -Date: Mon Nov 24 17:16:52 2014 +0100 +commit b01ef11 +Author: Pascal Quantin +Date: Sun Jan 18 15:35:29 2015 +0100 - CPHA: Update versions lists + HTTP: revert a change done in g0ee179c - Use also value_string ext + As indicated in the comment above, the previous code was done on purpose to handle the NUL case - Request from Hugo van der Kooij - - Bug:10723 - Change-Id: I0603687215b7e82a987a4a6cde00eb996b04a77c - Reviewed-on: https://code.wireshark.org/review/5466 - Reviewed-by: Anders Broman + Bug: 10866 + Change-Id: I66eb9f6fbc9477456310978b420ba30975d81b0a + Reviewed-on: https://code.wireshark.org/review/6621 + Reviewed-by: Pascal Quantin -commit 10803f2 -Author: Stephen Fisher -Date: Fri Nov 21 16:23:24 2014 -0700 +commit 2660806 +Author: Martin Kaiser +Date: Sun Jan 18 13:51:00 2015 +0100 - Second attempt at putting a description in the preferences page + no need for if(tree) - Change-Id: I6d196486e824c82d29f1c233ef3230ad8619715d - Reviewed-on: https://code.wireshark.org/review/5434 - Reviewed-by: Stephen Fisher + Change-Id: I7e8cfe3a220d65e80afa109a62867c4ff2ce08e8 + Reviewed-on: https://code.wireshark.org/review/6619 + Reviewed-by: Martin Kaiser -commit 953e6b1 +commit c922801 Author: Michael Mann -Date: Sat Nov 22 14:13:10 2014 -0500 +Date: Sat Jan 17 18:30:07 2015 -0500 - Pass data to JSON through dissector data, not pinfo->private_data. + ftype (integer): fix Uninitialized argument value found by Clang Analyzer - Change-Id: I21dc2777822f0836f486432343cc1238886ad29d - Reviewed-on: https://code.wireshark.org/review/5460 - Reviewed-by: Anders Broman + Change-Id: I79e893f1d810a90c6a495067941d2e393e9fee72 + Reviewed-on: https://code.wireshark.org/review/6501 + Reviewed-by: Alexis La Goutte + Reviewed-by: Michael Mann -commit 0c716f7 -Author: Bill Meier -Date: Mon Nov 24 11:38:43 2014 -0500 +commit e7593ea +Author: Pascal Quantin +Date: Sun Jan 18 13:13:00 2015 +0100 - openflow; Fix a (no-effect) typo in openflow_version_values[] + asn2wrs: autodetect if 64 bits variant is required for constrained integers - Change-Id: I7a51face9c675ac3c03f2306ec40293b4835e02e - Reviewed-on: https://code.wireshark.org/review/5468 - Reviewed-by: Bill Meier - -commit 7309664 -Author: AndersBroman -Date: Mon Nov 24 17:22:02 2014 +0100 - - [SIP/DIAMETER] Reinstate the lost dfilter_store_sip_from_addr() and use it - for 3GPP AVP 601 Public-Identity. + It does not work with defines, but is already a great step forward - Change-Id: I5ef6608e7821779b00f79486860ee5f578828dfc - Reviewed-on: https://code.wireshark.org/review/5467 + Change-Id: I346d4124690ec46a2299d4eae8031bbb19a3db8e + Reviewed-on: https://code.wireshark.org/review/6617 Reviewed-by: Anders Broman + Reviewed-by: Pascal Quantin -commit 78849d0 +commit 12d17d2 Author: Pascal Quantin -Date: Mon Nov 24 15:51:27 2014 +0100 +Date: Sun Jan 18 13:35:20 2015 +0100 - SMTP: escape ASCII strings printed to COL_INFO + Update libwireshark0.symbols - This is already done automatically for the hf entries thanks to hfinfo_format_text() function - - Bug: 10536 - Change-Id: I9ee56b795234a94f0e59c82a96e3e6cedf71c4e6 - Reviewed-on: https://code.wireshark.org/review/5459 - Petri-Dish: Pascal Quantin - Reviewed-by: Michael Mann - Tested-by: Petri Dish Buildbot + Change-Id: I694448a998d3a1b74b19d2f1dfd6bb2be5bbce39 + Reviewed-on: https://code.wireshark.org/review/6616 Reviewed-by: Pascal Quantin + Tested-by: Pascal Quantin -commit daed807 -Author: Michael Mann -Date: Sun Nov 23 00:12:57 2014 -0500 +commit c326fca +Author: Pascal Quantin +Date: Sun Jan 18 12:22:22 2015 +0100 - Pass FrameID as data to the heuristic table, rather than use pinfo->private_data. + LDAP: g8c608e6 did not include the changes in template file, that got lost afterwards - Change-Id: Idd5818cbb2b1f8628bb29c2c71dfc6d41df89b5d - Reviewed-on: https://code.wireshark.org/review/5448 - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Change-Id: I5d79d3e48c1ad83713a312dce39b749f47b0ecc8 + Reviewed-on: https://code.wireshark.org/review/6612 + Reviewed-by: Pascal Quantin -commit 6dbb97d -Author: Dave Tapuska -Date: Mon Nov 17 17:12:36 2014 -0500 +commit 13b1e90 +Author: Pascal Quantin +Date: Sun Jan 18 11:58:02 2015 +0100 - SSL: Implement Extended Master Secret - - Store all handshake mesages in a buffer so that we can hash them - correctly when generating the master secret. - - This change does not work correctly for DTLS retransmitted packets; that - are in the handshake as they will be hashed twice; which is bad. Looking - for ideas to implement this. + ASN.1: regenerate dissectors after g506409d - Bug: 10686 - Change-Id: Ied01d4cc37b4270f325070a8d1630d3123577a0d - Reviewed-on: https://code.wireshark.org/review/5168 - Reviewed-by: Peter Wu - Petri-Dish: Alexis La Goutte - Tested-by: Petri Dish Buildbot - Reviewed-by: Alexis La Goutte + Change-Id: If82112ce7bae4de0c0c24794dc57ffebbf401978 + Reviewed-on: https://code.wireshark.org/review/6611 + Reviewed-by: Pascal Quantin -commit eb93f3b +commit ebea11a Author: Guy Harris -Date: Sun Nov 23 17:03:42 2014 -0800 +Date: Sun Jan 18 02:46:49 2015 -0800 - Don't do unsafe pointer casting - - Don't cast a pointer-to-int into a pointer-to-pointer and pass the - resulting pointer to g_hash_table_lookup_extended() - pointers and ints - are *not* guaranteed to be the same size. Instead, just have a variable - of type gpointer, pass a pointer to *that*, and then run that result - through GPOINTER_TO_UINT(). + We need epan/wmem/wmem.h regardless of whether we have GeoIP. - This fixes a reproducible crash. + It's used to generate the "sorry, we don't have GeoIP" message. - Change-Id: I42954f222ab59866cb909b80d9dbb1d2668d2aff - Reviewed-on: https://code.wireshark.org/review/5457 + Change-Id: Ibd4e15508d3e2d09d81951b4dc23a1264971bb7a + Reviewed-on: https://code.wireshark.org/review/6610 Reviewed-by: Guy Harris -commit ec650d4 -Author: Peter Wu -Date: Sun Nov 23 23:58:24 2014 +0100 - - elf: separate ett for program and sections entries - - This makes it easier to focus on a single section entry, collapsing all - other entries. - - Change-Id: I3de72065eb279e9449496a7224508e5be85c3757 - Reviewed-on: https://code.wireshark.org/review/5456 - Reviewed-by: Michael Mann - -commit 4d55e1f +commit c7500dd Author: Guy Harris -Date: Sun Nov 23 12:30:59 2014 -0800 +Date: Sun Jan 18 02:43:54 2015 -0800 - Presumably the intent is to dump *non*-dummy entries. + Fix another dfilter_compile() call. - I.e., presumably the intent is to dump *resolved* hosts, rather than - *unresolved* hosts where there's no known host name and the name field - is a string form of the address (the premise being that looking the - address up in the hash table repeatedly, and using the already-generated - string, will be faster than generating the string repeatedly). - - Change-Id: Iad1beb1d5f9cd9ed92bad5386111cb659614ee4d - Reviewed-on: https://code.wireshark.org/review/5455 + Change-Id: I8b035a09b1bc1981a78a80e0a2547dce65a2ac9c + Reviewed-on: https://code.wireshark.org/review/6609 Reviewed-by: Guy Harris -commit da5487f +commit cfcbb28 Author: Guy Harris -Date: Sun Nov 23 00:20:10 2014 -0800 +Date: Sun Jan 18 02:22:19 2015 -0800 - Newlines at the ends of lines, please. + 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. + + Allow either gchar ** argument to be null; if the argument is null, no + error message is allocated or provided. - Change-Id: I7b484e3ddac7cb1330c966819514a9468ea69066 - Reviewed-on: https://code.wireshark.org/review/5454 + Change-Id: Ibd36b8aaa9bf4234aa6efa1e7fb95f7037493b4c + Reviewed-on: https://code.wireshark.org/review/6608 Reviewed-by: Guy Harris -commit b2030ca -Author: Gerald Combs -Date: Sun Nov 23 08:04:42 2014 -0800 +commit c60fb30 +Author: Alexis La Goutte +Date: Sun Jan 18 10:23:10 2015 +0100 - [Automatic manuf, services and enterprise-numbers update for 2014-11-23] + Try to make Mac OS X Buildbots happy - Change-Id: I6f8a66b742571dcde011125df9295daedc5652a7 - Reviewed-on: https://code.wireshark.org/review/5450 - Reviewed-by: Gerald Combs + 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 -commit e50095c +commit a1f2342 Author: Michael Mann -Date: Sat Nov 22 23:11:32 2014 -0500 +Date: Sat Jan 17 21:17:24 2015 -0500 - Remove use of pinfo->private_data (which doesn't appear to be used anyway) and pass it as dissector data. - - Some other minor cleanup while in the neighborhood. + Miscellaneous ep_strdup_printf replacement. - Change-Id: I1b0c0567488fa350c14d21c5f5e4cb9746177af1 - Reviewed-on: https://code.wireshark.org/review/5447 + Change-Id: I973c672e9d573ad67e9b9fd82a5610aaf8a74efa + Reviewed-on: https://code.wireshark.org/review/6605 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann -commit e908804 -Author: Guy Harris -Date: Sat Nov 22 12:20:05 2014 -0800 +commit ef7e8aa +Author: Michael Mann +Date: Sat Jan 17 20:59:20 2015 -0500 - Update symbol list. + Remove ep_strndup - Change-Id: Ib1cb41f212bbccd4e20d3621110cbb98c01a7196 - Reviewed-on: https://code.wireshark.org/review/5444 - Reviewed-by: Guy Harris + Change-Id: Id336dc16f97a0973754993094aa637813c0ca31c + Reviewed-on: https://code.wireshark.org/review/6604 + Reviewed-by: Michael Mann -commit 08cf40e +commit 403be72 Author: Michael Mann -Date: Sat Nov 22 13:13:22 2014 -0500 +Date: Sat Jan 17 20:34:35 2015 -0500 - Use dissector data to "return" XML data to XMPP dissector. + Remove emem from GeoIP - Change-Id: I9abdc8c3deed35131af1537733d624d5cfced182 - Reviewed-on: https://code.wireshark.org/review/5443 - Petri-Dish: Michael Mann + Change-Id: Ifa96dc38a277b86c28f762489251dcc595afae67 + Reviewed-on: https://code.wireshark.org/review/6603 Reviewed-by: Michael Mann -commit 534b596 +commit 86726f4 Author: Michael Mann -Date: Sun Nov 16 10:22:34 2014 -0500 +Date: Fri Jan 16 23:11:49 2015 -0500 - Cleanup packet-sccp.c in preparation of trying to remove sccp_info member of packet_info. - - Convert a handful of global variables into function parameters that get passed through the dissector, so we shouldn't be dependent on pinfo->sccp_info anymore. Removal of pinfo->sccp_info will be done in a separate patch (when the dissectors that use it can be updated). + Trim down the use of ep_ memory in the display filter code. - packet-sua.c may need similar treatment. + Couldn't quite eliminate it completely, but it's much improved. Need to figure out where/when to free dfilter_error_msg. - Change-Id: If0001638d666afc07e04b02aa32ef31d6223a5de - Reviewed-on: https://code.wireshark.org/review/5343 + Change-Id: I10216e9546d38e83f69991ded8ec0b3fc8472035 + Reviewed-on: https://code.wireshark.org/review/6591 Reviewed-by: Michael Mann + +commit 0ad15f8 +Author: Michael Mann +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 Tested-by: Petri Dish Buildbot - Reviewed-by: Alexis La Goutte + Reviewed-by: Michael Mann -commit e2b597a -Author: Jeff Morriss -Date: Wed Nov 19 22:22:12 2014 -0500 +commit b5eb971 +Author: Michael Mann +Date: Sat Jan 17 16:30:25 2015 -0500 - Fix problem where the profile bar moves further left every time Wireshark is - run. + Replace all remaining instances of ep_new with wmem_new and wmem_packet_scope. - For the saved/restored geometry to be consistently correct we need to always - show the expert info and capture file comment icons. Disable them if no - capture file is open. - - Bug: 10518 - Change-Id: I6e254f66a17f8f54f28cfbafb4e0f92e02cff70c - Reviewed-on: https://code.wireshark.org/review/5404 - Reviewed-by: Evan Huus - Petri-Dish: Evan Huus - Tested-by: Petri Dish Buildbot - Reviewed-by: Alexis La Goutte + Change-Id: I50b2cd0e233554bc58082e96e8d879b40edfc0c1 + Reviewed-on: https://code.wireshark.org/review/6595 + Reviewed-by: Michael Mann -commit c61a037 -Author: Jesse Gross -Date: Tue Nov 18 14:36:30 2014 -0800 +commit be113e8 +Author: Alexis La Goutte +Date: Mon Jan 12 20:04:32 2015 +0100 - Add version check in Geneve dissector. + DHCP/BOOTP: Option 125 Suboption: (1) option-len always expects 1 but specification allows for more - We should warn when decoding Geneve packets with an unknown - version number. + 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' - Change-Id: Id40b756c3bb0320b69fbd8ee98830a2b05834a48 - Reviewed-on: https://code.wireshark.org/review/5420 - Reviewed-by: Anders Broman - Petri-Dish: Anders Broman - Tested-by: Petri Dish Buildbot - Reviewed-by: Alexis La Goutte + Issue reported by Steve Krebs + + Bug:10784 + Change-Id: I8eced7a70877d13d925b81c0f47885609baa7633 + Reviewed-on: https://code.wireshark.org/review/6510 + Reviewed-by: Michael Mann -commit 01f9706 -Author: Graham Bloice -Date: Fri Nov 21 23:27:56 2014 +0000 +commit 506409d +Author: Pascal Quantin +Date: Sat Jan 17 22:43:46 2015 +0100 - Add the required c flags for some test executables + X509AF: dissect Certificate Serial Number as INT64 instead of INT32 - Change-Id: I93b0c346fff162899e5f97dd2366e01cf99ec38e - Reviewed-on: https://code.wireshark.org/review/5435 - Petri-Dish: Graham Bloice - Tested-by: Petri Dish Buildbot - Reviewed-by: Graham Bloice + Bug: 10862 + Change-Id: Ie315298dd090b3b689f6a9bfff6f6f5bf7cc715a + Reviewed-on: https://code.wireshark.org/review/6594 + Reviewed-by: Michael Mann -commit 741db4c -Author: Guy Harris -Date: Sat Nov 22 01:07:13 2014 -0800 +commit 77dac91 +Author: Michael Mann +Date: Fri Jan 16 23:18:46 2015 -0500 - Get rid of another global in the print code. + A few more emem replacements with wmem. - Pass the "output only these protocols" hash table as an argument, - instead. + Change-Id: Icfb319fba937642db637a7f26b5e7627461df3b0 + Reviewed-on: https://code.wireshark.org/review/6590 + Reviewed-by: Michael Mann + +commit 5c5b3f7 +Author: Michael Mann +Date: Fri Jan 16 21:47:48 2015 -0500 + + Convert proto_construct_match_selected_string to use wmem. - Change-Id: Id8540943037e7b9bbfe377120c3f60dbe54fe0f1 - Reviewed-on: https://code.wireshark.org/review/5440 - Reviewed-by: Guy Harris + Change-Id: I7a40c0996517aa71b4ddb764ce3a6e92a55260ad + Reviewed-on: https://code.wireshark.org/review/6589 + Reviewed-by: Michael Mann -commit c68e77b -Author: Guy Harris -Date: Sat Nov 22 00:28:12 2014 -0800 +commit 6010d99 +Author: Sebastian Kloeppel +Date: Thu Jan 15 11:19:41 2015 +0100 - Pass a capture_file * to write_psml_preamble() in tfshark as well. + Added Card Application Toolkit Transport Protocol (CATTP) dissector - Change-Id: I2b2ae78d4b75bb27a44d185b48e3d85794effdb7 - Reviewed-on: https://code.wireshark.org/review/5439 - Reviewed-by: Guy Harris + Bug: 10843 + Change-Id: I35350d98b4225be12875b16e67506f7385ea9f28 + Reviewed-on: https://code.wireshark.org/review/6111 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin -commit b19b12a -Author: Guy Harris -Date: Sat Nov 22 00:06:54 2014 -0800 +commit ffa8bdd +Author: Russel +Date: Fri Jan 16 14:27:10 2015 -0800 - Get rid of write_headers global variable. + Correct PF field offset when looking for DA - Have write_psml_preamble() and write_csv_preamble() take a capture_file * - as an argument, so they can print the column titles themselves, rather - than having to defer it to the routine that prints packet data. + Previous code was not shifting far enough, was checking PS instead + of PF. - Change-Id: Ifd1b7a13062be8ad46846315976922a752778153 - Reviewed-on: https://code.wireshark.org/review/5438 - Reviewed-by: Guy Harris + Change-Id: Ic0bdbb4dfaa7bdd708a49f1fb67706dd949f2607 + Reviewed-on: https://code.wireshark.org/review/6578 + Reviewed-by: Michael Mann -commit 6e1214c -Author: Guy Harris -Date: Fri Nov 21 19:32:33 2014 -0800 +commit 8ec6ac6 +Author: Martin Kaiser +Date: Sun Jan 11 11:57:42 2015 +0100 - Fix comments. + dissect CCRC, APRC and the APDU body's data - Change-Id: I3b7340939b8204102bfc7e2e7d83f4d978cf7bad - Reviewed-on: https://code.wireshark.org/review/5437 - Reviewed-by: Guy Harris + Change-Id: I21f7420286ed3e668ce4dc0eac06bbf4172039d6 + Reviewed-on: https://code.wireshark.org/review/6588 + Reviewed-by: Martin Kaiser -commit 7d7fc47 -Author: Guy Harris -Date: Fri Nov 21 19:22:54 2014 -0800 +commit 21e40ea +Author: Martin Kaiser +Date: Sat Jan 10 18:33:32 2015 +0100 - Split the low-level print stream code into a separate file. - - Put the low-level print stream code from epan/print.c into - epan/print_stream.c, leaving the higher-level stuff in print.c + dissect the serial characters and the CRC - Change-Id: Iae961f168ec655a29f434257b1af0937fca9f025 - Reviewed-on: https://code.wireshark.org/review/5436 - Reviewed-by: Guy Harris + Change-Id: I64af822f30b02d313f5242014ff5e40a73dffa35 + Reviewed-on: https://code.wireshark.org/review/6587 + Reviewed-by: Martin Kaiser -commit 08475ff -Author: Bill Meier -Date: Wed Nov 19 13:52:52 2014 -0500 +commit a38b714 +Author: Alexis La Goutte +Date: Sat Jan 17 14:55:22 2015 +0100 - README.heuristic: rework example code. + RSYNC: Malformed Packet on rsync-version with length 2 - Specifically: show the use of tcp_dissect_pdus() - for a TCP heuristic dissector + RSYNC dissector always think the resync-version length = 4 - Change-Id: I02f184b2c8ef6ed128ef3d0bc59eed759aae54bb - Reviewed-on: https://code.wireshark.org/review/5399 - Reviewed-by: Bill Meier + Bug:10863 + Change-Id: I2dee3ff7195af110223903d79b938849666878a7 + Reviewed-on: https://code.wireshark.org/review/6584 + Reviewed-by: Anders Broman -commit fecea97 -Author: Alexis La Goutte -Date: Wed Nov 19 21:34:50 2014 +0100 +commit aa1057d +Author: maisheri +Date: Sat Jan 17 14:05:38 2015 +0530 - VoIP Call (GTK): Fix Dereference of null pointer found by Clang analyzer + EAPOL-MKA: Included fixes for the distributed sak handling. - Change-Id: I80029b6238c78dcab83a6a70eca0af5b66e1488d - Reviewed-on: https://code.wireshark.org/review/5401 - Reviewed-by: Evan Huus + Change-Id: Id91ba408266f18a9336811bf9d8b875796ea0cc1 + Reviewed-on: https://code.wireshark.org/review/6582 + Reviewed-by: maisheri + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte -commit c07e9fe -Author: Irene Ruengeler -Date: Mon Nov 17 08:51:12 2014 +0100 +commit 62ea319 +Author: Guy Harris +Date: Fri Jan 16 18:59:12 2015 -0800 - Add minimize and maximize buttons to the SCTP analysis windows. + PacketLogger files can be big-endian or little-endian. - As suggested by Jeff Morriss. + Bug: 10861 + Change-Id: Iedb248aa4a96e65bb525ba6475dc767e5dfefbe0 + Reviewed-on: https://code.wireshark.org/review/6579 + Reviewed-by: Guy Harris + +commit 3f284fb +Author: Pascal Quantin +Date: Thu Jan 15 22:41:13 2015 +0100 + + USB: do not put usb_address_t structure on stack and initialize it completely (including implicit padding for alignment) - Change-Id: Ibe2d30c31d51ab92377d64068527b424a92e8a64 - Reviewed-on: https://code.wireshark.org/review/5361 - Petri-Dish: Jeff Morriss + Bug: 10857 + Change-Id: Ib8339a5dc1c9461e681e0015c3f851c642f300c9 + Reviewed-on: https://code.wireshark.org/review/6560 + Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot - Reviewed-by: Jeff Morriss - Tested-by: Jeff Morriss - Reviewed-by: Evan Huus + Reviewed-by: Pascal Quantin -commit d7e277a -Author: Michael Mann -Date: Fri Nov 21 10:43:40 2014 -0500 +commit 1e8c6ee +Author: Pascal Quantin +Date: Fri Jan 16 22:28:13 2015 +0100 - CANopen bugfixes - - 1. Fixed endianess in CANopen dissector. - According to CiA 301, 7.1.1. (p. 26): - "For numerical data types the encoding is little endian style." - - 2. Fixed NMT type string in CANopen dissector - NMT function code should not display 'EMERGENCY' - - 3. Fixed time stamp decoding + Update a comment - * Offset increment was too low for data type size - * Decoding of time_stamp_days must equal time_stamp_msec and thus be letohs instead of ntohs. CANopen data is little-endian encoded. + Change-Id: I7bf1173bfb23e5f083b8aaf09476b30b4791aae0 + Reviewed-on: https://code.wireshark.org/review/6577 + Reviewed-by: Pascal Quantin + +commit fa54781 +Author: Guy Harris +Date: Fri Jan 16 11:26:20 2015 -0800 + + Update comment to reflect the current reality. - 4. Fix: Use correct description string for NMT error control state bits - canopen.nmt_guard.state was faulty named "Node-ID". This was changed to "State". + Change-Id: I7f8c66723efc9d21ec3abc08e57db1df5f772f04 + Reviewed-on: https://code.wireshark.org/review/6576 + Reviewed-by: Guy Harris + +commit 23666ba +Author: Guy Harris +Date: Fri Jan 16 10:40:26 2015 -0800 + + Spaces separate bytes; they don't have to surround them. - 5. Fix nmt_guard_state value_string array - CiA 301 desribes only 4 valid values. All other were deleted. - 0x00 was renamed from 'Initalisation' to 'Boot-up' following CiA301. + 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). - 6. Shortened EMERGENCY to EMCY + Change-Id: Ia2b732c74fc6020acc01a2c0c52ed3567d36d762 + Reviewed-on: https://code.wireshark.org/review/6575 + Reviewed-by: Guy Harris + +commit b6ec25f +Author: Alexis La Goutte +Date: Fri Jan 16 18:05:15 2015 +0100 + + IS-IS: Add missing i variable for subclv loop (IS Reachability) - The term EMCY is the standard abbreviation used in CiA standard for Emergency service. + Issue found by Alexander Okonnikov - 7. Fix: Allow SYNC and NMT error frames without any payload - NMT node guard remote requests do note have a payload, - SYNC frames only have an optional payload (counter) + Change-Id: I4eacab63a685b84c0d75811b96dc452471244337 + Reviewed-on: https://code.wireshark.org/review/6573 + Reviewed-by: Evan Huus + +commit 22543d3 +Author: Alexis La Goutte +Date: Fri Jan 16 18:03:03 2015 +0100 + + IS-IS: wrong length for SubTLV 18 (TE default Metric) - If item length is set to -1, decode will cause a 'Malformed Packet' error. + Issue found by Alexander Okonnikov - 8. Rename MT_NMT_GUARD to MT_NMT_ERR_CTRL which better reflects its scope + Change-Id: I8c1da71183f5bba50bb0bb541c259d5dba0b067d + Reviewed-on: https://code.wireshark.org/review/6572 + Reviewed-by: Evan Huus + +commit 3f57512 +Author: Evan Huus +Date: Fri Jan 16 11:09:51 2015 -0500 + + Kill more unused emem functions - Change-Id: I676f9b5f2e4efd8e7c9528fe289e7510c4d43235 - Reviewed-on: https://code.wireshark.org/review/5425 - Reviewed-by: Michael Mann - Petri-Dish: Michael Mann + Change-Id: Ib81410b6d760886f2ae585f44ac58fc135da62c7 + Reviewed-on: https://code.wireshark.org/review/6568 + Petri-Dish: Evan Huus + Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus -commit f2fc562 -Author: AndersBroman -Date: Fri Nov 21 15:54:59 2014 +0100 +commit 4fa7396 +Author: Alexis La Goutte +Date: Thu Jan 15 12:45:02 2015 +0100 - Replace tvb_length() + CMakeList.txt/Makefile.am (root) : fix indent (use tabs) - Change-Id: I0b5ad4d588f0b658abaf3892d08d6520ecd2f645 - Reviewed-on: https://code.wireshark.org/review/5431 + Makefile.am: avoid double space + CMakeList.txt: Add modelines info + + Change-Id: Ic27d16b2f502362509ab13158e5428208afe3925 + Reviewed-on: https://code.wireshark.org/review/6570 Reviewed-by: Anders Broman -commit 96fb347 -Author: Jeff Morriss -Date: Thu Nov 20 19:35:25 2014 -0500 +commit 16d367f +Author: Alexis La Goutte +Date: Fri Jan 16 17:09:51 2015 +0100 - Remove some leftover debug printfs. + ZBee ZCL: use tvb_get_guint8() (avoid tvb_get_ptr... !) - Change-Id: I9f4c7f71ae403059a2a236ba095b21753f7938fa - Reviewed-on: https://code.wireshark.org/review/5417 - Reviewed-by: Michael Mann + Change-Id: I248ddb1dee5398528279807968b095cbc5413ae0 + Reviewed-on: https://code.wireshark.org/review/6569 + Reviewed-by: Anders Broman -commit 1cde318 -Author: Michał Orynicz -Date: Thu Nov 20 13:16:33 2014 +0100 +commit 531df02 +Author: Michael Mann +Date: Fri Jan 16 08:15:41 2015 -0500 - Fix for very big pid and tid numbers in logcat_text + Remove se_ alloced memory from packet_list_store - There can be no space after pid colon if tid is big enough - in logcat long format. - - Change-Id: I8e03e78c88e4bef1a5fdb3a04b77f58fa7d055bc - Reviewed-on: https://code.wireshark.org/review/5411 - Reviewed-by: Michal Labedzki + Change-Id: I7aa2f5f8b433468ad2c2cd73cfce986d128a9ae0 + Reviewed-on: https://code.wireshark.org/review/6565 + Reviewed-by: Evan Huus + Reviewed-by: Michael Mann -commit 1d8673c -Author: Michał Orynicz -Date: Thu Nov 20 13:09:31 2014 +0100 +commit 0235775 +Author: Pascal Quantin +Date: Fri Jan 16 14:59:54 2015 +0100 - Move text logcat regex strings to shared header - - To avoid further duplication of work and bugfixing, - move regex strings to wiretap/logcat_text.h and include - this file in epan/dissectors/packet-logcat-text.c + GSM SIM: enhance dissection of APDU Class byte - Change-Id: I82773cda0e3240844139b104c68738ec82788014 - Reviewed-on: https://code.wireshark.org/review/5410 - Petri-Dish: Michal Labedzki + Change-Id: I2089ff665a92ce16a0af100e2515463c92c6d057 + Reviewed-on: https://code.wireshark.org/review/6567 + Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot - Reviewed-by: Michal Labedzki + Reviewed-by: Pascal Quantin -commit 1b9dd75 -Author: Jeff Morriss -Date: Thu Nov 20 20:30:32 2014 -0500 +commit ada1eec +Author: Michael Mann +Date: Sun Jan 11 21:32:53 2015 -0500 - Fix the build: dissect_a21_ie_common() can't be static any more. + SE_COPY_ADDRESS -> WMEM_COPY_ADDRESS - Change-Id: I93db6bc35aef9c36a294e530730cd295ad6851ef - Reviewed-on: https://code.wireshark.org/review/5419 - Reviewed-by: Jeff Morriss + 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 -commit 1df0d9c -Author: Guy Harris -Date: Thu Nov 20 16:57:24 2014 -0800 +commit 260b19e +Author: Michael Mann +Date: Fri Jan 16 08:29:57 2015 -0500 - Include "ws_symbol_export.h" to make sure WS_DLL_PUBLIC is defined. + Remove seasonal memory from everything except address resolutions - Wrap the declaration for C++ while we're at it. + This includes circuits, conversations and streams as well as camel and h225 dissectors. - Change-Id: Ifcc1b47bab139f5fb8da8c3dd4f20b1ebb99739e - Reviewed-on: https://code.wireshark.org/review/5418 - Reviewed-by: Guy Harris + Change-Id: Ia5ee70a5e5c6bcb420f0f19df126595246a3c042 + Reviewed-on: https://code.wireshark.org/review/6566 + Petri-Dish: Michael Mann + Reviewed-by: Anders Broman -commit 9732398 -Author: Alexis La Goutte -Date: Thu Nov 20 20:04:42 2014 +0100 +commit b2c4586 +Author: Chris Brandson +Date: Thu Jan 15 19:20:08 2015 -0800 - A21: fix warning: no previous prototype for function ... [-Wmissing-prototypes] + bug 10833 undecoded bitmaps were being displayed raw which is hard to interpret, changed to an more friendly format - Change-Id: Ib2f3816892f1682c175b0dee3c80725caebf3d4d - Reviewed-on: https://code.wireshark.org/review/5415 + Change-Id: If79a695646837cdfb3e1b168a47b96984c58e328 + Reviewed-on: https://code.wireshark.org/review/6563 Reviewed-by: Anders Broman -commit 5e932ad +commit a4d1709 +Author: Jeff Morriss +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 + +commit d009b55 Author: Alexis La Goutte -Date: Thu Nov 20 20:04:26 2014 +0100 +Date: Thu Jan 15 19:48:39 2015 +0100 - EPL: fix warning: no previous prototype for function ... [-Wmissing-prototypes] + Quakeworld: Nesting level does not match indendation (CID 1159218) - Change-Id: I40de0c8c2bd40f18a33947367fdeec5a22a3093a - Reviewed-on: https://code.wireshark.org/review/5414 + Change-Id: I6d18f103bda6db025eebfc902453256b007dddf7 + Reviewed-on: https://code.wireshark.org/review/6556 Reviewed-by: Anders Broman + Reviewed-by: Michael Mann -commit e77261f +commit 3f8fbb7 Author: Michael Mann -Date: Mon Nov 17 20:04:30 2014 -0500 +Date: Sun Jan 11 21:18:22 2015 -0500 - Eliminate proto_tree_add_text from some dissectors. + Remove the last two true calls to se_alloc. - Change-Id: Ib160211198ca02f7eacf29d04568628c11f208a5 - Reviewed-on: https://code.wireshark.org/review/5407 + (The other calls are just wrapped in macros) + + Change-Id: I6a029dddf7742ba95510ec24cec30553461e48c6 + Reviewed-on: https://code.wireshark.org/review/6558 Petri-Dish: Michael Mann - Reviewed-by: Alexis La Goutte - Tested-by: Petri Dish Buildbot + Reviewed-by: Evan Huus Reviewed-by: Michael Mann -commit 9611e75 -Author: AndersBroman -Date: Thu Nov 20 16:07:55 2014 +0100 +commit e530c89 +Author: Michael Mann +Date: Sun Jan 11 19:48:54 2015 -0500 - Replace tvb_length...() calls. + Replace se alloced memory in compare stat tap. - Change-Id: Idda7cd56a12b36d18774a1fe324c69eb8f5e4330 - Reviewed-on: https://code.wireshark.org/review/5412 - Reviewed-by: Anders Broman + Also replaced comments mentioning se_alloc memory with wmem_file_scope, since it's more accurate. + + 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. + + Change-Id: I8ceecbd00d65b3442dc02d720b39c2e15aa0c8a6 + Reviewed-on: https://code.wireshark.org/review/6557 + Reviewed-by: Evan Huus + Reviewed-by: Michael Mann -commit 9145acb -Author: Bill Meier -Date: Tue Nov 18 22:53:32 2014 -0500 +commit 7d43836 +Author: Deon van der Westhuysen +Date: Tue Jan 6 10:22:48 2015 +0100 - uat: tighten up dec/hex uat field validity checking + QT: stats_tree plug-ins not added to statistics menu - Specifically: - - Use the proper code for testing strtol() result; - - Also: Values greater than 32-bits treated as an error - (on LP64 architectures); + 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). - Change-Id: I56e8e734fbb9a22dbd9ed4112e24327ffd7ee3c0 - Reviewed-on: https://code.wireshark.org/review/5394 - Reviewed-by: Bill Meier - Petri-Dish: Bill Meier + This patch dynamically adds all registered stats_tree plug-ins to the statistics menu. + + Bug: 9528 + Change-Id: I99f9415502ca9f7121d494c856861edc1a762079 + Signed-off-by: Alexis La Goutte + Reviewed-on: https://code.wireshark.org/review/6336 + Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot - Reviewed-by: Alexis La Goutte + Reviewed-by: Gerald Combs -commit ead585f +commit d5ee022 Author: Michael Mann -Date: Sun Nov 16 15:15:52 2014 -0500 +Date: Thu Jan 15 15:09:47 2015 -0500 - Give better hints as to where the "expert info" fields go. + Replace C++ style comment with C style. - Change-Id: I9b1cee43ef9280504745b136b87507c2b6bb5369 - Reviewed-on: https://code.wireshark.org/review/5406 + Change-Id: Ibee0dccdb5a330866dcd0047216cd5a4da45fc8b + Reviewed-on: https://code.wireshark.org/review/6559 Reviewed-by: Michael Mann -commit f7f19f0 -Author: Pascal Quantin -Date: Wed Nov 19 20:10:15 2014 +0100 +commit c610c38 +Author: Alexis La Goutte +Date: Thu Jan 15 19:46:11 2015 +0100 - IrDA: always initialize buffer before accessing it + Conversation Table : Copy-paste error (CID 1262415) - Bug: 10716 - Change-Id: I8e54f750b70076758d5fd0d7f35f9c782f5d0bf9 - Reviewed-on: https://code.wireshark.org/review/5398 - Tested-by: Pascal Quantin - Petri-Dish: Pascal Quantin - Tested-by: Petri Dish Buildbot - Reviewed-by: Pascal Quantin + Change-Id: I37fd8154f93763ac091528921d1b66d8e8fd56dd + Reviewed-on: https://code.wireshark.org/review/6555 + Reviewed-by: Michael Mann -commit bcc4c7f -Author: Balint Reczey -Date: Fri Nov 14 21:39:00 2014 +0100 +commit e75dd98 +Author: Alexis La Goutte +Date: Thu Jan 15 19:45:10 2015 +0100 - Fix global plugin folder when it is set as an absolute path + NetFlow: Assign instead of compare (CID 1262419 & 1262420) - This fixes regression in creating Debian packages caused by - 80b36cdbde90ac9639938a14e8fd90a79602666a + Change-Id: Idc2c2e02b973f65c6c2f22f2d1bfd8545cd23f63 + Reviewed-on: https://code.wireshark.org/review/6554 + Reviewed-by: Martin Mathieson + +commit 1562827 +Author: Alexis La Goutte +Date: Thu Jan 15 19:38:25 2015 +0100 + + Packet List (Qt): Missing break in switch (CID 1262418) - Change-Id: I46702ad4c9a11ce317da7ef664c84e1f22d3f709 - Reviewed-on: https://code.wireshark.org/review/5316 - Reviewed-by: Evan Huus - Petri-Dish: Evan Huus - Reviewed-by: Balint Reczey + Change-Id: Id46f2be5b5206dfcb0ce7e7ea2d31398eff54917 + Reviewed-on: https://code.wireshark.org/review/6552 + Reviewed-by: Gerald Combs -commit 6fbcc18 -Author: Michał Orynicz -Date: Thu Nov 20 09:55:40 2014 +0100 +commit 3385984 +Author: Alexis La Goutte +Date: Thu Jan 15 19:43:11 2015 +0100 - Fix text logcat for changes in android L + Address to str: Missing break in switch (CID 1262416 & 1262417) - In L, in line "-- beginning of /" the "/" was removed. - This commit accomodates text logcat to that change. + It will also fix "Unused Value" (CID 1262422) - Change-Id: I4cbfadf5a8169589f2848ce1a5793cea593ba459 - Reviewed-on: https://code.wireshark.org/review/5405 - Petri-Dish: Michal Labedzki - Tested-by: Petri Dish Buildbot - Reviewed-by: Michal Labedzki + Change-Id: I626c087365e9d6fe625f807ab8ded518d94cab64 + Reviewed-on: https://code.wireshark.org/review/6553 + Reviewed-by: Evan Huus -commit 087518b +commit adf0881 Author: Alexis La Goutte -Date: Wed Nov 19 19:18:39 2014 +0100 +Date: Thu Jan 15 19:26:52 2015 +0100 - MIP6: Access network identifier option is not full decoded + HTTP: fix implicit conversion shortens 64-bit value into a 32-bit value - * Add subtype Geo Location (2) and Operator Identifier (3) - * Use also offset to calculate the length - * Remove proto_tree_add_text + It will be make Mac OS X buildbot happy - Issue reported by Ravindranath K M - - Bug:10712 - Change-Id: I9ad81ece856df134f3a706ad774d34e638cb5c94 - Reviewed-on: https://code.wireshark.org/review/5397 + Change-Id: I628445c1358675a58cc2d26ce1ca3007dd619ff3 + Reviewed-on: https://code.wireshark.org/review/6551 Reviewed-by: Alexis La Goutte -commit d23247e -Author: Guy Harris -Date: Wed Nov 19 16:53:36 2014 -0800 +commit 9c044e2 +Author: Pascal Quantin +Date: Thu Jan 15 14:25:24 2015 +0100 - White space tweaking to match what's in Samba git. - - (Samba git also needs some white space tweaking; this only changes the - cases where we're not obviously "better".) + ZigBee: packet scope memory cannot be used for BASE_CUSTOM callbacks - Change-Id: Iafb9cf8fea67b898b12850a7793806e3fccb39ac - Reviewed-on: https://code.wireshark.org/review/5403 - Reviewed-by: Guy Harris + Change-Id: I28fe21151b9f8c91786ca6c56d141a458419c501 + Reviewed-on: https://code.wireshark.org/review/6548 + Reviewed-by: Pascal Quantin -commit 4fdabdc -Author: Alexis La Goutte -Date: Wed Nov 19 21:35:14 2014 +0100 +commit 69d32a9 +Author: Uli Heilmeier +Date: Mon Jan 12 16:26:39 2015 +0100 - SBC: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + HTTP Dissector: Add CitrixAGBasic authentication + + Citrix uses a proprietary authentication schema called CitrixAGBasic for + their StoreFront/Web Interface product. - Change-Id: I6ac8e0eed88e78521f7d5623b9afdb6a42900ede - Reviewed-on: https://code.wireshark.org/review/5402 + 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). + + Bug: 10851 + Change-Id: Ic8e48db94809c9c64889cd050911de3fe23cdcdd + Reviewed-on: https://code.wireshark.org/review/6526 Reviewed-by: Michael Mann -commit 06dc2a7 +commit e0539ed Author: Gerald Combs -Date: Wed Nov 19 09:03:44 2014 -0800 +Date: Thu Jan 15 08:34:52 2015 -0800 - voip_calls: Fix tap callbacks. - - We don't need to call the VoIP tap reset and draw callbacks repeately. - Do so only once from the RTP tap. Packet callbacks should return a - gboolean. + CMake: Rename the windeployqt variable. - Clean up some function names and make some static. + 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: I5c934ce8ce7f279861e8cc73235bbfc27d7fe622 - Reviewed-on: https://code.wireshark.org/review/5396 + Change-Id: I14998b921009e44e5ca743e2915fe84447b22df0 + Reviewed-on: https://code.wireshark.org/review/6549 Reviewed-by: Gerald Combs -commit cb090e8 -Author: Bill Meier -Date: Wed Nov 19 11:25:17 2014 -0500 +commit 58bb07b +Author: Graham Bloice +Date: Wed Jan 14 22:59:21 2015 +0000 - [pedantic] Replace usage of 'long' and 'long long' + Fix-copy-qt-dll - Change-Id: I78fc82c1a83eb04d78a11fc76710c92dfc916208 - Reviewed-on: https://code.wireshark.org/review/5395 - Reviewed-by: Bill Meier + 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. + + Change-Id: I12860d415f80cee323c72aa8a4892eaa6126f165 + Reviewed-on: https://code.wireshark.org/review/6537 + Reviewed-by: Graham Bloice + Petri-Dish: Graham Bloice + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs -commit 67ab27a -Author: Michael Tüxen -Date: Wed Nov 19 15:57:48 2014 +0100 +commit a1fce22 +Author: Martin Kaiser +Date: Thu Jan 15 16:18:23 2015 +0100 - Add support for PAD chunks. + remove the executable bits from packet-zvt.c - Add support for PAD chunks as defined in RFC 4820. + (I should not use git on cygwin for adding new files) - Change-Id: I66a83d5d133429154fe40ccef26687c8350463cf - Reviewed-on: https://code.wireshark.org/review/5393 - Reviewed-by: Michael Tüxen + Change-Id: I314d78073f1ebd633a20ff7c9ac3d0b236b3906a + Reviewed-on: https://code.wireshark.org/review/6547 + Reviewed-by: Martin Kaiser -commit d7179ac -Author: Michael Tüxen -Date: Wed Nov 19 15:35:36 2014 +0100 +commit ba7aa19 +Author: Martin Kaiser +Date: Wed Dec 24 12:42:16 2014 +0100 - Fix the length reported as value length. + start a dissector for ZVT Kassenschnittstelle - The length reported as value length for unknown chunks - was actually the chunk length. Therefore it was off by 4. + this is a protocol between payment terminals and + electronic cash-register systems / vending machines - Change-Id: Ieea79d2c51b4729fc139395174625d1f362d1ee5 - Reviewed-on: https://code.wireshark.org/review/5392 - Reviewed-by: Michael Tüxen + Change-Id: Ieac87c0af8e15f2dfe8b4a6274f3b56d652a5b1f + Reviewed-on: https://code.wireshark.org/review/6531 + Reviewed-by: Martin Kaiser + Tested-by: Martin Kaiser -commit c62dac1 -Author: Michael Mann -Date: Sun Nov 16 13:10:37 2014 -0500 +commit 1e1d96f +Author: AndersBroman +Date: Thu Jan 15 16:01:40 2015 +0100 - Eliminate proto_tree_add_text from packet-mate.c + 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: I3f4b3eb23b91b219df373b3012fbefa63abfa4d3 - Reviewed-on: https://code.wireshark.org/review/5350 - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Change-Id: I49f89c862ddc8351091a9a939415e4ba6e7603f5 + Reviewed-on: https://code.wireshark.org/review/6546 + Reviewed-by: Anders Broman -commit 61b0638 -Author: Graham Bloice -Date: Tue Nov 18 15:59:44 2014 +0000 +commit ef0435b +Author: Evan Huus +Date: Thu Jan 15 08:31:26 2015 -0500 - Remove Windows linker flags from the CMake link flags test as the - test doesn't actually pass the flags to the VS linker. + ZigBee: don't use packet_scope outside of dissection - Change-Id: I5d546afcb80a49e39143078bc8f0855b0ba0f7e8 - Reviewed-on: https://code.wireshark.org/review/5384 - Petri-Dish: Graham Bloice - Tested-by: Petri Dish Buildbot - Reviewed-by: Graham Bloice - -commit 39b0c2d -Author: Stig Bjørlykke -Date: Thu Oct 16 13:58:58 2014 +0200 - - Wiretap: Added file_seek SEEK_END support. + 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. - This is needed for Lua File:seek("end"). + Introduced in gbdfabe59. - Change-Id: I28fb23f2f29ca8083c77bf065db8816e039ae5a1 - Reviewed-on: https://code.wireshark.org/review/4722 - Reviewed-by: Michal Labedzki - Tested-by: Michal Labedzki - Petri-Dish: Michal Labedzki - Tested-by: Petri Dish Buildbot - Reviewed-by: Stig Bjørlykke + Bug: 10855 + Change-Id: I9b0085b1f7779ae6fbd12482c44d8f611cdbb49f + Reviewed-on: https://code.wireshark.org/review/6545 + Reviewed-by: Evan Huus -commit cfa0e5f -Author: Gerald Combs -Date: Tue Nov 18 13:13:35 2014 -0800 +commit c2350a5 +Author: Evan Huus +Date: Thu Jan 15 05:42:06 2015 -0500 - voip_calls: Regression fixes. + rsvp: fix typo - Fix struct initialization logic. Clear a GQueue instead of deleting it. - Don't crash if we have no sequence diagram items. Make sure we show all - flows and not just invites. Zero allocated memory in a couple of places. + caught by test suite as: + Duplicate field detected in call to proto_register_field_array: + rsvp.call_attributes is already registered - Change-Id: Ia5bb3ba57cf625de4b554b354e098aa0361dff28 - Reviewed-on: https://code.wireshark.org/review/5390 - Reviewed-by: Gerald Combs + Change-Id: Ibf4ead3026b9930fb8f6ab07f0a5a4c299cedc35 + Reviewed-on: https://code.wireshark.org/review/6544 + Reviewed-by: Evan Huus -commit dc5b8f1 -Author: Martin Kaiser -Date: Sun Nov 16 19:09:57 2014 +0200 +commit 0d9248e +Author: Martin Mathieson +Date: Thu Jan 15 09:41:32 2015 +0000 - dissect TA(1) + Netflow: Fix spelling of 'latitude' - Change-Id: If618b0c3dc0502f5a31dcc580b9116daacb40239 - Reviewed-on: https://code.wireshark.org/review/5389 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + Change-Id: Iaae40f4a191e458645263c8d7a114392cd063707 + Reviewed-on: https://code.wireshark.org/review/6543 + Reviewed-by: Martin Mathieson -commit 7cdfe52 -Author: Sergey Avseyev -Date: Tue Nov 18 21:11:22 2014 +0300 +commit adaa661 +Author: Alexis La Goutte +Date: Wed Jan 7 21:32:47 2015 +0100 - Update Couchbase dissector: + Update to libnghttp2 0.7.1 - * Register new commands: - * 0x5c: DCP_NOOP - * 0x5d: DCP_BUFFER_ACKNOWLEDGEMENT - * 0x5e: DCP_CONTROL - * 0x5f: DCP_RESERVED4 - - Change-Id: I22d8eb8f6628e07b2e2ab2bc137688329eead1be - Reviewed-on: https://code.wireshark.org/review/5385 + Change-Id: Ib8d40586a3b95674447819f77eaaa69376dce6fd + Reviewed-on: https://code.wireshark.org/review/6411 Reviewed-by: Alexis La Goutte -commit e97d235 -Author: Pascal Quantin -Date: Mon Nov 17 22:49:24 2014 +0100 - - SPDY: do not try to access an uninitialized tvb - - Coming when data length = 0 - - Bug: 10704 - Change-Id: Ibd0730be661d966aa0429480dba97ed7d3e5c471 - Reviewed-on: https://code.wireshark.org/review/5377 +commit 5b92ab9 +Author: Miltos Patsiouras +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 Reviewed-by: Alexis La Goutte -commit 4b96030 +commit 06ddb7e Author: Alexis La Goutte -Date: Thu Oct 30 09:16:51 2014 +0100 +Date: Tue Jan 13 11:45:15 2015 +0100 - 802.11: Remove proto_tree_add_text + CAPWAP: Add a IEE802.11 Message Element Type (RFC5416) + + * IEEE 802.11 Information Element (1029) - Change-Id: I40d351e3317ff7e207e5c68a39aaedb73faf54f9 - Reviewed-on: https://code.wireshark.org/review/5281 + Add add_tagged_field to packet-ieee80211.h (will be used by other dissector) + + Change-Id: Icd13be416ccc47fb2309b9962e9a47c339885d1e + Reviewed-on: https://code.wireshark.org/review/6524 Reviewed-by: Michael Mann Petri-Dish: Michael Mann - Tested-by: Alexis La Goutte + Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte -commit c2f971d -Author: Guy Harris -Date: Mon Nov 17 21:16:19 2014 -0800 +commit fcd2d4f +Author: Graham Bloice +Date: Wed Jan 14 23:05:02 2015 +0000 - Fix indentation. + Fix cmake-cflags - Change-Id: Icc474748f755c21d281620c3b0f5d4d90f09223b - Reviewed-on: https://code.wireshark.org/review/5380 - Reviewed-by: Guy Harris - -commit 36837a2 -Author: Pascal Quantin -Date: Mon Nov 17 23:22:08 2014 +0100 - - MIPv6: display Experimental Mobility Message Data as such + The flags that are deleted are already supplied by the CMake generator. - Bug: 10703 - Change-Id: I9b16f503418d7464234be3c772b5dae3fb5eb7a9 - Reviewed-on: https://code.wireshark.org/review/5378 - Reviewed-by: Pascal Quantin - Tested-by: Pascal Quantin - Reviewed-by: Michael Mann + Change-Id: Ifafc2343ac0c5d365a39f4a181b23f54c65bce74 + Reviewed-on: https://code.wireshark.org/review/6538 + Petri-Dish: Graham Bloice + Tested-by: Petri Dish Buildbot + Reviewed-by: Graham Bloice -commit 1dec509 -Author: Gerald Combs -Date: Mon Nov 17 16:43:39 2014 -0800 +commit cb1f8a3 +Author: Alexis La Goutte +Date: Mon Jan 12 18:14:00 2015 +0100 - voip_calls: Move to ui. + CAPWAP: Add some IEE802.11 Message Element Type (RFC5416) - Move voip_calls.[ch] to ui. Add callbacks to voip_calls_tapinfo_t. - Remove unused function definitions. + * IEEE 802.11 OFDM Control (1033) + * IEEE 802.11 Update WLAN (1044) - Change-Id: Ib12db7053d53afa81ef2a66dc0cfe681bc624dd2 - Reviewed-on: https://code.wireshark.org/review/5379 - Reviewed-by: Gerald Combs + Change-Id: I702de1d649b1dc2af1de83ee21152c6a18f42dfc + Reviewed-on: https://code.wireshark.org/review/6509 + Reviewed-by: Anders Broman -commit a07f081 -Author: Gerald Combs -Date: Sun Nov 16 11:32:11 2014 -0800 +commit f6021e8 +Author: Alexis La Goutte +Date: Mon Jan 12 17:13:28 2015 +0100 - voip_calls: Get rid of global variables. - - Move the members of voip_rtp_tapinfo_t to voip_calls_tapinfo_t. Move a - bunch of formerly static variables there as well. Note that we might - want to make them private again at some point. Remove launch_count. It - appeared to be unused. + CAPWAP: Add a new Message Element Type (RFC5415) - Wrap the individual registration routines in voip_calls_init_all_taps. - Wrap the removal routines in voip_calls_remove_all_tap_listeners. + * Delete Station (18) - Move voip_calls_get_info() to voip_calls_dlg.c. Make it static. - - Change-Id: I58f9d91f55cfb5e4b0c048a5a1d5d4b947f4641b - Reviewed-on: https://code.wireshark.org/review/5372 - Petri-Dish: Gerald Combs - Reviewed-by: Gerald Combs + Change-Id: I33afa96d183b8ff22725d2e00dcfeccea3fdfa04 + Reviewed-on: https://code.wireshark.org/review/6508 + Reviewed-by: Michael Mann + Reviewed-by: Anders Broman -commit 5c7c701 +commit d9ec8ab Author: Alexis La Goutte -Date: Mon Nov 17 19:10:14 2014 +0100 +Date: Sun Jan 4 13:16:47 2015 +0100 - 802.11: Enhance Supported Operating Classes + mate_util: fix parameter ... not found in the function declaration [-Wdocumentation] - * Use expert_info to display warning about length (Remove proto_tree_add_text) + Change-Id: I66af53ee06866b45339814b5fa949551c0dd45c1 + Reviewed-on: https://code.wireshark.org/review/6535 + Reviewed-by: Anders Broman + +commit 6f630c1 +Author: Jeff Morriss +Date: Wed Jan 14 21:04:32 2015 -0500 + + Fix the compile: Use the new (double) variable. - Change-Id: I36ce6b6fc1138c53621da4913e23f9f1ceaaca50 - Reviewed-on: https://code.wireshark.org/review/5369 - Reviewed-by: Michael Mann + Change-Id: I38a9b0f55e9f19fe7f4f09f5eec2817dd822c6d0 + Reviewed-on: https://code.wireshark.org/review/6542 + Reviewed-by: Jeff Morriss -commit 4b63d9f -Author: Alexis La Goutte -Date: Mon Nov 17 19:03:46 2014 +0100 +commit b63a942 +Author: Gerald Combs +Date: Wed Jan 14 16:55:40 2015 -0800 - 802.11: Enhance Extenede Channel Switch Announcement + Fix a crash in the GTK+ RTP Streams dialog. - * Use expert info to display warning about launch (remove proto_tree_add_text) - * Remove a check about Unknown data (Not need) + 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: I3ec1d0f5b955019cfe43141df5f712eb1446dce3 - Reviewed-on: https://code.wireshark.org/review/5368 - Reviewed-by: Michael Mann + Change-Id: I3cbcc48216a078f85f13860d14707f309b9820d7 + Reviewed-on: https://code.wireshark.org/review/6541 + Reviewed-by: Gerald Combs -commit f4ad915 -Author: Alexis La Goutte -Date: Mon Nov 17 21:43:36 2014 +0100 +commit d443db0 +Author: Gerald Combs +Date: Wed Jan 14 16:41:38 2015 -0800 - H248: Fix Dereference of null pointer found by Clang analyzer - - Also fix some indent issue + Fix indentation. - Change-Id: I262bdddd031fec6a0f91b7172bb2d67be3c33000 - Reviewed-on: https://code.wireshark.org/review/5370 - Reviewed-by: Michael Mann + Change-Id: I089d18d6dde56c04d75f7c991511728a0a66f699 + Reviewed-on: https://code.wireshark.org/review/6540 + Reviewed-by: Gerald Combs -commit da69b51 -Author: Pascal Quantin -Date: Mon Nov 17 21:59:14 2014 +0100 +commit 9a19d6d +Author: Gerald Combs +Date: Wed Jan 14 15:13:40 2015 -0800 - DECT: ensure that bfield_data buffer is always fully initiated + CMake: Look for FOP and HHC only when needed. - Bug: 10710 - Change-Id: I444bc4ff7e542a8aa5ac8e20bac44a823ac74cfd - Reviewed-on: https://code.wireshark.org/review/5371 - Reviewed-by: Pascal Quantin - Tested-by: Pascal Quantin - Reviewed-by: Michael Mann + FOP is only required for generating PDF output and HHC is only needed + for CHM output. Don't look for them unconditionally. + + Change-Id: I7bec7d061c9e9e8b99431cab873e8c719469552c + Reviewed-on: https://code.wireshark.org/review/6539 + Reviewed-by: Gerald Combs -commit 7a7a763 -Author: Joerg Mayer -Date: Mon Nov 17 21:12:54 2014 +0100 +commit 242f711 +Author: Gerald Combs +Date: Tue Jan 13 13:32:12 2015 -0800 - cmake: - Avoide rebuilding the guides each and every time. - Don't print the single file guides to stdout. + CMake: Update windeployqt discovery. - Change-Id: Ie94fc4b24676e9abc7258c4ea1c7fd3049a96fb6 - Reviewed-on: https://code.wireshark.org/review/5367 - Reviewed-by: Jörg Mayer + Update the comments and add a URL. Use HINTS, which is more correct + according to the documentation. + + Change-Id: I82a7e2790dfa0b398e2b534f9f45851f55bdc0d2 + Reviewed-on: https://code.wireshark.org/review/6536 + Reviewed-by: Gerald Combs -commit 4a86d62 -Author: Joerg Mayer -Date: Mon Nov 17 21:05:11 2014 +0100 +commit 5b8fa72 +Author: Gerald Combs +Date: Tue Jan 13 13:32:12 2015 -0800 - Use ntoh24 instead of less readable and less correct code. - Remove redundant / wrong comments. - Add two small (helpful) comments :-) + CMake: Copy Qt DLLs to the target directory. - Change-Id: I9c5451587d744a8418e6a90139b771a055e93387 - Reviewed-on: https://code.wireshark.org/review/5366 - Reviewed-by: Jörg Mayer + 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. + + Change-Id: If85d89478472b10b31229413465955fe98b0ef02 + Reviewed-on: https://code.wireshark.org/review/6529 + Petri-Dish: Gerald Combs + Reviewed-by: Graham Bloice + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs -commit 82bb363 -Author: Alexis La Goutte -Date: Mon Nov 17 17:10:36 2014 +0100 +commit 86fde78 +Author: Gerald Combs +Date: Tue Jan 13 10:15:18 2015 -0800 - LLDP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + CMake: Copy wireshark-gtk dependent DLLs to the target directory. - Change-Id: I8c750ed9ad775b9be9d12050d200d7f1b4ddb86e - Reviewed-on: https://code.wireshark.org/review/5365 - Reviewed-by: Michael Mann + 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 + Tested-by: Petri Dish Buildbot + Reviewed-by: Graham Bloice + Reviewed-by: Gerald Combs -commit 3ce0167 +commit 20e2c05 Author: AndersBroman -Date: Mon Nov 17 13:36:17 2014 +0100 +Date: Wed Jan 14 13:47:08 2015 +0100 - [BSSMAP] de_mid() used with wrong length. + [E212]Modify dissect_e212_mcc_mnc() to take E212 number type as an + argument. While at it remove deprecated APIs - Change-Id: Ia64f254d85845ff39eacc7a339fdfa646ff9bb50 - Reviewed-on: https://code.wireshark.org/review/5364 + Change-Id: Ib1a7e9d7aeba6379fb4492816a0ac602e67493c6 + Reviewed-on: https://code.wireshark.org/review/6534 Reviewed-by: Anders Broman -commit 3815b14 -Author: Pascal Quantin -Date: Mon Nov 17 10:44:36 2014 +0100 +commit 36aca29 +Author: Graham Bloice +Date: Mon Jan 12 15:12:04 2015 +0000 - E212: fix bytes highlighting when dissecting the high nibble variant + Minor Development Guide updates - Change-Id: I376dcb333f7768242dbdb73313870e1e22d959ff - Reviewed-on: https://code.wireshark.org/review/5362 - Reviewed-by: Pascal Quantin + Corrected info about paths to built executable. + Cross referenced empty debugger sections to the section with info. + + Change-Id: I4366825990f1a5286c7292c9f00e540160c1b5d0 + Reviewed-on: https://code.wireshark.org/review/6520 + Reviewed-by: Michael Mann + Reviewed-by: Graham Bloice -commit bea106c -Author: Michael Mann -Date: Fri Nov 14 15:12:06 2014 -0500 +commit 0ee179c +Author: Pascal Quantin +Date: Tue Jan 13 23:18:37 2015 +0100 - Eliminate proto_tree_add_text + HTTP: allocate header_name in packet scope instead of file scope - Also some other cleanup to simplify dissector logic. + While we are at it, factorize the copy of value string - Change-Id: Ia84300b7eadafe292361014dd0e565ec250cae44 - Reviewed-on: https://code.wireshark.org/review/5311 - Reviewed-by: Michael Mann - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot + Change-Id: I2a16155641b8bd8623baf51f787a5f450e7b3803 + Reviewed-on: https://code.wireshark.org/review/6530 Reviewed-by: Anders Broman -commit f3f833c -Author: Martin Kaiser -Date: Tue Nov 11 21:05:03 2014 +0100 +commit 63a3d04 +Author: Guy Harris +Date: Tue Jan 13 15:13:40 2015 -0800 - display filter: the body of a range should only be - a string, a field name or another range - not an unparsed element + Consistently use the "g_string_free returns a C string pointer" idiom. - Bug: 10690 - Change-Id: I126143636c940cc73ed6467660f0a573209e2ae9 - Reviewed-on: https://code.wireshark.org/review/5243 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + 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. + + 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 + Reviewed-by: Guy Harris -commit 25f950e +commit 9f5e4fb Author: Guy Harris -Date: Sun Nov 16 18:25:56 2014 -0800 +Date: Tue Jan 13 13:00:59 2015 -0800 - Add tshark -G dissector-tables to dump a list of dissector tables. + uat_load() and uat_save() return a success indication; use it. - That list doesn't show the entries in the dissector tables, just - information about the tables themselves. + Instead of always ignoring the return value, always check it, and only + report an error if it returns FALSE. - Clean up some tshark man page issues while we're at it. + (Alternative: have it return NULL on success and a pointer to a + g_malloc()ed string on failure.) - Change-Id: I70beee34110f5c0d58105944dd71105a8400f5ca - Reviewed-on: https://code.wireshark.org/review/5360 + Fix a comment while we're at it. + + Change-Id: Icb72c9f47775b6552e3eb4fe5ddcc85482bfb5fb + Reviewed-on: https://code.wireshark.org/review/6528 Reviewed-by: Guy Harris -commit 57b7227 -Author: Michael Mann -Date: Fri Nov 14 15:13:05 2014 -0500 +commit 25f010b +Author: Pascal Quantin +Date: Tue Jan 13 14:26:34 2015 +0100 - Eliminate proto_tree_add_text by formatting field hf_opcua_ByteString in a few places. + MAC LTE: upgrade dissector to v12.4.0 - Change-Id: I9606aa36b7d7b6bb2ef2e7685e6629163ca83ef7 - Reviewed-on: https://code.wireshark.org/review/5312 - Reviewed-by: Michael Mann - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Evan Huus + Change-Id: Ieb5395a6ae7a1d7625fe645d0caf14008993d3d9 + Reviewed-on: https://code.wireshark.org/review/6521 + Reviewed-by: Pascal Quantin -commit 14bc6d8 -Author: Jeff Morriss -Date: Sun Nov 16 12:17:40 2014 -0500 +commit bc23f79 +Author: Guy Harris +Date: Tue Jan 13 12:13:45 2015 -0800 - Remove some ununused/unmatched tags. + 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: I0f8e4381b27d1defeb5980692823d297d2f48bab - Reviewed-on: https://code.wireshark.org/review/5349 - Petri-Dish: Jeff Morriss - Tested-by: Petri Dish Buildbot - Reviewed-by: Evan Huus + Change-Id: I40297746a2ef729c56763baeddbb0842386fa0d0 + Reviewed-on: https://code.wireshark.org/review/6525 + Reviewed-by: Guy Harris -commit cacbffe -Author: Pascal Quantin -Date: Sun Nov 16 21:58:36 2014 +0100 +commit a988253 +Author: Gerald Combs +Date: Mon Jan 12 14:44:42 2015 -0800 - PortableApps: ensure that the personal folder is set to the App directory + CMake: Copy libwireshark dependent DLLs to the target directory. - Otherwise the portable version ends up loading the user local personal profile + Add a "copy_cli_dlls" target which copies the DLLs required to run our + command line programs to the run directory. - Change-Id: Ib670c065319b0dd9673f239ae9459f6ee530f69e - Reviewed-on: https://code.wireshark.org/review/5351 - Reviewed-by: Pascal Quantin - Tested-by: Pascal Quantin - Reviewed-by: Evan Huus + 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 -commit e26e1dc -Author: Alexis La Goutte -Date: Sun Nov 16 16:12:40 2014 +0100 +commit 42e4040 +Author: AndersBroman +Date: Tue Jan 13 15:12:45 2015 +0100 - BATMAN: fix indent and encoding args + [GPRS CDR]Fix faulty ASN1 modification + Should be: egsnPDPRecord [70] EGSNPDPRecordV750 - use tabs for indent and use fix-encoding-args tools + Change-Id: I4b03524c09b6ce603cf4783144d588c8839a16e6 + Reviewed-on: https://code.wireshark.org/review/6523 + Reviewed-by: Anders Broman + +commit db7f25f +Author: AndersBroman +Date: Tue Jan 13 14:04:44 2015 +0100 + + [GPRS CDR] Handle Rel 7 CDRs - Change-Id: I5e066c6cbc429021cf21a55d5ffd5b60718ad5f8 - Reviewed-on: https://code.wireshark.org/review/5340 - Reviewed-by: Michael Mann - Reviewed-by: Evan Huus + Change-Id: I09833a326e486273c3eacaceba0963fe88e0dac6 + Reviewed-on: https://code.wireshark.org/review/6522 + Reviewed-by: Anders Broman -commit 9d0085f +commit f90eeb1 Author: Guy Harris -Date: Sun Nov 16 15:21:12 2014 -0800 +Date: Mon Jan 12 20:35:44 2015 -0800 - Make sure the NLPID appears in the protocol tree. + When allocating address structures, use wmem_new0(). - For protocols for which the NLPID is not considered part of the PDU, put - the NLPID into the protocol tree ourselves. + 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. - Bug: 10706 - Change-Id: I2676d1934dd468ec755a6f94d95a23f025ba0f25 - Reviewed-on: https://code.wireshark.org/review/5358 + Change-Id: I995fd26cc2f20edb5a599f95562b720561708e57 + Reviewed-on: https://code.wireshark.org/review/6517 Reviewed-by: Guy Harris -commit 08a9478 +commit b204ff4 Author: Guy Harris -Date: Sun Nov 16 14:59:23 2014 -0800 +Date: Mon Jan 12 20:07:09 2015 -0800 - Fix a comment to reflect reality. + Do bounds checking when decompressing WCP packets. + + 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. - Change-Id: I812b0246368266c76f7fe9ef355619603c5d37b0 - Reviewed-on: https://code.wireshark.org/review/5357 + 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 -commit 7b558dd -Author: Alexis La Goutte -Date: Sun Nov 2 16:15:31 2014 +0100 +commit 63d8e44 +Author: Jörg Mayer +Date: Tue Jan 13 02:35:37 2015 +0100 - Add unused-const-variable (enable by default on new clang release) + Fix ASCIIDOC detection broken by commit ae2888aeb2b418c9f62 - Change-Id: I1d882e02188ba38ec1b5583c5933d0c92f0539e4 - Reviewed-on: https://code.wireshark.org/review/5068 - Petri-Dish: Alexis La Goutte - Tested-by: Petri Dish Buildbot - Reviewed-by: Balint Reczey + Change-Id: I36cd42a9040e8f8ab2b11ff4211a1298663909a2 + Reviewed-on: https://code.wireshark.org/review/6512 + Reviewed-by: Jörg Mayer -commit 05acb67 -Author: Alexis La Goutte -Date: Sun Nov 16 16:28:51 2014 +0100 +commit de5e7b8 +Author: Michael Mann +Date: Mon Jan 12 11:24:37 2015 -0500 - mcast_stream: fix indent (use 4 spaces) + Fix casting compiler warning - Add also modelines info - - Change-Id: Idea65bfa25ce8a379c590074ab89a06f935c6648 - Reviewed-on: https://code.wireshark.org/review/5344 + Change-Id: I179706042168cb4fd1bfb5f9c573f302d9d62fa0 + Reviewed-on: https://code.wireshark.org/review/6506 Reviewed-by: Michael Mann -commit 7213ad5 -Author: Alexis La Goutte -Date: Sun Nov 16 16:42:32 2014 +0100 +commit 0b271aa +Author: Evan Huus +Date: Mon Jan 12 10:08:29 2015 -0500 - rtp_stream: fix indent (use 4 spaces) + Remove ep_strbuf code - Add also modelines info + Thanks to Michael's work, it is now totally unused. - Change-Id: I4c4c6d7e292ba387aacb3f71afcac756b2875847 - Reviewed-on: https://code.wireshark.org/review/5345 + Change-Id: I67b5f7c69535a08f96f449c36c429e2548f4ea11 + Reviewed-on: https://code.wireshark.org/review/6505 + Petri-Dish: Evan Huus Reviewed-by: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Evan Huus -commit b867baf -Author: Alexis La Goutte -Date: Sun Nov 16 16:15:27 2014 +0100 +commit f699f61 +Author: Jeff Morriss +Date: Fri Jan 9 16:44:15 2015 -0500 - BATMAN: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + Error out if the user requests the SBC library but it's not found. - Change-Id: I6cfabc18921397002a2303f3511fa51bf5b41956 - Reviewed-on: https://code.wireshark.org/review/5341 - Reviewed-by: Michael Mann + Change-Id: I7c152420703d0d37c7b29d3c8f535b17180e020a + Reviewed-on: https://code.wireshark.org/review/6455 + Reviewed-by: Jeff Morriss -commit 9f0fb57 -Author: Alexis La Goutte -Date: Sun Nov 16 16:00:35 2014 +0100 +commit 7967ef9 +Author: Michael Mann +Date: Fri Jan 9 19:50:09 2015 -0500 - RADIUS: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + Remove emem APIs from UAT functionality. - Change-Id: I5127b737c0d9db08c61a70bb6c16fef030d39f83 - Reviewed-on: https://code.wireshark.org/review/5339 + Change-Id: I009c09f25d170e5c9aaaef713eaacb3252817856 + Reviewed-on: https://code.wireshark.org/review/6460 + Petri-Dish: Michael Mann + Reviewed-by: Evan Huus + Petri-Dish: Anders Broman + Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann -commit 0cc6a7e -Author: Gerald Combs -Date: Sun Nov 16 08:06:50 2014 -0800 +commit 554a397 +Author: AndersBroman +Date: Mon Jan 12 13:58:49 2015 +0100 - [Automatic manuf, services and enterprise-numbers update for 2014-11-16] + [GPRS CDR] Add expert info for unknown record types. - Change-Id: Ie677285f75a7ef0390d93469a4f97eaad813fdc0 - Reviewed-on: https://code.wireshark.org/review/5346 - Reviewed-by: Gerald Combs + Change-Id: Ib485f435b6c423b06c7c31f2cf681d01261bfc15 + Reviewed-on: https://code.wireshark.org/review/6504 + Reviewed-by: Anders Broman -commit 7f7d566 -Author: Alexis La Goutte -Date: Sun Nov 16 15:27:06 2014 +0100 +commit d7bce33 +Author: Graham Bloice +Date: Mon Jan 12 11:26:59 2015 +0000 - btavdtp: Add missing break; + Fix Cygwin path - Issue found by Clang Analyzer: - Value stored to 'codec_dissector' is never read + 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. - Change-Id: I7a9fc5e3ffd04c77cbbb8d5e5b885d8a29468cfd - Reviewed-on: https://code.wireshark.org/review/5330 - Reviewed-by: Balint Reczey + Same change to runa2x.sh to be consistent. + + Change-Id: I177a5e7d17a0077b0e8ca7d264d7e725a5312e24 + Reviewed-on: https://code.wireshark.org/review/6503 + Petri-Dish: Graham Bloice + Reviewed-by: Graham Bloice + Tested-by: Graham Bloice -commit b12be84 -Author: Michael Mann -Date: Sat Nov 15 21:24:27 2014 -0500 +commit 0385d15 +Author: Graham Bloice +Date: Sun Jan 11 20:37:03 2015 +0000 - Remove file_type_subtype member from packet_info. + Fix Cygwin path in runa2x.sh - Just pass the necessary data to the frame dissector. + 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. - Change-Id: I1a4bab32f7b5e28f4e7707794d71b04dab388908 - Reviewed-on: https://code.wireshark.org/review/5328 - Reviewed-by: Michael Mann - Petri-Dish: Michael Mann + Change-Id: I206db542b5e89895a43c48626e2d14fff380fc8f + Reviewed-on: https://code.wireshark.org/review/6497 + Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot - Reviewed-by: Alexis La Goutte + Reviewed-by: Graham Bloice -commit d1696a6 -Author: Michael Mann -Date: Sat Nov 15 18:47:06 2014 -0500 +commit a49e1d5 +Author: Graham Bloice +Date: Fri Jan 2 17:20:46 2015 +0000 - "Bubble up" the use of pinfo->circuit_id and pinfo->ctype to make it more obvious where in used in hopes that it can be eliminated through passing dissector data (or methods other than using packet_info) + Make running the tests a little easier on Windows - Change-Id: Ib0e7efc123a3f9c06f58b5579c3c25b18818205c - Reviewed-on: https://code.wireshark.org/review/5326 - Reviewed-by: Michael Mann - Petri-Dish: Michael Mann + 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. + + Change-Id: I0f4da1fa87802bf0a4039bb5a91e577fae506d79 + Reviewed-on: https://code.wireshark.org/review/6243 + Tested-by: Graham Bloice + Reviewed-by: Gerald Combs + Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot - Reviewed-by: Alexis La Goutte + Reviewed-by: Graham Bloice -commit f92ed4d -Author: Michael Mann -Date: Sat Nov 15 20:35:51 2014 -0500 +commit 2619edd +Author: AndersBroman +Date: Fri Jan 9 16:39:47 2015 +0100 - Remove ipproto member of packet_info. + [E212] Make it possible to use different filters for MCC and MNC in LAI + RAI and SAI. - All situations can be handled with "shimmed" dissector functions. - - Change-Id: Ic85483b32d99d3270b193c9f6b29574d8fad46a8 - Reviewed-on: https://code.wireshark.org/review/5327 - Reviewed-by: Michael Mann - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Alexis La Goutte + Change-Id: I2abcc868899b8752f66347b3a0fe190670c3ce3f + Reviewed-on: https://code.wireshark.org/review/6447 + Reviewed-by: Anders Broman -commit 3b8ed36 +commit e974a6f Author: Alexis La Goutte -Date: Fri Nov 14 17:42:44 2014 +0100 +Date: Sat Jan 10 16:13:31 2015 +0100 - DNS: NAPTR RR Replacement Length is incorrect + msg_rng_rsp (Wimax): fix Copy-paste error (CID 11158604) - It seems the Replacement Length field calculated by Wireshark (which Wireshark calls "rReplacement Length"), is the length of the first label of the DNS name in the Replacement, instead of the entire DNS name length. + Change-Id: I134d8178d741d741404963a89f60e1d1bfd9a2dd + Reviewed-on: https://code.wireshark.org/review/6473 + Reviewed-by: Anders Broman + +commit 706c625 +Author: Alexis La Goutte +Date: Fri Dec 19 11:09:28 2014 +0100 + + ISIS: Add code and length for SubTLV Extended IS Reachability - Issue found by Boaz + * remove some proto_tree_add_text call - Bug:10700 - Change-Id: I8b726f3a3bf316d688a40c3ade100d255ca3be42 - Reviewed-on: https://code.wireshark.org/review/5300 - Reviewed-by: Pascal Quantin + Change-Id: I18bc26cc95934e77b19d24edbb417af4c895d53e + Reviewed-on: https://code.wireshark.org/review/6468 + Petri-Dish: Alexis La Goutte + Reviewed-by: Anders Broman -commit 4960171 -Author: Gerald Combs -Date: Sat Nov 15 10:36:16 2014 -0800 +commit ca17499 +Author: Jeff Morriss +Date: Fri Jan 9 16:47:44 2015 -0500 - VoIP calls: Fixup whitespace. + Add DJI UAV Drone Control Protocol to the list of new protocols. - Set modelines and reindent to match the files in the top-level ui - directory. + (This change also brings NEWS up to date with release-notes.asciidoc) - Change-Id: I7ea221e76a4b0ad3b6bcf7a3c8b4645c16aecbba - Reviewed-on: https://code.wireshark.org/review/5325 - Reviewed-by: Gerald Combs + Change-Id: Ie61c27901947210ddf95bbb1bb8c36e489bc0c8c + Reviewed-on: https://code.wireshark.org/review/6456 + Reviewed-by: Anders Broman -commit 51c5b7a -Author: Gerald Combs -Date: Sat Nov 15 09:18:06 2014 -0800 +commit 4a0ec75 +Author: Guy Harris +Date: Sun Jan 11 13:18:39 2015 -0800 - VoIP calls: Start separating common and GTK+-dependent code. + Use the GTK+ 2 name for VoidSymbol. - Remove more calls to voip_calls_get_info. Get rid of the global cfile. - Lowercase more function names. + 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: Ieda779779cce9f05e07c54314bceab4a18bae22f - Reviewed-on: https://code.wireshark.org/review/5324 - Reviewed-by: Gerald Combs + Change-Id: I52b14a7f2273f2af2b914c3646eb33d21673057e + Reviewed-on: https://code.wireshark.org/review/6498 + Reviewed-by: Guy Harris -commit 7f3f4a5 -Author: Robert Grange -Date: Sat Nov 15 11:35:09 2014 +0100 +commit 528a857 +Author: Graham Bloice +Date: Sat Jan 10 21:29:57 2015 +0000 - paquet-mq: Eliminiate proto_tree_add_text + Fix CMake generation and use of Windows .rc files - Eliminate proto_tree_add_text for Expert Info - Improve PCF Parameters numeric value display + CMake now generates local copies of .rc files for all the Windows + components and uses the files in the build of the components. - Change-Id: Ibc259ba05d0591d434e7638d91d6943101d45305 - Reviewed-on: https://code.wireshark.org/review/5080 - Reviewed-by: Robert Grange - Petri-Dish: Michael Mann + 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. + + Updated build architecture detection, required for wireshark.manifest.in + + Change-Id: I7b1ff43050e9b0efb861d1041636fb4aef49a4f8 + Reviewed-on: https://code.wireshark.org/review/6482 + Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Reviewed-by: Graham Bloice -commit d550b17 -Author: Gerald Combs -Date: Fri Nov 14 18:43:28 2014 -0800 +commit 7d004dc +Author: Pascal Quantin +Date: Sun Jan 11 20:53:11 2015 +0100 - VoIP calls: Use our tap offsets. + Revert "Lemon: Update lemon tools" - Add convenience functions to convert between tap IDs and tapinfo - pointers. Use them to get rid of some calls to voip_calls_get_info(). + This reverts commit 5855dd8d538eb81d4825961b1bf0d583bf96f751. - Lowercase function names. Remove more exit()s. + This Lemon update fails to compile on OSX and triggers asserts on other platforms - Change-Id: I187fdc505bc22cc05edafed9e97ede8279ea53f9 - Reviewed-on: https://code.wireshark.org/review/5321 - Reviewed-by: Gerald Combs + Change-Id: I12a8a2bf32db31e5a9b0cb1a67a39724e30f3e91 + Reviewed-on: https://code.wireshark.org/review/6496 + Reviewed-by: Pascal Quantin -commit 0be9e7d -Author: Guy Harris -Date: Fri Nov 14 19:37:32 2014 -0800 +commit c8c9917 +Author: Pascal Quantin +Date: Sun Jan 11 15:35:08 2015 +0100 - 0.0 is a double, 0.0f is a float. + Fix some more regressions introduced in gecaa1f8 - Change-Id: I882bbda2c579cfd7a1b96ce190541262193405e0 - Reviewed-on: https://code.wireshark.org/review/5320 - Reviewed-by: Guy Harris - -commit 3428361 -Author: Gerald Combs -Date: Fri Nov 14 19:30:42 2014 -0800 - - Fix a pointer type. + Convert one other set of static variables to pinfo scoped memory while we are at it - Change-Id: I5cc67fa320b3241d6793575d59e49160ef40b260 - Reviewed-on: https://code.wireshark.org/review/5319 - Reviewed-by: Gerald Combs + Change-Id: If550b76ef6a4dd2707d79de8579ac439d16dce79 + Reviewed-on: https://code.wireshark.org/review/6490 + Reviewed-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Reviewed-by: Michael Mann -commit 3275ba2 -Author: Gregor Miernik -Date: Tue Nov 4 11:53:39 2014 +0100 +commit 5855dd8 +Author: Alexis La Goutte +Date: Wed Aug 27 22:20:12 2014 +0200 - LLDP: Dissector for Hytec specific extensions added + Lemon: Update lemon tools - It provides dissection of objects with additional neighbor and link information - defined by Hytec (pcap example available on wiki.wireshark.org/HYTEC). - Also OUI of "Hytec Geraetebau GmbH" added. + Fix warning: declaration shadows a variable in the global scope [-Wshadow] - Change-Id: I92119e46fd5f4c4b385ac3df3170a4766fe056b7 - Reviewed-on: https://code.wireshark.org/review/5107 - Petri-Dish: Michael Mann - Reviewed-by: Michael Mann + Add include + + 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 + + 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 + Reviewed-by: Alexis La Goutte -commit 1e2a3dc -Author: Gerald Combs -Date: Fri Nov 14 13:53:58 2014 -0800 +commit 74b20dc +Author: Peter Wu +Date: Thu Dec 18 12:31:49 2014 +0100 - VoIP calls: Clean up tap registration and removal. + gtk: fix crash on Broadway GDK backend - Start moving away from a global voip_calls_tapinfo_t. Pass the - voip_calls_tapinfo_t struct address to each registration and removal - routine. + 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. - All of the tap registration and removal routines are called at the same - time. Replace the individual registration tracking booleans with a - central one. + 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). - Calling exit() from the GUI is rude. Don't do that. + 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. - Change-Id: I9535002e2905a45a8cfc9643590b5d2d360ffc24 - Reviewed-on: https://code.wireshark.org/review/5318 - Reviewed-by: Gerald Combs + 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) + + 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. + + Change-Id: Ic1f0ee2b87cd573023ee8e966f06489b3b744dcf + Reviewed-on: https://code.wireshark.org/review/5832 + Reviewed-by: Balint Reczey -commit 62fd2ac -Author: Michael Mann -Date: Fri Nov 14 15:18:23 2014 -0500 +commit ae2888a +Author: Gerald Combs +Date: Sat Jan 10 18:02:07 2015 -0800 - Eliminate proto_tree_add_text from some plugin dissector files. + CMake: Try to fix Cygwin a2x discovery. - Change-Id: Ib2d900833a8763307be6b1cfc8df20d7019d2706 - Reviewed-on: https://code.wireshark.org/review/5313 - Petri-Dish: Michael Mann - Reviewed-by: Michael Mann + Change-Id: I46ddd10ab533ff7114aa6a4241a9a261da19329c + Reviewed-on: https://code.wireshark.org/review/6487 + Petri-Dish: Graham Bloice + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs -commit ba3bc1e -Author: Gerald Combs -Date: Fri Nov 14 13:15:38 2014 -0800 +commit 9b9a06c +Author: Robert Grange +Date: Sun Jan 11 12:57:06 2015 +0100 - VoIP calls tap ID cleanup. + packet-mq: Avoid using sort in dissector - Remove all of the public dummy members from voip_calls_tapinfo_t. Use - pointer arithmetic to generate private, unique IDs instead. + Avoid using sort for string_value_ext. The string value are now + sorted at definition - We weren't removing the SUA listener. Do so. Use the correct M3UA ID. + Change-Id: I08452b0423289d04e55ed7e3573e74bfcc329865 + Reviewed-on: https://code.wireshark.org/review/6488 + Reviewed-by: Robert Grange + Petri-Dish: Pascal Quantin + Reviewed-by: Pascal Quantin + +commit 9d55a0b +Author: Gerald Combs +Date: Sun Jan 11 08:05:06 2015 -0800 + + [Automatic manuf, services and enterprise-numbers update for 2015-01-11] - Change-Id: I8e8cdb6addbc4868aebc004be20a2f57b4acf75b - Reviewed-on: https://code.wireshark.org/review/5315 - Petri-Dish: Gerald Combs + Change-Id: I2f9625ebc812095bd4c7464981a96b38c4548694 + Reviewed-on: https://code.wireshark.org/review/6491 Reviewed-by: Gerald Combs -commit 225c86f -Author: Guy Harris -Date: Fri Nov 14 15:59:38 2014 -0800 +commit f2bedeb +Author: Pascal Quantin +Date: Sun Jan 11 14:54:24 2015 +0100 - Do the "-z help" processing separately, and do it for Wireshark as well. + FDDI: fix a memory corruption introduced in gecaa1f8 - Yes, Wireshark does a bunch of GUI stuff, and then takes the window down - before printing the help, but the same is true for some command-line - error messages as well. - - Change-Id: Id501468416c83308e4c0a9e7a66116d8d33a9d84 - Reviewed-on: https://code.wireshark.org/review/5317 - Reviewed-by: Guy Harris + Bug: 10845 + Change-Id: I4d47711f397d9aaa965dff3e97478517f638a2e2 + Reviewed-on: https://code.wireshark.org/review/6489 + Reviewed-by: Pascal Quantin -commit 3554580 -Author: Guy Harris -Date: Fri Nov 14 12:29:04 2014 -0800 +commit aa9376e +Author: Pascal Quantin +Date: Sat Jan 10 19:19:04 2015 +0100 - It's not missing, it's passed on. + LTE RRC: upgrade dissector to v12.4.0 - Change-Id: Id1b1c7501f357667abb961948afdd816e13a7ad3 - Reviewed-on: https://code.wireshark.org/review/5314 - Reviewed-by: Guy Harris + Change-Id: I0bd6c124bd3aa0efe09db81135adc690751e08ae + Reviewed-on: https://code.wireshark.org/review/6477 + Reviewed-by: Pascal Quantin -commit 1b4d51e -Author: Guy Harris -Date: Fri Nov 14 12:24:51 2014 -0800 +commit d07364d +Author: Michael Mann +Date: Sat Jan 10 12:41:04 2015 -0500 - Update Debian symbol files. + Restore #undef HAVE_STDLIB_H and #undef HAVE_STRING_H in kerberos dissector. - Change-Id: Iee66cf87d742780740b572b39c8ecf94f93dc142 - Reviewed-on: https://code.wireshark.org/review/5310 - Reviewed-by: Guy Harris + 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 -commit 99b6afb -Author: Guy Harris -Date: Fri Nov 14 12:21:12 2014 -0800 +commit f5c4d06 +Author: Michael Mann +Date: Sat Jan 10 19:04:06 2015 -0500 - Add a name field to tap_param, for use in error messages. + Replace some "low hanging fruit" uses of emem. - Change-Id: Ia4317b61ff30e269eba0ee2ea2c46f1668544b1b - Reviewed-on: https://code.wireshark.org/review/5309 - Reviewed-by: Guy Harris + 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 -commit 04ab731 +commit fdd6554 Author: Guy Harris -Date: Fri Nov 14 12:05:31 2014 -0800 +Date: Sat Jan 10 16:26:46 2015 -0800 - The registered -z parameter string shouldn't end with a comma. + Rename the FT_BYTES separator types to SEP_ from BASE_. + + There's no requirement for "display" field values to have names + beginning with BASE_; use SEP_, to indicate that they're separators. - If it ends with a comma, then, if you don't provide any parameters, you - get a "no such -z statistic" message followed by a list of available - statistics. + (And, yes, we should introduce SEP_NONE, with a value of 0, and use it.) - If it doesn't end with a comma, then, if you don't provide any - parameters *and* a parameter is required, you get a usage message, which - is more useful - and, in many of those cases, a parameter *isn't* - required. + 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: I81275ea41ad4611d8210ca3cb07c09f0abde58f2 - Reviewed-on: https://code.wireshark.org/review/5308 + Change-Id: I856aafda2c60b8320dffe287f0deb06a9604a2bf + Reviewed-on: https://code.wireshark.org/review/6486 Reviewed-by: Guy Harris -commit 4729e13 -Author: Guy Harris -Date: Fri Nov 14 11:25:04 2014 -0800 +commit b4f5b6e +Author: Graham Bloice +Date: Sun Jan 11 00:05:42 2015 +0000 - Add an optional flag and a type for UUID parameters for stat taps. + Update CMake "Project names" and Folders - For future use, with common code to parse the -z argument. + This gives a more structured layout in Visual Studio - Change-Id: Ib2a11bd5c91b5ac48ced2cd2d112b97c301ff72a - Reviewed-on: https://code.wireshark.org/review/5307 - Reviewed-by: Guy Harris + Change-Id: I0da87a3e5ec759c69aeee031366cf287485cdac2 + Reviewed-on: https://code.wireshark.org/review/6485 + Reviewed-by: Graham Bloice + Tested-by: Graham Bloice -commit 42c6e57 -Author: Stephen Fisher -Date: Fri Nov 14 12:17:36 2014 -0700 +commit b2f03cb +Author: Gerald Combs +Date: Sat Jan 10 14:41:55 2015 -0800 - Update my e-mail address again. + make-version.pl updates. - Change-Id: I0083bbf84658dbb0d4cef91e9e8f5855b8a2ba4f - Reviewed-on: https://code.wireshark.org/review/5306 - Reviewed-by: Stephen Fisher - -commit c3582a6 -Author: Guy Harris -Date: Fri Nov 14 10:55:50 2014 -0800 - - There's nothing GTK+ about TShark. + Set the version variables in CMakeLists.txt directly from + make-version.pl instead of pulling them from configure.ac. - Remove gtk from routine names in CLI taps. + Use the correct default value for VERSION_EXTRA in config.nmake. - Change-Id: I0846da9b1e8119ed966b441cb1ca0ce1820fd1c8 - Reviewed-on: https://code.wireshark.org/review/5305 - Reviewed-by: Guy Harris + 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 -commit 4d3c4c4 -Author: Guy Harris -Date: Fri Nov 14 10:51:40 2014 -0800 +commit 2219f78 +Author: Martin Mathieson +Date: Sat Jan 10 19:48:05 2015 +0000 - Rename stat_cmd_args.[ch] to stat_tap_ui.[ch]. + Netflow: do transport resolution on ports (if know they are UDP or TCP) - The intent is to handle more than just command-line arguments; reflect that. - - Change-Id: Ia10efda85a9d11c6579d1bec6f789cee30d9e825 - Reviewed-on: https://code.wireshark.org/review/5304 - Reviewed-by: Guy Harris + Change-Id: I8fc3675f03b7eaec6a9385638197067981762a70 + Reviewed-on: https://code.wireshark.org/review/6474 + Petri-Dish: Martin Mathieson + Reviewed-by: Martin Mathieson -commit 0dae81b -Author: Irene Ruengeler -Date: Fri Nov 14 10:06:51 2014 +0100 +commit 14cad60 +Author: Michael Mann +Date: Sat Jan 10 14:20:06 2015 -0500 - Allow SCTP graphs to resize with the window they're in. + Remove ep_ allocated memory from get_conversation_filter and just return a g_alloced string. - Bug: 10698 - Change-Id: I3304bd36945619aeb405c74917f21de3faa3fcbb - Reviewed-on: https://code.wireshark.org/review/5284 - Reviewed-by: Jeff Morriss + Change-Id: Ie7f6b2c5479fec1a44afb5e446ef6abf304113af + Reviewed-on: https://code.wireshark.org/review/6480 + Reviewed-by: Michael Mann -commit a21436e -Author: Guy Harris -Date: Fri Nov 14 10:42:26 2014 -0800 +commit 59c1e32 +Author: Michael Mann +Date: Fri Jan 9 12:51:15 2015 -0500 - tap_ui -> stat_tap_ui. + Add BASE_SPACE for FT_BYTES - The old routine had stat_ in the name, as the expectation was that they - were for statistics taps; that's still the expectation, so have stat_ in - the data structure and routine names. + 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)? - Change-Id: Ic98d011012b8641173d41fa0ec4f4e625614370a - Reviewed-on: https://code.wireshark.org/review/5303 - Reviewed-by: Guy Harris + Change-Id: I1a8f1ab263ece2736a8012b66fdd6a9105db7282 + Reviewed-on: https://code.wireshark.org/review/6451 + Reviewed-by: Michael Mann -commit 0e64efc -Author: Guy Harris -Date: Fri Nov 14 10:35:42 2014 -0800 +commit effc826 +Author: Michael Mann +Date: Sun Jan 4 11:17:53 2015 -0500 - Use G_GUINT64_FORMAT to format a guint64. + Add preference to display spaces between bytes for FT_BYTES fields. - A 64-bit integer isn't necessarily a long, it might be a long long. Use - G_GUINT64_FORMAT to format it. + I think this can make fields more readable (for a small amount of bytes). - Make it a guint64 while we're at it - the field is a FT_GUINT64. + 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: I7ee855905ea77347576005441824b1c4630f5659 - Reviewed-on: https://code.wireshark.org/review/5302 - Reviewed-by: Guy Harris + Change-Id: I59e2acf9b00a4eb1279e6c2b2b7bd8ecef20db9b + Reviewed-on: https://code.wireshark.org/review/6304 + Reviewed-by: Michael Mann -commit 7390516 +commit 02fb290 Author: Guy Harris -Date: Fri Nov 14 10:31:04 2014 -0800 +Date: Sat Jan 10 11:47:46 2015 -0800 - For tap UIs, register a list of parameters and some menu information. + Sort the value_string_exts at dissector registration time. - The intent here is to centralize more UI information so that we can move - more tap UI stuff to common code. This is a beginning. + You *CANNOT* defer it until dissection time, otherwise "tshark -G + values" will fail. - Change-Id: Ic35ac0c01bc7b942aab88177db4065847a5e6c30 - Reviewed-on: https://code.wireshark.org/review/5301 + Change-Id: I4edf9abda271baaf916f020a211b9add5543ecc7 + Reviewed-on: https://code.wireshark.org/review/6481 Reviewed-by: Guy Harris -commit 09f0d2c -Author: Bill Meier -Date: Wed Nov 12 23:38:40 2014 -0500 +commit 531a9f0 +Author: Guy Harris +Date: Sat Jan 10 11:39:43 2015 -0800 - hiqnet: Improve dissection for hiqnet over TCP or UDP - - -- Use tcp_dissect_pdus() for hiqnet over tcp so as to properly - handle hiqnet PDUS is a TCP stream of data; - - -- Handle possible multiple hiqnet PDUs in a UDP payload. + Squelch a compiler warning. - -- Add Fixme: re multiple hiqnet PDUs in a frame. + 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. - Change-Id: I3527c6ea13571d16bcf23dd3771d0a89734a7c5a - Reviewed-on: https://code.wireshark.org/review/5267 - Reviewed-by: Raphaël Doursenaud - Reviewed-by: Bill Meier + Change-Id: Id668efe666634798c278958bd7e6d790ec476539 + Reviewed-on: https://code.wireshark.org/review/6479 + Reviewed-by: Guy Harris -commit a55d18e -Author: Bill Meier -Date: Wed Nov 12 22:04:37 2014 -0500 +commit 51acf16 +Author: Robert Grange +Date: Fri Jan 9 11:06:10 2015 +0100 - hiqnet: Simplify code somewhat; Adjust the "names" and display of certain fields. + packet-mq: sort some value_string_ext in dissector - Specifically: Use proto_tree_add_bitmask() to show the "flags" and - "categories" bitfields (instead of building the fields - display "by hand"). - The bitfield display changed as follows: - - A bitfield with all bits=0 will have a detailed - dissection tree; (for both 'flags' & 'categories'); - - The 'categories' individual bitfields are now - displayed as FT_BOOLEAN (not FT_UINT32). + Some value_string_ext are sorted only in the dissector, + and only once. - Change-Id: Icd35698aae492b81b340d08030e6a1563f1640ae - Reviewed-on: https://code.wireshark.org/review/5266 - Reviewed-by: Bill Meier - -commit 9a1df71 -Author: AndersBroman -Date: Fri Nov 14 15:39:45 2014 +0100 - - [S1AP) Wrong tree used - s1ap.cnf:547:14: error: variable 'subtree' set but not used + Adapted as said in comments. + Added test for sort in dissect_mq_spx - Change-Id: I84a345709b1ef9688f3f1a4e876a75dd575c1c2e - Reviewed-on: https://code.wireshark.org/review/5299 - Reviewed-by: Anders Broman + Change-Id: If72159fe96ab28a3ed540778d67996e152b4f110 + Reviewed-on: https://code.wireshark.org/review/6444 + Reviewed-by: Pascal Quantin -commit 56fa29e -Author: AndersBroman -Date: Fri Nov 14 14:53:02 2014 +0100 +commit b760da9 +Author: Pascal Quantin +Date: Sat Jan 10 10:16:37 2015 +0100 - [S1AP] Let the A21 dissector do further dissection of Cdma2000SectorID + MQ: ensure that at least 4 bytes were captured before doing heuristic checks - Change-Id: I8c503acf6860b34d24769cdf981dcaeea4667ffb - Reviewed-on: https://code.wireshark.org/review/5298 - Reviewed-by: Anders Broman - -commit d6f2392 -Author: Michal Labedzki -Date: Fri Nov 14 13:39:29 2014 +0100 - - Fix declaration in btavrcp + Otherwise it could trigger an exception - Change-Id: I47e4ad2baa7ca4c48e8c0eea472e568fc06d3386 - Reviewed-on: https://code.wireshark.org/review/5297 + Change-Id: I280e3c5d9e5554e4be49035c03e0170ae4495e6e + Reviewed-on: https://code.wireshark.org/review/6463 + Reviewed-by: Robert Grange Reviewed-by: Pascal Quantin -commit d7cc141 -Author: Michal Labedzki -Date: Wed Nov 12 12:00:46 2014 +0100 +commit 7600ddb +Author: Alexis La Goutte +Date: Sat Jan 10 16:12:29 2015 +0100 - Bluetooth: Ubertooth: Update to the latest firmware + UTS: fix Copy-paste error (CID 11158603) - Changelog: - - add some assign numbers - - implement new type of usb_rx_packet: LE_PROMISC - - Change-Id: Iffe01a50f873221c695f16a76c1954d6c82d73df - Reviewed-on: https://code.wireshark.org/review/5289 - Petri-Dish: Michal Labedzki - Reviewed-by: Michal Orynicz - Tested-by: Petri Dish Buildbot - Reviewed-by: Michal Labedzki + Change-Id: Ibabb8ab3ccb0543856c84822542baa1ac0139f7e + Reviewed-on: https://code.wireshark.org/review/6472 + Reviewed-by: Michael Mann -commit 9952e7c -Author: AndersBroman -Date: Fri Nov 14 12:54:33 2014 +0100 +commit 15ac6eb +Author: Alexis La Goutte +Date: Sat Jan 10 16:12:07 2015 +0100 - [BSSMAP] Handle vendor specific encoding of "Layer 3 Message Contents". + ISMACRYP: fix Copy-paste error (CID 11158602) - Change-Id: I351bc0a6a8ae636b2f888a80f61e526096a61b64 - Reviewed-on: https://code.wireshark.org/review/5295 - Reviewed-by: Anders Broman + Change-Id: I4978627115f46a8aa90ccf67f7c008cdf9986da6 + Reviewed-on: https://code.wireshark.org/review/6471 + Reviewed-by: Michael Mann -commit e83c7f0 -Author: Pascal Quantin -Date: Fri Nov 14 10:07:52 2014 +0100 +commit e2fa5a5 +Author: Alexis La Goutte +Date: Sat Jan 10 16:11:41 2015 +0100 - NAS EPS: fix dissection of APN AMBR IE when first byte is set to 0xFE + CTDB: fix Copy-paste error (CID 11158596) - Bug: 10699 - Change-Id: I0f359639d5836f557370ab6d6aad45faa4417b6e - Reviewed-on: https://code.wireshark.org/review/5285 - Tested-by: Pascal Quantin - Petri-Dish: Pascal Quantin - Tested-by: Petri Dish Buildbot - Reviewed-by: Pascal Quantin + Change-Id: Ieaa70505f4b880569be6126166a71f32d84f79a8 + Reviewed-on: https://code.wireshark.org/review/6470 + Reviewed-by: Michael Mann -commit f172791 -Author: Michal Labedzki -Date: Sun Nov 2 18:55:40 2014 +0100 +commit 6780519 +Author: Alexis La Goutte +Date: Sat Jan 10 16:11:15 2015 +0100 - Translations: Update Polish translation + NLM: fix Copy-paste error (CID 11158588) - All messages are translated now. - - Tłumaczenie Wiresharka jest teraz kompletne. Zachęcam do testowania - i wytykania błędów. - - Change-Id: Iaffb2e581c765b5b3dff7750f878e6391539ebd6 - Reviewed-on: https://code.wireshark.org/review/5293 - Reviewed-by: Michal Labedzki + Change-Id: I0d2736f3e00c62bb908e346a641d0ddc8b171fd2 + Reviewed-on: https://code.wireshark.org/review/6469 + Reviewed-by: Michael Mann -commit f1dee59 -Author: Michal Labedzki -Date: Wed Nov 12 11:57:12 2014 +0100 +commit 0f6b09d +Author: Alexis La Goutte +Date: Sat Jan 10 16:26:55 2015 +0100 - Bluetooth: A2DP: Add AVRCP song position indicator + to_str (epan): fix parameter 'scope' not found in the function declaration [-Wdocumentation] - "sbc.avrcp_song_position" can be used to determine time synchronization - between AVRCP and A2DP. It is updated on every - AVRCP PlaybackPositionChanged. Also provide version for aptx. - - Change-Id: I48cd49f0fee54131a738290e2a70a24d33ba1d22 - Reviewed-on: https://code.wireshark.org/review/5290 - Reviewed-by: Michal Labedzki + Change-Id: Ie414d28415b71a79780d37fae454b90a7a610e1c + Reviewed-on: https://code.wireshark.org/review/6475 + Reviewed-by: Michael Mann -commit ad1977b +commit 1a30c97 Author: Michal Labedzki -Date: Thu Nov 13 10:52:16 2014 +0100 +Date: Fri Dec 19 15:43:50 2014 +0100 - Qt: Fix non-translate-able text + Bluetooth: A2DP: APT-X: Unhardcode stream configuration - Change-Id: I8c2376117ca1ac92c341ba938929af2d13e23f72 - Reviewed-on: https://code.wireshark.org/review/5291 + Change-Id: I16cfb4d014020a7fb2c67fef3128021c9901719a + Reviewed-on: https://code.wireshark.org/review/6442 + Petri-Dish: Michal Labedzki Reviewed-by: Michal Labedzki + Tested-by: Michal Labedzki -commit 6d678ff +commit f343710 Author: Michal Labedzki -Date: Thu Nov 13 19:42:36 2014 +0100 +Date: Mon Dec 29 09:45:40 2014 +0100 - Qt: Fix typo + Bluetooth: HCI: Detect Vendor by "Read Local Version Information" + + 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) - Change-Id: Idc2b945ac3bd5de961cc9c581398dc12f6831070 - Reviewed-on: https://code.wireshark.org/review/5292 + Change-Id: I1fa748a67ad7943e61d4445d240f0578b94560fc + Reviewed-on: https://code.wireshark.org/review/6408 + Petri-Dish: Michal Labedzki + Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki + Tested-by: Michal Labedzki -commit 38218df +commit 55df238 Author: Michal Labedzki -Date: Fri Nov 7 15:41:29 2014 +0100 +Date: Mon Dec 29 08:53:15 2014 +0100 - Bluetooth: AVRCP: Improve command/response trancing + Bluetooth: SMP: Add missing opcode for "Identity Address Information" + + Also fix tvb_length, tvb_length_remaining warnings. - Make command/response tracking field filterable and jumpable. + Bug: 10299 - Change-Id: Ib0dfc9ea9954f8d29d06ceda3d44a7f95c94bc53 - Reviewed-on: https://code.wireshark.org/review/5288 + Change-Id: Ib8b55ea9f2220394a5896d13e5cc4e2cefff1e13 + Reviewed-on: https://code.wireshark.org/review/6407 + Petri-Dish: Alexis La Goutte Reviewed-by: Michal Labedzki + Tested-by: Michal Labedzki -commit 5a46f26 +commit d6e0409 Author: Michal Labedzki -Date: Fri Nov 7 10:47:33 2014 +0100 +Date: Tue Dec 23 14:57:45 2014 +0100 - Bluetooth: AVRCP: Fix swappend SongPosition and SongLength + Bluetooth: Add HCI Vendor Broadcom dissector - SongPosition and SongLength are swapped in Info column. Fix it. + 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. - Change-Id: I4c9bece51dbfe62885e8426a8aef07f336670099 - Reviewed-on: https://code.wireshark.org/review/5287 + Change-Id: Ie68d3737c88a8cef39260a9d93192cfc81871d6c + Reviewed-on: https://code.wireshark.org/review/6406 Reviewed-by: Michal Labedzki + Tested-by: Michal Labedzki -commit 6e44997 +commit c69b2ab Author: Michal Labedzki -Date: Mon Nov 3 10:14:28 2014 +0100 +Date: Sat Jan 3 16:26:53 2015 +0100 - Bluetooth: AVDTP: Add possibility to force decode as APT-X + Bluetooth: ATT: Dissect opcode with more precision - Change-Id: Id99647846c9bc7666f33938c811358576353390d - Reviewed-on: https://code.wireshark.org/review/5286 + Change-Id: Iddc1a6d899b10b0d5c25723a71da7dcd11c6dfad + Reviewed-on: https://code.wireshark.org/review/6405 + Petri-Dish: Michal Labedzki Reviewed-by: Michal Labedzki + Tested-by: Michal Labedzki -commit 2986388 -Author: Alexis La Goutte -Date: Wed Nov 12 16:40:02 2014 +0100 +commit 7177ced +Author: Michal Labedzki +Date: Wed Dec 17 16:12:41 2014 +0100 - dtd_preparse : fix indent (Use tabs) + USB: Fix Conversation/Endpoint filters - Change-Id: Iec6ef7109ccea8a164db4f62af9fae1dceba6ae6 - Reviewed-on: https://code.wireshark.org/review/5282 - Reviewed-by: Anders Broman + There were not fields for that, so simple add them. + + Change-Id: I489bae24ac96ea0baf395add731f4d62ccf19352 + Reviewed-on: https://code.wireshark.org/review/6401 + Petri-Dish: Michal Labedzki + Tested-by: Michal Labedzki + Reviewed-by: Michal Labedzki -commit 2788df9 +commit c93d0ab Author: Alexis La Goutte -Date: Wed Nov 12 17:10:40 2014 +0100 +Date: Fri Jan 9 17:12:26 2015 +0100 - Gtk Utils: fix unknown command tag name 'parm'; did you mean 'param'? (-Wdocumentation) + IS-IS: Incorrect decoding of IPv4 Interface/Neighbor Address sub-TLVs in Extended IS Reachability TLV - Change-Id: I89f242bf916d22e0a4a665696ec3fe5ee02b8a1f - Reviewed-on: https://code.wireshark.org/review/5283 - Reviewed-by: Anders Broman - -commit 6e535a8 -Author: Michael Mann -Date: Thu Nov 13 20:37:46 2014 -0500 - - Multipath TCP checksum requires M flag set as well as enough option length. + 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. - Bug: 10692 - Change-Id: I8d9874a2c0a6b98497d43804bcf27a8c7e152a9b - Reviewed-on: https://code.wireshark.org/review/5275 + 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 + Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann - Petri-Dish: Michael Mann - Reviewed-by: Alexis La Goutte -commit 4a7dd62 +commit 5fe1f66 Author: Michael Mann -Date: Thu Nov 13 22:38:54 2014 -0500 +Date: Fri Jan 9 23:04:47 2015 -0500 - Always create a subtree for Mobility options, even if it doesn't have a specific dissection function. + Finish off emem_strbuf_t usage. - Bug: 10618 - Change-Id: Ic4d52485a6bd96f906b4a0d61b75a31bfad4e8f8 - Reviewed-on: https://code.wireshark.org/review/5276 + Change-Id: Ib0b911c86a7f8a7cca022e9e324c910664ce397e + Reviewed-on: https://code.wireshark.org/review/6461 Reviewed-by: Michael Mann -commit c2e090f -Author: Ryan Doyle -Date: Wed Nov 12 20:36:49 2014 +1100 - - Dissector for elasticsearch protocol - - Provides dissection for the elasticsearch protocol. This includes full - dissection of the multicast discovery protocol, the HTTP query interface - and partial dissection of the binary protocol. - - Change-Id: I738fb498976e44fa05168c2bc3a7e842a9e96df9 - Reviewed-on: https://code.wireshark.org/review/4948 - Reviewed-by: Alexis La Goutte - -commit 4cc4315 -Author: Sven Eckelmann -Date: Wed Oct 1 18:26:12 2014 +0200 +commit 3a9869d +Author: Evan Huus +Date: Fri Jan 9 12:28:10 2015 -0500 - batadv: Add dissector support for batadv v15 + Remove/replace ep_strsplit() - The packet format for batman-adv v15 supports: - - * Complete reordered packet type ids - * reordered flags - * type-version-length-value data containers - * new types for coding packets and unicast transfer of TVLVs - * dropped packet types for vis, translation table query and roaming - * reordered packet formats - * transparent fragmentation of batadv packets - - Change-Id: I9e6733f9dd6b54eeecda19cf570599161d28b46e - Signed-off-by: Sven Eckelmann - Signed-off-by: Simon Wunderlich - Reviewed-on: https://code.wireshark.org/review/5175 + Change-Id: I4a803d83844d937804849b2ad3b067381c9b96d0 + Reviewed-on: https://code.wireshark.org/review/6448 + Petri-Dish: Evan Huus + Reviewed-by: Evan Huus Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann -commit 9cc9028 -Author: Lukas Emersberger -Date: Fri Oct 17 14:13:06 2014 +0200 - - epl: Duplicated Frames - - Remake of the duplicated frames filter with - less memory usage. - - Change-Id: I7c8694b5ae69c919b866bbc661bad5e3f0a3e1d7 - Reviewed-on: https://code.wireshark.org/review/4773 - Reviewed-by: Roland Knall - Petri-Dish: Michael Mann - Reviewed-by: Lukas Emersberger - Reviewed-by: Michael Mann - -commit ab7f35d -Author: Guy Harris -Date: Thu Nov 13 00:43:17 2014 -0800 - - hf_cc_loss is supposed to be a floating-point value, divided by 65535. - - That's what the code did when it used proto_tree_add_text(); make it do - so now. That squelches a run-time error. - - Reformat the script-added hf_ values while we're at it. - - Change-Id: I48d16280c523faa3b266e8df37f5e0e0b2827712 - Reviewed-on: https://code.wireshark.org/review/5270 - Reviewed-by: Guy Harris - -commit 67f86dd -Author: Guy Harris -Date: Wed Nov 12 21:22:05 2014 -0800 - - Get rid of spaces before tabs. - - Change-Id: I70ff250a905ac578d7e3afc63a82a5fcb3983608 - Reviewed-on: https://code.wireshark.org/review/5269 - Reviewed-by: Guy Harris - -commit d1ccc33 -Author: Michael Mann -Date: Sun Nov 9 21:13:38 2014 -0500 +commit e54b5f0 +Author: Gerald Combs +Date: Fri Jan 9 10:39:17 2015 -0800 - Add dissector table for sFlow header dissection. + CMake: Copy admonition graphics to the correct directory. - Change-Id: I189a5b2d5f769395fa5e387f8be49b81903fb252 - Reviewed-on: https://code.wireshark.org/review/5262 - Reviewed-by: Michael Mann - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman + Change-Id: Iecba4000c487a90efedfc7547771539c3748a7f0 + Reviewed-on: https://code.wireshark.org/review/6454 + Reviewed-by: Gerald Combs -commit 17798bc -Author: Guy Harris -Date: Wed Nov 12 21:19:41 2014 -0800 +commit 8bd80e0 +Author: Gerald Combs +Date: Fri Jan 9 13:53:17 2015 -0800 - Handle duplicate attribute and TLV entries specially. - - For attributes, handle them the same way we handle duplicate vendors. + CMake: Set WIRESHARK_TARGET_PLATFORM. - For TLVs, ignore duplicates; they shouldn't happen. + 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. - Change-Id: Ie968478c40a9b7848fa8ea25b144eda8656e5874 - Reviewed-on: https://code.wireshark.org/review/5268 - Reviewed-by: Guy Harris + Change-Id: Ief43733bdf162998cd54ff3732f94c8baa3d1e11 + Reviewed-on: https://code.wireshark.org/review/6458 + Reviewed-by: Gerald Combs -commit f8e24c9 -Author: Michael Mann -Date: Wed Nov 5 23:07:35 2014 -0500 +commit a81f0d1 +Author: Gerald Combs +Date: Fri Jan 9 14:15:39 2015 -0800 - Eliminate proto_tree_add_text for some dissectors. + Fix airpdcap debugging code. - Change-Id: Ide14bcac0b1563bee4260ac9c1a280ba99e97e71 - Reviewed-on: https://code.wireshark.org/review/5261 - Reviewed-by: Michael Mann - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman + Change-Id: Ied1094dd3c6ad176fea830c0857ba43e09d3cb10 + Reviewed-on: https://code.wireshark.org/review/6457 + Reviewed-by: Gerald Combs -commit 0515087 -Author: Guy Harris -Date: Wed Nov 12 19:01:26 2014 -0800 +commit 2bb26ea +Author: Gerald Combs +Date: Fri Jan 9 10:23:51 2015 -0800 - Handle new vendors and changes to vendors differently. - - If, when adding a new vendor, we already find a vendor with the given - ID, don't bother adding it to the vendors-by-ID table with the same ID, - and, if and only if the vendor name has changed, remove it from the - vendors-by-name table, free the old name, replace it with the new name, - and, add it back to the vendors-by-name table with the new name. + CMake: Copy CHM graphics from the correct source. - Bug: 10666 - Change-Id: I43ebcb57c742563157c71b01ebc0b35797a408e1 - Reviewed-on: https://code.wireshark.org/review/5265 - Reviewed-by: Guy Harris + Change-Id: Iea67bdaf8d83009c808bd39693fe273b3181ff76 + Reviewed-on: https://code.wireshark.org/review/6452 + Reviewed-by: Gerald Combs -commit f598fa8 -Author: Guy Harris -Date: Wed Nov 12 18:11:00 2014 -0800 +commit f5de0c4 +Author: Martin Mathieson +Date: Fri Jan 9 18:11:26 2015 +0000 - Squelch a compiler warning. + Netflow: Fix some duplicate label names - Some compilers complain that we're casting a 16-bit integer to a - pointer; making it a standard-size integer squelches the warning. - - Change-Id: Iba0e767d7801afdc369b64a1cf050bf8db37da7b - Reviewed-on: https://code.wireshark.org/review/5264 - Reviewed-by: Guy Harris + Change-Id: I077bdd6394898a445c00a1e7aec1c4c11b3e9ec2 + Reviewed-on: https://code.wireshark.org/review/6450 + Reviewed-by: Martin Mathieson -commit f7d91bd -Author: Gerald Combs -Date: Tue Nov 11 09:56:58 2014 -0800 +commit 4f65899 +Author: Gerald Combs +Date: Fri Jan 9 08:58:15 2015 -0800 - Qt: Flatten group boxes. + CMake: Migrate to hhc.cmake. - As discussed in change 5185, the "big 3" HIGs discourage the use of - traditional group boxes. Flatten our existing ones. + Remove FindHHC.cmake in favor of CMake's FindHTMLHelp. Remove the + hhc.cmd wrapper. - Change-Id: I68ef4aa9fd0f69a42750bf735df2250a468bfb2d - Reviewed-on: https://code.wireshark.org/review/5263 + Change-Id: I548e58d2264c74596e9067d5053b056c35089b3c + Reviewed-on: https://code.wireshark.org/review/6449 Reviewed-by: Gerald Combs -commit 6df5252 -Author: Michael Mann -Date: Sun Nov 9 15:44:56 2014 -0500 +commit ffb6f10 +Author: Gerald Combs +Date: Thu Jan 8 17:16:09 2015 -0800 - Add Decode As functionality for MPLS PW Associated Channel Type. - - Add CFM and MPLS dissector as possible decoders. + CMake: Cygwin-ify the xmllint path as well. - Bug: 10574 - Change-Id: Ic39c6b8d68b965ff9d342f5ee789a8eff3134a5a - Reviewed-on: https://code.wireshark.org/review/4935 - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Change-Id: I5e62ed6baeed3fcb76cdffd30666ad01713acd2a + Reviewed-on: https://code.wireshark.org/review/6439 + Reviewed-by: Gerald Combs -commit ae1630d -Author: Alexis La Goutte -Date: Wed Nov 12 12:57:36 2014 +0100 +commit 1b4f965 +Author: Dario Lombardo +Date: Fri Jan 2 15:28:20 2015 +0100 - Fix warning: no previous prototype for function ... [-Wmissing-prototypes] + Some typos fixed. - warning coming after g055e4768ece and g421913b721 - - Change-Id: I5caeeb89c559faef8007f2946c68c7172b75dfa8 - Reviewed-on: https://code.wireshark.org/review/5250 - Petri-Dish: Alexis La Goutte - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Change-Id: I65df0c40d771c4854b73fd5c35d1af600f15f324 + Reviewed-on: https://code.wireshark.org/review/6445 + Reviewed-by: Pascal Quantin -commit 54aea45 +commit 872a239 Author: AndersBroman -Date: Wed Nov 12 14:15:48 2014 +0100 +Date: Fri Jan 9 10:16:06 2015 +0100 - [Art-Net] - - The heuristic chek was missing "e" out of "Art-Net\0" - - tvb_length() - tvb_captured_length() + Add missing #include ( "ui/gtk/old-gtk-compat.h" ) - Change-Id: Iad9900f3a22e2fdbd0d6056efc1af90511cc458a - Reviewed-on: https://code.wireshark.org/review/5257 + Change-Id: Ic53c3cd4a38c587ab3c0dcb9f8349ca50e338f80 + Reviewed-on: https://code.wireshark.org/review/6443 Reviewed-by: Anders Broman -commit 63cf939 -Author: Alexis La Goutte -Date: Wed Nov 12 12:26:22 2014 +0100 +commit 284229c +Author: Michael Mann +Date: Thu Jan 8 13:16:01 2015 -0500 - ADB: fix warning: no newline at end of file [-Wnewline-eof] - - Warning found by Clang + Convert EUI64 address APIs to use wmem. - Change-Id: I7b801808aefa294e32fff560ea1a49620f0e0ea0 - Reviewed-on: https://code.wireshark.org/review/5249 - Petri-Dish: Alexis La Goutte - Reviewed-by: Michal Orynicz + Change-Id: I57d2e435ac72ea07ec9a567e0b1ce4410966e3d2 + Reviewed-on: https://code.wireshark.org/review/6419 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann Reviewed-by: Anders Broman -commit 2043c9d -Author: Dario Lombardo -Date: Wed Nov 12 11:06:45 2014 +0100 +commit 17f1a44 +Author: Michal Labedzki +Date: Fri Dec 19 15:41:57 2014 +0100 - Updates in it translation. + Bluetooth: AVDTP: Fix other-side Reconfigure - Change-Id: I9e90fca521f17f4ae49e132990f77b2610807e6d - Reviewed-on: https://code.wireshark.org/review/5248 - Reviewed-by: Alexis La Goutte - -commit f2d94e1 -Author: Alexis La Goutte -Date: Tue Nov 11 12:52:04 2014 +0100 - - PIM: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + It is used to properly configure internal SEP data using to + properly decode music stream. - Change-Id: I1540c7878692625a9e38b48f8681c07bab852a64 - Reviewed-on: https://code.wireshark.org/review/5234 + Change-Id: If8a15267ce072eaedfac947d7558be2d3e796483 + Reviewed-on: https://code.wireshark.org/review/6404 + Petri-Dish: Michal Labedzki Reviewed-by: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michal Labedzki + Tested-by: Michal Labedzki -commit 219cf30 -Author: Jeff Morriss -Date: Tue Nov 11 15:22:12 2014 -0500 +commit 5be440f +Author: Michal Labedzki +Date: Thu Dec 18 10:42:01 2014 +0100 - Fix SMPP timestamp decoding when the current date/time's offset to UTC is - different from the timestamp's offset to UTC. + Bluetooth: AVDTP/VDP: Add link to first and last packet in the stream - The fix for bug 6712 ignored the fact that daylight savings will affect the - offset from UTC--and whether daylight savings is in effect today might be - different than whether it was in effect in the timestamp we're decoding. + Useful for analyzing stream issues. - Bug: 10672 - Change-Id: Ie513c361cff41007f2328cd9ca9ca4800ffef500 - Reviewed-on: https://code.wireshark.org/review/5245 - Petri-Dish: Michael Mann - Petri-Dish: Jeff Morriss - Reviewed-by: Michael Mann + Change-Id: I1c9f43807dc3abc050cf17c971fbd270b812faa5 + Reviewed-on: https://code.wireshark.org/review/6402 + Petri-Dish: Michal Labedzki + Tested-by: Petri Dish Buildbot + Reviewed-by: Michal Labedzki + Tested-by: Michal Labedzki -commit cfd71d7 -Author: Jeff Morriss -Date: Tue Nov 11 20:48:39 2014 -0500 +commit 879a221 +Author: Michal Labedzki +Date: Thu Dec 18 15:19:50 2014 +0100 - Fix a couple of (AFAICS false) may-be-used-uninitialized warnings that show up - on the OSX 10.5 buildbot. + Bluetooth: BTLE RF: Remove tree and reduce indentation level - Change-Id: I49e066feab8b980ea85371095234e96e89db71e1 - Reviewed-on: https://code.wireshark.org/review/5247 - Reviewed-by: Jeff Morriss - -commit ea5b234 -Author: Jeff Morriss -Date: Tue Nov 11 15:37:04 2014 -0500 - - Fix a couple of (AFAICS false) may-be-used-uninitialized warnings that show up with gcc 4.8.3. + Useless check for tree avoid setting Bluetooth addresses. - Change-Id: I71c9013670dd6e8c74e039bd252cfac2c9e95a18 - Reviewed-on: https://code.wireshark.org/review/5246 - Reviewed-by: Jeff Morriss + Change-Id: If38465679370c5ea74f6d916e409e337d60cf7db + Reviewed-on: https://code.wireshark.org/review/6403 + Petri-Dish: Michal Labedzki + Tested-by: Petri Dish Buildbot + Reviewed-by: Michal Labedzki + Tested-by: Michal Labedzki -commit 2f3e577 -Author: AndersBroman -Date: Tue Nov 11 21:21:28 2014 +0100 +commit 6a6e2ef +Author: Michael Mann +Date: Thu Jan 8 12:13:18 2015 -0500 - [GTP] Fix decoding of UMTS GTP QoS Profile i n Radius and Diameter - messages. - Fixes Bug 10688 + Have ipxnet addresses use wmem scoped memory. - Change-Id: Iff29ae3f6cee1b4ad12a0e5c5d7fd3da1c9343af - Reviewed-on: https://code.wireshark.org/review/5244 + Change-Id: I1d8eed2ceacccce2768590f0689cd2c83a5e56e9 + Reviewed-on: https://code.wireshark.org/review/6418 + Petri-Dish: Hadriel Kaplan Reviewed-by: Anders Broman -commit feedcb0 -Author: AndersBroman -Date: Tue Nov 11 21:00:16 2014 +0100 +commit 456095c +Author: Michael Mann +Date: Thu Jan 8 11:54:36 2015 -0500 - [Radius] Make dictionary.starent.vsa1 the default dictionary. - at least with the trace in Bug 10688 that makes the most sense. + disperse atalk-utils.[ch] + + 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. - Change-Id: I76213449076a2f49a4b72c6dd87b022fb10b9eef - Reviewed-on: https://code.wireshark.org/review/5242 + 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 Reviewed-by: Anders Broman -commit b1c91b0 -Author: Alexis La Goutte -Date: Tue Nov 11 19:35:55 2014 +0100 +commit d296c75 +Author: Michael Mann +Date: Thu Jan 8 13:59:33 2015 -0500 - Tools: Add fix_pragma_wdocumentation to UNKNOWN licence + Some more random removal of ep_ memory. - Change-Id: Ib5665924b99644c52c95d408c7cff19509cf3eb2 - Reviewed-on: https://code.wireshark.org/review/5241 - Reviewed-by: Alexis La Goutte + Change-Id: I6eccd20280e907bd9e6a5fcf873ccf80afddecac + Reviewed-on: https://code.wireshark.org/review/6416 + Petri-Dish: Hadriel Kaplan + Reviewed-by: Anders Broman -commit dfaaba8 -Author: Bill Meier -Date: Tue Nov 11 12:56:34 2014 -0500 +commit 45cbdbc +Author: AndersBroman +Date: Thu Jan 8 10:01:56 2015 +0100 - hiqnet: Use correct filter names; Fix specification of hf_dhcp - - "foo.flags..." --> "hiqnet.flags..."; - Use BASE_NONE for hf_dchp. + Add missing #include ( "ui/gtk/old-gtk-compat.h" ) - Change-Id: Ic3ca4754a1daeefc831dbfcd6a280fe19f8efbf3 - Reviewed-on: https://code.wireshark.org/review/5240 - Reviewed-by: Bill Meier + Change-Id: I03ddea2fc7db52df1ff3571e196250bc5e3ff036 + Reviewed-on: https://code.wireshark.org/review/6410 + Petri-Dish: Alexis La Goutte + Reviewed-by: Anders Broman -commit bd9ff6b -Author: Alexis La Goutte -Date: Sat Nov 8 18:21:07 2014 +0100 +commit fb40fd3 +Author: Joerg Mayer +Date: Fri Jan 9 02:34:21 2015 +0100 - Add tools for fix -Wdocumentation - - Use pragma to disable -Wdocumentation when include glib.h, gmodule or gtk/gtk.h + 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 ". - Change-Id: I576c0d5c4a12ac3b505ac9543646356ff29ac814 - Reviewed-on: https://code.wireshark.org/review/5198 - Reviewed-by: Alexis La Goutte + Change-Id: Ib2584379c512cbd7f437f36ef932b372fe02203a + Reviewed-on: https://code.wireshark.org/review/6440 + Reviewed-by: Jörg Mayer -commit 7e2ede3 -Author: Alexis La Goutte -Date: Tue Nov 11 17:56:05 2014 +0100 +commit 4bc8d0f +Author: Gerald Combs +Date: Thu Jan 8 16:55:26 2015 -0800 - Hiqnet: fix warning found by fix-encoding-args tools + CMake: Try to fix the xsltproc path. - Change-Id: I7e513ec5b617217cd238861f5f02d44edce0bedd - Reviewed-on: https://code.wireshark.org/review/5239 - Reviewed-by: Alexis La Goutte - -commit 0f4860b -Author: Alexis La Goutte -Date: Tue Nov 11 17:50:17 2014 +0100 - - Hiqnet: fix Mac OS X buildbot + Try to make the xsltproc path compatible with Cygwin. This is a blind + attempt to fix the Windows 8 buildbot. It works fine locally. - Change-Id: Ia4fec86ed389ccb558fe9e1acfb6e87b7012bb75 - warning: declaration of 'strlen' shadows a global declaration - Reviewed-on: https://code.wireshark.org/review/5237 - Petri-Dish: Alexis La Goutte - Tested-by: Petri Dish Buildbot - Reviewed-by: Alexis La Goutte + Change-Id: Ib9d55dd07c6b17cfddf313716227d347109d2103 + Reviewed-on: https://code.wireshark.org/review/6438 + Reviewed-by: Gerald Combs -commit 41cc80e -Author: Alexis La Goutte -Date: Tue Nov 11 17:54:09 2014 +0100 +commit 67b1593 +Author: Michael Mann +Date: Thu Jan 8 16:16:56 2015 -0500 - Hiqnet: fix typo lenght => length + Remove proto_tree_add_ax25 - Change-Id: I104d8bb0c56899faef6f4d608859e7b1a34e45a4 - Reviewed-on: https://code.wireshark.org/review/5238 - Reviewed-by: Alexis La Goutte - -commit 8b5b0b3 -Author: Raphaël Doursenaud -Date: Mon Oct 20 13:07:56 2014 +0200 - - Initial Harman HiQnet dissector + 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. - Change-Id: I43042edde09395e328d84bf4b172465829915a98 - Reviewed-on: https://code.wireshark.org/review/5014 - Petri-Dish: Alexis La Goutte - Tested-by: Petri Dish Buildbot - Reviewed-by: Alexis La Goutte + Change-Id: I3bb86ba8f05ef3363407bcfe9b059ee27ebc135d + Reviewed-on: https://code.wireshark.org/review/6429 + Reviewed-by: Michael Mann -commit 7469fab -Author: desolat -Date: Tue Nov 11 00:46:05 2014 +0100 +commit ecaa1f8 +Author: Michael Mann +Date: Thu Jan 8 17:07:25 2015 -0500 - BACAPP: fix dissection of event parameters for event notifications of Event_Type Change_of_Status_Flags + convert variables that were static just because of SET_ADDRESS macro to use the proper pinfo->pool instead. - Implementation for this event parameter type was missing - - Bug: 9626 - Change-Id: Iea0bc819858bbf5660d97cfd0c418a963ac149fb - Reviewed-on: https://code.wireshark.org/review/5228 + Change-Id: I914918d9629f654ead497dddac0f412b690e4409 + Reviewed-on: https://code.wireshark.org/review/6430 Reviewed-by: Michael Mann - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman -commit b2c2deb -Author: Guy Harris -Date: Mon Nov 10 19:47:59 2014 -0800 +commit a2abf8b +Author: Joerg Mayer +Date: Fri Jan 9 02:04:49 2015 +0100 - Fix a problem that causes build failures with CMake on Yosemite. + Fix CMake Warning "Argument not separated from preceding token by whitespace." - Change-Id: I52e81656470df887eb3c53b2632bf5a310b1b063 - Reviewed-on: https://code.wireshark.org/review/5229 - Reviewed-by: Guy Harris + Change-Id: I1ecd3bd0081c2f69d4e4f21f84cb46d086b657a2 + Reviewed-on: https://code.wireshark.org/review/6437 + Reviewed-by: Jörg Mayer -commit afae2b6 -Author: David Ameiss -Date: Mon Nov 10 14:24:18 2014 -0600 +commit ab717f2 +Author: Joerg Mayer +Date: Fri Jan 9 01:58:52 2015 +0100 - Allow building under OSX Yosemite using cmake. + Use the FindHTMLHelp.cmake provided by cmake to find the hhc. + Lower case some function/macro calls. - CFPropertyListCreateFromStream() has been deprecated in Yosemite, in favor of CFPropertyListCreateWithStream(). The autotools - build checks for the existence of the new function, but the cmake build does not. So, add a check for it to CMakeLists.txt, and - update cmakeconfig.h.in to provide the "template" for HAVE_CFPROPERTYLISTCREATEWITHSTREAM. - - Change-Id: I1a4e3e1ce83092ecf7725527b921eeca80b18d4b - Note: CFPropertyListCreateWithStream() works under Mavericks as well. - Reviewed-on: https://code.wireshark.org/review/5226 - Reviewed-by: Stig Bjørlykke - Tested-by: Stig Bjørlykke + Change-Id: I57532e3b4701963b88a536a7ecfe7dfaf4be3d4c + Reviewed-on: https://code.wireshark.org/review/6436 + Reviewed-by: Jörg Mayer -commit c44ff77 -Author: Bill Meier -Date: Mon Nov 10 15:07:51 2014 -0500 +commit 03f273a +Author: Gerald Combs +Date: Thu Jan 8 15:39:27 2015 -0800 - amqp: Misc changes; + HTML Help: Fix titles. - - amqp_1_0_dissectiom: Use MIN(32-bit-length, 0xFFFF) as the length to dissect; - The original code just used the low-order 16 bits of the 32-bit length - field as the length to dissect. - Add an expert warning if the actual PDU length is > 65K. + AsciiDoc converts single quotes into curly quote entities, which HTML + Help doesn't support. Use sed to fixup the title string. - - tvb_length() --> tvb_reported_length() + We might want to drop HTML Help at some point. - Change-Id: I3230600f460a8bd495eeec17fa6e704bf24de1a2 - Reviewed-on: https://code.wireshark.org/review/5225 - Reviewed-by: Bill Meier + Change-Id: I0c7d3be90c0de7dbac0f1367cc6ba323c7380939 + Reviewed-on: https://code.wireshark.org/review/6435 + Reviewed-by: Gerald Combs -commit bc990fc -Author: Martin Kaiser -Date: Mon Sep 1 09:47:26 2014 +0200 +commit 315cc72 +Author: Gerald Combs +Date: Thu Jan 8 16:27:34 2015 -0800 - USB: consider the device class when we try to select the next dissector + CMake: Revert the release notes xsltproc command. - at the moment, we only use the interface class, even in situations where - it's not applicable (e.g. control request that's not addressed to an - interface or an endpoint) - this is a hack that works because some - dissectors register for interface class "unknown", I'm trying to make - this workaround obsolete - - Change-Id: I6bf4253a2f8bf5a75ea1a08c3e52d36f80abd7ab - Reviewed-on: https://code.wireshark.org/review/5215 - Petri-Dish: Martin Kaiser - Tested-by: Petri Dish Buildbot - Reviewed-by: Sean Stalley - Reviewed-by: Alexis La Goutte - -commit 0f7aedc -Author: AndersBroman -Date: Mon Nov 10 17:43:53 2014 +0100 - - Use correct offset and lenght for Choice EOC. + Should fix the release_notes_txt target. - Change-Id: I8152e1a07768a3bc245bbafa7c24901ba26a2478 - Reviewed-on: https://code.wireshark.org/review/5224 - Reviewed-by: Anders Broman + Change-Id: Ie930c49ad34ad70070b8f7d28d79bee55f263c40 + Reviewed-on: https://code.wireshark.org/review/6434 + Reviewed-by: Gerald Combs -commit 0f758fa -Author: Victor Voronkov -Date: Mon Nov 10 12:07:15 2014 +0100 +commit 1baf9bb +Author: Guy Harris +Date: Thu Jan 8 15:50:15 2015 -0800 - WCCP: fix parsing of extended assignment data element + Use G_GINT64_CONSTANT() for 64-bit constants. - Bug: 10641 - Change-Id: I51322757c5aa7877fa8ff7915330ff24e7a8cbe2 - Reviewed-on: https://code.wireshark.org/review/5221 - Reviewed-by: Michael Mann + Change-Id: I2b4f24c0e68f8d1edb53981b2ada7db6cd0eff72 + Reviewed-on: https://code.wireshark.org/review/6433 + Reviewed-by: Guy Harris -commit ea16705 -Author: Stig Bjørlykke -Date: Thu Nov 6 11:19:25 2014 +0100 +commit cd7408e +Author: Gerald Combs +Date: Tue Jan 6 16:59:32 2015 -0800 - Improved deregistering fields. - - This improvement avoids use of deallocated memory (crash) if using a - deregistered field in display filter, color filter, custom column and - other cases when the field is used as "interesting field". - - This functionality is currently used in http, imf and ldap preferences. + CMake: Enable DocBook on Windows. - Also removed unused proto_registrar_n() as this does not work correctly - after deregistering fields. - - Change-Id: I043e3bf7a98bd773c9801e712a012d1eab8a7f94 - Reviewed-on: https://code.wireshark.org/review/5161 - Reviewed-by: Stig Bjørlykke - Tested-by: Stig Bjørlykke - -commit d58567b -Author: Stig Bjørlykke -Date: Wed Nov 5 14:36:29 2014 +0100 - - Fixed memory leakage in col_cleanup. + 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. - Several fields in cinfo is allocated memory and must be freed here - to avoid memory leakage when recreating the packet list. + Move the ASCIIDOC2DOCBOOK macro to FindASCIIDOC.cmake. Add FindHHC.cmake. + Add hints to FindFOP.cmake. - Do not allocate memory for col_expr[] as this points to static strings - or other allocated strings. + Use unique file names in the HTML Help chain in an attempt to avoid a + race condition. - Change-Id: I840377e3c590b1a3e2a38e0537465a028041d1e9 - Reviewed-on: https://code.wireshark.org/review/5137 - Petri-Dish: Stig Bjørlykke - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann - Reviewed-by: Anders Broman - -commit 64b8759 -Author: Gerald Combs -Date: Sun Nov 9 22:16:15 2014 -0800 - - Try to fix dist. + To do: + - Fix curly quote in HHC title. - Change-Id: Ib4332bace88f9db7a06867861c40627e2bdc55f0 - Reviewed-on: https://code.wireshark.org/review/5218 + Change-Id: I9b154b7fbd02703656e2ab380199ec0a6db4e36d + Reviewed-on: https://code.wireshark.org/review/6379 Reviewed-by: Gerald Combs -commit cd5b402 -Author: Gerald Combs -Date: Sun Nov 9 21:28:00 2014 -0800 +commit 4b8c668 +Author: Guy Harris +Date: Thu Jan 8 13:25:54 2015 -0800 - Fix an include. + To register an SCTP port, register in "sctp.port", not "udp.port". - Change-Id: Ic46b24cac01c49be01c7ad9e8a12b276fcdf81a5 - Reviewed-on: https://code.wireshark.org/review/5217 - Reviewed-by: Gerald Combs + Change-Id: I8f013b2895e42919ea0d97cdc35414ea3f5aec9b + Reviewed-on: https://code.wireshark.org/review/6422 + Reviewed-by: Guy Harris -commit 6228930 -Author: Gerald Combs -Date: Sun Nov 9 18:13:57 2014 -0800 +commit d8773b1 +Author: Pascal Quantin +Date: Thu Jan 8 21:08:13 2015 +0100 - Finish converting the User's Guide to AsciiDoc. + MQ: fix crash at startup - As with the Developer's Guide, add user-guide-docinfo.xml, which lets us - carry over DocBook front matter. Remove the meta_info chapter. Most of - its contents are now in user-guide-docinfo.xml. Add a DocBook revision - history based on hints from the Git/SVN/CVS revision history. + the array given to qsort algorithm must be alterable - Remove the various makefile targets for converting AsciiDoc files to - DocBook chapters. Remove GPL_appendix.xml. We use the AsciiDoc version. - - Change-Id: I543fa2a92f2c735c5f00c97ec65cff2187e09e3a - Reviewed-on: https://code.wireshark.org/review/5216 - Petri-Dish: Gerald Combs - Tested-by: Petri Dish Buildbot - Reviewed-by: Gerald Combs + Change-Id: I811cade161b7635e9bc9e070c1ec37d2cce50d1f + Reviewed-on: https://code.wireshark.org/review/6420 + Reviewed-by: Alexis La Goutte -commit 055e476 -Author: Michael Mann -Date: Sun Nov 9 14:00:01 2014 -0500 +commit c94192d +Author: Martin Mathieson +Date: Thu Jan 8 16:08:06 2015 +0000 - Add subdissector table for MPLS PW Associated Channel Type + Netflow: add (hidden) root filters for each vendor with supported 'pie' entries - Change-Id: Id72fcbe74b91b4eb25fb4d3f3d47a1d53c2857b2 - Reviewed-on: https://code.wireshark.org/review/5212 - Reviewed-by: Michael Mann + Change-Id: I2bdca4c092c247ab253d6ceb3770ac7ea935cdad + Reviewed-on: https://code.wireshark.org/review/6414 + Reviewed-by: Martin Mathieson -commit 3924310 -Author: Gerald Combs -Date: Sun Nov 9 11:39:15 2014 -0800 +commit 8bfd306 +Author: Michal Labedzki +Date: Wed Dec 31 10:53:25 2014 +0100 - WSUG: Convert ``Command Line Tools'' to AsciiDoc. + Bluetooth: Update to latest Assigned Numbers (up to 4.2) - Move the idl2wrs section to the Developer's Guide. Leave most of the - other content intact for now. + Also start decoding next two profile attribute groups in SDP + (MPS and CTN) and add new two fields in EIR/AD. - Change-Id: I98c6eeab62af5cc55e3ce23ab1107df02b1a22cf - Reviewed-on: https://code.wireshark.org/review/5214 - Reviewed-by: Gerald Combs + Change-Id: I4dc13df2b3b13e8c2a2a5c4af2cabae9ee83d539 + Reviewed-on: https://code.wireshark.org/review/6409 + Petri-Dish: Michal Labedzki + Reviewed-by: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte -commit c61df20 -Author: Michael Mann -Date: Sun Nov 9 14:01:39 2014 -0500 +commit 90453a4 +Author: Bill Meier +Date: Thu Jan 8 10:42:51 2015 -0500 - Restore a "ti" assignment that slightly altered dissection. + mka: Minor cleanup - Change-Id: I94cd7893a2e6b3668499d41519649f6a7782aa60 - Reviewed-on: https://code.wireshark.org/review/5213 - Reviewed-by: Michael Mann + 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 -commit b41f0c3 -Author: Gerald Combs -Date: Sun Nov 9 10:20:26 2014 -0800 +commit e123878 +Author: Bill Meier +Date: Thu Jan 8 10:40:25 2015 -0500 - WSUG: Convert ``Troubleshooting'' to AsciiDoc. + zbee-zcl-misc: Minor changes - The chapter is disabled so its final output hasn't been checked. Leave - most of the content intact for now. + tvb_captured_length() --> tvb_reported_length(); + whitespace changes. - Change-Id: I2147ee2863e7ededadf892794a836b4dc8055649 - Reviewed-on: https://code.wireshark.org/review/5211 - Reviewed-by: Gerald Combs + Change-Id: Id9c302d84f28ec23e554445777c7685c8d09918c + Reviewed-on: https://code.wireshark.org/review/6412 + Reviewed-by: Bill Meier -commit f8f915c -Author: Gerald Combs -Date: Sun Nov 9 10:07:46 2014 -0800 +commit e63e771 +Author: Michal Labedzki +Date: Tue Dec 30 09:11:03 2014 +0100 - WSUG: Convert ``Protocols'', ``Messages'', and ``How Wireshark Works'' - to AsciiDoc. + Bluetooth: AVDTP: Present bitfields for codec ad true/false - ``How Wireshark Works'' is disabled, so its final output hasn't been - checked. + Previously they are present as hex value. - Leave most of the content intact for now. + Change-Id: Ia30ba4da02e6bd4b0d68987506245e0534feadb6 + Reviewed-on: https://code.wireshark.org/review/6400 + Petri-Dish: Michal Labedzki + Reviewed-by: Michael Mann + +commit 2d448f0 +Author: Michael Mann +Date: Fri Jan 2 22:19:53 2015 -0500 + + Eliminate proto_tree_add_text from some dissectors. - Change-Id: Ia78951faa3ffd9c6d2e23067dbfb954ab4042f60 - Reviewed-on: https://code.wireshark.org/review/5210 - Reviewed-by: Gerald Combs + Change-Id: Ief4c377d56748e1a8ed0ef7fe5ba03b9be00cd8d + Reviewed-on: https://code.wireshark.org/review/6267 + Reviewed-by: Anders Broman -commit d8a0757 -Author: Gerald Combs -Date: Sat Nov 8 22:05:52 2014 -0800 +commit 2021845 +Author: Michal Labedzki +Date: Tue Dec 30 11:18:35 2014 +0100 - WSUG: Convert ``Files'' to AsciiDoc. + autotools: Add possibility to build without optional codec SBC - Leave most of the content intact for now. + 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. - Change-Id: I78f47b8310cb41ac5a07d352e56ec907b36665f8 - Reviewed-on: https://code.wireshark.org/review/5209 - Reviewed-by: Gerald Combs + Bug: 10794 + + Change-Id: I1b936c628c9de0179aa3d5da5ac547bd910af8ba + Reviewed-on: https://code.wireshark.org/review/6399 + Petri-Dish: Michal Labedzki + Tested-by: Petri Dish Buildbot + Tested-by: Michal Labedzki + Reviewed-by: Michal Labedzki -commit 2dda088 -Author: Gerald Combs -Date: Sun Nov 9 08:05:15 2014 -0800 +commit 0078211 +Author: Michal Labedzki +Date: Thu Jan 8 11:16:27 2015 +0100 - [Automatic manuf, services and enterprise-numbers update for 2014-11-09] + Add quotation marks in Conversations/Endpoints when address is string - Change-Id: Icfdef00a4b9b303bde89bf57077817f25e47d190 - Reviewed-on: https://code.wireshark.org/review/5206 - Reviewed-by: Gerald Combs + Change-Id: I39d49542cd563db1f6d3423b4e382a9a5e1c801b + Reviewed-on: https://code.wireshark.org/review/6398 + Petri-Dish: Michal Labedzki + Tested-by: Petri Dish Buildbot + Reviewed-by: Michal Labedzki + Tested-by: Michal Labedzki -commit f7ac077 -Author: Michael Mann -Date: Sat Nov 8 21:08:52 2014 -0500 +commit ec8ca91 +Author: Alexis La Goutte +Date: Thu Jan 8 11:36:35 2015 +0100 - Create a subdissector table for juniper payload protocols. + BTSDP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - Change-Id: I60fd9c6c486b9b3b90e32fb9ccce3973569cc2ee - Reviewed-on: https://code.wireshark.org/review/5204 + Change-Id: I48ddaa9ffe8f81094d63dd886dd15bb63888cbd7 + Reviewed-on: https://code.wireshark.org/review/6396 + Reviewed-by: Michal Labedzki Reviewed-by: Michael Mann - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Evan Huus -commit 8153cbc -Author: Gerald Combs -Date: Sat Nov 8 22:23:25 2014 -0800 +commit a3e934f +Author: Alexis La Goutte +Date: Thu Jan 8 11:36:21 2015 +0100 - Try to fix wsluarm dependency. + BATADV: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - Change-Id: I90f6a400bb5078c7719c3088d87c4632b810346b - Reviewed-on: https://code.wireshark.org/review/5205 - Reviewed-by: Gerald Combs + Change-Id: I3c33511389aa2f4b3eed73f1c712561b20e18bf7 + Reviewed-on: https://code.wireshark.org/review/6395 + Reviewed-by: Michael Mann -commit 04aad36 -Author: Gerald Combs -Date: Sun Nov 2 13:20:08 2014 -0800 +commit bd1cd01 +Author: Michal Labedzki +Date: Thu Jan 8 12:22:18 2015 +0100 - Convert the Lua reference to AsciiDoc. - - Move it to the Developer's Guide while we're here. + GTK/RTP Player: Fix crash when touch RTP Stream - Nudge the markup in epan/wslua where needed. Note that we should - probably convert it to AsciiDoc (if we're going to keep it in the DG) or - Doxygen. + Move converts of addresses when they are really valid. - Change-Id: Ie175111043f98b7a37eeeb8d185a833d8e866f8b - Reviewed-on: https://code.wireshark.org/review/5203 - Reviewed-by: Gerald Combs + Change-Id: Ie0c77e8e23bd97ba55d68dad7da7015b9d355b0d + Reviewed-on: https://code.wireshark.org/review/6397 + Petri-Dish: Michal Labedzki + Reviewed-by: Michal Orynicz + Tested-by: Petri Dish Buildbot + Tested-by: Michal Labedzki + Reviewed-by: Michal Labedzki -commit 5020856 -Author: Alexis La Goutte -Date: Sat Nov 8 18:03:23 2014 +0100 +commit b6cf61b +Author: Dario Lombardo +Date: Thu Jan 8 09:51:05 2015 +0100 - Fix error: parameter 'XX' not found in the function declaration (-Wdocumentation) + Small parenthesis fix - Change-Id: I5850b813989bd6ed33263c0fae3aa29e977e82ec - Reviewed-on: https://code.wireshark.org/review/5195 - Reviewed-by: Evan Huus + Change-Id: I6bab238a37f7309daece7a7bfc062da41819d9ff + Reviewed-on: https://code.wireshark.org/review/6394 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin -commit d094ca8 -Author: Alexis La Goutte -Date: Sat Nov 8 18:01:25 2014 +0100 +commit 513ed24 +Author: Evan Huus +Date: Mon Jan 5 18:07:56 2015 -0500 - SNMP: Fix warning found by -Wunused-const-variable + ieee80211: initialize bssid for data frames - Change-Id: If3fcab128e3e6bce04f4922568ab7ff8575b01fe - warning: unused variable 'smux_types' [-Wunused-const-variable] - Reviewed-on: https://code.wireshark.org/review/5194 - Reviewed-by: Evan Huus - -commit dea982b -Author: Alexis La Goutte -Date: Sat Nov 8 11:14:27 2014 +0100 - - PIM: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + Hypothentical fix for + https://bugs.launchpad.net/ubuntu/+source/wireshark/+bug/1407662 which I haven't + actually tried. - Change-Id: I4bfc67705ee824e68f14e4177a3194d66bbbe165 - Reviewed-on: https://code.wireshark.org/review/5188 - Reviewed-by: Evan Huus + Change-Id: Ib6d30873be7676eef756731a56a1d21a41c2c16c + Reviewed-on: https://code.wireshark.org/review/6330 + Reviewed-by: Pascal Quantin + Reviewed-by: Anders Broman -commit ae61a41 -Author: desolat -Date: Sat Nov 8 13:05:03 2014 +0100 +commit a323f0c +Author: Robert Grange +Date: Sat Dec 27 17:46:33 2014 +0100 - BACAPP: fix dissection of event parameters for event notifications of Event_Type Change_of_Characterstring + packet-mq: Add New Def, Reformat Lines, re-order val_str def - Implementation for this event parameter type was missing + 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 - Bug: 9625 - Change-Id: I575d387ec4764fa1ecd365624d13e3f41e2473c6 - Reviewed-on: https://code.wireshark.org/review/5189 - Reviewed-by: Michael Mann - Petri-Dish: Michael Mann + 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 in *.c files + correct [-Wunused-const-variable] + + Change-Id: Iaee26289e098cde0e5787ca1c98de64b6b733fa2 + Reviewed-on: https://code.wireshark.org/review/6079 + Reviewed-by: Robert Grange + Reviewed-by: Alexis La Goutte + Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot - Reviewed-by: Evan Huus + Reviewed-by: Anders Broman -commit 79d3c33 -Author: Martin Kaiser -Date: Sat Nov 8 19:26:12 2014 +0100 +commit 37e64d8 +Author: Alexis La Goutte +Date: Wed Jan 7 18:18:46 2015 +0100 - simplify the while-loop in dissect_pmip6_opt_cr() + Unistim: Nesting level does not match indendation (CID 1159216) - Bug: 10676 - Change-Id: I5614c640d3fd23196984eb2bb013ba15fb318305 - Reviewed-on: https://code.wireshark.org/review/5200 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + Change-Id: I024f47a41328ea7e8db3c79012b892f3cb48caad + Reviewed-on: https://code.wireshark.org/review/6376 + Reviewed-by: Pascal Quantin + Reviewed-by: Anders Broman -commit ee1c74c +commit dcc4936 Author: Martin Kaiser -Date: Sat Nov 8 19:25:05 2014 +0100 +Date: Tue Jan 6 23:04:55 2015 +0100 - simple fix for bug 10676 + use the http server port as index for the ws.port dissector table - Bug: 10676 - Change-Id: I442aa2ce44309655190752e715279d7325647336 - Reviewed-on: https://code.wireshark.org/review/5199 + 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 + + Bug: 10805 + Change-Id: Ib0d35d29fe947cfb7b21107e734c64debbb91048 + Reviewed-on: https://code.wireshark.org/review/6353 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser -commit 421913b +commit 866d2f8 +Author: Alexis La Goutte +Date: Wed Jan 7 18:09:55 2015 +0100 + + PPCAP: Nesting level does not match indendation (CID 1259218) + + Change-Id: I3d3a4243913f7f0267342693868ec1f2981534e3 + Reviewed-on: https://code.wireshark.org/review/6374 + Reviewed-by: Anders Broman + +commit 20414eb Author: Michael Mann -Date: Fri Nov 7 07:47:43 2014 -0500 +Date: Wed Jan 7 20:25:29 2015 -0500 - Create real subdissectors to the IGMP protocol. + Replace some ep_alloc and ep_alloc0 with its wmem equivalent. - Change-Id: I79ee9413b87722bfe4782342737cff03cfc34495 - Reviewed-on: https://code.wireshark.org/review/5179 + These cases were pretty easy to identify. Also replaced some comments that referenced ep_alloced memory, when it's now in fact wmem_alloced. + + Change-Id: I07d2f390a9c0b34aa2956880476755d1acf5db0a + Reviewed-on: https://code.wireshark.org/review/6392 + Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot - Reviewed-by: Alexis La Goutte - Reviewed-by: Michael Mann + Reviewed-by: Anders Broman -commit bd5384c -Author: Martin Kaiser -Date: Sat Nov 8 15:50:26 2014 +0100 +commit cff098e +Author: Michael Mann +Date: Wed Jan 7 19:24:52 2015 -0500 - fix a copy&paste mistake: type -> length + guid_to_ep_str -> guid_to_str - Change-Id: Ifafdc150c655caf4c7046e3038a6b5e4eeb3cf80 - Reviewed-on: https://code.wireshark.org/review/5193 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + guid_to_str now uses wmem allocation. + + Change-Id: I8e48d1a720942fbefbaa6227ae0929cb9f856359 + Reviewed-on: https://code.wireshark.org/review/6391 + Reviewed-by: Anders Broman -commit 5844761 -Author: Martin Kaiser -Date: Sat Nov 8 12:30:39 2014 +0100 +commit 5d610b5 +Author: Michael Mann +Date: Wed Jan 7 18:24:17 2015 -0500 - fix a crash in the endpoint dialogue - - compile Wireshark with GeoIP enabled - load a USB capture - open Statistics / Endpoints - the tree is empty, USB is not amongst the selected Enpoint Types - select USB in the Endpoint Types list - -> crash + Remove decode_numeric_bitfield. - to fix this, add a NULL check for cur_tree to EndpointDialog::tabChanged() + It was only used by 1 dissector and that dissector can just use bitmasking in the hf_ field. - Change-Id: I43d963ae5cd451120ac354e89e37ccbbbc2c5910 - Reviewed-on: https://code.wireshark.org/review/5192 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + Change-Id: I99179356dd7cbfab0c7be1512357a7e4c0eecde6 + Reviewed-on: https://code.wireshark.org/review/6390 + Reviewed-by: Anders Broman -commit 47909d3 -Author: Martin Kaiser -Date: Sat Nov 8 12:12:36 2014 +0100 +commit 4a5ca5c +Author: Michael Mann +Date: Wed Jan 7 18:13:23 2015 -0500 - remove parent parameter from dissect_usb_setup_response() + bytes_to_ep_str -> bytes_to_str - Change-Id: Ib4a5cc3b783d3a4a1477624678964a9627d582e6 - Reviewed-on: https://code.wireshark.org/review/5191 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + Change-Id: Ifcda8328dedec0ef4104c3a124d6246f99493750 + Reviewed-on: https://code.wireshark.org/review/6389 + Reviewed-by: Anders Broman -commit f82b2f2 -Author: Martin Kaiser -Date: Sat Nov 8 11:58:33 2014 +0100 +commit 2209678 +Author: Michael Mann +Date: Wed Jan 7 16:24:17 2015 -0500 - remove parent parameter from dissect_usb_setup_request() + ep__port_to_display -> _port_to_display - Change-Id: I5a24de9a12e301d472e701140299304e2cb4fcfc - Reviewed-on: https://code.wireshark.org/review/5190 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + Adjust any other ep_ related APIs related to the transition. + + Change-Id: I961b371c2c4bda557e0f1817705c27eef0dae66c + Reviewed-on: https://code.wireshark.org/review/6388 + Reviewed-by: Anders Broman -commit 570df75 -Author: Michael Mann -Date: Fri Nov 7 22:53:41 2014 -0500 +commit 907d145 +Author: David Ameiss +Date: Wed Dec 10 14:21:19 2014 -0600 - Add checkfiltername.pl to pre-commit script + Various minor updates to the LBM dissectors. - Change-Id: I34d8aa7034a4aacc2a95b35a30f25356b33a51b9 - Reviewed-on: https://code.wireshark.org/review/5187 + Change-Id: I36954ea0d8b525b4d7a1b3407f9e9d0e1c9bbd67 + Reviewed-on: https://code.wireshark.org/review/6378 Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte -commit 48885cc -Author: Sven Eckelmann -Date: Tue Sep 30 16:39:37 2014 +0200 +commit d245f38 +Author: Bill Meier +Date: Wed Jan 7 20:50:45 2015 -0500 - batadv: Add missing padding to batadv_unicast_4addr_v14 - - The already frozen packet format of batman-adv for Linux 3.5 was rejected by - David S. Miller. The 4addr format v14 was therefore changed after the freeze - and published in his final form in Linux 3.8. + packet-irda.c: Add editor modelines - Change-Id: I519476c4c6d62b403e197fae6a853d9bbe61f9bc - Signed-off-by: Sven Eckelmann - Signed-off-by: Simon Wunderlich - Reviewed-on: https://code.wireshark.org/review/5174 - Reviewed-by: Michael Mann + Change-Id: I626b60a185e750af94306892cd41dc8729920cfd + Reviewed-on: https://code.wireshark.org/review/6393 + Reviewed-by: Bill Meier -commit 3428e80 +commit 6edb27b Author: Guy Harris -Date: Fri Nov 7 15:16:17 2014 -0800 +Date: Wed Jan 7 16:50:23 2015 -0800 - Don't forward-declare amqp_0_10_get_size_field(), as it no longer exists. + FT_DOUBLEs are 8 bytes; use FT_FLOAT for 4-byte floating-point values. - Change-Id: I796826bafd0768b610c9afbde8407fd9d3cc775e - Reviewed-on: https://code.wireshark.org/review/5180 + Change-Id: Ia39f8604229df18e1cdbbf81b78cd423e70f0f3c + Reviewed-on: https://code.wireshark.org/review/6386 Reviewed-by: Guy Harris -commit 8f62bb7 -Author: Bill Meier -Date: Fri Nov 7 15:59:17 2014 -0500 +commit 8f1b82b +Author: Luke Mewburn +Date: Mon Dec 22 23:35:55 2014 +1100 - amqp: handle potential overflows when dissecting amqp_0_10 PDUs; + Set the (GT) address even if the message is routed by SSN. - Bug: 10582 - Change-Id: I2fbb16b9d641dfe872aed468f8b944f7ef274261 - Reviewed-on: https://code.wireshark.org/review/5176 - Reviewed-by: Bill Meier + 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. + + Change-Id: Ic088a4de408303a34c17c42820602ed6bf113840 + Reviewed-on: https://code.wireshark.org/review/6053 + Reviewed-by: Jeff Morriss -commit 848e24e -Author: Masayuki Takemura -Date: Thu Nov 6 14:56:08 2014 +0900 +commit 5e8c053 +Author: Guy Harris +Date: Wed Jan 7 11:43:15 2015 -0800 - dictionary: add missing TLV definition for WiMAX-Downlink-Granted-QoS - - The type of the value of the Downlink-Granted-QoS is defined as tlv, but the - TLV definition has not given in the file. - - This changeset adds the definition as per WiMAX Forum specification. - As per the spec, the TLV definition is same as the QoS-Descriptor TLV. - - - - Section 5.4.2.29 QoS-Descriptor and 5.4.2.63 Downlink Granted-QoS in - WMF-T33-001-R010v05. - - Change-Id: I72d97ed6f7532239cba62cc4cd1b6693fcd43123 - - dictionary: change type of WiMAX-Uplink-Granted-QoS VSA - - This changeset changes the type of WiMAX-Uplink-Granted VSA to tlv and - provides the TLV definition as per WiMAX Forum Specification. - - The TLV definition is same as the QoS-Descriptor VSA. - - + Squelch a compiler warning. - Section 5.4.2.30 Uplink Granted-QoS and 5.4.2.29 QoS-Descriptor in - WMF-T33-001-R010v05. + 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. - Change-Id: If6b505bc985c0fb41b19cf2d2fc7b4f887c72b7a - Reviewed-on: https://code.wireshark.org/review/5158 - Reviewed-by: Alexis La Goutte + Change-Id: Iffd2940187180cde1ad55ff7d3bd7c45acf22eba + Reviewed-on: https://code.wireshark.org/review/6380 + Reviewed-by: Guy Harris -commit aec5ffb +commit ccce7ab Author: Alexis La Goutte -Date: Fri Nov 7 15:32:53 2014 +0100 +Date: Wed Jan 7 18:13:51 2015 +0100 - DNS: WKS RR Protocol field is read as 4 bytes instead of 1 - - In the attached pcap file, there's a single DNS packet with WKS RR in the Prerequisites section. - The Protocol field of this RR is read as if it is 4 bytes long instead of 1, which actually reads part of the bytes of the following RR. + capture file dlg (GTK): Nesting level does not match indendation (CID 1159217) - Found by boaz - - Bug:10675 - Change-Id: Icf12c7f3864b629a242598373c06eee4de0ca098 - Reviewed-on: https://code.wireshark.org/review/5170 + Change-Id: I9ae1862993a3a9d10bd7575295b08c91752cb77f + Reviewed-on: https://code.wireshark.org/review/6375 Reviewed-by: Pascal Quantin - Reviewed-by: Anders Broman -commit de37217 -Author: Pascal Quantin -Date: Fri Nov 7 12:47:18 2014 +0100 +commit d3f67c1 +Author: Alexis La Goutte +Date: Wed Jan 7 18:19:58 2015 +0100 - DNS: fix name length and label count for a root server + S5066DTS: Nesting level does not match indendation (CID 1159211 & 1159212) - Bug: 10674 - Change-Id: I44297bfa64c31ab53d2aa61b6e54253b7a5a1e27 - Reviewed-on: https://code.wireshark.org/review/5167 + Change-Id: I8145696de995e821793e7bc1576d5a5673c7b503 + Reviewed-on: https://code.wireshark.org/review/6377 Reviewed-by: Pascal Quantin - Tested-by: Pascal Quantin - Reviewed-by: Anders Broman -commit 14489d6 -Author: Graham Bloice -Date: Fri Nov 7 14:54:32 2014 +0000 +commit a6ba632 +Author: Alexis La Goutte +Date: Wed Jan 7 18:07:25 2015 +0100 - Fixed hf field blurb values after changes from change 5166 + BTLE: Nesting level does not match indendation (CID 1261651) - Change-Id: I1c32fb3629c714d72b5398ad82d219d8786980a1 - Reviewed-on: https://code.wireshark.org/review/5171 - Reviewed-by: Graham Bloice - Petri-Dish: Graham Bloice - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman + Change-Id: I11e436ca91c766edc8e85fd2402e61a17465bee2 + Reviewed-on: https://code.wireshark.org/review/6373 + Reviewed-by: Michael Mann -commit 43069c2 -Author: AndersBroman -Date: Fri Nov 7 15:12:52 2014 +0100 +commit 64a7bac +Author: Michael Mann +Date: Wed Jan 7 10:11:22 2015 -0500 - GTPv2: Update Indication with Octet 8 and 9 dissection. + tvb_bytes_to_ep_str -> tvb_bytes_to_str - Change-Id: Ifa18f31a98932236b102db0f4f28169a7eb72978 - Reviewed-on: https://code.wireshark.org/review/5169 - Reviewed-by: Anders Broman + Change-Id: I79c613cbdd8dc939dd4c29ebc477fb6eefd5bfc4 + Reviewed-on: https://code.wireshark.org/review/6371 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann -commit 09cdfe8 +commit 98d3b14 Author: Michael Mann -Date: Thu Nov 6 22:10:11 2014 -0500 +Date: Wed Jan 7 09:36:06 2015 -0500 - Fix all remaining filter name errors found with checkfiltername.pl - - This should make it possible to add checkfiltername.pl to the pre-commit script. + Replace bytes_to_ep_str_punct with wmem equivalent. - Change-Id: Icdee7e4ea3381fa1467bb4b5caf0f60c255adec0 - Reviewed-on: https://code.wireshark.org/review/5166 + Change-Id: I8aa7d7374db94685fd875cbf358c3bfbc83f3255 + Reviewed-on: https://code.wireshark.org/review/6370 Reviewed-by: Michael Mann - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman -commit b5dead8 -Author: Lukas Emersberger -Date: Thu Oct 23 09:13:39 2014 +0200 +commit 9cfe67f +Author: Michael Mann +Date: Wed Jan 7 08:29:35 2015 -0500 - epl: Reassembly table fix + tvb_bytes_to_ep_str_punct -> tvb_bytes_to_str_punct - Fixed an error that retransmitted frames were added to the - reassembly table. + Also change bytestring_to_str to match bytes_to_ep_str_punct functionality (limiting byte string size) - Change-Id: I314412cb8f2ce49142e4b7f001613948f5e03bf6 - Reviewed-on: https://code.wireshark.org/review/4916 - Reviewed-by: Roland Knall - Reviewed-by: Lukas Emersberger + Change-Id: Idb958c7f0c203d103629469302b81fa922714f7e + Reviewed-on: https://code.wireshark.org/review/6369 Reviewed-by: Michael Mann -commit 72c70b6 -Author: Guy Harris -Date: Thu Nov 6 16:46:31 2014 -0800 +commit 493f03b +Author: Michael Mann +Date: Wed Jan 7 00:19:55 2015 -0500 - Call the default language preference setting "Use system setting". + Remove bytestring_to_ep_str - That more correctly describes it - it doesn't do any form of automatic - detection of anything, it just picks up the system settings from - wherever Qt picks them up. + Use wmem equivalent bytestring_to_str - Change-Id: I62d40719728cc9735e3b8f3e4202b7e61fc3f43b - Reviewed-on: https://code.wireshark.org/review/5165 - Reviewed-by: Guy Harris + Change-Id: I1ec7509e3adb36ab0f65317459653cb3b4b11af8 + Reviewed-on: https://code.wireshark.org/review/6368 + Reviewed-by: Michael Mann -commit 28e19b6 -Author: J. Bruce Fields -Date: Mon Apr 15 13:56:20 2013 -0400 +commit 2139110 +Author: Dario Lombardo +Date: Fri Dec 12 11:12:24 2014 +0100 - nfs: parse full setclientid CLID_INUSE reply - - Note there can be some extra data in the CLID_INUSE case. - - (Future work: dissect_nfs_clientaddr4 could use some improvement.) + Updates in it translation. - Ping-Bug: 10649 - Change-Id: I92f34c6cc7a9328458f1e4391b04009f5e47290b - Reviewed-on: https://code.wireshark.org/review/5141 - Reviewed-by: Bruce Fields + Change-Id: I3a7b71daa6e4e69ef9cc6dcb777851a8643d6684 + Reviewed-on: https://code.wireshark.org/review/6367 + Petri-Dish: Graham Bloice + Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann -commit 255f1c0 -Author: Stig Bjørlykke -Date: Thu Nov 6 08:27:55 2014 +0100 +commit 667897c +Author: AndersBroman +Date: Wed Jan 7 17:34:33 2015 +0100 - mrcpv2: Fixed a memory leakage. + [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 - Moved mrcpv2_tcp_range to proto_reg_handoff and removed the unused - range_empty() init. - - Change-Id: I0bb704db62299c9b3f54e2924162738bf7290ab6 - Reviewed-on: https://code.wireshark.org/review/5156 - Reviewed-by: Evan Huus - Petri-Dish: Evan Huus - Tested-by: Petri Dish Buildbot - Reviewed-by: Alexis La Goutte + Change-Id: Id32789fa5e34766c5734b0be13af015473ac257c + Reviewed-on: https://code.wireshark.org/review/6372 + Reviewed-by: Anders Broman -commit 1c707b4 -Author: Stig Bjørlykke -Date: Thu Nov 6 08:30:01 2014 +0100 +commit a479d9a +Author: Evan Huus +Date: Wed Jan 7 09:22:30 2015 -0500 - rtsp: Fixed a memory leakage. + simplify tvb_address_to_str - Moved rtsp_tcp_port_range to proto_reg_handoff and removed the unused - range_empty() init. + deduplicate most of the tvb_get_ptr calls - Change-Id: I695bc5a78d8e6177f2b2847ecee58a0d973d7d1c - Reviewed-on: https://code.wireshark.org/review/5157 - Reviewed-by: Evan Huus - Petri-Dish: Evan Huus + Change-Id: Ic95b1d545bfebf58fc64a81f816c47d63e5ddcd0 + Reviewed-on: https://code.wireshark.org/review/6366 + Petri-Dish: Michael Mann + Reviewed-by: Michael Mann Tested-by: Petri Dish Buildbot - Reviewed-by: Alexis La Goutte + Reviewed-by: Evan Huus -commit 0b9c5cd -Author: Maarten Bezemer -Date: Thu Nov 6 13:21:03 2014 +0100 +commit 734e408 +Author: Orgad Shaneh +Date: Wed Jan 7 10:25:35 2015 +0200 - Improve error message by including the (expected) class information + MSVC: Fix opting out of libraries - The code checks whether the tag AND class are matching with their expected values, but only the tag information is shown in the error message. - When the class is not matching, the error message shows the given and expected tags which are the same, confusing the user what is wrong with it. + When *_DIR variables are defined (even if empty), nmake tries + to build them and fails. - Furthermore, the messages for SEQUENCE and SEQUENCE OF are made the same/similar. + Don't set them at all if not configured to. - Change-Id: I6c1d0968c903105ec7f6e0648d589a4263a8ca18 - Reviewed-on: https://code.wireshark.org/review/5162 - Reviewed-by: Stig Bjørlykke + Change-Id: I3825c16f26e45a1a3fc489633084a074838f8c34 + Reviewed-on: https://code.wireshark.org/review/6365 + Petri-Dish: Graham Bloice + Tested-by: Petri Dish Buildbot + Reviewed-by: Graham Bloice -commit 6e81b2d -Author: AndersBroman -Date: Thu Nov 6 16:57:09 2014 +0100 +commit ed9a9be +Author: Michael Mann +Date: Tue Jan 6 14:52:54 2015 -0500 - BER: Fix offset and length of EOC in Sequence loop + Use tvb_address_to_str as an optimization - Change-Id: I4384339688c1dda5e011b7ff7772940fd61de8d1 - Reviewed-on: https://code.wireshark.org/review/5164 - Reviewed-by: Anders Broman + Change-Id: Ic79d8bdc58b84087531b298b3b27273c1afccd4f + Reviewed-on: https://code.wireshark.org/review/6357 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann -commit 883718c -Author: Michael Tüxen -Date: Thu Nov 6 13:46:24 2014 +0100 +commit 4088a82 +Author: Michael Mann +Date: Tue Jan 6 14:54:03 2015 -0500 - Always process the expert info for the new open request message. + SET_ADDRESS -> TVB_SET_ADDRESS to "hide" some of the tvb_get_ptr use. - Change-Id: I38a4bee1b482f320c7e2fd685cf5823ddb4f8d36 - Reviewed-on: https://code.wireshark.org/review/5163 - Reviewed-by: Michael Tüxen - -commit b479ab4 -Author: Stig Bjørlykke -Date: Thu Nov 6 08:25:55 2014 +0100 - - lbtrm: Use correct variable for outgoing_mc_address. + 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. - Change-Id: I17e06e39de0de347926825741897646507691657 - Reviewed-on: https://code.wireshark.org/review/5155 - Reviewed-by: Alexis La Goutte + Change-Id: Id7cefd440b81834de1d1aace7cd0789b1c871a22 + Reviewed-on: https://code.wireshark.org/review/6358 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann -commit bb05124 -Author: Bill Meier -Date: Thu Nov 6 00:35:24 2014 -0500 +commit 6252074 +Author: Pascal Quantin +Date: Tue Jan 6 21:28:56 2015 +0100 - coap: fix a bug; do some cleanup. + DJIUAV: small cleanups - Bug fix: do initial calls to col_...() *before* the dissection code so - that proper column info is displayed even if the dissector - exits early because of an exception, etc. + - fix some typos + - remove a useless include + - change an obsolete API + - comment unused hf entries for now - Cleanup: - - Use wmem_strbuf instead of static fixed length char arrays; - - Create/use an extended value_string; - - Use %u (not %d) when formatting unsigned values; - - Use strchr() to search a string for a character; - - Misc ... - - Change-Id: I57ca584f989c3ab1cf141270cc50160f9fb980ae - Reviewed-on: https://code.wireshark.org/review/5153 - Reviewed-by: Bill Meier + Change-Id: I5939bc2fe9ddc6c422f35423aa22e884f20f088d + Reviewed-on: https://code.wireshark.org/review/6349 + Reviewed-by: Alexis La Goutte + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin -commit 3e34273 -Author: Stig Bjørlykke -Date: Wed Nov 5 14:48:43 2014 +0100 +commit 50a9863 +Author: Guy Harris +Date: Wed Jan 7 02:17:14 2015 -0800 - Lua: Fixed some memory leakages. + Don't run checkapi on .rc files. - Change-Id: I5e14c2e5a3868ec40d1989876b06919aa9ece4a1 - Reviewed-on: https://code.wireshark.org/review/5138 - Petri-Dish: Stig Bjørlykke - Tested-by: Petri Dish Buildbot - Reviewed-by: Evan Huus + Change-Id: I75879bfcd0d9706523447146b16c319d3eb56d23 + Reviewed-on: https://code.wireshark.org/review/6361 + Reviewed-by: Guy Harris -commit c321dc3 -Author: Evan Huus -Date: Wed Nov 5 23:43:20 2014 -0500 +commit 9696eb6 +Author: Martin Kaiser +Date: Tue Dec 30 14:31:04 2014 +0100 - rpc: fix regression in gbfc5483174d + SMB: the "encryption key" in the negotiate response is not really a key + but the data for the Challenge/Response authentication - value can be NULL, in which case memduping it will crash + (at least, that's my understanding of + http://msdn.microsoft.com/en-us/library/ee441946.aspx) - Bug: 10667 - Change-Id: I8950fae94d80a2f06f24a785532536ad73f1855d - Reviewed-on: https://code.wireshark.org/review/5152 - Reviewed-by: Evan Huus + rename the items and filter strings accordingly + + Bug: 10777 + Change-Id: I38378f0b31252d7bc8ec5e8ad7cee81a1a48cb4d + Reviewed-on: https://code.wireshark.org/review/6137 + Reviewed-by: Anders Broman -commit d0c031f -Author: J. Bruce Fields -Date: Fri Oct 31 12:43:07 2014 -0400 +commit a76559e +Author: Guy Harris +Date: Tue Jan 6 20:53:54 2015 -0800 - nfs: clean up fh_expire_type dissection + Cast away an insignificant warning. - This is a bit simpler and makes the field searchable. - - Ping-Bug: 10649 - Change-ID: I68386f987c419c0b6cbc181f29c6bce6c04fcfdb - Reviewed-on: https://code.wireshark.org/review/5145 - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Change-Id: Ifd74719ced4d1ff99a2a913ad6a6797d3e80b311 + Reviewed-on: https://code.wireshark.org/review/6359 + Reviewed-by: Guy Harris -commit 060cc68 -Author: J. Bruce Fields -Date: Wed Oct 29 09:00:07 2014 -0400 +commit 3bb887f +Author: Michael Mann +Date: Tue Jan 6 23:27:36 2015 -0500 - nfs: NFSv4.2 SEEK, ALLOCATE, DEALLOCATE support + Fix compiler error because I didn't completely amend last patch. - NFSv4.2 is still a draft, but these three ops are implemented at least - for Linux now and are very unlikely to change any further. - - Ping-Bug: 10649 - Change-Id: Ia2917de59fb2b0ed7191c9f362b7eb60756d7634 - Reviewed-on: https://code.wireshark.org/review/5143 - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot + Change-Id: I7b8ffc4a63e69b5f50666dc1cf3482ae20124c0f + Reviewed-on: https://code.wireshark.org/review/6356 Reviewed-by: Michael Mann -commit 67c9ff0 -Author: J. Bruce Fields -Date: Fri Oct 31 14:55:12 2014 -0400 +commit 47d670d +Author: Michael Mann +Date: Mon Jan 5 19:26:28 2015 -0500 - nfs: interpret aclsupport attribute + Add tvb_address_to_str. - It's not an interesting attribute but I've occasionally been annoyed by - having to look it up just to verify a server isn't doing something nuts. + This is intended to handle ALL address types retrieved from a tvbuff. - Ping-Bug: 10649 - Change-Id: I660b62039075a4044946e590ee75ed5690290bc5 - Reviewed-on: https://code.wireshark.org/review/5146 - Reviewed-by: Michael Mann - -commit 5431032 -Author: J. Bruce Fields -Date: Mon Sep 30 17:54:42 2013 -0400 - - nfs: label NFSv4 CREATE symlink arguments more helpfully + 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. - Currently it's hard to tell which field is the name of the symlink and - which is the target; both are labeled just "Name". + 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. - Ping-Bug: 10649 - Change-Id: I1322a3652ffbcee920a6808dcc5613cefe8d8588 - Reviewed-on: https://code.wireshark.org/review/5142 + Change-Id: I361d991c4ad90142173e63eae02a94d68af3ec43 + Reviewed-on: https://code.wireshark.org/review/6333 Reviewed-by: Michael Mann -commit ed7b9e6 -Author: J. Bruce Fields -Date: Fri Oct 17 15:45:39 2014 -0400 +commit 0f426d6 +Author: Joseph Huffman +Date: Mon Jan 5 09:53:53 2015 -0800 - nfs: fix open result_flags + Improved handling of ARDP fragmented packets. - The protocol values here are all wrong, and miss new flags from rfc - 5661. + 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. - Ping-Bug: 10649 - Change-Id: I03fb2b521b415dbca5d4b77eda609eb8084da57c - Reviewed-on: https://code.wireshark.org/review/5140 + Change-Id: I1f2aa722b6e0d1ed3572ff332b4dd8c0e5c5a765 + Signed-off-by: Joseph Huffman + Reviewed-on: https://code.wireshark.org/review/6344 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann -commit 55fb7ea -Author: Joerg Mayer -Date: Wed Nov 5 21:10:07 2014 +0100 +commit 85e69d4 +Author: Gerald Combs +Date: Tue Jan 6 15:44:19 2015 -0800 - Enable some runtime sanity checks when using at least gcc 4.9 + Fix GCC pragma. - Change-Id: I33208d4c27a27fb9222577ca176357035eeb7ba1 - Reviewed-on: https://code.wireshark.org/review/5150 - Reviewed-by: Jörg Mayer + Fix "error: #pragma GCC diagnostic not allowed inside functions". + + Change-Id: Iaa7e39ac46975f00bc337b97875ba8b77295064a + Reviewed-on: https://code.wireshark.org/review/6355 + Reviewed-by: Gerald Combs -commit 80b36cd -Author: Joerg Mayer -Date: Wed Nov 5 21:05:34 2014 +0100 +commit e3eab83 +Author: Gerald Combs +Date: Tue Jan 6 15:08:51 2015 -0800 - Fix plugin search path: It was relative instead of absolute, resulting - in not found plugins (lib/wireshark/plugins/1.99.1). + checkAPIs: C++ comments are allowed in Windows resource files. - Change-Id: Ie81f3c4450789ff7e37c99e197b44e7df47d8df5 - Reviewed-on: https://code.wireshark.org/review/5149 - Reviewed-by: Jörg Mayer + Change-Id: I3885278bf293b1fd7db812ce265734bcdc904c6f + Reviewed-on: https://code.wireshark.org/review/6354 + Reviewed-by: Gerald Combs -commit 547323b -Author: Stephen Fisher -Date: Wed Nov 5 09:43:00 2014 -0700 +commit 6e03daf +Author: Gerald Combs +Date: Tue Jan 6 11:52:53 2015 -0800 - Allow the environment variable RCC to set before running configure to - allow for unusual paths for Qt's rcc program (FreeBSD ports puts it in - /usr/local/lib/qt5/bin). This matches the existing functionality of the - MOC and UIC variables/programs. + Try to suppress clang warnings in exntest. + + Nested TRYs result in: - Change-Id: I885d61bce54d9e893e0c2fc496a9ff767a096ae6 - Reviewed-on: https://code.wireshark.org/review/5139 - Petri-Dish: Stephen Fisher + warning: declaration shadows a local variable + + Change-Id: Ifaa7baebde0ea4c18be5a53ab7e7964e84716496 + Reviewed-on: https://code.wireshark.org/review/6347 + Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot - Reviewed-by: Stephen Fisher + Reviewed-by: Gerald Combs -commit d2c0600 -Author: Ambarish Malpani -Date: Tue Nov 4 14:38:07 2014 -0800 +commit 119f564 +Author: Pascal Quantin +Date: Tue Jan 6 21:59:04 2015 +0100 - Make SSL certificates available to tshark as bytes via the dtls/ssl.handshake.certificate key. + MBIM: call dissector_(add|delete)_uint only when necessary - Changed the entries so that users have access to the whole certificate in - tshark. This allows developers to process the certs in custom ways - - Change-Id: I113d60b2b3f12c6b15a644ec02bbebf7134f0ece - Reviewed-on: https://code.wireshark.org/review/5119 - Reviewed-by: Peter Wu + Change-Id: I12bbe9e1d81560f1874d4e575b19db1842fa0c72 + Reviewed-on: https://code.wireshark.org/review/6352 Reviewed-by: Pascal Quantin -commit 1af7c2b -Author: Michal Labedzki -Date: Tue Nov 4 18:47:11 2014 +0100 +commit a6e6dee +Author: Gerald Combs +Date: Tue Jan 6 12:19:04 2015 -0800 - Qt: Simplify disabling entries in ContextMenu + NSIS: Quote all paths in config.nsh. - We have direct access to every entry (action) in ContextMenu. - Use it instead of storing "actions" and checking its name. + Fix the MAKEDIR substitution. Add config.nsh to .gitignore. - Change-Id: I97a1723898409faf13280c5655b7738661ab594b - Reviewed-on: https://code.wireshark.org/review/5135 - Petri-Dish: Michal Labedzki - Reviewed-by: Michal Labedzki - Tested-by: Michal Labedzki - Tested-by: Petri Dish Buildbot - Reviewed-by: Alexis La Goutte + Change-Id: I9c5f6469569e826e4a8036b9b1b483c16558f788 + Reviewed-on: https://code.wireshark.org/review/6351 + Reviewed-by: Gerald Combs -commit ce4be19 -Author: Matthieu Texier -Date: Mon Sep 15 16:10:51 2014 +0200 +commit f39366b +Author: Martin Mathieson +Date: Tue Jan 6 11:18:24 2015 +0000 - pim: BIDIR support (RFC 5015) + NetFlow: Add Ixia 'IxFlow' fields and make some general usability improvements + - Bug: 10231 - Change-Id: Ia93fa76b8d381971f900de4a8ce591f03cd82da0 - Reviewed-on: https://code.wireshark.org/review/5118 + - 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 + + Change-Id: I3147387a3cd0d1fc33b879b3ba226753ed2cd8dd + Reviewed-on: https://code.wireshark.org/review/6331 Reviewed-by: Alexis La Goutte -commit 85aa1bc -Author: Pascal Quantin -Date: Wed Nov 5 12:50:32 2014 +0100 +commit 29207bf +Author: Guy Harris +Date: Tue Jan 6 12:08:41 2015 -0800 - ws_mempbrk_sse42.c: remove inclusion of stdint.h as it's no more required after g79e4da4 + $(MSVCR_DLL) might contain spaces, so we need to quote that sed expression. - Change-Id: I48776a286ba1d412ecda55857938d9daa77fd3f7 - Reviewed-on: https://code.wireshark.org/review/5136 - Petri-Dish: Pascal Quantin - Tested-by: Petri Dish Buildbot - Reviewed-by: Pascal Quantin + Change-Id: Ia3aca07a5aa8adcc99d17fa559662d79659f46ca + Reviewed-on: https://code.wireshark.org/review/6348 + Reviewed-by: Guy Harris -commit 701f055 -Author: Bill Meier -Date: Wed Nov 5 00:21:33 2014 -0500 +commit ea46a44 +Author: Gerald Combs +Date: Mon Jan 5 12:53:46 2015 -0800 - mih: tvb_length() --> tvb_reported_length(); Fix some boolean bitfield displays. + NSIS: Move definitions to their own file. - Change-Id: I52dd05842afdff4ffd8a70ff56d665ea28d0f63b - Reviewed-on: https://code.wireshark.org/review/5133 - Reviewed-by: Bill Meier + 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. + + Change-Id: I439fea5721c5b209a753044a8e9e8ac6fc5291c3 + Reviewed-on: https://code.wireshark.org/review/6345 + Reviewed-by: Gerald Combs -commit e8d375c -Author: Bill Meier -Date: Tue Nov 4 22:28:44 2014 -0500 +commit a70929c +Author: Gerald Combs +Date: Tue Jan 6 10:44:37 2015 -0800 - mih: Fix some bugs; Add an XXX comment. + CMake: Add an ENABLE_CODE_ANALYSIS option. - One of the bugs: (2^32) is *not* 2 to the power of 32. + Currently Visual Studio-only. Enabling it adds /analyze:WX- to + LOCAL_CFLAGS, similar to config.nmake. - Change-Id: Id4dab16380f757e89c05be4182da3ac92c92abd6 - Reviewed-on: https://code.wireshark.org/review/5127 - Reviewed-by: Bill Meier + Change-Id: Ida68831e85f5f04b9f84faa95a39fed24e5f490d + Reviewed-on: https://code.wireshark.org/review/6346 + Reviewed-by: Gerald Combs -commit 6aee9b1 -Author: Bill Meier -Date: Tue Nov 4 22:34:51 2014 -0500 +commit 087fea3 +Author: Alexis La Goutte +Date: Tue Jan 6 10:36:37 2015 +0100 - opensafety: Use 1<<10 (not 2^10) in a #define; + DJI UAV: Add dissector to autotools and add modelines info - Comment out the #define since it's not actually used. :) - - Change-Id: Ia34200d3eb705a74a33cbcf18175a7f780f2d2e2 - Reviewed-on: https://code.wireshark.org/review/5128 - Reviewed-by: Bill Meier + Change-Id: I2a312af906ddf01ff05083a657f474a921ab95a3 + Reviewed-on: https://code.wireshark.org/review/6337 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann -commit dfb5ddb +commit dd65274 Author: Joerg Mayer -Date: Wed Nov 5 04:16:22 2014 +0100 +Date: Tue Jan 6 16:20:04 2015 +0100 - Show the bit-encoding into the (shared) 2-Byte value for - fragment number and sequence number + 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: I38bb61471fe43c5cfa8274e728a56d4cdb132ec1 - Reviewed-on: https://code.wireshark.org/review/5126 + Change-Id: I37dea1a5c8d743f5dcf4a4d9ff38ff92200271d0 + Reviewed-on: https://code.wireshark.org/review/6343 Reviewed-by: Jörg Mayer -commit aae48be -Author: Pascal Quantin -Date: Mon Nov 3 23:32:47 2014 +0100 - - DNS: replace hash map by red-black tree to fix request/response tracking when transaction id is reused - - Bug: 10657 - Change-Id: Id4356dcd6802da40b4a3e2e2095cc9d2932c2c68 - Reviewed-on: https://code.wireshark.org/review/5100 - Petri-Dish: Pascal Quantin - Tested-by: Petri Dish Buildbot - Reviewed-by: Evan Huus - -commit 2bd15c7 -Author: Evan Huus -Date: Tue Nov 4 21:31:17 2014 -0500 +commit 1d7da82 +Author: Alexis La Goutte +Date: Tue Jan 6 10:41:01 2015 +0100 - sigcomp-udvm: fix invalid access - - Way back in 2006, svn r20041 (now gd408f2f6fc) worked around a problem by - limiting the amount of buffer dealt with in the udvm_state_access call (changing - it from state_minimum_access_length_buff[n] to STATE_MIN_ACCESS_LEN). - - The very next line however, tries to read the same amount of buffer to display - to the user - since it seems nobody ever applied a proper fix for the original - case, just apply the same workaround to the second call. + DNS: fix no previous prototype for 'qname_labels_count' [-Wmissing-prototypes] - Bug: 10662 - Change-Id: I32c81ee2a8eb7b30ff7ab1fbbb6ea5f206385d4b - Reviewed-on: https://code.wireshark.org/review/5124 - Reviewed-by: Evan Huus + Change-Id: I2c5b662f6b46d60a97a491ca8ec01b3f0e41fa56 + Reviewed-on: https://code.wireshark.org/review/6338 + Reviewed-by: Anders Broman -commit bfc5483 -Author: Evan Huus -Date: Sat Nov 1 16:36:01 2014 -0400 +commit 5fb2f27 +Author: Gerald Combs +Date: Thu Jan 1 11:41:03 2015 -0800 - rpc: take a file-scope copy of some RPC procedures + Qt: Add a context menu to the packet list header. - The original may be freed out from underneath us if a duplicate is registered. - Thanks to Bruce Fields for pointing out one case of this I'd missed. + 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. - Also replace a bunch of manual "foo.field = 0" with just wmem_new0() instead. - - Bug: 10636 - Change-Id: I342bd732f062b0a191cbbf5ae417356385d2fd53 - Reviewed-on: https://code.wireshark.org/review/5046 - Petri-Dish: Evan Huus + Change-Id: I1bd3834a26994de96894d2b7512bce2c19915c77 + Reviewed-on: https://code.wireshark.org/review/6277 + Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot - Reviewed-by: Evan Huus + Reviewed-by: Alexis La Goutte + Reviewed-by: Gerald Combs -commit cd93af0 -Author: Guy Harris -Date: Tue Nov 4 18:08:47 2014 -0800 +commit cbca7ee +Author: Stig Bjørlykke +Date: Tue Jan 6 13:58:59 2015 +0100 - Oops, we also need to worry about pcap_get_tstamp_precision(). + p_mul: Indicate if fletcher algorithm is used. - Change-Id: I60a1f671ba313c59ca1999ab703ee11370608758 - Reviewed-on: https://code.wireshark.org/review/5123 - Reviewed-by: Guy Harris + 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 -commit 6f3fc0e -Author: Guy Harris -Date: Tue Nov 4 17:53:17 2014 -0800 +commit 0910b55 +Author: Stig Bjørlykke +Date: Tue Jan 6 13:51:33 2015 +0100 - Get rid of unused variable. + s5066ses: Fixed some missing sapid mappings. - Leftover crud before I notied that RTLD_NEXT would do what I want. + The previous s5066ses commit added sapid value strings but missed + updating PDU type 21 and 25. - Change-Id: I5e510e74c65b211e6cc6c300e760869abb399dc8 - Reviewed-on: https://code.wireshark.org/review/5121 - Reviewed-by: Guy Harris + Change-Id: I5cd4dba14eacdf2f590490a95b0cc62b04193b9e + Reviewed-on: https://code.wireshark.org/review/6341 + Reviewed-by: Stig Bjørlykke -commit 78492d9 -Author: Guy Harris -Date: Tue Nov 4 17:49:29 2014 -0800 +commit e8568c8 +Author: Ricardo Cristian Ramirez +Date: Sun Jan 4 02:19:12 2015 +0200 - Cope with newer Xcode not having the 10.6 SDK. + s5066sis: Consume transport layer data in S5066sis - The latest Xcode, as of today, has only 10.9 and 10.10 SDKs, which means - that, if we build Wireshark and request a deployment minimum release of - 10.6, we'll be building against an SDK in which libpcap has routines - that aren't available in 10.6 and that doesn't use weak linking for - them, so the resulting binary won't actually work on 10.6. + 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 - Use the run-time loader to find those routines (currently, only - pcap_set_tstamp_precision()) and call them only if we find them. - - On other UN*Xes, we still assume that we'll be running only on the - release against which we were built and newer releases. - - Change-Id: Iab20d86fe3be4b299cfb6e25c1f95dc6e1581661 - Reviewed-on: https://code.wireshark.org/review/5120 - Reviewed-by: Guy Harris + Bug: 10827 + Change-Id: Iffdf5d567e1a417ccbafdac919f5a5200159d31b + Reviewed-on: https://code.wireshark.org/review/6292 + Reviewed-by: Stig Bjørlykke + Tested-by: Stig Bjørlykke -commit 196d7b4 -Author: Guy Harris -Date: Tue Nov 4 12:43:44 2014 -0800 +commit 55de46f +Author: Michael Mann +Date: Mon Jan 5 11:12:08 2015 -0500 - Add the flag SVGs to the set of files we distribute. + Replace ep_address_to_str with address_to_str. - Change-Id: Ib6e9098a4b411eeb1e5f597f3ec5f55e98632ad3 - Reviewed-on: https://code.wireshark.org/review/5117 - Reviewed-by: Guy Harris + Change-Id: I4f1078b20f41800f72a751612703ad0d4c2ae87b + Reviewed-on: https://code.wireshark.org/review/6323 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman -commit e65f581 -Author: Guy Harris -Date: Tue Nov 4 20:36:13 2014 +0000 +commit 124272e +Author: Anish Bhatt +Date: Mon Jan 5 22:50:44 2015 -0800 - Revert "Follow a suggestion from libtoolize:" + [PROFINET] v2: Fix swapped MaintenanceRequired & MaintenanceDemanded bits - Sadly, older versions of autoconf - such as the ones on the OS X buildbots - don't know about AC_CONFIG_MACRO_DIRS. + Fix the correct code path this time. + Bug: 10753 - This reverts commit 89291ad4f3293893387b385a0800cad42215ddd4. - - Change-Id: Ie4fa71062886f58c7f6014f6b7969921f0b824ae - Reviewed-on: https://code.wireshark.org/review/5116 - Reviewed-by: Guy Harris + Change-Id: I7bc2e74c91868986303e8b41b25e43a665be1860 + Reviewed-on: https://code.wireshark.org/review/6335 + Reviewed-by: Alexis La Goutte -commit 79e4da4 -Author: Stephen Fisher -Date: Tue Nov 4 12:58:48 2014 -0700 +commit eb98b04 +Author: Anish Bhatt +Date: Mon Jan 5 22:26:46 2015 -0800 - Fix compilation error on FreeBSD 10.0-RELEASE (with clang): change int8_t to - gint. + Revert "[PROFINET] Fix swapped MaintenanceRequired & MaintenanceDemanded bits" - Change-Id: I7974497a8f50e5d18ec74aa7554f058056a6022c - Reviewed-on: https://code.wireshark.org/review/5115 - Petri-Dish: Stephen Fisher - Reviewed-by: Stephen Fisher + 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 + + Change-Id: Ia3bd088aeb376b8511d64352f62c4304e4129ba6 + Reviewed-on: https://code.wireshark.org/review/6334 + Reviewed-by: Alexis La Goutte -commit 89291ad -Author: Stephen Fisher -Date: Tue Nov 4 11:43:46 2014 -0700 +commit a7a1704 +Author: Graham Bloice +Date: Mon Jan 5 23:40:52 2015 +0000 - Follow a suggestion from libtoolize: - - libtoolize: Consider adding 'AC_CONFIG_MACRO_DIRS([./aclocal-fallback])' to - configure.ac + Minor CMake updates to better group build artefacts - This is explained in the libtool manual: + Move capchild, caputils, codecs and wsutil into a Libs group + Move gtkui into UI group + Move update-sminmpec into tools group - "In the future other Autotools will automatically check the contents of - AC_CONFIG_MACRO_DIRS, but at the moment it is more portable to add the macro - directory to ACLOCAL_AMFLAGS in Makefile.am, which is where the tools currently - look. If libtoolize doesn't see AC_CONFIG_MACRO_DIRS, it too will - honour the first -I argument in ACLOCAL_AMFLAGS when - choosing a directory to store libtool configuration macros in. It is perfectly - sensible to use both AC_CONFIG_MACRO_DIRS and ACLOCAL_AMFLAGS, as long as they - are kept in synchronisation." - - Change-Id: Ic203b0b5104ea3423cf8c0042b2278e82bcea332 - Reviewed-on: https://code.wireshark.org/review/5113 - Reviewed-by: Stephen Fisher + Change-Id: Iaf2bfe4697265af2c3ed9c9d7de2d5d1ef3cafee + Reviewed-on: https://code.wireshark.org/review/6332 + Reviewed-by: Graham Bloice + Tested-by: Graham Bloice -commit 8765fec -Author: Stephen Fisher -Date: Tue Nov 4 12:17:45 2014 -0700 +commit 1176db2 +Author: Guy Harris +Date: Mon Jan 5 13:18:26 2015 -0800 - Ignore additional generated files: + Squelch harmless compiler warnings. - aclocal-fallback/libtool.m4 - aclocal-fallback/ltoptions.m4 - aclocal-fallback/ltsugar.m4 - aclocal-fallback/ltversion.m4 - aclocal-fallback/lt~obsolete.m4 + (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.) - Change-Id: I7c9bb5c383f44800345540ec05a67175bd7267cc - Reviewed-on: https://code.wireshark.org/review/5114 - Reviewed-by: Stephen Fisher + Change-Id: I1a9c68b4b1007f0a38017ba3570b94efb0b6845a + Reviewed-on: https://code.wireshark.org/review/6329 + Reviewed-by: Guy Harris -commit 6086885 -Author: Stephen Fisher -Date: Tue Nov 4 10:11:40 2014 -0700 +commit 318b8f8 +Author: Joerg Mayer +Date: Mon Jan 5 20:41:45 2015 +0100 - Fix some compilation errors (size_t to guint/gint) and an unused parameter + Beginnings of dissection of the dji drones control protocol. - Change-Id: I2d64d840c93f951dd5481ca5950ff5587da6843d - Reviewed-on: https://code.wireshark.org/review/5112 - Petri-Dish: Pascal Quantin - Reviewed-by: Guy Harris + Change-Id: Ifda0b97df7e25b535a5010f25c8e8e1af83cb532 + Reviewed-on: https://code.wireshark.org/review/6328 + Reviewed-by: Jörg Mayer -commit 9ac261f -Author: Bill Meier -Date: Tue Nov 4 11:15:18 2014 -0500 +commit 15a238a +Author: Joerg Mayer +Date: Mon Jan 5 20:35:25 2015 +0100 - amqp: Fix a number of bugs in dissect_amqp_0_10_map(). + 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. - (Among other things: "2 ^ xxx" is *not* 2 to the xxx'th power). - - Change-Id: I893b72e853ecbb5d7e6259e950fb347e89eed6c2 - Reviewed-on: https://code.wireshark.org/review/5109 - Reviewed-by: Bill Meier + Change-Id: I53bfddd27f87ad5482227f786af8c4728c5774fc + Reviewed-on: https://code.wireshark.org/review/6327 + Reviewed-by: Jörg Mayer -commit c3c59dc -Author: Guy Harris -Date: Tue Nov 4 04:36:23 2014 -0800 +commit 13dbf52 +Author: Stephen Fisher +Date: Mon Jan 5 11:37:44 2015 -0700 - add the type dom_sid28 and call ad-hoc dissector + Attempt to fix "make distcheck" on Ubuntu buildbot - Pick up change from Samba: + Change-Id: I6e7ea1e2aaf839fdb3af8a3a5a47aabbb12056ef + Reviewed-on: https://code.wireshark.org/review/6326 + Reviewed-by: Stephen Fisher + +commit cbc5faa +Author: Stephen Fisher +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. - commit 87fb54b77f4b9caaf2b25635b7813e29a448aaa6 - Author: Matthieu Patou - Date: Tue Oct 1 12:04:02 2013 -0700 + Change-Id: Ib2eee8d37e7029202675bac35839b1c0d5fc5131 + Reviewed-on: https://code.wireshark.org/review/6320 + Reviewed-by: Stephen Fisher + +commit 22b4ec9 +Author: Michael Mann +Date: Sun Jan 4 21:40:05 2015 -0500 + + Replace ep_display_to_address with wmem equivalent display_to_address. - pidl-wireshark: add the type dom_sid28 and call ad-hoc dissector + Almost all instances require using "manual" memory management, but it gets some ep_ calls out of the GUI. - Change-Id: Ide5041b901b5e1785b5cabd4b6320f830bbef2b8 - Reviewed-on: https://code.wireshark.org/review/5108 - Reviewed-by: Guy Harris + Change-Id: Ifa7303766b08d09442ccf3d7063cbe061578ecd9 + Reviewed-on: https://code.wireshark.org/review/6318 + Reviewed-by: Michael Mann -commit e38e828 -Author: Stig Bjørlykke -Date: Tue Nov 4 12:04:20 2014 +0100 +commit 9a7318a +Author: Alexis La Goutte +Date: Sun Jan 4 13:00:54 2015 +0100 - Lua: Fix for register dissectors only once. - - The postdissector may be registered before adding the dissector function. + Wimax: fix no previous prototype for ... [-Wmissing-prototypes] - Change-Id: I2285824835491ac91e00515bfb18eb471888eaf8 - Reviewed-on: https://code.wireshark.org/review/5106 - Petri-Dish: Stig Bjørlykke + Change-Id: I1dac7d362bab680c313766de19d51132d1ce6dfa + Reviewed-on: https://code.wireshark.org/review/6298 + Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot - Reviewed-by: Stig Bjørlykke - Tested-by: Stig Bjørlykke + Reviewed-by: Michael Mann -commit e41f088 -Author: Guy Harris -Date: Tue Nov 4 02:07:30 2014 -0800 +commit 4270673 +Author: Alexis La Goutte +Date: Mon Jan 5 11:05:56 2015 +0100 - SWITCH_TYPE is not always defined, SwitchType() will try to find a fallback - - Pick up change from Samba: - - commit 4b09df897803e78265fd19f6ff19be6e3d8a3944 - Author: Matthieu Patou - Date: Tue Oct 1 12:10:18 2013 -0700 - - pidl-wireshark: SWITCH_TYPE is not always defined, SwitchType() will try to find a fallback + OSITP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - Pair-Programmed-With: Stefan Metzmacher - - Change-Id: I1f41ece23e8fec30f9cd89a2203ad63ee6e21e36 - Reviewed-on: https://code.wireshark.org/review/5105 - Reviewed-by: Guy Harris - -commit 5025bc2 -Author: Michal Labedzki -Date: Sat Dec 21 17:55:43 2013 +0100 - - Qt: Dynamic languages - - - get language as soon as possible (before creating any Qt objects) to make all - translations working - - dynamic list of supported languages - - runtime change of GUI language (no need to restart application) - - add flags icons support - - search for *.qm languages in buildin resources, then - data dir called "languages" (main directory in sources or - /usr/share/wireshark/languages), then user directory - (UNIX: ~/.wireshark/languages); "languages" directory should contains - files wireshark_xx.qm where xx is language code (en, en_GB, etc.), - and optional xx.svg for flag icon - - try to fix some untranslated manually-created UI items - (need manual reset text of those components) - - Change-Id: I62ca8a8cddce47cec9dbcad6b0bd68b6cfd92229 - Reviewed-on: https://code.wireshark.org/review/5041 - Tested-by: Michal Labedzki - Reviewed-by: Michal Labedzki + Change-Id: Ied8e931541e8e570ef32376eec61779a32bbd493 + Reviewed-on: https://code.wireshark.org/review/6322 + Reviewed-by: Anders Broman -commit 15e78de -Author: Stig Bjørlykke -Date: Fri Oct 31 13:21:46 2014 +0100 +commit b03a21a +Author: Alexis La Goutte +Date: Mon Jan 5 11:05:20 2015 +0100 - Lua: Register dissectors only once. + SMTP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - Change-Id: I883e8560e9d101d34760d09715255e4fccc9eb98 - Reviewed-on: https://code.wireshark.org/review/5022 - Reviewed-by: Hadriel Kaplan - Reviewed-by: Stig Bjørlykke - Tested-by: Stig Bjørlykke + Change-Id: I234b9dad79e3327637f8cdcd406a49f9e7435f33 + Reviewed-on: https://code.wireshark.org/review/6321 + Reviewed-by: Anders Broman -commit e2f2e18 -Author: Stephen Fisher -Date: Mon Nov 3 17:05:38 2014 -0700 +commit c411029 +Author: Alexis La Goutte +Date: Sat Jan 3 20:18:56 2015 +0100 - Also ignore TAGS files in addition to the already ignored tags in .gitignore + Update to QCustomPlot 1.3.0 - Change-Id: Id787cf8dfd3df5fac6d535422e00eff3788570b0 - Reviewed-on: https://code.wireshark.org/review/5103 - Reviewed-by: Stephen Fisher + Reapply remove trailing whitespace and some spelling fixes + Fix also a not ASCII caracter in qcustomplot.h + + Change-Id: Ibd5433015dd117f4d028c842a4add53041adbd11 + Reviewed-on: https://code.wireshark.org/review/6275 + Petri-Dish: Alexis La Goutte + Reviewed-by: Anders Broman -commit 3b5cb2a -Author: Stephen Fisher -Date: Mon Nov 3 16:39:16 2014 -0700 +commit 696fcdb +Author: Dario Lombardo +Date: Tue Dec 30 12:31:46 2014 +0100 - Update my e-mail address + Added DNS statistics support - Change-Id: I46b03b15820c4d3df172528068317ae0ddc8fab2 - Reviewed-on: https://code.wireshark.org/review/5102 - Reviewed-by: Stephen Fisher + 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). + + Change-Id: I90658f7aa6707aa39bdd787a51b20fed4dbddc53 + Reviewed-on: https://code.wireshark.org/review/6236 + Reviewed-by: Alexis La Goutte -commit 6167673 +commit 087723a Author: Guy Harris -Date: Mon Nov 3 15:03:01 2014 -0800 +Date: Sun Jan 4 20:06:55 2015 -0800 - Regenerate DCE RPC dissectors with the current pidl. + Suppress the check for ' as a formatting character on Windows. - Change-Id: I3cfb9399a9e5ed783083fa5b26a39646fb53875f - Reviewed-on: https://code.wireshark.org/review/5101 + Change-Id: I006359faeeeb5d01ecdb57878c599c5e8a93a77f + Reviewed-on: https://code.wireshark.org/review/6319 Reviewed-by: Guy Harris -commit 1119eb6 +commit fc39b9b Author: Guy Harris -Date: Mon Nov 3 12:05:47 2014 -0800 +Date: Sun Jan 4 17:43:19 2015 -0800 - generate ALIGN_TO_x_BYTES instructions if the element has the align_x flag + In CMake, check for thousands-grouping support in the GLib printf routines. - Pick up change from Samba: + We do that with the autotools; do it with CMake as well. - commit 93f262ee6d162bf007b79d2daf9de6c49c6163d1 - Author: Matthieu Patou - Date: Fri Oct 18 00:04:28 2013 -0700 + 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. - pidl-wireshark: generate ALIGN_TO_x_BYTES instructions if the element has the align_x flag + Fix autotools' comment for that item while we're at it (it checks the + GLib printf routines, not the system printf routines). - Change-Id: I865eae69ea7a8200630d3ad69bda9ac7b1c12255 - Reviewed-on: https://code.wireshark.org/review/5099 + Change-Id: I000f0f3b955d9b192ade15e3fabc46d6b48a052e + Reviewed-on: https://code.wireshark.org/review/6317 Reviewed-by: Guy Harris -commit 283b5cd +commit 533f857 Author: Guy Harris -Date: Mon Nov 3 12:03:32 2014 -0800 +Date: Sun Jan 4 16:31:49 2015 -0800 - if the structure has the flag no_align then set also no_align in the dceprc_info structure + Don't check for nl80211 stuff if we don't have libnl. - commit 3f6ca430b067705d556031d52736d5a5d5ae8f55 - Author: Matthieu Patou - Date: Fri Oct 11 13:18:37 2013 -0700 + While we're at it, do the checks in the same order that we do in + autotools. - pidl-wireshark: if the structure has the flag no_align then set also no_align in the dceprc_info structure - - Some dissection function will try to do alignment if the no_align flag - is not set. - - Pair-Programmed-With: Stefan Metzmacher - - Change-Id: Ie2377f4d6c1c4f2fde7084ba666bd417568122dd - Reviewed-on: https://code.wireshark.org/review/5098 + Change-Id: Ie253cdeb740a5be4a5817ce4f7ed683aeea868c8 + Reviewed-on: https://code.wireshark.org/review/6316 Reviewed-by: Guy Harris -commit 9299bf4 +commit 8fe6b04 Author: Guy Harris -Date: Mon Nov 3 11:55:34 2014 -0800 +Date: Sun Jan 4 16:25:51 2015 -0800 - Remove casts, make some whitespace changes in generated code. - - This is the part of this change from Samba: + Note why we only default to enabling libnl on Linux. - commit f0a6043fb201940f438f63c809df7186aa307f01 - Author: Matthieu Patou - Date: Sun Oct 5 18:25:27 2014 -0700 + (Just as we note why we only check for it on Linux in autotools.) - pidl-wireshark: handle 8 bits enum and change the signature of enum function to pass the exact type - - Instead of passing a uint32 in all cases we pass the exact type - - Pair-Programmed-With: Stefan Metzmacher - - that wasn't already in our version. - - Change-Id: I7da99cb701c2eedadeb8acb68d32f657dfa85e5b - Reviewed-on: https://code.wireshark.org/review/5097 + Change-Id: I58c1f31fdf667ed554a4e911df13e5c864171ac0 + Reviewed-on: https://code.wireshark.org/review/6315 Reviewed-by: Guy Harris -commit 26d4fb0 +commit 05fd11e Author: Guy Harris -Date: Mon Nov 3 11:50:53 2014 -0800 +Date: Sun Jan 4 16:11:56 2015 -0800 - add definition for IPV4/IPV6 types + Add a check for NL80211_PROTOCOL_FEATURE_SPLIT_WIPHY_DUMP. - Pick up change from Samba: + Just as we check for it in autotools, check for it in CMake. - commit 49e0dc7ad0f3c29df20badacc4294f1adc375aaf - Author: Matthieu Patou - Date: Fri Oct 25 23:11:37 2013 -0700 - - pidl-wireshark: add definition for IPV4/IPV6 types - - Change-Id: I514f855370c1d9355ffc6ff9b31f8aedd70b9122 - Reviewed-on: https://code.wireshark.org/review/5096 + Change-Id: I342a3fcde6a5f8190dac67260f25c070b6f5430f + Reviewed-on: https://code.wireshark.org/review/6314 Reviewed-by: Guy Harris -commit d993cdd +commit 2f1ac87 Author: Guy Harris -Date: Mon Nov 3 11:46:18 2014 -0800 +Date: Sun Jan 4 14:10:56 2015 -0800 - insure that we have an entire match for the variable name + Clean up handling of INET6. - Pick up patch from Samba: + We wire it on, so we don't need a commented out wiring-it-on on Windows. - commit fa331f64d1a40350496c7acf68c20cb3fead6eaf - Author: Matthieu Patou - Date: Thu Oct 3 09:45:19 2013 -0700 + Explain *why* we're wiring it on rather than doing checks for IPv6 + support. - pidl-wireshark: insure that we have an entire match for the variable name - - Change-Id: I1e730dfb3b9eb96a4cda34659297fddeac7801c8 - Reviewed-on: https://code.wireshark.org/review/5095 + Change-Id: I205ba2456160f9dad48041f27c63a09cdcdc12d3 + Reviewed-on: https://code.wireshark.org/review/6313 Reviewed-by: Guy Harris -commit 0139ac8 +commit 553cdfd Author: Guy Harris -Date: Mon Nov 3 11:44:05 2014 -0800 +Date: Sun Jan 4 13:19:47 2015 -0800 - generate an error for the new Pipe type in typedef - - Pick up change from Samba: + No need to #define HAVE_PYTHON. - commit 5d0d45c9a71f137dc29ca79d49bd558f34bf1ff5 - Author: Matthieu Patou - Date: Sun Sep 29 00:42:36 2013 -0700 + We don't check it (we don't support Python as an extension language - + the experimental support was dropped). - pidl-wireshark: generate an error for the new Pipe type in typedef + Change-Id: Iedbe1dc5095614676c7eb3026d02f421bdba0d1d + Reviewed-on: https://code.wireshark.org/review/6312 + Reviewed-by: Guy Harris + +commit fac8356 +Author: Hadriel Kaplan +Date: Mon Dec 29 00:21:15 2014 -0500 + + Make all Lua code use wmem not emem - Pair-Programmed-With: Stefan Metzmacher + Changed all remaining code in wslua that was using emem, to use wmem or + simpler methods. - Change-Id: I9e6da50b657f774fadf7c3777900d409999d4660 - Reviewed-on: https://code.wireshark.org/review/5094 - Reviewed-by: Guy Harris + Bug: 9927 + Change-Id: I3d19a770e0fd77d996bdb6b61a76a722cc2bcd55 + Reviewed-on: https://code.wireshark.org/review/6109 + Petri-Dish: Michael Mann + Reviewed-by: Hadriel Kaplan + Petri-Dish: Hadriel Kaplan + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann -commit 08a85b8 +commit 5653fce Author: Guy Harris -Date: Mon Nov 3 11:34:29 2014 -0800 +Date: Sun Jan 4 12:58:49 2015 -0800 - add a function to change the type of a hf_field + No *pcap should have pcap_open() without the other remote extensions. - Pick up change from Samba: + 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. - commit 755bc4ed29c89fc15d4230ce8b828b3afcfa2912 - Author: Matthieu Patou - Date: Thu Oct 3 01:10:48 2013 -0700 + (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.) - pidl-wireshark: add a function to change the type of a hf_field + So there's no need to check for pcap_findalldevs_ex() or + pcap_createsrcstr(). - We can use this to change the type FT_BYTE when we realize that the - object dissected is an array of bytes - - Change-Id: I1f24ce834b6a5be0d933b1fdfd9a0baa88c3761a - Reviewed-on: https://code.wireshark.org/review/5093 + Change-Id: I9323aad20136684d05d1e909326792a2f1408887 + Reviewed-on: https://code.wireshark.org/review/6311 Reviewed-by: Guy Harris -commit e0c7277 -Author: Guy Harris -Date: Mon Nov 3 11:30:26 2014 -0800 +commit 9aeb249 +Author: Pascal Quantin +Date: Sun Jan 4 18:47:40 2015 +0100 - Handle the case when the DATA_TYPE is not a simple type + ACSE: get rid of an evil global variable - Pick up change from Samba: + Bug: 10787 + Change-Id: I225dab439e195bbd308bcafd4658e77ef9023c0f + Reviewed-on: https://code.wireshark.org/review/6263 + Tested-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Reviewed-by: Evan Huus + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + +commit d9b480d +Author: Pascal Quantin +Date: Sun Jan 4 19:22:05 2015 +0100 + + PKIX1Explicit: get rid of an evil global variable - commit 343db5326b369cbdef4b723e3056acc2a866a887 - Author: Matthieu Patou - Date: Tue Sep 23 01:28:40 2014 -0700 + Bug: 10744 + Change-Id: I9fbd7c881ab6b17fa9febb55a4f33dbb229c900b + Reviewed-on: https://code.wireshark.org/review/6264 + Tested-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Reviewed-by: Evan Huus + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + +commit d16f114 +Author: Michael Mann +Date: Wed Dec 24 22:12:17 2014 -0500 + + Convert "FC Member Identifier" fields from all strings to their "native" formats. - pidl-wireshark: Handle the case when the DATA_TYPE is not a simple type + Change-Id: I7ea32170b1cdcbc16c1d62b1069c4ed71ea6e9bb + Reviewed-on: https://code.wireshark.org/review/6099 + Reviewed-by: Michael Mann + +commit d3581ae +Author: Gerald Combs +Date: Fri Jan 2 14:06:42 2015 -0800 + + Make sure we don't underrun a buffer when decrypting SSL. - Pair-Programmed-With: Stefan Metzmacher + Discovered by Noam Rathaus. - Change-Id: I511a60beb392e5e92701d5ace1260397fb4be851 - Reviewed-on: https://code.wireshark.org/review/5092 - Reviewed-by: Guy Harris + Change-Id: Ia0275601b2a825ba616656064d9a6eca109e34fa + Reviewed-on: https://code.wireshark.org/review/6256 + Petri-Dish: Gerald Combs + Reviewed-by: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Evan Huus -commit 58a325e -Author: Guy Harris -Date: Mon Nov 3 11:24:18 2014 -0800 +commit ac52f0e +Author: Alexis La Goutte +Date: Sat Jan 3 20:26:08 2015 +0100 - Improve string delection in function ContainsString + SCTP (Graph Dialog Qt): fix Copy-paster error (CID 1158585) - Pick up patch from Samba: - - commit 5740a06b320d56840439fb7fe3b8b27f341ddaa7 - Author: Matthieu Patou - Date: Sat Oct 4 21:19:12 2014 -0700 + Change-Id: I8939dbc8339284f9a1e515aff533d67ddbb6d469 + Reviewed-on: https://code.wireshark.org/review/6274 + Reviewed-by: Evan Huus + +commit c2f6ce7 +Author: Alexis La Goutte +Date: Wed Dec 24 15:30:03 2014 +0100 + + TCP: Update Multipath TCP (MPTCP) to final RFC (RFC 6824) - pidl: Improve string delection in function ContainsString + * 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: I702c12e4275315511728d5ef6db07e03be9c2b38 - Reviewed-on: https://code.wireshark.org/review/5091 - Reviewed-by: Guy Harris + Change-Id: I2e4dfd75623d3218c574e3a112e799666adcc377 + Reviewed-on: https://code.wireshark.org/review/6034 + Reviewed-by: Alexis La Goutte + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Evan Huus -commit 0713d35 -Author: Guy Harris -Date: Mon Nov 3 11:20:27 2014 -0800 +commit f648247 +Author: Pascal Quantin +Date: Sun Jan 4 18:43:57 2015 +0100 - Make the compilation of PIDL produce the same results if the content hasn't changed + Get rid of warning: comma at end of enumerator list [-Wpedantic] - Pick up change from Samba: - - commit 4986359816704f38d4fad3ddd0d07a0f0a25b335 - Author: Matthieu Patou - Date: Mon Sep 22 21:52:14 2014 -0700 + Change-Id: I8faca065e1afff6d4d29b9b96c1b0f0b135163a7 + Reviewed-on: https://code.wireshark.org/review/6306 + Reviewed-by: Pascal Quantin + +commit 4a94374 +Author: Pascal Quantin +Date: Sun Jan 4 18:33:22 2015 +0100 + + Fix linkage on Windows machine - pidl: Make the compilation of PIDL producing the same results if the content hasn't change + Change-Id: I24c8670fdf0910c3324fcfa8db8a8dbaad1dfbba + Reviewed-on: https://code.wireshark.org/review/6305 + Reviewed-by: Pascal Quantin + +commit ff01bc6 +Author: Peter Wu +Date: Fri Dec 19 20:28:05 2014 +0100 + + gtk: fix crash when moving columns - Newer perl versions don't generate stable results anymore. + 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. - Pair-Programmed-With: Stefan Metzmacher + 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). - Change-Id: Ifced47229b3033d1fae494adff0dee6671304812 - Reviewed-on: https://code.wireshark.org/review/5090 - Reviewed-by: Guy Harris + Bug: 10795 + Change-Id: Ia97d330c8bef747809fa09a8709a19cb03c7e00a + Reviewed-on: https://code.wireshark.org/review/5881 + Reviewed-by: Alexis La Goutte + Reviewed-by: Pascal Quantin -commit f2269b4 -Author: Guy Harris -Date: Mon Nov 3 11:07:54 2014 -0800 +commit 553da37 +Author: Michael Mann +Date: Sat Jan 3 21:56:16 2015 -0500 - Pass di to one more call to PIDL_dissect_uint8(). + Create BASE_DOT, BASE_DASH, and BASE_SEMICOLON types for the FT_BYTES field type. - The case for type "char" wasn't fixed. + 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. - Change-Id: Ia745263cd4d11a3c00b1ecc72e044f4e404da283 - Reviewed-on: https://code.wireshark.org/review/5088 - Reviewed-by: Guy Harris + 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 -commit 7a78792 -Author: Guy Harris -Date: Mon Nov 3 08:39:07 2014 -0800 +commit 2085bbe +Author: Sylvain Munaut +Date: Sun Jan 4 16:57:10 2015 +0100 - Don't use -msse4.2 with MSVC. + gmr1_rach: Update dual-values fields to use true_false_string - Change-Id: I457d45d9ad05e0eb851e78a7342e666ef9df8ffd - Reviewed-on: https://code.wireshark.org/review/5086 - Reviewed-by: Guy Harris + Change-Id: I87f2be4b28f6409e525afc36e8ed834fae3befbb + Signed-off-by: Sylvain Munaut + Reviewed-on: https://code.wireshark.org/review/6300 + Reviewed-by: Pascal Quantin -commit bba77c3 -Author: AndersBroman -Date: Mon Nov 3 16:19:10 2014 +0100 +commit 84e43d9 +Author: Sylvain Munaut +Date: Sun Jan 4 16:46:12 2015 +0100 - tvb_length -> tvb_reported_length + gmr1_rach: Add support for GmPRS/GMR-1 3G Channel Request Type 1 & 2 - Change-Id: I48b618008c8c8accd6f161bdc42e02906a4765b7 - Reviewed-on: https://code.wireshark.org/review/5085 - Reviewed-by: Anders Broman + Those are related to the Packet Data service. + + Change-Id: Ia8e9732901609e1cdad38558aac4a2f3475a0a9d + Signed-off-by: Sylvain Munaut + Reviewed-on: https://code.wireshark.org/review/6291 + Reviewed-by: Pascal Quantin -commit 7613327 -Author: AndersBroman -Date: Mon Nov 3 09:49:50 2014 +0100 +commit 1cd9d02 +Author: Gerald Combs +Date: Sun Jan 4 08:05:05 2015 -0800 - Comment out - dictionary.rfc6929 - dictionary.rfc6930 - dictionary.rfc7155 - dictionary.rfc7268 - As they give errors in the test suit, something may have changed in the - free rasdius syntax, + [Automatic manuf, services and enterprise-numbers update for 2015-01-04] - Change-Id: I27c2c4ea8b96601dfaf48b8dc29273fa6adca655 - Reviewed-on: https://code.wireshark.org/review/5084 - Reviewed-by: Anders Broman + Change-Id: Id1c008d9bbce7d9fdf8b1d2ec7d382e9d205db17 + Reviewed-on: https://code.wireshark.org/review/6301 + Reviewed-by: Gerald Combs -commit f3cc900 +commit dbcb0b5 Author: Alexis La Goutte -Date: Sun Nov 2 17:07:41 2014 +0100 +Date: Sun Jan 4 12:51:21 2015 +0100 - MIPv6: Mobility Header Link Layer Address is parsed incorrectly - - Looking at RFC 5568 (http://tools.ietf.org/html/rfc5568#section-6.4.3) - It says that the Link-Layer Address (LLA) Option, should have an address right after the option code + stats tree plugin: fix no previous prototype for 'plugin_register_tap_listener' [-Wmissing-prototypes] - Bug:10006 - Bug:10627 - Change-Id: I6fcd98a7c9896862e4c9547b945cf3848daaf474 - Reviewed-on: https://code.wireshark.org/review/5075 - Reviewed-by: Anders Broman + Change-Id: If8ea78b9aceb9dbd7f2103aa141b57715188ff4f + Reviewed-on: https://code.wireshark.org/review/6297 + Reviewed-by: Michael Mann -commit 9b37e1e +commit b0b51dd Author: Alexis La Goutte -Date: Mon Oct 27 13:40:45 2014 +0100 +Date: Sat Jan 3 20:47:53 2015 +0100 - HPSW: fix neighbor MAC Address + GTPv2: fix Logically dead code (CID 1250813) - Use the wrong length for display mac address (6 and no the length of option) - Also fix update of item (don't update the root item) - - Change-Id: I38cd1a6a045e797b01cd1a8de5add0949eaa0f01 - Reviewed-on: https://code.wireshark.org/review/4950 + Change-Id: I1761af90bd85b14e6021a5d7b07686a37593a152 + Reviewed-on: https://code.wireshark.org/review/6279 Reviewed-by: Anders Broman -commit e4c257a -Author: Pascal Quantin -Date: Sun Nov 2 12:59:47 2014 +0100 +commit fa0ebfc +Author: Alexis La Goutte +Date: Sun Jan 4 13:14:50 2015 +0100 - Qt: fix what seems to be a copy/paste error in MainWindow::loadWindowGeometry() (Coverity CID 1158563) - - Change-Id: Iaa2a6367fbb434514751e0ed4f273f883798ce8a - Reviewed-on: https://code.wireshark.org/review/5066 - Reviewed-by: Alexis La Goutte - Reviewed-by: Anders Broman + BACAPP: fix empty paragraph passed to '@param' command [-Wdocumentation] + + Change-Id: Ibef3cee6930dea08fc7a87635c48de609d3d4015 + Reviewed-on: https://code.wireshark.org/review/6299 + Reviewed-by: Michael Mann -commit 1a2fcc5 -Author: Pascal Quantin -Date: Sun Nov 2 12:58:26 2014 +0100 +commit 83ac5b7 +Author: Alexis La Goutte +Date: Sat Jan 3 20:44:06 2015 +0100 - Qt: fix a potential memory leak FollowStreamDialog::follow() found by Coverity (CID 1159304) + GTPv2: fix Logically dead code (CID 1255924) - Change-Id: I53709c6729c6d9156d2ba5ccd83e92bc27433e26 - Reviewed-on: https://code.wireshark.org/review/5065 - Reviewed-by: Alexis La Goutte + Change-Id: Ia21d8f68b5d898b4493da8cf948ad421f94234fc + Reviewed-on: https://code.wireshark.org/review/6278 Reviewed-by: Anders Broman -commit 7b4215d -Author: Anish Bhatt -Date: Mon Oct 27 01:12:21 2014 -0700 +commit 98ba630 +Author: Sylvain Munaut +Date: Sat Jan 3 01:36:19 2015 +0100 - [Radius] Update dictionaries from freeradius 3.0.4 + gmr1_rach: Fixup the MOC Dialled Number decoding - Update includes all new/renamed dictionaries in radius, but does not cover any differences in already included dictionaries, which will be handled in a separate update. + Turns out the special values 1023/1022/1021 can happen in any group + and not just the last one. - Change-Id: I6d1e1cc1815423fb71ec940366964a366ab41a25 - Reviewed-on: https://code.wireshark.org/review/4947 - Reviewed-by: Anders Broman + The last one is still special though with codes [1100->1209] being + exclusive to it. + + Change-Id: If86d0260aaa2cc1215560b89d7fc57d7ef21f082 + Signed-off-by: Sylvain Munaut + Reviewed-on: https://code.wireshark.org/review/6290 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin -commit bea8299 -Author: Martin Kaiser -Date: Thu Aug 28 18:39:02 2014 +0200 +commit a22ea3d +Author: Sylvain Munaut +Date: Sat Jan 3 10:50:28 2015 +0100 - remove parent parameter from try_dissect_next_protocol() + gmr1_rach: Update NULL GPS position decoding with reality - Change-Id: Ib05b67c8741f90444e773e7c9e1378f00f41dad7 - Reviewed-on: https://code.wireshark.org/review/5083 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + 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 + Reviewed-on: https://code.wireshark.org/review/6289 + Reviewed-by: Pascal Quantin -commit 179a9b5 -Author: Martin Kaiser -Date: Thu Aug 28 18:24:19 2014 +0200 +commit a16ac8f +Author: Sylvain Munaut +Date: Fri Jan 2 14:38:25 2015 +0100 - new function proto_tree_get_parent_tree() - it returns the parent tree of a given tree object + gmr1_rach: Use FT_INT24 instead of FT_UINT24 for latitude/longitude - Change-Id: I191e0221651ffb5b26df761e9a25075aa0eb2ad3 - Reviewed-on: https://code.wireshark.org/review/4954 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + 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. + + 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 + Reviewed-on: https://code.wireshark.org/review/6288 + Reviewed-by: Pascal Quantin -commit 250c1ec -Author: Balint Reczey -Date: Sun Nov 2 20:35:37 2014 +0100 +commit 7c9d6ff +Author: Hadriel Kaplan +Date: Sat Jan 3 19:27:59 2015 -0500 - Fix typo: Intrustion -> Intrusion + Lua: replace proto_tree_add_text calls - Change-Id: Iea95556a4d77ff54d46a505903e50134f51d563a - Reviewed-on: https://code.wireshark.org/review/5082 + Replace proto_tree_add_text() calls in Lua API code, to use Lua-specific hfinfo items. + + Bug: 10828 + Change-Id: I9b5899106502a9bdbc748b5ec0f27b787d374562 + Reviewed-on: https://code.wireshark.org/review/6296 + Reviewed-by: Hadriel Kaplan + Petri-Dish: Hadriel Kaplan + Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte -commit dab9c85 -Author: Guy Harris -Date: Sun Nov 2 11:26:15 2014 -0800 +commit 2ef85f5 +Author: Alexis La Goutte +Date: Sat Jan 3 19:29:05 2015 +0100 - Fix syntax. + WiFi Display: fix no previous prototype for ... [-Wmissing-prototypes] - Change-Id: Icc18cd7369bae21629aafd5631a373485ef75dea - Reviewed-on: https://code.wireshark.org/review/5081 - Reviewed-by: Guy Harris - -commit 66e204f -Author: Guy Harris -Date: Sun Nov 2 10:37:31 2014 -0800 - - Handle packagemaker being an ordinary command in /usr/bin. + It is the revert of adb81f335d17a151361f00001e125480eeaf7bc5 - Change-Id: Ic804a0fdb4dc450683f57be4814a347e20ecd401 - Reviewed-on: https://code.wireshark.org/review/5079 - Reviewed-by: Guy Harris + Change-Id: I7a19ff175ca1ab59d0d0d9e89b3b3e6e12de3b96 + Reviewed-on: https://code.wireshark.org/review/6273 + Reviewed-by: Michael Mann -commit 70cab47 -Author: Guy Harris -Date: Sun Nov 2 10:10:17 2014 -0800 +commit aad1a81 +Author: Graham Bloice +Date: Sat Jan 3 20:52:54 2015 +0000 - Fix syntax, add a check for failure to find PackageMaker, make sure it's a file. + Fix out-of-tree build includes of config.h - Change-Id: Id5bb23a8c5ebd8a63a51029de541cd32e484029c - Reviewed-on: https://code.wireshark.org/review/5078 - Reviewed-by: Guy Harris + 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 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 + + Revert "CMake: Clobber the top-level config.h before we build." + + This reverts commit 1f3849ce614aeae5fda742beffe5558e7c2a8b71. + + Ping-Bug: 10301 + Change-Id: Ie567e7cc696fd48f3e730fc27032c5d2a7d8f341 + Reviewed-on: https://code.wireshark.org/review/6285 + Reviewed-by: Graham Bloice + Petri-Dish: Graham Bloice + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs -commit 4f94c9e +commit 9384854 Author: Guy Harris -Date: Sun Nov 2 09:25:11 2014 -0800 +Date: Sat Jan 3 14:35:01 2015 -0800 - Handle PackageMaker a bit better. + Use g_strdup_printf(), rather than a fixed-length buffer, for the app name. - Look for the binary in various places, rather than looking for - particular directories and adding them to the path. That lets us use - the PackageMaker binary from the PackageMaker.app bundle (it can either - be run as a GUI app or from the command line), so you don't have to have - a symlink to it from one of the directories in question. + Add some missing g_free()s while we're at it. - Change-Id: I1ad701291698544f96d419663f0b4a669876d2f1 - Reviewed-on: https://code.wireshark.org/review/5077 + Change-Id: Id38acc21d3c0b337e5d05baaf5ebbcd63699ff50 + Reviewed-on: https://code.wireshark.org/review/6287 Reviewed-by: Guy Harris -commit f968017 -Author: Alexis La Goutte -Date: Sun Nov 2 16:58:39 2014 +0100 - - RTPS: fix warning: no previous prototype for function ... [-Wmissing-prototypes] - - Change-Id: I1943c1446a7bc3381d869514d7802bc0fbb1f6e3 - Reviewed-on: https://code.wireshark.org/review/5072 - Reviewed-by: Anders Broman - -commit 232879a +commit 9df7386 Author: Alexis La Goutte -Date: Sun Nov 2 16:41:46 2014 +0100 +Date: Sat Jan 3 19:43:57 2015 +0100 - gsm a dtap: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + It is also 2015 for Mac OS X :-) - Change-Id: Ifbe59a51e5fa6158f9073402f1a1ab63df2dfa42 - Reviewed-on: https://code.wireshark.org/review/5071 + Change-Id: Idbd5e09ac80015feee7ddd30b9569219fde596e1 + Reviewed-on: https://code.wireshark.org/review/6269 Reviewed-by: Anders Broman -commit 3f38631 +commit 9ab44b3 Author: Alexis La Goutte -Date: Sun Nov 2 16:41:16 2014 +0100 +Date: Sat Jan 3 19:43:24 2015 +0100 - fcels: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + Info.plist : fix indent (use tabs) - Change-Id: I1c351348399caea313abb94680a610073b3e5af7 - Reviewed-on: https://code.wireshark.org/review/5070 + Change-Id: I241c124fa341ae5d6126a189374d69dea1a08d96 + Reviewed-on: https://code.wireshark.org/review/6268 Reviewed-by: Anders Broman -commit f1bdcd9 -Author: Alexis La Goutte -Date: Sun Nov 2 16:40:02 2014 +0100 +commit 760aa14 +Author: Guy Harris +Date: Sat Jan 3 14:00:47 2015 -0800 - lzxpress: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + Use g_strdup_printf(), rather than a fixed-length buffer, for the app name. - Change-Id: I028d8877a845af5830b17abfe7eb10d8528b334a - Reviewed-on: https://code.wireshark.org/review/5069 - Reviewed-by: Anders Broman + Change-Id: Ie6034e229f37278fce44b2fddad9250dfb5bc6c8 + Reviewed-on: https://code.wireshark.org/review/6286 + Reviewed-by: Guy Harris -commit 2899a6e -Author: Gerald Combs -Date: Sun Nov 2 08:06:55 2014 -0800 +commit dfa50e6 +Author: Guy Harris +Date: Sat Jan 3 13:36:02 2015 -0800 - [Automatic manuf, services and enterprise-numbers update for 2014-11-02] + Use get_ws_vcs_version() to generate the version string. - Change-Id: Idc5360a39ab2f2f0b0827bc6c71f95e2f175d792 - Reviewed-on: https://code.wireshark.org/review/5073 - Reviewed-by: Gerald Combs - -commit ba008bf -Author: Michael Mann -Date: Sat Nov 1 16:55:25 2014 -0400 - - Eliminate proto_tree_add_text from several dissectors. + That's what we do in, for example, dumpcap. - Change-Id: I6d3125f15d268edd47ef74dd655eb86cb25ee52d - Reviewed-on: https://code.wireshark.org/review/5047 - Reviewed-by: Michael Mann - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Alexis La Goutte - -commit f19c70c -Author: Pascal Quantin -Date: Sun Nov 2 12:17:58 2014 +0100 - - DNS: fix Coverity CID 281285 and CID 1238867 + Also, use g_strdup_printf() for the strings, rather than using + fixed-length arrays. - Change-Id: Ia5747a5d0c8c63b7471de624c96e546c7bbfbf57 - Reviewed-on: https://code.wireshark.org/review/5064 - Reviewed-by: Pascal Quantin - Reviewed-by: Michael Mann + Change-Id: I36ad201e3eda903ef3a089bafb09df0581efe512 + Reviewed-on: https://code.wireshark.org/review/6284 + Reviewed-by: Guy Harris -commit c49c775 -Author: Pascal Quantin -Date: Sun Nov 2 13:27:37 2014 +0100 +commit a190c93 +Author: Martin Mathieson +Date: Fri Jan 2 23:28:44 2015 +0000 - Add identification of Windows (Server) 10 + Remove unnecessary includes from wiretap folder - Change-Id: I5ab7a4dc67ceac644faead0d9e460e3babaf6355 - Reviewed-on: https://code.wireshark.org/review/5067 - Reviewed-by: Pascal Quantin + Change-Id: I10d3057801673bc1c8ea78f144215869cc4b1851 + Reviewed-on: https://code.wireshark.org/review/6217 + Petri-Dish: Martin Mathieson + Reviewed-by: Martin Mathieson -commit f8c3f15 +commit 1f3849c Author: Gerald Combs -Date: Sat Nov 1 20:52:34 2014 -0700 +Date: Sat Jan 3 12:02:56 2015 -0800 - WSUG: Convert ``Customizing'' to AsciiDoc. + CMake: Clobber the top-level config.h before we build. - Leave most of the content intact for now. + 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 - Change-Id: Id00d942f87e0a25e27333ac56eb9b99311694a13 - Reviewed-on: https://code.wireshark.org/review/5063 + Ping-Bug: 10301 + Change-Id: I7ebeb31c92022fd28cbfca05fdb6931ffa2d9cae + Reviewed-on: https://code.wireshark.org/review/6282 Reviewed-by: Gerald Combs -commit 2d8d217 +commit 4d3acd9 Author: Pascal Quantin -Date: Sat Nov 1 22:40:41 2014 +0100 +Date: Sat Jan 3 17:59:54 2015 +0100 - DNS: fix dissection of ISDN RR Sub Address field + tshark: dump port number when generating SCTP, TCP or UDP conversations - Bug: 10650 - Change-Id: I3411d4e5ef534a663940974d98c351976005ee8e - Reviewed-on: https://code.wireshark.org/review/5057 + Change-Id: Ie3cda43a4cfca06482f2cee09f33230d1535b77d + Reviewed-on: https://code.wireshark.org/review/6265 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Reviewed-by: Alexis La Goutte + Tested-by: Alexis La Goutte Reviewed-by: Pascal Quantin - Tested-by: Pascal Quantin -commit 5e40aa4 +commit 17dcd95 Author: Pascal Quantin -Date: Sat Nov 1 22:08:44 2014 +0100 +Date: Sat Jan 3 20:40:16 2015 +0100 - print: do not try to add an empty hex stream to PDML output for a text only hf + IPv6: do not allocate tap data on stack - Bug: 10651 - Change-Id: If38af2879b9a20f4755a7843f20c7327d66c95b1 - Reviewed-on: https://code.wireshark.org/review/5054 - Reviewed-by: Evan Huus - Tested-by: Pascal Quantin + Bug: 10780 + Change-Id: I2526fb9a5a2dfd61b19dff5ba1b7902f77927f4a + Reviewed-on: https://code.wireshark.org/review/6276 Reviewed-by: Pascal Quantin + Tested-by: Pascal Quantin -commit 0af4395 -Author: Michael Mann -Date: Fri Oct 31 12:24:59 2014 -0400 +commit 2f34ae9 +Author: Guy Harris +Date: Sat Jan 3 11:03:05 2015 -0800 - Announce messages should only have a TLV if the message length is > 64. + Remove the testing stuff. - Also, cleaned up a unnecessary global variable. + 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. - Bug: 10611 - Change-Id: I8ef5658eeb1f7a240b508833baac64719af144d8 - Reviewed-on: https://code.wireshark.org/review/5029 - Reviewed-by: Evan Huus - Petri-Dish: Evan Huus - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann - -commit 070165c -Author: Pascal Quantin -Date: Sat Nov 1 21:09:41 2014 +0100 - - Ethernet: fix a trivial typo + (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: Ibf623aa9e7153e7d54dda1000face1bac42a0088 - Reviewed-on: https://code.wireshark.org/review/5045 - Reviewed-by: Pascal Quantin + Change-Id: I040126026c4101aca1264affc04e585fee89b87b + Reviewed-on: https://code.wireshark.org/review/6272 + Reviewed-by: Guy Harris -commit a162f5b +commit e133ba9 Author: Pascal Quantin -Date: Sat Nov 1 19:21:31 2014 +0100 +Date: Sat Jan 3 18:06:33 2015 +0100 - DNS: fix display of A6 address suffix field + tshark: dump port number when generating SCTP endpoints statistics - Bug: 10652 - Change-Id: Ibd119177feecd27d0c6baba255e7e3da37b131bd - Reviewed-on: https://code.wireshark.org/review/5043 - Tested-by: Pascal Quantin - Petri-Dish: Pascal Quantin - Tested-by: Petri Dish Buildbot - Reviewed-by: Pascal Quantin + Change-Id: I72b557f0d12ba7a8c13288399a97ef1634121f79 + Reviewed-on: https://code.wireshark.org/review/6266 + Reviewed-by: Michael Mann -commit 20bac9d -Author: Robert Grange -Date: Sat Nov 1 11:27:51 2014 +0100 +commit 0452f76 +Author: Anish Bhatt +Date: Fri Jan 2 20:00:08 2015 -0800 - packet-mq: Use value_string_ext for big value string. more struct dissected + [PROFINET] Fix swapped MaintenanceRequired & MaintenanceDemanded bits - Use of value_string_ext for big value_strign array, sort them, to force use the btree search - parse more integer value with value_string - Bug: 9367 - Change-Id: I49625cf2d46e0974cddde2c7b1767cb7d06ec47d - Reviewed-on: https://code.wireshark.org/review/5037 - Petri-Dish: Bill Meier - Tested-by: Petri Dish Buildbot - Reviewed-by: Bill Meier + Bug: 10753 + + Change-Id: Ib5522eba5c1d9107219ee2d70c96899ba6f22ca1 + Reviewed-on: https://code.wireshark.org/review/6258 + Petri-Dish: Michael Mann + Reviewed-by: Michael Mann -commit cfdd207 -Author: Gerald Combs -Date: Sat Nov 1 09:53:07 2014 -0700 +commit e7c4241 +Author: Graham Bloice +Date: Fri Jan 2 18:06:58 2015 +0000 - Qt: Limit the amount of Follow Stream text. + Fix Windows x64 CMake build - QTextEdit + QTextDocument don't handle large amounts of data very well. - Truncate our displayed text after 2 MB. + Unfortunately Kerberos for Windows (kfw) has a different lib + name for x86 & x64. Fix FindKERBEROS.cmake to check for both + lib names. - Change-Id: I0b549a0b05a490272bc0d34af0f2c6661c548d0f - Reviewed-on: https://code.wireshark.org/review/5042 - Reviewed-by: Gerald Combs + Change-Id: I525df6de099d4e50322226317bda8d93d7a8dd23 + Reviewed-on: https://code.wireshark.org/review/6246 + Reviewed-by: Graham Bloice + Petri-Dish: Graham Bloice + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann -commit 74e8613 -Author: Jeff Morriss -Date: Fri Oct 31 14:16:11 2014 -0400 +commit d7c3edd +Author: Hadriel Kaplan +Date: Thu Jan 1 21:34:16 2015 -0500 - Don't check the checksum if we're encapsulated in an (ICMP) error packet. + Lua: replace deprecated functions - This is the case when an ICMP echo is returned (e.g., because it's too big). + 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. - This effectively applies SVN rev 36193 to ICMPv6. - - Bug: 10620 - Change-Id: I29aeaabc2467c818714df448e39b3a93027c8961 - Reviewed-on: https://code.wireshark.org/review/5030 - Petri-Dish: Jeff Morriss + Bug: 10822 + Change-Id: Ib0686f90be1edc892d3ecf401b91eb7484540b3e + Reviewed-on: https://code.wireshark.org/review/6247 + Reviewed-by: Hadriel Kaplan + Petri-Dish: Hadriel Kaplan Tested-by: Petri Dish Buildbot - Reviewed-by: Alexis La Goutte + Reviewed-by: Anders Broman -commit 6a37368 -Author: Stig Bjørlykke -Date: Wed Oct 15 11:54:05 2014 +0200 +commit 61c6fb8 +Author: Guy Harris +Date: Sat Jan 3 03:06:53 2015 -0800 - Validate no_of_bits in ws_sign_ext32 and ws_sign_ext64 + Remove the probes from packet-kerberos.c. - The result of the '<<' expression is undefined if no_of_bits - 1 is negative. + 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? - Change-Id: I3fff09afe414bdd9d6736ee351f1c542c503b93d - Reviewed-on: https://code.wireshark.org/review/4698 - Reviewed-by: Evan Huus - Petri-Dish: Evan Huus - Tested-by: Petri Dish Buildbot - Reviewed-by: Alexis La Goutte + Change-Id: If238ff54aa4f0cda662c7a52d76e33363a77240d + Reviewed-on: https://code.wireshark.org/review/6262 + Reviewed-by: Guy Harris -commit 54ae596 -Author: Michal Labedzki -Date: Fri Oct 24 15:48:35 2014 +0200 +commit 544ed8a +Author: Guy Harris +Date: Fri Jan 2 23:41:28 2015 -0800 - Translations: Update Polish translation + Stick some #define probes in on Windows. - Still not complete, but almost complete. + 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. - Change-Id: I6e793c4f6648b423a42841347d22073c0b079767 - Reviewed-on: https://code.wireshark.org/review/5040 - Reviewed-by: Michal Labedzki + Change-Id: I782406e2189819d9400b84b6632fe0fb62c5996d + Reviewed-on: https://code.wireshark.org/review/6261 + Reviewed-by: Guy Harris -commit 6f3d91f -Author: Michal Labedzki -Date: Sat Oct 25 18:59:41 2014 +0200 +commit 16fe32f +Author: Guy Harris +Date: Fri Jan 2 20:06:34 2015 -0800 - Qt: Fix build with Qt < 4.8 + Temporarily #if 0 out the call to read_keytab_file(). - Change-Id: I13d4addb16c5c2790703feb63666367d39f36682 - Reviewed-on: https://code.wireshark.org/review/5039 - Reviewed-by: Michal Labedzki + 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. + + Change-Id: If607e0eeeff854693cf9ce2ea1009d34a20a9992 + Reviewed-on: https://code.wireshark.org/review/6259 + Reviewed-by: Guy Harris -commit ea7c867 -Author: Michal Labedzki -Date: Fri Oct 24 15:48:56 2014 +0200 +commit 33ba8d3 +Author: Guy Harris +Date: Fri Jan 2 16:27:24 2015 -0800 - Bluetooth: Fix AVRCP UUID + Support -K iff HAVE_KERBEROS is defined. - Change-Id: Iaddde4a1ce49b46e4473c1a470760d9cbbe8000e - Reviewed-on: https://code.wireshark.org/review/5038 - Reviewed-by: Michal Labedzki + 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. + + Clean up indentation while we're at it. + + Change-Id: I94aa6d565c3d5545620a7aeeaabce03153ec5e1c + Reviewed-on: https://code.wireshark.org/review/6257 + Reviewed-by: Guy Harris -commit 1f0a68d -Author: AndersBroman -Date: Fri Oct 31 10:10:38 2014 +0100 +commit d1d5bf1 +Author: Michael Mann +Date: Fri Jan 2 12:19:10 2015 -0500 - Missed cahnges from last commit: - - Replace some deprecated APIs + Replace proto_tree_add_text in dissector header files where it was used in a macro that should be expert info. - Change-Id: If815e7191afb445c474a59cf1e3af603fc7b0b28 - Reviewed-on: https://code.wireshark.org/review/5018 + Change-Id: I045368a0a91586231fc4b1e2700c2275088b76af + Reviewed-on: https://code.wireshark.org/review/6244 + Petri-Dish: Michael Mann Reviewed-by: Anders Broman + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann -commit 155fe6c +commit 5eecf81 Author: Guy Harris -Date: Fri Oct 31 19:50:42 2014 -0700 +Date: Fri Jan 2 13:17:15 2015 -0800 - Set CXXFLAGS to include $VERSION_MIN_FLAGS. + Don't define a stub read_keytab_file() on Windows if we don't have Kerberos. - You never know when some library might start using C++, so set CXXFLAGS - everywhere. + 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: I7e49a3446bb6b587e20058be48e06a5f345679c3 - Reviewed-on: https://code.wireshark.org/review/5036 + Change-Id: I7e7b12aa93c4f31953300ef513fc09a1f55f8aef + Reviewed-on: https://code.wireshark.org/review/6255 Reviewed-by: Guy Harris -commit 2bd1d46 +commit 970e7c1 Author: Gerald Combs -Date: Fri Oct 31 16:12:47 2014 -0700 +Date: Fri Jan 2 12:33:49 2015 -0800 - Qt: Better Follow Stream hints. - - Show the client and server colors in the hint text. + Try to clarify the PowerShell requirements. - Change-Id: Iddcda8c3f4f7dc0d8919749aeffc8c09c6445c17 - Reviewed-on: https://code.wireshark.org/review/5035 + Change-Id: Ie4ad0388b920ba4a8483ad8af351ddbdd121a28b + Reviewed-on: https://code.wireshark.org/review/6254 Reviewed-by: Gerald Combs -commit 5a71cfd -Author: Gerald Combs -Date: Fri Oct 31 15:49:04 2014 -0700 +commit 42baa9d +Author: Pascal Quantin +Date: Fri Jan 2 21:02:13 2015 +0100 - Qt: Disable our widgets while tapping. + USB HID: fix report descriptor main items dissection - Prevents a crash when changing the spinbox value during the middle of a - follow. + true_false_string definitions were inverted + While we are at it, use the exact same wording as in the spec - Change-Id: I07cea883c72c5975633e4b7046155f9b6de9cc4a - Reviewed-on: https://code.wireshark.org/review/5034 - Reviewed-by: Gerald Combs + Bug: 10825 + Change-Id: Ia391b310e92eb88a9a144a2fb0974701a460afc8 + Reviewed-on: https://code.wireshark.org/review/6251 + Reviewed-by: Pascal Quantin -commit 065d2b7 -Author: Guy Harris -Date: Fri Oct 31 13:08:11 2014 -0700 +commit 7d943e1 +Author: Pascal Quantin +Date: Fri Jan 2 19:20:03 2015 +0100 - Don't force a verbose build. + Add back "version.h" inclusion - That was probably something I put in while debugging. It can be put - back - or added to some other make command - as necessary. + 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 - Change-Id: I184a5b8537c43c87844e6e75f65dd3c0accde9ac - Reviewed-on: https://code.wireshark.org/review/5033 - Reviewed-by: Guy Harris + Change-Id: I3d56985fa1d04bcb066fe015a588c24cf3cb7267 + Reviewed-on: https://code.wireshark.org/review/6248 + Reviewed-by: Pascal Quantin -commit 29fda99 -Author: Guy Harris -Date: Fri Oct 31 12:27:30 2014 -0700 +commit b90f784 +Author: Michael Mann +Date: Fri Jan 2 12:34:21 2015 -0500 - Undo my personal disabling of the Qt download/build/install. + Add sanity check to ensure integer types don't get set to BASE_NONE. - I did that because I didn't want to wait a day for Qt to build, but - didn't intend to make that change in the official source. + 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). - In the longer term, we should perhaps change the script to download and - install a binary package; sadly, their installers can't be made 100% - command-line and automated, but, well, the CMake installer pops up a - dialog, too, and if you don't have Java installed, some of the configure - scripts that check for Java pop up non-blocking "do you want to install - Java?" dialogs from OS X. - - Change-Id: I99781d5e54529955bf9363a7ee9d4122403fa955 - Reviewed-on: https://code.wireshark.org/review/5032 - Reviewed-by: Guy Harris + Change-Id: I1d113871b10fcae5a6d3e9036cc80d7b1ec1ae57 + Reviewed-on: https://code.wireshark.org/review/6245 + Reviewed-by: Michael Mann -commit 3426ffa -Author: Guy Harris -Date: Fri Oct 31 12:11:22 2014 -0700 +commit e7d0cdc +Author: Graham Bloice +Date: Fri Jan 2 13:12:17 2015 +0000 - For OS X, don't rigidly tie the SDK version to the minimum target version. + Fix lua tests on Windows - According to + Convert TEST_DIR path to a Windows path, this is used in all the lua tests. + Fix a typo - https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/cross_development/Configuring/configuring.html#//apple_ref/doc/uid/10000163i-CH1-SW1 + Change-Id: I38808822c998ed1df007732b3701b6b13d6c886b + Reviewed-on: https://code.wireshark.org/review/6235 + Reviewed-by: Graham Bloice + Reviewed-by: Hadriel Kaplan + +commit a3c705a +Author: Bill Meier +Date: Fri Jan 2 11:24:30 2015 -0500 + + mux27010: Add a link to info about the mux27010 packet structure. - the deployment target (minimum target OS version) and SDK version aren't - necessarily the same and, in fact, Apple typically only ship two SDKs - with each Xcode release, so if you want to build for 10.6 with the 10.6 - SDK, you have to use a version of Xcode sufficiently old to have the - 10.6 SDK. + Change-Id: I46f8efc8c95bf4501a631ef3adc5291939ab1497 + Reviewed-on: https://code.wireshark.org/review/6240 + Reviewed-by: Bill Meier + +commit 887d198 +Author: Evan Huus +Date: Fri Jan 2 11:11:21 2015 -0500 + + test: improve check for out-of-tree tests - Here, we instead search for the oldest SDK for an OS whose version is - greater than or equal to the deployment target. Note that this may not - work for X11-based Wireshark, as the X11 libraries can change - incompatibly between releases. (Fortunately, our plan is to kick - X11-based Wireshark to the curb for OS X, removing a large pile of - aggravation for users.) + 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. - This also requires some fixes when building Qt and gdk-pixbuf, as some - cases where we were using the minimum OS target version we needed to be - using the SDK version. + Change-Id: Iab8b63681db6256aa1a6fc389d2536acbd491aba + Reviewed-on: https://code.wireshark.org/review/6239 + Reviewed-by: Evan Huus + +commit 5cb96a0 +Author: Evan Huus +Date: Fri Jan 2 11:07:28 2015 -0500 + + test: default WS_QT_BIN_PATH to WS_BIN_PATH - For CMake, we're using its native "deployment target" support for OS X, - and hope that it will somehow do the right thing. + 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 - Change-Id: Ie8f42c5e4719e7ebdc56b9ba5a330665bee06280 - Reviewed-on: https://code.wireshark.org/review/5031 - Reviewed-by: Guy Harris + Change-Id: If9198565fc7b7b3911550fd200adb0f918622540 + Reviewed-on: https://code.wireshark.org/review/6238 + Reviewed-by: Evan Huus -commit d93be95 -Author: AndersBroman -Date: Fri Oct 31 15:13:36 2014 +0100 +commit 1c7ffed +Author: Evan Huus +Date: Fri Jan 2 10:48:19 2015 -0500 - Clean up handling of BDC coded numbers a bit. + ositp: fix some BASE_ errors from g7935ba9f5be - Change-Id: Ic3d523664e3c78b4ed289b7e5acf3f53614c6d54 - Reviewed-on: https://code.wireshark.org/review/5027 - Reviewed-by: Anders Broman + Change-Id: I71639f95f8efff9619e00dae45763ff863f0ca21 + Reviewed-on: https://code.wireshark.org/review/6237 + Reviewed-by: Evan Huus -commit d821440 -Author: Michael Mann -Date: Fri Oct 31 08:58:52 2014 -0400 +commit 27fa202 +Author: Joerg Mayer +Date: Wed Nov 5 21:00:26 2014 +0100 - Eliminate proto_tree_add_text from packet-gtpv2.c + Make it easier to run tests out of tree. - Change-Id: I127447941e4c926d9194373a405c82145b1392bb - Reviewed-on: https://code.wireshark.org/review/5025 + Change-Id: I4ed10339d3c543d9d199e5262b6e7bb8247544ac + Reviewed-on: https://code.wireshark.org/review/5148 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann -commit 54efe5d +commit 7935ba9 Author: Michael Mann -Date: Fri Oct 31 09:01:57 2014 -0400 +Date: Thu Jan 1 19:05:06 2015 -0500 - Improve the "guessing" of the hf_ field and encoding values. + Eliminate proto_tree_add_text from packet-ositp.c - Change-Id: Iaa042ef8b794c265870a04f6659720c321978697 - Reviewed-on: https://code.wireshark.org/review/5026 + Change-Id: If97f1b17bf8dbd6bac708b7dfbef6df73fad0f30 + Reviewed-on: https://code.wireshark.org/review/6218 Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Evan Huus -commit c6feecf -Author: Stig Bjørlykke -Date: Fri Oct 31 13:25:14 2014 +0100 +commit 3cc6aee +Author: Hadriel Kaplan +Date: Thu Jan 1 21:16:40 2015 -0500 - Lua: Only register postdissectors once. + Lua: regex test suite fails with UTF-8 locale - Change-Id: Id41e4ebd19e0b80faa06f628d689bdb77f2b84c9 - Reviewed-on: https://code.wireshark.org/review/5023 - Reviewed-by: Stig Bjørlykke - -commit 0347ff9 -Author: Stig Bjørlykke -Date: Fri Oct 31 13:03:08 2014 +0100 - - Remove unused RA_PYTHON_REGISTER and RA_PYTHON_HANDOFF. + 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. - Change-Id: Ia2bccb46be79a934dce447ec04dd81e12df9e131 - Reviewed-on: https://code.wireshark.org/review/5021 - Reviewed-by: Stig Bjørlykke + Bug: 10824 + Change-Id: I3dcad15a9e247a1e42d2f708ccfb7272de2fe960 + Reviewed-on: https://code.wireshark.org/review/6226 + Reviewed-by: Hadriel Kaplan + Reviewed-by: Graham Bloice -commit 96aa60a -Author: AndersBroman -Date: Fri Oct 31 13:06:47 2014 +0100 +commit 55c385e +Author: Evan Huus +Date: Wed Dec 31 17:05:58 2014 -0500 - CAMEL: tvb_length... -> tvb_reported_length... + tvb: implement endianness-paramterized getters - Change-Id: Ia9013127d72f9228b8151338429d9f612ba9a1f4 - Reviewed-on: https://code.wireshark.org/review/5020 - Reviewed-by: Anders Broman + e.g. tvb_get_guint16(tvb, offset, ENC_LITTLE_ENDIAN) + + Change-Id: Iea02fd59b13678aca741d028fb1f66f334447498 + Reviewed-on: https://code.wireshark.org/review/6191 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Evan Huus -commit 0c97281 -Author: AndersBroman -Date: Fri Oct 31 10:48:47 2014 +0100 +commit 611cfd0 +Author: Guy Harris +Date: Thu Jan 1 19:54:34 2015 -0800 - BER: tvb_length... -> tvb_reported_length... + Always set decrypt_len when setting decrypt. - Change-Id: I4868223ab54046977dbe833e6d1a2078d8d2c6d9 - Reviewed-on: https://code.wireshark.org/review/5019 - Reviewed-by: Anders Broman + This may not always be necessary, but.... + + Change-Id: Ib409839dbee0574c516568a1f43793f8b407f611 + Reviewed-on: https://code.wireshark.org/review/6232 + Reviewed-by: Guy Harris -commit c427839 -Author: AndersBroman -Date: Fri Oct 31 09:58:47 2014 +0100 +commit a621bb7 +Author: Stephen Fisher +Date: Fri Jan 2 03:49:10 2015 +0000 - Fix: - - packet-dcerpc.c:4664:51: error: unused parameter 'pinfo' [-Werror=unused-parameter] - - packet-dcerpc.c:5083:83: error: unused parameter 'offset' [-Werror=unused-parameter] - - Replace some deprecated APIs + 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" - Change-Id: I12cbc92a1f07252ebc3ff638b0a8436b2e226a18 - Reviewed-on: https://code.wireshark.org/review/5017 - Reviewed-by: Anders Broman + This reverts commit f94eb278624b5e5ff357ec7f943a16fb7ef2e61b. + + Change-Id: I1a74fa221bdb3d72e88a46ced64e0d434a8fe552 + Reviewed-on: https://code.wireshark.org/review/6231 + Reviewed-by: Stephen Fisher -commit 31e3fc0 +commit 8541578 Author: Guy Harris -Date: Fri Oct 31 01:50:43 2014 -0700 +Date: Thu Jan 1 17:53:24 2015 -0800 - Fix name of C-Ares source directory & make the name of the -done file match it. + 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. - The directory's name begins with "c-ares-", not "cares-". Fix that, and - make the -done file's name begin with "c-ares-" as well. + Fix some more indentation while we're at it. - Change-Id: Ifa178c638ca634ca6b762b12290ccfcc4fa928f9 - Reviewed-on: https://code.wireshark.org/review/5015 + Bug: 10823 + Change-Id: Ia7b7b1d9fb06af5df945f19a375bf5bef3277018 + Reviewed-on: https://code.wireshark.org/review/6221 Reviewed-by: Guy Harris -commit d93bf88 -Author: Guy Harris -Date: Fri Oct 31 00:36:39 2014 -0700 +commit 5c529c9 +Author: Bill Meier +Date: Thu Jan 1 20:41:49 2015 -0500 - The C-Ares "done" file should have a name beginning with cares-. + Add '*.nativecodeanalysis.xml' to 'clean' targets - Fix a presumed copy-and-pasteo. - - Change-Id: I6953bfb46741923507bb58b4e48a72d92313e07c - Reviewed-on: https://code.wireshark.org/review/5012 - Reviewed-by: Guy Harris + Change-Id: I90dbf0b31fc737150a01533763a7869b34c68cb6 + Reviewed-on: https://code.wireshark.org/review/6220 + Reviewed-by: Bill Meier -commit 2717766 +commit 06a1f46 Author: Michael Mann -Date: Fri Oct 24 22:47:22 2014 -0400 +Date: Thu Jan 1 19:56:03 2015 -0500 - Use tcp_dissect_pdus in DCE/RPC dissector when running atop TCP. + Have hf variables outputted in the order they were found in the file. - Yes DCE/RPC runs on top of many dissectors, all which need their own fragmentation support, but TCP can give it to you "for free". DCE/RPC protocol format is also very conducive to it. + 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. - Ping-Bug: 6392 - Change-Id: I0d16854fed3d9c4229c3d2973782f676a51dd719 - Reviewed-on: https://code.wireshark.org/review/4923 - Reviewed-by: Anders Broman + Change-Id: I4b078a6328ba7c2781f07bb41d701412fc74ba22 + Reviewed-on: https://code.wireshark.org/review/6219 + Reviewed-by: Michael Mann + +commit 454fd6e +Author: Bill Meier +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 + +commit 887cce4 +Author: Martin Mathieson +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 + +commit 1c14f5b +Author: Martin Mathieson +Date: Fri Jan 2 00:15:40 2015 +0000 + + Restore inclusion of gui_utils.h to pixmap_save.c + + Change-Id: Ied83d36d8f56f8dc1550ff5ae68bc2b61ea6f1b6 + Reviewed-on: https://code.wireshark.org/review/6214 + Reviewed-by: Martin Mathieson -commit 47ff5bb +commit 860cb39 Author: Michael Mann -Date: Thu Oct 30 17:08:04 2014 -0400 +Date: Tue Dec 30 23:26:19 2014 -0500 - Sync debian symbol files to current API. + tshark: Add endpoints statistics - Change-Id: I64b18ac20401f93b6162ecc7ec4935f8b78508f7 - Reviewed-on: https://code.wireshark.org/review/5009 + "stat name" has been official changed to "endpoints" for all dissectors, rather than a mixture of "host"/"endpoints" based on dissector. + + Change-Id: If34bcb5165b493948e784ba038ab202803a59843 + Reviewed-on: https://code.wireshark.org/review/6154 + Reviewed-by: Pascal Quantin + Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman -commit 2787a93 -Author: Alexis La Goutte -Date: Thu Oct 30 09:33:36 2014 +0100 +commit 07c9492 +Author: Michael Mann +Date: Fri Dec 19 08:08:38 2014 -0500 - HTTP2: Update to draft-15 + Remove pkt_comment member from packet_info structure. - * Add new error code (HTTP_1_1_REQUIRED) - * Use hexa value for error code (like the spec) - * Add reference to Alt-SVC spec + Change-Id: Ifd3d201a09944e3fc36188f891ea8a584886101d + Reviewed-on: https://code.wireshark.org/review/5884 + Reviewed-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Reviewed-by: Anders Broman + +commit f384fa0 +Author: Guy Harris +Date: Thu Jan 1 15:33:01 2015 -0800 + + Fix tpyo. - Change-Id: Ifbcb32e97168440cb34f59740871b6c896e90461 - Reviewed-on: https://code.wireshark.org/review/4992 - Reviewed-by: Daniel Stenberg - Reviewed-by: Michael Mann + Change-Id: I5b190ee35086664ed053d376def4e21ab9ad9236 + Reviewed-on: https://code.wireshark.org/review/6213 + Reviewed-by: Guy Harris -commit 618560a -Author: Michael Mann -Date: Thu Oct 30 08:43:24 2014 -0400 +commit 2ce7dfe +Author: Guy Harris +Date: Thu Jan 1 15:27:53 2015 -0800 - Eliminate proto_tree_add_text from packet-fcels.c + More indentation cleanups. - Change-Id: Iac322d7c7d66d90994bce377dd8c7e39a36466cf - Reviewed-on: https://code.wireshark.org/review/5003 - Petri-Dish: Michael Mann - Reviewed-by: Michael Mann + Change-Id: I6d21bda89f8032d302620e21ac393dc345165ac7 + Reviewed-on: https://code.wireshark.org/review/6212 + Reviewed-by: Guy Harris -commit 93d5bb3 -Author: Martin Kaiser -Date: Thu Oct 30 23:13:44 2014 +0100 +commit 6c24c7e +Author: Guy Harris +Date: Thu Jan 1 15:14:51 2015 -0800 - temporary workaround to stop the fuzz failures + Clean up indentation. - Bug: 10635 - Change-Id: I2132119710392e077f74c92e737e4edce4fcc295 - Reviewed-on: https://code.wireshark.org/review/5011 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + Change-Id: I5aa6cafc6249b3a820b1bbf2eddc2ec1fdc88685 + Reviewed-on: https://code.wireshark.org/review/6211 + Reviewed-by: Guy Harris -commit 2e31475 -Author: Gerald Combs -Date: Thu Oct 30 14:36:02 2014 -0700 +commit 43f09e6 +Author: Martin Mathieson +Date: Thu Jan 1 23:09:08 2015 +0000 - Add a missing backslash. + Remove unneeded includes from ui folder - Change-Id: Iac79c885fe10805b61512ed2c02cd652f1c3fd7a - Reviewed-on: https://code.wireshark.org/review/5010 - Reviewed-by: Gerald Combs + Change-Id: Ifd1eebff9080cd3867e44e4dcb2d2681370ed60a + Reviewed-on: https://code.wireshark.org/review/6128 + Reviewed-by: Martin Mathieson -commit 7665ac5 -Author: Gerald Combs -Date: Thu Oct 30 13:42:31 2014 -0700 +commit 5981dab +Author: Guy Harris +Date: Thu Jan 1 15:05:25 2015 -0800 - OS X: Don't add libtool control files to the app bundle. + Declare read_keytab_file() in epan/dissectors/packet-kerberos.h. - According to https://developer.apple.com/library/mac/technotes/tn2206 - the Contents/PlugIns directory should *only* contain executable files. - Only copy .so (and in case we need them) .dylib files. + 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. - Change-Id: I01f077735018733926db92e7576f6f4fecb68862 - Reviewed-on: https://code.wireshark.org/review/5008 - Reviewed-by: Gerald Combs + Yes, that means you also have to include and, therefore, + you have to include . 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". + + Change-Id: Ide5c31e6d85e6011d57202f728dbc656e36138ef + Reviewed-on: https://code.wireshark.org/review/6210 + Reviewed-by: Guy Harris -commit f5ed47d -Author: Michael Mann -Date: Wed Oct 29 17:33:12 2014 -0400 +commit 445ddc8 +Author: Hadriel Kaplan +Date: Wed Dec 31 15:24:18 2014 -0500 - Eliminate proto_tree_add_text from packet-q933.c + Lua: FieldInfo '==' check isn't really equality - Change-Id: If5b85609d3daaf66cbcc15e3127af4e7f5736e52 - Reviewed-on: https://code.wireshark.org/review/4995 - Petri-Dish: Michael Mann + 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 + Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann -commit 3d9b35f -Author: Jeff Morriss -Date: Thu Oct 30 14:16:06 2014 -0400 +commit 6d6ba64 +Author: Bill Meier +Date: Thu Jan 1 12:21:36 2015 -0500 - Fix a typo: Unidirected -> Undirected - - As reported in https://ask.wireshark.org/questions/37462/possible-mistake-in-bluetooth-low-energy-hci-event-type + .gitignore: Add '*.nativecodeanalysis.xml' - Change-Id: Ia6217531208b00c52c89bcb279cbbe67b5163e96 - Reviewed-on: https://code.wireshark.org/review/5004 - Reviewed-by: Michael Mann + Change-Id: I54133af8626125b51e4263d3c77358752bdcf339 + Reviewed-on: https://code.wireshark.org/review/6209 + Reviewed-by: Bill Meier -commit a683dd3 +commit 7ed0cd7 Author: Guy Harris -Date: Thu Oct 30 12:13:21 2014 -0700 +Date: Thu Jan 1 10:28:06 2015 -0800 - Make the data rate field float, and calculate it for 802.11n. + wireshark-qt.cpp belongs in, err, umm, the Qt Wireshark - not the GTK+ one. - Bug: 10637 - Change-Id: Ifd4094f308246e92500cc7149c0d42c8496fb9f4 - Reviewed-on: https://code.wireshark.org/review/5005 + Change-Id: I101be1967f45bcb56d72784a456e394ca7e51323 + Reviewed-on: https://code.wireshark.org/review/6208 Reviewed-by: Guy Harris -commit cc640f0 -Author: Jeff Morriss -Date: Thu Oct 30 11:56:30 2014 -0400 +commit 72f035d +Author: Pascal Quantin +Date: Thu Jan 1 18:50:37 2015 +0100 - Prohibit ctype APIs (except toupper() which is still used by file.c - make - that deprecated). + Qt: fix crash when opening Preferences window on Windows - Also remove a few tabs that were in there. + Do not use delete on g_allocated memory - Change-Id: I1bb2ad726828366a9f7d1a4064b1215b743ad3b5 - Reviewed-on: https://code.wireshark.org/review/5000 - Reviewed-by: Michael Mann + Change-Id: I84e0adc65c45520916adb9b2f6d46ca3f144486e + Reviewed-on: https://code.wireshark.org/review/6207 + Reviewed-by: Pascal Quantin -commit 4210a8c -Author: Jeff Morriss -Date: Thu Oct 30 11:45:20 2014 -0400 +commit 1663c2a +Author: Pascal Quantin +Date: Thu Jan 1 14:09:29 2015 +0100 - Replace one more isprint() with g_ascii_isprint(). + Welcome in 2015 - Change-Id: I7d49b0d250a5918a7437a524492e834588c6c8cf - Reviewed-on: https://code.wireshark.org/review/4999 - Petri-Dish: Jeff Morriss - Reviewed-by: Anders Broman + Change-Id: Ib581b9383b211ea8dbcea1cadf98a2b8c3548ab5 + Reviewed-on: https://code.wireshark.org/review/6204 + Reviewed-by: Pascal Quantin -commit 066a334 -Author: AndersBroman -Date: Thu Oct 30 17:40:20 2014 +0100 +commit e8e38b4 +Author: Guy Harris +Date: Thu Jan 1 04:36:07 2015 -0800 - Add casts to try to please the OSX buildbot. + wireshark-qt.cpp is only a Qt Wireshark source file. - Change-Id: I66d546ef2dd276bf151b2956ccbe1f2b6c5cb2f5 - Reviewed-on: https://code.wireshark.org/review/5002 - Reviewed-by: Anders Broman + It's not a GTK+ Wireshark source file, so don't include it in + wireshark-gtk. + + Change-Id: I0affa1fab1a29e10e1cf446e49182c9c4f218b87 + Reviewed-on: https://code.wireshark.org/review/6203 + Reviewed-by: Guy Harris -commit e0a3526 -Author: Jeff Morriss -Date: Thu Oct 30 12:01:43 2014 -0400 +commit 6ef4cbd +Author: Guy Harris +Date: Thu Jan 1 04:16:05 2015 -0800 - Tell the user which file __func__ was found in. + Include "file.h" to get read_keytab_file() declared. - Change-Id: Ia69ceaf320cb97447f80a7c090efe6d36262a1c1 - Reviewed-on: https://code.wireshark.org/review/5001 - Reviewed-by: Jeff Morriss + Change-Id: I7e9ea47019f259a56a8652d0e003e23a3e1d1366 + Reviewed-on: https://code.wireshark.org/review/6202 + Reviewed-by: Guy Harris -commit 62831ba -Author: Michael Mann -Date: Thu Oct 30 11:35:47 2014 -0400 +commit 219d37e +Author: Guy Harris +Date: Thu Jan 1 04:13:05 2015 -0800 - convert_proto_tree_add_text.pl - missed adding an else statement to logic. + Let routines from the Kerberos dissector be called from C++. - Change-Id: I7f31e9ba47d2e94887bd01a84bab356c0c835d92 - Reviewed-on: https://code.wireshark.org/review/4998 - Reviewed-by: Michael Mann + Wrap its declarations in the usual "extern "C"" stuff. + + Change-Id: I353ab334bc08a69fdacaaab5672edf758b14766a + Reviewed-on: https://code.wireshark.org/review/6201 + Reviewed-by: Guy Harris -commit cda985d -Author: Matthieu Patou -Date: Fri Oct 10 16:53:20 2014 -0400 +commit 0a64b55 +Author: Guy Harris +Date: Thu Jan 1 03:28:48 2015 -0800 - Create the compress module for compression functions. + Remove wireshark_cxx. - For the moment there is only the lzxpress compression used by DRS + It may have been part of the "build Qt Wireshark as C++" hacks, and is + now causing build problems. - Bug: 10546 - Change-Id: Ifc7e1767934224c0198f0b09caa3efbad979ca1f - Reviewed-on: https://code.wireshark.org/review/4600 - Petri-Dish: Anders Broman - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Change-Id: If471bf3dca01f1bc6e9b5b871d0de3159e4c8e1c + Reviewed-on: https://code.wireshark.org/review/6200 + Reviewed-by: Guy Harris -commit fea733e -Author: Michael Mann -Date: Thu Oct 30 11:19:30 2014 -0400 +commit 8bf7078 +Author: Guy Harris +Date: Thu Jan 1 01:19:57 2015 -0800 - Add logic to determine if a "tvb get" call is used as a parameter to a proto_tree_add_text call. convert_proto_tree_add_text.pl has an easier time determining hf_ field values with a "tvb get" call present, so it's more likely those dissectors will be picked first in eliminating their proto_tree_add_text calls. + Move ui/qt/main.cpp to wireshark-qt.cpp, and get rid of the dummy.cpp hack. - Change-Id: I3dd57a73c8e60d8075a6bb987efd52b96b38445c - Reviewed-on: https://code.wireshark.org/review/4997 - Reviewed-by: Michael Mann + Change-Id: Ib4684264363593372b3bf078cf17cae1a1cb10d6 + Reviewed-on: https://code.wireshark.org/review/6199 + Reviewed-by: Guy Harris -commit f8c7a5b -Author: AndersBroman -Date: Thu Oct 30 15:58:58 2014 +0100 +commit a4019a3 +Author: Guy Harris +Date: Wed Dec 31 21:02:46 2014 -0800 + + Rename a variable to avoid a compiler warning. + + (Thanks, IBM and AT&T.) + + Change-Id: Ifcffd4937f90ca466c01ebc4f3e3bd8555a9b078 + Reviewed-on: https://code.wireshark.org/review/6198 + Reviewed-by: Guy Harris - Add an RFC reference and fix deprecated API. +commit 21697af +Author: Graham Bloice +Date: Wed Dec 31 13:56:34 2014 +0000 + + Added DNP3 support for g13 and g43, output command events - Change-Id: I8dcddc6bcbaf462a6e74b76764ea26b7f5b08920 - Reviewed-on: https://code.wireshark.org/review/4996 + Bug: 10347 + Change-Id: Ic173f31d8cf3fd002454f4c22b85c19bae42d544 + Reviewed-on: https://code.wireshark.org/review/6175 + Reviewed-by: Graham Bloice + Petri-Dish: Graham Bloice + Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman -commit 79c977c -Author: Jeff Morriss -Date: Tue Oct 28 21:43:12 2014 -0400 +commit 889c566 +Author: Michael Mann +Date: Tue Dec 30 16:45:01 2014 -0500 - Remove the optional strncasecmp.{h,c} target (for systems that don't have that API). + Eliminate proto_tree_add_text from WiMax plugin. - strncasecmp() has been prohibited for years (in favor of the g_ascii_ version). + 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). - Change-Id: I64b7c29099b1c5240757e2026fe3490096a84755 - Reviewed-on: https://code.wireshark.org/review/4980 - Petri-Dish: Anders Broman + Change-Id: I563db9f8ea216efe37322b784ab0daf25c038d9e + Reviewed-on: https://code.wireshark.org/review/6149 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot - Reviewed-by: Jeff Morriss + Reviewed-by: Anders Broman -commit c0a4a91 +commit 114e773 Author: Guy Harris -Date: Thu Oct 30 02:03:28 2014 -0700 +Date: Wed Dec 31 16:46:50 2014 -0800 - Dataflow analysis is hard, let's go shopping! + Call setlocale() before getting version information. - Another case where the compiler didn't figure out that the variables - aren't used if they're not set. + That way, the setlocale() call used to get the current locale will get + the right answer. - Change-Id: I70bfb06c6d86d41a266a087ece971c40cd697ee9 - Reviewed-on: https://code.wireshark.org/review/4994 + Change-Id: Ib43e16a9d98d08e5ddaff81fd3235f5b64d7b95b + Reviewed-on: https://code.wireshark.org/review/6197 Reviewed-by: Guy Harris -commit fdb3ea5 +commit a53b67c Author: Guy Harris -Date: Thu Oct 30 01:58:15 2014 -0700 +Date: Wed Dec 31 16:10:02 2014 -0800 - Squelch some used-but-not-set warnings (one legitimate, others not). + Don't include header files that we don't appear to need. - Also, we don't care how much tagged value data we've read, we just care - whether we've read any or not (EOF reading the first one means "end of - file", EOF reading any of the subsequent ones means "short read"). + 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. - Change-Id: I2edc54494967b3a88bcc2c79d97eedfded00150d - Reviewed-on: https://code.wireshark.org/review/4993 + Change-Id: Ic9eae65e77e2425144f7fe4885fc865fcf6ab1ff + Reviewed-on: https://code.wireshark.org/review/6196 Reviewed-by: Guy Harris -commit aac8daa +commit 9a7d455 Author: Guy Harris -Date: Thu Oct 30 00:59:31 2014 -0700 +Date: Wed Dec 31 15:32:42 2014 -0800 - Use correct variable. + Use setlocale() to get the current locale. - To check whether data_rate_or_mcs_index is set, check - saw_data_rate_or_mcs_index; we might see a value of 0 for that field - (it's a valid MCS index), so we can't use it as an out-of-band value - meaning "not set". + This: - Change-Id: I75d7fdb4a90836538c82f56f2afb05c0603278a5 - Reviewed-on: https://code.wireshark.org/review/4991 + 1) should work on Windows; + + 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. + + Change-Id: Iee064237e70501a5450d4daa9ab849391f200efd + Reviewed-on: https://code.wireshark.org/review/6195 Reviewed-by: Guy Harris -commit d2ee010a +commit 1bc2565 Author: Guy Harris -Date: Thu Oct 30 00:06:48 2014 -0700 +Date: Wed Dec 31 14:53:29 2014 -0800 - Extract the center frequency from Peek tagged files. + Don't include signal.h unless we need it. - Change-Id: I44bc278f563264ca20f0250fc3376b6741bdcbfa - Reviewed-on: https://code.wireshark.org/review/4990 + Change-Id: I3965e0951eee919720f780b5e52732fd18fd9786 + Reviewed-on: https://code.wireshark.org/review/6194 Reviewed-by: Guy Harris -commit ec33c3d +commit 91e4330 +Author: Gerald Combs +Date: Wed Dec 31 14:21:50 2014 -0800 + + Qt: Convert more dialog titles. + + Change-Id: I9c3e3471a92b7af9347a541bece3d9405d37dce0 + Reviewed-on: https://code.wireshark.org/review/6193 + Reviewed-by: Gerald Combs + +commit 0e57ff2 Author: Guy Harris -Date: Wed Oct 29 23:52:13 2014 -0700 +Date: Wed Dec 31 14:47:04 2014 -0800 - Support the bandwidth and "short GI" fields from Peek tagged files. + We no longer do anything signal-related, so don't include . - Add a number of fields corresponding to components of the radiotap MCS - field, add presence bits for them, and set and dissect the fields - supported by Peek tagged files. + Update a comment pertaining to that, while we're at it. - Change-Id: I3fc801a3bc180e1c174d074a794af0f3d338f249 - Reviewed-on: https://code.wireshark.org/review/4989 + Change-Id: Ic0a3f8575f8e98ca6032ed3e06e3dd76055d65a1 + Reviewed-on: https://code.wireshark.org/review/6192 Reviewed-by: Guy Harris -commit aff087a +commit 23b1127 Author: Guy Harris -Date: Wed Oct 29 17:08:56 2014 -0700 +Date: Wed Dec 31 13:43:01 2014 -0800 - Handle the MCS index in Peek tagged files. - - Use the "MCS index used" extended flag bit to indicate whether the "data - rate or MCS index" field is a data rate or MCS index. + Swallow get_glib_version_info() into get_compiled_version_info(). - Display the MCS index value if it's present. + It's not that complicated, so we might as well just do it in line. - (More to come - MCS indices, plus other information, should be used to - calculate the data rate for 11n and beyond.) - - Get rid of the hdr_info_t structure while we're at it; just use local - variables for each of the fields. - - Change-Id: I546f53a8ebd89078d5f23e1290557b97348aff38 - Reviewed-on: https://code.wireshark.org/review/4988 + Change-Id: I10809db554e668a853d28e7dca48b2de0ed51ad3 + Reviewed-on: https://code.wireshark.org/review/6190 Reviewed-by: Guy Harris -commit 8165448 +commit 93efc20 Author: Guy Harris -Date: Wed Oct 29 16:03:08 2014 -0700 +Date: Wed Dec 31 13:25:13 2014 -0800 - Expand the 802.11 pseudo-header and support new radio metadata. + "#else", not "#elif", for the last part of a chain of conditionals. - Add a set of presence bits, so we can indicate which bits of radio - metadata we do and don't have. + Also give more details, for future reference, on how to determine + whether the processor supports CPUID. - Fill in more radio metadata from capture files, and display it. + Change-Id: I01e7173e45b0079f02338e51248238c05302dbd2 + Reviewed-on: https://code.wireshark.org/review/6189 + Reviewed-by: Guy Harris + +commit c15b749 +Author: Pascal Quantin +Date: Wed Dec 31 17:36:13 2014 +0100 + + Qt: fix 'Limit to display filter' functionality in Conversations/Endpoints windows - (More to come.) + Change-Id: Ib57df32fbbe820b1105b11200b112d56a112e2a9 + Reviewed-on: https://code.wireshark.org/review/6180 + Reviewed-by: Pascal Quantin + Reviewed-by: Gerald Combs + +commit d5d2c0e +Author: Guy Harris +Date: Wed Dec 31 11:51:33 2014 -0800 + + ws_cpuid() returns a success/failure indication; make it gboolean. - Change-Id: Idea2c05442c74af17c14c4d5a8d8025ab27fbd15 - Reviewed-on: https://code.wireshark.org/review/4987 + Change-Id: I03403ce29c4ac343d56fc2cf33aa8da90a082cbb + Reviewed-on: https://code.wireshark.org/review/6185 Reviewed-by: Guy Harris -commit 4acf495 +commit 35cf7c6 Author: Guy Harris -Date: Wed Oct 29 10:53:49 2014 -0700 +Date: Wed Dec 31 11:46:04 2014 -0800 - Rename the strnatcmp.c routines and make them use the g_ascii_XXX() routines. - - Rename strnatcmp()/strnatcasecmp() to ws_ascii_XXX(), and make them use - the g_ascii_XXX() routines rather than ctype.h routines, to eliminate - locale-dependent behavior. + Distinguish between IA-32 and non-x86. - (If you want locale-dependent "natural order" sorting, you probably want - "dictionary order" sorting, which is more complicated than just natural - order sorting.) + 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. - Change-Id: I837f2776b2a909b547dc9a6072e497911b5380e5 - Reviewed-on: https://code.wireshark.org/review/4985 + Change-Id: Id6fbd3e5c7d4f04063bc9bcd8f1644cd617b297e + Reviewed-on: https://code.wireshark.org/review/6184 Reviewed-by: Guy Harris -commit d2f4b6f -Author: AndersBroman -Date: Wed Oct 29 16:43:43 2014 +0100 +commit cb7c949 +Author: Guy Harris +Date: Wed Dec 31 11:34:08 2014 -0800 - Replace isalpha() with g_ascii_isprint(). + Move some routines into ws_version_info.c. - Change-Id: I416fd36f65ee80a0b17939bc081ddae0f3f72a32 - Reviewed-on: https://code.wireshark.org/review/4984 - Reviewed-by: Anders Broman + 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. + + Change-Id: I58edd18da3301095012d2c7a3c5198e5a7073964 + Reviewed-on: https://code.wireshark.org/review/6183 + Reviewed-by: Guy Harris -commit 065d5c8 -Author: AndersBroman -Date: Wed Oct 29 16:27:42 2014 +0100 +commit ce9ca9d +Author: Alexis La Goutte +Date: Wed Dec 31 12:52:52 2014 +0100 - Don't include ctype.h and replace isascii() with _ascii_isprint(). - Remove deprecated APIs while at it. + rtse.cnf: fix Nesting level does not match indendation (CID 1159214) - Change-Id: I002ed4a696782caaeeb70a3e4ced4ae81f3d5372 - Reviewed-on: https://code.wireshark.org/review/4983 + Change-Id: I86e6c9103990bedf93c323e1360394a7c0a39db4 + Reviewed-on: https://code.wireshark.org/review/6173 + Reviewed-by: Michael Mann Reviewed-by: Anders Broman -commit 79f878f -Author: Alex Tessmer -Date: Wed Oct 29 01:57:17 2014 -0700 +commit f42fe1a +Author: Alexis La Goutte +Date: Wed Dec 31 11:53:00 2014 +0100 - VXLAN: Fix flag bitmasks - - Fix bitmask for flags bits 0-2. + Zbee ZDP: fix Copy-paste error (CID 1158598) - Change-Id: Id7c42a79f0524eae103a586a16b89ccecf031d6f - Reviewed-on: https://code.wireshark.org/review/4982 + Change-Id: If98d391f51c9d2aa31b1a3a93b774d91d364cccc + Reviewed-on: https://code.wireshark.org/review/6163 Reviewed-by: Anders Broman -commit b8df934 -Author: AndersBroman -Date: Wed Oct 29 09:36:06 2014 +0100 +commit 02f41b1 +Author: Alexis La Goutte +Date: Wed Dec 31 12:42:09 2014 +0100 - Add missing stuff for custom plugins. + GTPv2: fix Copy-paste error (CID 1158587) - Change-Id: I34a35fe789d473b630b80c4f8f30833e0e04d188 - Reviewed-on: https://code.wireshark.org/review/4981 + Change-Id: I56eaa2071b4b8042c214cf882d35ebec646d2cb5 + Reviewed-on: https://code.wireshark.org/review/6169 + Reviewed-by: Alexis La Goutte Reviewed-by: Anders Broman -commit 451f7f0 +commit f485b28 Author: Gerald Combs -Date: Tue Oct 28 17:10:45 2014 -0700 +Date: Wed Dec 31 08:53:39 2014 -0800 - Qt: Better protocol highlight colors. - - Use the "Window" palette colors for protocol-level highlighting. + Test suite: Make sure we have a usable locale before we run iconv. - Change-Id: Ife55d70041aa12110a00782d790be0d747b32562 - Reviewed-on: https://code.wireshark.org/review/4979 + Change-Id: Ib1f3143dc48af4c556b9bcdfafbb477fd59b6359 + Reviewed-on: https://code.wireshark.org/review/6181 Reviewed-by: Gerald Combs -commit 0b03183 -Author: Gerald Combs -Date: Tue Oct 28 12:00:44 2014 -0700 +commit fad9b76 +Author: Alexis La Goutte +Date: Wed Dec 31 12:39:57 2014 +0100 - Qt: Add a set of 2x 16-pixel toolbar icons. + wslua field: fix Copy-paste error (CID 1158590 & 1158589) - Optimize the toolbar PNGs. + Change-Id: I566ddd2930b5c86bc32ca9ba12cd4be7d994bd22 + Reviewed-on: https://code.wireshark.org/review/6168 + Reviewed-by: Anders Broman + +commit 24c076f +Author: Alexis La Goutte +Date: Wed Dec 31 12:37:22 2014 +0100 + + pcapng (wiretap): fix Copy-paste error (CID 1158591 & 1158592) - To do: The rest of the PNGs. + Change-Id: I117c007c0a8be573bb3069fc44a490e6e5d2fef8 + Reviewed-on: https://code.wireshark.org/review/6167 + Reviewed-by: Anders Broman + +commit b0e6fbf +Author: Bill Meier +Date: Wed Dec 31 11:08:07 2014 -0500 + + umts_fp: Replace se_new0(...) by wmem_new0(wmem_file_scope(), ...) - Change-Id: Ieed8b0d099655994d43cdc9cf6c9a094d84c1802 - Reviewed-on: https://code.wireshark.org/review/4978 - Reviewed-by: Gerald Combs + Change-Id: I9d40ffd199147fb8b975c493253d5cf796be5983 + Reviewed-on: https://code.wireshark.org/review/6179 + Reviewed-by: Bill Meier -commit e86553e -Author: Guy Harris -Date: Tue Oct 28 12:02:46 2014 -0700 +commit f7b6dcc +Author: Hadriel Kaplan +Date: Mon Dec 29 20:49:05 2014 -0500 - Get rid of unnecessary include of . + Lua: allow a Dissector object to be passed in for register_heuristic - Change-Id: I60d5630478ccc185b9eed8066a902c6599421fad - Reviewed-on: https://code.wireshark.org/review/4977 - Reviewed-by: Guy Harris + Bug: 10695 + Change-Id: I81181b2d00fcb5f0c25ab89bbe4968897f47a3a6 + Reviewed-on: https://code.wireshark.org/review/6131 + Petri-Dish: Hadriel Kaplan + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann -commit 417c181 -Author: Guy Harris -Date: Tue Oct 28 11:36:38 2014 -0700 +commit 1121288 +Author: Alexis La Goutte +Date: Wed Dec 31 12:33:15 2014 +0100 - Use guint8 for 8-bit unsigned numeric values. + GTP: fix Copy-paste error (CID 1158594 & 1158595) - That slightly better expresses the intent. + Change-Id: I501c0d666c7b280656e2d7cf7a196d489d452eff + Reviewed-on: https://code.wireshark.org/review/6166 + Reviewed-by: Pascal Quantin + +commit a1732dc +Author: Pascal Quantin +Date: Wed Dec 31 16:47:28 2014 +0100 + + GTK: fix 'Limit to display filter' functionality in Conversations/Endpoints windows - Also, fix the message printed for bad bytes in a field name to handle - bytes that are bad because they don't correspond to printable ASCII - characters. + Change-Id: I1efb7717c9eb4638fbff292e2953accc3e945ee6 + Reviewed-on: https://code.wireshark.org/review/6178 + Reviewed-by: Pascal Quantin + +commit 9e7d69f +Author: Bill Meier +Date: Wed Dec 31 10:30:33 2014 -0500 + + checkAPIs.pl: Error/warnings output goes to STDERR - Change-Id: I01f232c35bbbe30286999b6c607bfcf3d491453d - Reviewed-on: https://code.wireshark.org/review/4976 - Reviewed-by: Guy Harris + Change-Id: Ib6f460147c26c4fbfb9bd0fd8dd0dd12561be9ea + Reviewed-on: https://code.wireshark.org/review/6177 + Reviewed-by: Bill Meier -commit 8ea4df9 -Author: Guy Harris -Date: Tue Oct 28 11:18:40 2014 -0700 +commit 493e413 +Author: Alexis La Goutte +Date: Wed Dec 31 12:50:46 2014 +0100 - Use g_ascii_isalnum() rather than isalnum(). + SCTP: fix Nesting level does not match indendation (CID 1159213 & 1159215 ) - Only *ASCII* alphanumerics are allowed in filterable field names, so use - g_ascii_isalnum() to check for them. That avoids issues with characters - with the 8th bit set and avoids locale-dependent behavior. + Change-Id: Icd04c5f1f09b9cf704828e4b6a598cd2c1f6dd15 + Reviewed-on: https://code.wireshark.org/review/6172 + Reviewed-by: Michael Mann + +commit beb50e6 +Author: Alexis La Goutte +Date: Wed Dec 31 12:49:27 2014 +0100 + + DHCPv6: fix Nesting level does not match indendation (CID 1159219) - Change-Id: I4e3c4eec907f5e576629229fcf154fcf728b7a2e - Reviewed-on: https://code.wireshark.org/review/4973 - Reviewed-by: Guy Harris + Change-Id: Id57a9f2df6a4011078b0bef359b2cd5503f6f7ce + Reviewed-on: https://code.wireshark.org/review/6171 + Reviewed-by: Michael Mann -commit bab44ad -Author: Jeff Morriss -Date: Tue Oct 28 11:15:57 2014 -0400 +commit 784b39c +Author: Alexis La Goutte +Date: Wed Dec 31 12:48:09 2014 +0100 - Add some new features to the list and regenerate NEWS. + GTPv2: fix typo in Anders e-mail Address - Change-Id: I8d0897e63b44c8077b7488b8c8b7a3df0adf37a1 - Reviewed-on: https://code.wireshark.org/review/4971 + Change-Id: I2410aa7bce574c9153b971b2d8b0cbfbe24e54dc + Reviewed-on: https://code.wireshark.org/review/6170 Reviewed-by: Anders Broman -commit 0011fc4 -Author: Jeff Morriss -Date: Tue Oct 28 11:19:23 2014 -0400 +commit 0f6f2bd +Author: Alexis La Goutte +Date: Wed Dec 31 12:26:14 2014 +0100 - Add GPLv2+ license header to keep license-check happy. + jxta: fix Copy-paste error (CID 1158599 & 1158600) - This change must be reviewed/approved by the script's author (Gerald). - - Change-Id: Id89c1d05bf43cdd2d6823b5ef46162a9f11fb263 - Reviewed-on: https://code.wireshark.org/review/4972 - Reviewed-by: Anders Broman + Change-Id: Ica4ade2e7de70cefc4e77d421e35ddd72e688c16 + Reviewed-on: https://code.wireshark.org/review/6165 + Reviewed-by: Michael Mann -commit e8d2ba9 +commit aeb10b9 Author: Alexis La Goutte -Date: Tue Oct 28 00:02:16 2014 +0100 +Date: Wed Dec 31 12:20:55 2014 +0100 - Pref: Remove unsued function + mount: fix Copy-paste error (CID 1224605) - Fix also warning: no previous prototype for 'prefs_get_uint_preference' [-Wmissing-prototypes] + Don't longer need to check if(tree) - Change-Id: I4626372a9c131584c515a43e73aa019e2f696d29 - Reviewed-on: https://code.wireshark.org/review/4960 - Reviewed-by: Anders Broman + Change-Id: I4ec572df28bad3c487c3c744840d97b79781feb3 + Reviewed-on: https://code.wireshark.org/review/6164 + Reviewed-by: Michael Mann -commit 9056eb9 -Author: alage -Date: Mon Oct 20 14:12:59 2014 +0200 +commit 7c93e81 +Author: Alexis La Goutte +Date: Mon Dec 29 18:05:09 2014 +0100 - Patch for KNXnet/IP dissector + Column utils: Missing varargs init or cleanup (CID 1212122) - -removed some proto_tree_add_bits_itemand used bitmaks instead - -fixed KNX Groupaddress decoding - -improved apci decoding - -filternames changed + Change-Id: I013c737c2cd62e3f1f49b113a7ce0c0616e1ecc4 + Reviewed-on: https://code.wireshark.org/review/6119 + Reviewed-by: Michael Mann + +commit 60d7413 +Author: Alexis La Goutte +Date: Wed Dec 31 12:29:12 2014 +0100 + + prefs: fix typo - Change-Id: I2593d54c5e94141445e9e8f32204848e9f48ff6a - Reviewed-on: https://code.wireshark.org/review/4874 - Reviewed-by: Anders Broman + Change-Id: Ic4dbbab5e53b5745cb703e6e30b2dc6251c3918e + Reviewed-on: https://code.wireshark.org/review/6161 + Reviewed-by: Michael Mann -commit 422e1d9 -Author: Guy Harris -Date: Tue Oct 28 00:24:49 2014 -0700 +commit c34c2a6 +Author: Pascal Quantin +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 + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + +commit 3865bca +Author: Pascal Quantin +Date: Wed Dec 31 15:17:19 2014 +0100 - Add a comment showing mapping to radiotap. + Update libwsutil symbols - Useful if we try to provide some "standard" 802.11 metadata header that - can support both radiotap and Peek tagged (and perhaps others). + Change-Id: Icddb71202fb44ab3cf2ee5923b5a10f71f078ce5 + Reviewed-on: https://code.wireshark.org/review/6176 + Reviewed-by: Pascal Quantin + +commit 22701ad +Author: Pascal Quantin +Date: Wed Dec 31 13:48:51 2014 +0100 + + DNS: ensure that suffix_addr structure is always initialized - Change-Id: Ibac9829e3411670a439db7cb77e1694a5641b0a5 - Reviewed-on: https://code.wireshark.org/review/4970 - Reviewed-by: Guy Harris + Bug: 10816 + Change-Id: Ifd036148f9f2e76516913bda11cf07fdb63def94 + Reviewed-on: https://code.wireshark.org/review/6174 + Reviewed-by: Pascal Quantin -commit 3d359da -Author: Michael Mann -Date: Wed Oct 22 08:53:07 2014 -0400 +commit 37efc4a +Author: Guy Harris +Date: Wed Dec 31 02:23:14 2014 -0800 - Refactor pinfo->circuit_id from H.223 dissector. + We do stuff with signals only on UN*Xes. - Change-Id: Id63e0088047c7948fd190ba4dd5fbcb536e0cc6b - Reviewed-on: https://code.wireshark.org/review/4921 - Reviewed-by: Anders Broman + Change-Id: I1b1a304143cf4e4a14107d1d55057cef24552a70 + Reviewed-on: https://code.wireshark.org/review/6160 + Reviewed-by: Guy Harris -commit 09957ca -Author: Alexis La Goutte -Date: Sun Oct 26 11:08:35 2014 +0100 +commit 914dc6c +Author: Luke Mewburn +Date: Wed Dec 24 13:19:57 2014 +1100 - DNS NXT RR is parsed incorrectly + E.164: display country_code as decimal not hex - The queries RRs and answers RRs are parsed fine. - However, only the first 2 authoritative RRs are parsed and none of the 3 additional RRs are parsed. - The second authoritative RR is of type NXT, and even though it has data length of 9, Wireshark reads all the bytes until the end of the packet as if they are part of bitmap in this RR (it reads 317 bytes too many). - This causes it to not parse the rest of the RRs correctly. + 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...) - Found by boaz + If the country_code or identification_code contain BCD digits > 9 + add an expert info warning. - Bug:10615 - Change-Id: I22e5987c44a11399b07c3106fbb70c6e9e867afe - Reviewed-on: https://code.wireshark.org/review/4940 - Reviewed-by: Michael Mann - Petri-Dish: Michael Mann + 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 Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman + Reviewed-by: Pascal Quantin -commit 25448b0 -Author: Alexis La Goutte -Date: Wed Aug 20 12:40:16 2014 +0200 +commit 8f75a2e +Author: Guy Harris +Date: Wed Dec 31 00:50:01 2014 -0800 - ISIS: Display code/type and length for unknown code/type + And, again, no more version_info.c. - Change-Id: Idb70d571ae7d7f5fc87c08012ab380d35b2856a0 - Reviewed-on: https://code.wireshark.org/review/4961 - Reviewed-by: Anders Broman + Change-Id: I0500383aa6c553e995c60fad850553c0ce5a66d9 + Reviewed-on: https://code.wireshark.org/review/6159 + Reviewed-by: Guy Harris -commit 960ddb0 -Author: Alexis La Goutte -Date: Mon Oct 27 13:42:37 2014 +0100 +commit a3d946c +Author: Ebben Aries +Date: Wed Dec 31 00:54:40 2014 -0700 - HPSW: Fix display of wrong length + BGP : Simple typo fix for BGP Attribute - Change-Id: Iaa0cff55b4f8bbdd50eec665c134a2f21e21f9d4 - Reviewed-on: https://code.wireshark.org/review/4951 - Reviewed-by: Anders Broman + Change-Id: I793eed5c7d63c82e13847c8a6c8fd6def3025b8c + Reviewed-on: https://code.wireshark.org/review/6158 + Reviewed-by: Hadriel Kaplan + Tested-by: Hadriel Kaplan -commit a2b9b90 +commit 64dd98e Author: Guy Harris -Date: Mon Oct 27 23:49:28 2014 -0700 +Date: Tue Dec 30 23:09:41 2014 -0800 - Some additional information from bug 10637. + No version_info.c any more. - That bug includes a capture and a screendump of OmniPeek's dissection of - the packet in that capture; this lets us identify some tags as the - center frequency of the 802.11 channel and a set of extended flags used - for 802.11n and 802.11ac. - - Show some flags from bug 9586, under the assumption that certain fields - in the Peek tagged header correspond to certain fields in the remote - Peek protocol. + Change-Id: I96f4d07ac08d80811bb4ba9469cba8265d288945 + Reviewed-on: https://code.wireshark.org/review/6157 + Reviewed-by: Guy Harris + +commit 938b6a7 +Author: Guy Harris +Date: Tue Dec 30 23:07:24 2014 -0800 + + Wrong function name. - Change-Id: I0f3c2e6638d6cf5f6ec470d65bd574171a2d958d - Reviewed-on: https://code.wireshark.org/review/4969 + Change-Id: I56e6a7dbb7290963548fdd61784554d67fc70bfe + Reviewed-on: https://code.wireshark.org/review/6156 Reviewed-by: Guy Harris -commit 7e6b029 +commit 0bf38f7 +Author: Hadriel Kaplan +Date: Tue Dec 30 17:39:56 2014 -0500 + + Lua: getting fieldinfo.value for FT_NONE causes assert + + 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 + Reviewed-by: Michael Mann + Reviewed-by: Hadriel Kaplan + Tested-by: Hadriel Kaplan + +commit 27be466 Author: Guy Harris -Date: Mon Oct 27 23:41:13 2014 -0700 +Date: Tue Dec 30 22:28:25 2014 -0800 - Bug 9586 says bit 0x00000100 in the "802.11n flags" means "802.11ac". + Do the full string in get_{compiled,runtime}_version_info(). - Also, the 0x00000100 flag is "MCS index used", if a dissection of an - 802.11n frame by OmniPeek is to be believed and if the "802.11n flags" - have the same meaning in Peek tagged files and in the Peek remote - protocol. + Have them start the string with "Compiled" or "Running on", and return + the string when done. - Rename that field to "extended flags", as it's not just for 802.11n, add - the "802.11ac" flag, and rename the "future use" flag. + Change-Id: Ic4d290c963621fa0385dc5aab766fd4ad31d3810 + Reviewed-on: https://code.wireshark.org/review/6155 + Reviewed-by: Guy Harris + +commit 84110d2 +Author: Pascal Quantin +Date: Tue Dec 30 23:46:24 2014 +0100 + + tshark: endpoints statistics are not supported for now, do not list them in -z + + Move statistics registration to "GUI" callback registration + + Change-Id: Id27c049dc8f91d311e9231342ae40749ca0ff5fc + Reviewed-on: https://code.wireshark.org/review/6151 + Reviewed-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Reviewed-by: Michael Mann + +commit c1f3047 +Author: Guy Harris +Date: Tue Dec 30 19:36:26 2014 -0800 + + Move the version_info.c stuff to wsutil/ws_version_info.c. - Change-Id: I605622801450d5d114c3c971c98960b198346bdd - Reviewed-on: https://code.wireshark.org/review/4968 + Change-Id: I3a5c7e219974bfb924819b43b4d445eaf00e5bde + Reviewed-on: https://code.wireshark.org/review/6153 Reviewed-by: Guy Harris -commit 0a5d6a1 -Author: Alexis La Goutte -Date: Tue Oct 28 00:01:08 2014 +0100 +commit 4eeb440 +Author: Michael Mann +Date: Tue Dec 30 19:25:35 2014 -0500 - MAUSB: fix warning: no previous prototype for 'proto_register_wfa_oui' [-Wmissing-prototypes] + Remove proto_tree_add_text from packet-dcerpc-pn-io.c - Change-Id: I86cc9f6f9cd50a6e081aabc10bce077281eb2d76 - Reviewed-on: https://code.wireshark.org/review/4959 - Reviewed-by: Sean Stalley - Reviewed-by: Anders Broman + Change-Id: Ia144061dc8c394d9ae89135009d06457e2aabb7d + Reviewed-on: https://code.wireshark.org/review/6152 + Reviewed-by: Michael Mann -commit 6369b8e +commit dcbebe0 Author: Gerald Combs -Date: Mon Oct 27 20:59:31 2014 -0700 +Date: Tue Dec 30 12:38:52 2014 -0800 - Try to fix dist. + Test suite: Start testing our output for valid UTF-8. + + Feed the output of `tshark -G ` to `iconv -f UTF-8`. Adjust a + couple of the Bluetooth dissectors and X11 keysyms accordingly. - Change-Id: I1802fd4e53132e76534b6dadbaa9713249af42e5 - Reviewed-on: https://code.wireshark.org/review/4966 + Change-Id: I5b04dc3fa4734c8f0a795daf44bd398fe5ebc1bd + Reviewed-on: https://code.wireshark.org/review/6146 + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs -commit 6055f35 -Author: Guy Harris -Date: Mon Oct 27 20:59:53 2014 -0700 +commit 3b57861 +Author: Gerald Combs +Date: Mon Dec 29 14:12:43 2014 -0800 - The "data rate" field in the 11n version of the header is an MCS index. + Qt: More WiresharkDialog conversions. - Change-Id: I5f23bec128444b6590b5fc938bbe0e8a679cd31b - Reviewed-on: https://code.wireshark.org/review/4965 - Reviewed-by: Guy Harris + Convert the Follow Stream and Export Objects dialogs. + + Change-Id: I8a4dda634f2f0475a24cf09601f76fb52069fe50 + Reviewed-on: https://code.wireshark.org/review/6126 + Reviewed-by: Gerald Combs -commit 5bed338 -Author: Alexis La Goutte -Date: Mon Oct 27 13:43:15 2014 +0100 +commit 97f5f39 +Author: Martin Kaiser +Date: Tue Dec 30 19:33:16 2014 +0100 - HPSW: Fix soft-deprecated APIs warning + free the temporary buffers allocated by gnutls_x509_privkey_export_rsa_raw() - Change-Id: I2f69781972fe2737e09d275dc842c4ea744e7fb1 - Reviewed-on: https://code.wireshark.org/review/4952 - Reviewed-by: Evan Huus + Bug: 10740 + Change-Id: Idd4afab1bca6204d17c4bd4345661ec821f209e0 + Reviewed-on: https://code.wireshark.org/review/6145 + Reviewed-by: Martin Kaiser + Tested-by: Martin Kaiser -commit 7ff0860 -Author: Alexis La Goutte -Date: Mon Oct 27 23:59:37 2014 +0100 +commit bc7a9e5 +Author: Pascal Quantin +Date: Tue Dec 30 16:23:07 2014 +0100 - Knxnetip: fix warning: ISO C does not allow extra ';' outside of a function + Fix IPv6/IPX statistics generation - Change-Id: I43da305fcf7b8a18699ab1c14ba2b7868aa8897b - Reviewed-on: https://code.wireshark.org/review/4958 - Reviewed-by: Evan Huus + 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 + Reviewed-by: Alexis La Goutte + Reviewed-by: Pascal Quantin + Reviewed-by: Michael Mann + +commit 935c8bf +Author: Pascal Quantin +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 + +commit f3f736c +Author: Martin Kaiser +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 + Tested-by: Martin Kaiser + +commit 246f727 +Author: Martin Kaiser +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 + Tested-by: Martin Kaiser -commit f62d60b -Author: Alexis La Goutte -Date: Mon Oct 27 23:57:59 2014 +0100 +commit e05e8f8 +Author: Martin Kaiser +Date: Tue Dec 30 17:44:45 2014 +0100 - Infiniband: fix warning: C++ style comments are not allowed in ISO C90 + skip the payload if it's empty - Change-Id: I706d6b7cf4c8d0367f485b55fa11a905bff426d1 - Reviewed-on: https://code.wireshark.org/review/4957 - Reviewed-by: Evan Huus + Change-Id: Ib38e747bc762422c690abc1cb127bb0944c80ce2 + Reviewed-on: https://code.wireshark.org/review/6141 + Reviewed-by: Martin Kaiser + Tested-by: Martin Kaiser -commit 55cc577 -Author: Alexis La Goutte -Date: Mon Oct 27 23:57:05 2014 +0100 +commit 8629aa2 +Author: Gerald Combs +Date: Mon Dec 29 15:15:59 2014 -0800 - Couchbase: fix no previous prototype for ... [-Wmissing-prototypes] + Qt: Continue using the new window title format. - Change-Id: Ieaefb9d50bf0224f4e90585d138867d0b88d5814 - Reviewed-on: https://code.wireshark.org/review/4956 - Reviewed-by: Evan Huus + Update several dialog titles to "Wireshark · ". + + Change-Id: I64645e913500ecd55a008e1609b46385dafe7de9 + Reviewed-on: https://code.wireshark.org/review/6127 + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs -commit 2418d06 -Author: Alexis La Goutte -Date: Mon Oct 27 23:56:14 2014 +0100 +commit 1ee4369 +Author: Martin Kaiser +Date: Tue Dec 30 16:47:30 2014 +0100 - AllJoyn: fix warning: no previous prototype for 'add_padding_item' [-Wmissing-prototypes] + no need for if(tree) - Change-Id: Id18ac125390efa22638845083f7d0d5eaf71cb97 - Reviewed-on: https://code.wireshark.org/review/4955 - Reviewed-by: Evan Huus + Change-Id: I0b20b66e1b44da0362c13009946a69738a2aa267 + Reviewed-on: https://code.wireshark.org/review/6138 + Reviewed-by: Martin Kaiser + Tested-by: Martin Kaiser -commit 309840f +commit d45fe5c Author: Alexis La Goutte -Date: Tue Oct 28 00:10:46 2014 +0100 +Date: Tue Dec 30 10:48:44 2014 +0100 - TN5250: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + .mailmap: Add Hadriel Kaplan - Change-Id: Ida9f7198d6e3ef7bab5d787883116600019180ec - Reviewed-on: https://code.wireshark.org/review/4963 - Reviewed-by: Evan Huus + Change-Id: Iddab5a98e47d90fe4a7e6fbf6b55bbb16e528415 + Reviewed-on: https://code.wireshark.org/review/6136 + Reviewed-by: Hadriel Kaplan + Tested-by: Hadriel Kaplan -commit 60172fa -Author: Alexis La Goutte -Date: Tue Oct 28 00:10:24 2014 +0100 +commit e0d268b +Author: Gerald Combs +Date: Mon Dec 29 17:24:44 2014 -0800 - ADB_cs: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + stats_tree: Make sure some structs are fully initialized. - Change-Id: I88e191c9eaf5f81b3d6d905ec9e7b7d27f0d21a3 - Reviewed-on: https://code.wireshark.org/review/4962 - Reviewed-by: Evan Huus + Get rid of a strcpy. + + Change-Id: I49460969fdf627fdb89030115ad5a658e300a5d4 + Reviewed-on: https://code.wireshark.org/review/6130 + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann -commit c5e66b1 +commit 4556498 Author: Gerald Combs -Date: Mon Oct 27 17:32:26 2014 -0700 +Date: Mon Dec 29 11:42:01 2014 -0800 - Qt: Add a set of 2x 24-pixel toolbar icons. + Qt: Convert more dialogs to WiresharkDialog. - Add a script to create each PNG from its source SVG using Inkscape - (which can conveniently be run from the command line). + Make the Sequence, IO Graph, Statistics Tree, and VoIP Calls dialogs + subclasses of WiresharkDialog. - Change-Id: Ief7410cf76fb1553ce56f1c6bc1ade03ab5db1d6 - Reviewed-on: https://code.wireshark.org/review/4964 + Remove "Stats Tree" from Statistics Tree dialog titles. Don't complain + if the user opens more than one instance of the dialog. + + Use the applicationName property in WiresharkApplication instead of a + separate variable. + + 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 -commit 84f0ce4 -Author: Gerald Combs -Date: Mon Oct 27 10:28:45 2014 -0700 +commit b6ff338 +Author: Guy Harris +Date: Mon Dec 29 18:57:31 2014 -0800 - Qt: Add bits display support to the byte view. + Tabs are not necessarily set every 4 spaces. - Add todo items for showing and hiding the offset, hex/bits, and - ASCII/EBCDIC sections and adding UTF-8 support. + Use spaces, not tabs, for indentation; that makes the code's layout + indepencent of tab settings, which might be every *8* spaces. - Change-Id: Ia40faf3f939ef1a8fca6fac827057bd89045482a - Reviewed-on: https://code.wireshark.org/review/4949 - Reviewed-by: Gerald Combs + Change-Id: I69891b6424a668f1ee0ca80cc622b8cb0ed8967e + Reviewed-on: https://code.wireshark.org/review/6132 + Reviewed-by: Guy Harris -commit ee72432 +commit ed58d88 Author: Michael Mann -Date: Sun Oct 26 23:16:30 2014 -0400 +Date: Sun Dec 28 21:43:51 2014 -0500 - Add enumerated value 639 to vals_parm_PID. - - Per http://www.nowsms.com/discus/messages/1/EMI_UCP_Specification_40-8156.pdf + Remove some proto_tree_add_text outside the dissector directory. - Bug: 10463 - Change-Id: I55957f7b77b3dcf8c65c288791fed6428a1f4ba5 - Reviewed-on: https://code.wireshark.org/review/4944 + Change-Id: I890846a0cede755a603243b4048fb5c917b2826b + Reviewed-on: https://code.wireshark.org/review/6112 + Petri-Dish: Michael Mann Reviewed-by: Michael Mann -commit 1c15981 -Author: Gerald Combs -Date: Sun Oct 26 18:48:14 2014 -0700 +commit 0d414e5 +Author: Pascal Quantin +Date: Sat Dec 27 23:15:41 2014 +0100 - Qt: ByteViewText hover information. + Add ability to follow UDP stream by index - When the user hovers over a byte view field, highlight it and show a - description in the status bar. + -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) - Add a "byte" status bar context and fix a label stack pop bug. + Change-Id: Ia367f36ea4f60db0fddb997a7e0903c09e172f2d + Reviewed-on: https://code.wireshark.org/review/6083 + Reviewed-by: Pascal Quantin + +commit 0905202 +Author: Alexis La Goutte +Date: Mon Dec 29 18:03:59 2014 +0100 + + TN5250: Missing break in switch (CID 280477) - Keep proto_find_field_from_offset from matching generated items. - Otherwise hovering and selecting finds things like GeoIP entries and - checksum validation information. This affects the GTK+ UI as well. + fix also indent typo - Change-Id: Ic81c0d8159510a72d30c41f961807d8a48d05e16 - Reviewed-on: https://code.wireshark.org/review/4943 - Reviewed-by: Gerald Combs + Change-Id: I47ff84a6062a203e14b9dde420a1a2efd5b05fab + Reviewed-on: https://code.wireshark.org/review/6118 + Reviewed-by: Michael Mann -commit c33deaa -Author: Martin Kaiser -Date: Sun Oct 26 23:27:22 2014 +0100 +commit 0fb4cdb +Author: Alexis La Goutte +Date: Mon Dec 29 18:12:43 2014 +0100 - SSL 3.0 and TLS ciphersuite values are two bytes long + Wimaxasncp: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang - Change-Id: I3ea2846fd4273efe654358ad4a317cb9b3670181 - Reviewed-on: https://code.wireshark.org/review/4942 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + Change-Id: Ie2808d20a7f8e28bfe9b929b1b222a901a29f510 + Reviewed-on: https://code.wireshark.org/review/6120 + Reviewed-by: Michael Mann -commit 3ac46ed -Author: Martin Kaiser -Date: Sun Oct 26 23:24:28 2014 +0100 +commit 621dbdd +Author: Graham Bloice +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 + Reviewed-by: Graham Bloice + Petri-Dish: Graham Bloice + Reviewed-by: Michael Mann - add TLS_FALLBACK_SCSV +commit 71fe134 +Author: Bill Meier +Date: Mon Dec 29 14:20:44 2014 -0500 + + rtsp: Fix (what I think may be) a minor bug. - Change-Id: I02ef08b6726f935d79cd3ca4f10ead5f1d18ee20 - Reviewed-on: https://code.wireshark.org/review/4941 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + (Also fixes a compiler 'Shadow' warning in a different way + than the now reverted previous fix). + + Change-Id: Iedcac3d402b89d1b0261a49647bf39cc854d1a0c + Reviewed-on: https://code.wireshark.org/review/6123 + Reviewed-by: Bill Meier -commit 079a017 -Author: Gerald Combs -Date: Sun Oct 26 08:06:15 2014 -0700 +commit 7ca5ad9 +Author: Bill Meier +Date: Mon Dec 29 13:52:09 2014 -0500 - [Automatic manuf, services and enterprise-numbers update for 2014-10-26] + rtsp: Fix compiler 'Shadow' warning ... - Change-Id: If2287edfd2a5b1ddcb6e365485020805aaf9cd88 - Reviewed-on: https://code.wireshark.org/review/4937 - Reviewed-by: Gerald Combs + Change-Id: I404546fc5eab82d7cb12971723040b4aa77f6a90 + Reviewed-on: https://code.wireshark.org/review/6122 + Reviewed-by: Bill Meier -commit 803a2f9 -Author: Michael Mann -Date: Sat Oct 25 19:44:56 2014 -0400 - - Various Mobile IPv6 bugfixes - - Most of this was found by Boaz Brickner, but to prevent a few more bug reports, I tried to find any remaining MIPv6 options that used -1 to read until "end of packet" instead of "end of option" - - 1. Option-Code and Reserved fields should be 1 byte, not 2 in Local Mobility Anchor Address mobility option - 2. IPv6 AUTH mobility option parses Mobility SPI - 3. IPv6 MESG-ID (should just be a timestamp field) - 4. IPv6 Redirect Mobility Option K and N bits are parsed incorrectly - - 5. The following options had a field that read until the end of the packet instead of the end of the option: - DNS-UPDATE-TYPE - AUTH Authentication Data - Care Of Test - Permanent Home Keygen Token - CGA Parameters - Signature - Experimental Mobility Option - - Bug: 10630 - Bug: 10629 - Bug: 10626 - Bug: 10625 - Bug: 10624 - Bug: 10622 - Bug: 10619 - Change-Id: I14c984a237efc1d1a09618d9a4a1caef1eaf8df0 - Reviewed-on: https://code.wireshark.org/review/4932 - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann +commit 72dedab +Author: Bill Meier +Date: Mon Dec 29 13:05:26 2014 -0500 + + rtsp: Replace g_warning() by expert...() (dissectors shouldn't do termio). + + Also: Add an expert...() in rtsp_create_conversation() for + "Unknown transport type". + + Change-Id: I1d8ca20b9c0bc1e3d11b947b6653a2e2669a0f96 + Reviewed-on: https://code.wireshark.org/review/6121 + Reviewed-by: Bill Meier -commit 3ffd8c5 -Author: Sean O. Stalley -Date: Mon Oct 13 16:09:09 2014 -0700 +commit ea08072 +Author: Alexis La Goutte +Date: Mon Dec 29 17:11:01 2014 +0100 - Use Wifi Alliance OUI for MA USB packets over SNAP + Wireshark Dialog (Qt): Add Modelines info - Change-Id: Icf4c995c8fbdb886e8b4e79a1fc7b62ac7137a07 - Reviewed-on: https://code.wireshark.org/review/4667 - Petri-Dish: Alexis La Goutte - Tested-by: Petri Dish Buildbot + Change-Id: I6689f5a95c6dc051d660198fd58ae96967f3468f + Reviewed-on: https://code.wireshark.org/review/6116 Reviewed-by: Michael Mann -commit 155c939 -Author: Gerald Combs -Date: Sat Oct 25 17:19:38 2014 -0700 +commit 90ba166 +Author: Alexis La Goutte +Date: Mon Dec 29 16:33:21 2014 +0100 - Use better theme-derived colors. Switch back to AlternateBase for - protocol-level highlighting. + capture_file.h (Qt): missing ] - Change-Id: I3de3442885b93093c3a4f5341080713a2039cd4c - Reviewed-on: https://code.wireshark.org/review/4933 - Reviewed-by: Gerald Combs + Change-Id: Ibc512f03913d77a6c4f0cdbcf5141efbd94b22f0 + Reviewed-on: https://code.wireshark.org/review/6115 + Reviewed-by: Michael Mann -commit 6e5784d -Author: Joseph Huffman -Date: Tue Oct 21 11:23:45 2014 -0700 +commit fce9da3 +Author: Alexis La Goutte +Date: Mon Dec 29 10:18:21 2014 +0100 - Added support for AllJoyn Reliable Datagram Protocol. + Zebra: Fix some indent typo - Change-Id: I3ec37d7aec0c51f9bd0791c8fa0c5ef3dabc9fbf - Signed-off-by: Joseph Huffman - Reviewed-on: https://code.wireshark.org/review/4414 - Reviewed-by: Alexis La Goutte - Petri-Dish: Alexis La Goutte - Tested-by: Petri Dish Buildbot + Change-Id: I41869fe46e6867333d14f6f86953ff01e2d112a8 + Reviewed-on: https://code.wireshark.org/review/6114 Reviewed-by: Michael Mann -commit 30742dd -Author: Guy Harris -Date: Sat Oct 25 16:08:02 2014 -0700 +commit 211789c +Author: Alexis La Goutte +Date: Mon Dec 29 10:17:04 2014 +0100 - Expand comments. + OpenFlow: Capatilize O and F of OpenFlow (when use Decode as) - Change-Id: I92348f98cd04ff0e7fc05e472075315ca0fd260e - Reviewed-on: https://code.wireshark.org/review/4931 - Reviewed-by: Guy Harris + 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 -commit 6ebb50c -Author: Guy Harris -Date: Sat Oct 25 15:40:50 2014 -0700 +commit 10bfe2c +Author: Bill Meier +Date: Mon Dec 29 11:07:54 2014 -0500 - Get rid of a trailing blank. + dcerpc: Replace g_warning() by expert...() (dissectors shouldn't do termio). - Change-Id: I7963f05a78ec764a21d388fcdba618ffbcf935e4 - Reviewed-on: https://code.wireshark.org/review/4930 - Reviewed-by: Guy Harris + Change-Id: If51a9acbb3b5a5b1623c72651c8a3ef2dd8ad068 + Also: Replace (one of many) proto_tree_add_text() instances. + Reviewed-on: https://code.wireshark.org/review/6117 + Reviewed-by: Bill Meier -commit f36bbff -Author: Guy Harris -Date: Sat Oct 25 15:38:27 2014 -0700 +commit 5b088af +Author: Michael Mann +Date: Sat Dec 27 10:49:26 2014 -0500 - Update a comment. + Eliminate proto_tree_add_text from packet-spice.c - Change-Id: I55002477a416710592a482725af68cdf2511e063 - Reviewed-on: https://code.wireshark.org/review/4929 - Reviewed-by: Guy Harris + 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 + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann -commit 1a45f18 -Author: Gerald Combs -Date: Sat Oct 25 13:06:05 2014 -0700 +commit 5f2b998 +Author: Graham Bloice +Date: Sun Dec 28 18:03:49 2014 +0000 - More offset color adjustments. + Minor doc updates, added Windows debugging info - Change-Id: I52cf406443988624fb0e4a9e180963c599c8b91d - Reviewed-on: https://code.wireshark.org/review/4928 - Reviewed-by: Gerald Combs + Change-Id: I7ddd6f8dead5db725c4e5f35778ce4b6f792bda9 + Reviewed-on: https://code.wireshark.org/review/6096 + Petri-Dish: Graham Bloice + Tested-by: Petri Dish Buildbot + Reviewed-by: Graham Bloice -commit 3d2ec16 +commit e8ec11f Author: Gerald Combs -Date: Sat Oct 25 12:36:32 2014 -0700 +Date: Mon Dec 22 15:51:36 2014 -0800 - Qt: ByteViewText fixups. - - Calculate our X coordinate using floating point arithmetic. This should - hopefully fix the wierd subpixel text shifting for some font sizes. - - Add alpha blending convenience routines to ColorUtils. Use them to - create the offset colors. The button color palette wasn't working very - well under Ubuntu. + Qt: Add a WiresharkDialog convenience class. - Use QFontMetricsF::lineSpacing for our line height. + 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. - Note that we don't support the BOLD gui.hex_dump_highlight_style - preference. Leave a hint for anyone wishing to do so. Comment out - related code for now. + Rename CaptureFile::read_only_ to file_closed_. Add methods to + WiresharkApplication for generating consistent window titles. - Change-Id: Ief77c9c8d00e05560cae6ecd781bd309027f6f5a - Reviewed-on: https://code.wireshark.org/review/4927 + Change-Id: Idc771556d8192e60f85dddc08fc4757698dee257 + Reviewed-on: https://code.wireshark.org/review/6097 Reviewed-by: Gerald Combs -commit 41f6923 -Author: Evan Huus -Date: Sat Oct 25 14:08:57 2014 -0400 +commit c1d9d93 +Author: Martin Mathieson +Date: Mon Dec 29 01:03:54 2014 +0000 - ncp2222: initialize buffer in build_expert_data - - We do a bunch of conditional logic to fill in the buffer, and then were checking - strlen(buffer) to see if we'd actually filled it in or not, but if we hadn't - then the buffer was garbage and strlen(buffer) was throwing valgrind warnings. - Ensure this works as intended by setting the first byte of the buffer - unconditionally at the beginning, so strlen(buffer) returns 0 as expected in - that case. + Restore string.h to os_version.c - Bug: 10628 - Change-Id: I6f6c29fbbcb601b6ebccb3a4b312f0fa72c169ae - Reviewed-on: https://code.wireshark.org/review/4924 - Reviewed-by: Evan Huus + Change-Id: I810a38c56829d5d3beaccc0171fc76f26ad79b52 + Reviewed-on: https://code.wireshark.org/review/6108 + Reviewed-by: Martin Mathieson -commit 88d1bba -Author: Dario Lombardo -Date: Tue Oct 21 16:52:21 2014 +0200 +commit 85781bb +Author: Martin Mathieson +Date: Mon Dec 29 00:28:26 2014 +0000 - Italian translation fixes + Add back string.h to sha1.c and sober128.c - Change-Id: I1dec07f6a3e721a4f35c8cde2da136e34d8e4cb2 - Reviewed-on: https://code.wireshark.org/review/4915 - Reviewed-by: Evan Huus - Reviewed-by: Alexis La Goutte + Change-Id: Idd8963717eab804f7d76652d1baf029be8b5997f + Reviewed-on: https://code.wireshark.org/review/6105 + Reviewed-by: Martin Mathieson -commit ceff4ed -Author: Gerald Combs -Date: Fri Oct 24 13:24:23 2014 -0700 +commit 8ae669c +Author: Martin Mathieson +Date: Mon Dec 29 00:16:03 2014 +0000 - Qt: Refactor ByteViewText. - - Instead of subclassing QTextEdit and filling it with the entire contents - of our tvbuff, subclass QAbstractScrollArea and draw text by hand only - when needed. The new code should be *much* faster. - - Some code based on QHexView by Even Teran - (https://code.google.com/p/qhexview/). - - To do: - - Finish the bit view implementation. + Restore string.h to md4.c - Change-Id: Ie44de6870d80711cd44324521a17ab76bcefe5e5 - Reviewed-on: https://code.wireshark.org/review/4922 - Reviewed-by: Gerald Combs + Change-Id: I1a2c57ea20bcb1fd22c0379f3f43d3589e497c1b + Reviewed-on: https://code.wireshark.org/review/6104 + Reviewed-by: Martin Mathieson -commit 001dbaf -Author: Pascal Quantin -Date: Tue Oct 21 19:38:25 2014 +0200 +commit 30edb91 +Author: Martin Mathieson +Date: Mon Dec 29 00:11:36 2014 +0000 - ESP: honor enable_null_encryption_decode_heuristic preference when the ESP packet does not match any known SA + Add string.h back to rc4.c - Otherwise checking the enable_encryption_decode preference will completely ignore enable_null_encryption_decode_heuristic - - Change-Id: I34744ddb2080453dab7cd7d34f47b4984969993c - Reviewed-on: https://code.wireshark.org/review/4897 - Petri-Dish: Pascal Quantin - Tested-by: Petri Dish Buildbot - Reviewed-by: Pascal Quantin + Change-Id: Idea9369742373e4a50edb3f391bdabfeeb3a2ca7 + Reviewed-on: https://code.wireshark.org/review/6103 + Reviewed-by: Martin Mathieson -commit 48da429 -Author: Michael Mann -Date: Wed Oct 22 09:02:46 2014 -0400 +commit 518e48d +Author: Martin Mathieson +Date: Mon Dec 29 00:08:12 2014 +0000 - Add a "placeholder protocol" for H.223 to avoid confusion when using Decode As. + Add back string.h - The Decode As dialog presents two H.223 options and only "trial and error" can determine if you want bitswapping or not. - - Change-Id: I9303c73375d130d3097d347bb374019dfc714068 - Reviewed-on: https://code.wireshark.org/review/4909 - Reviewed-by: Anders Broman - Reviewed-by: Michael Mann + Change-Id: Ia61c72c7e8d1ef92ec5a38d534620fc225eef365 + Reviewed-on: https://code.wireshark.org/review/6102 + Reviewed-by: Martin Mathieson -commit d2bb61a -Author: Gerald Combs -Date: Thu Oct 23 08:41:39 2014 -0700 +commit f215575 +Author: Martin Mathieson +Date: Sun Dec 28 23:56:13 2014 +0000 - OS X: Integrate CMake and osx-app.sh - - Add a -cb/--create-bundle option to osx-app.sh which builds the - application bundle. Use it in Autotools. (CMake does this by default.) + Add a couple of more needed includes - Copy over linker flags from configure.ac to CMakeLists.txt to support - rpathification and code signing. - - Add an osx-app custom target to CMake. + Change-Id: Ie160f81544c6c9b381078b555e91602617cb2700 + Reviewed-on: https://code.wireshark.org/review/6101 + Reviewed-by: Martin Mathieson + +commit 5efc18e +Author: Martin Mathieson +Date: Sun Dec 28 23:45:56 2014 +0000 + + Restore string.h as OS X misses it for strlen() - Change-Id: I6c20a1c27f8954aaea62904b7425b9312d994803 - Reviewed-on: https://code.wireshark.org/review/4918 - Reviewed-by: Gerald Combs + Change-Id: If1a968d54eed97fae915b8546d8d7a65a56b82db + Reviewed-on: https://code.wireshark.org/review/6100 + Reviewed-by: Martin Mathieson -commit 97a920c -Author: Guy Harris -Date: Thu Oct 23 03:27:15 2014 -0700 +commit e3efb80 +Author: Martin Mathieson +Date: Sun Dec 28 00:25:44 2014 +0000 - Don't free global_capture_opts.ifaces_err_info. + Deleting unnecessary #includes from wsutil. - Leave it around in case InterfaceTree::display() gets invoked without an - intervening call to scan_local_interfaces() (that would cause a - double-free) or in case scan_local_interfaces() gets called afterwards - (as it frees global_capture_opts.ifaces_err_info before setting it - again, so there's no leak there, but there would be a double-free). - This should prevent at least one crash I've seen. + Will look at cleaning up and committing script afterwards. - Change-Id: Iedd3959b420c09971557c473cc87aefd4454078c - Reviewed-on: https://code.wireshark.org/review/4917 - Reviewed-by: Guy Harris + Change-Id: Id785e581740ab62fe9258ecfcb0926761ad9c527 + Reviewed-on: https://code.wireshark.org/review/6086 + Reviewed-by: Martin Mathieson -commit a0d5ef8 -Author: Stig Bjørlykke -Date: Tue Oct 21 13:36:16 2014 +0200 +commit 016769d +Author: Hadriel Kaplan +Date: Thu Dec 25 10:17:11 2014 -0500 - Lua: Added support for FT_EUI64. + Expose dissector_add_for_decode_as() to Lua - Bug: 10603 - Change-Id: I21da496834b83466585f5b77f87970e3fab28b12 - Reviewed-on: https://code.wireshark.org/review/4894 + 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 + Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann - Reviewed-by: Hadriel Kaplan - Reviewed-by: Stig Bjørlykke -commit e6750fe -Author: Pascal Quantin -Date: Wed Oct 22 19:48:34 2014 +0200 +commit 5e16157 +Author: Stig Bjørlykke +Date: Sat Dec 27 15:39:40 2014 +0100 - Couchbase: fix some warnings found by the pre-commit hook + p_mul: Added checksum from ACP 142(A) - Change-Id: I16c8f5690973465728071abdf85c0f275433951e - Reviewed-on: https://code.wireshark.org/review/4913 - Reviewed-by: Pascal Quantin + Bug: 10807 + Change-Id: Ifd1ea5d67b65a7e7997458785fff95cc471e0dbc + Reviewed-on: https://code.wireshark.org/review/6076 + Petri-Dish: Stig Bjørlykke + Reviewed-by: Stig Bjørlykke + Tested-by: Stig Bjørlykke -commit e2bece7 -Author: Gerald Combs -Date: Wed Oct 22 10:05:35 2014 -0700 +commit 71c02b2 +Author: Michael Mann +Date: Wed Dec 24 00:06:35 2014 -0500 - Qt: Show / hide main widgets. - - Remove existing code which uses the visibilityChanged signal. It exists - in QToolbar but not QWidget. Use the actions to drive visibility - instead. - - Update MainWindow::layoutPanes to respect "recent" settings. + Create FT_FCWWN field type. - Move the show / hide actions to the top of the View menu to match GTK+. + 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. - Change-Id: I670682e2a094945dbd36c80f43cd14515bbca5a6 - Reviewed-on: https://code.wireshark.org/review/4911 - Petri-Dish: Gerald Combs - Tested-by: Petri Dish Buildbot - Reviewed-by: Gerald Combs + Change-Id: I4ca77870499fd8239584a70874998b5d194a7167 + Reviewed-on: https://code.wireshark.org/review/6036 + Petri-Dish: Michael Mann + Reviewed-by: Michael Mann -commit c5a8876 +commit 8965e90 Author: Pascal Quantin -Date: Wed Oct 22 19:45:36 2014 +0200 +Date: Sun Dec 28 16:35:57 2014 +0100 - Couchbase: fix FSF address and reorder opcode_vals array + Qt Follow window: keep data representation when switching between streams - Change-Id: I41448f9a111dde24c29984d8e4f053fc2a668c9e - Reviewed-on: https://code.wireshark.org/review/4912 + Change-Id: I1c7092d33d841e80ce110224f3bd617cb112be61 + Reviewed-on: https://code.wireshark.org/review/6091 Reviewed-by: Pascal Quantin + Reviewed-by: Gerald Combs -commit 58304b9 -Author: AndersBroman -Date: Wed Oct 22 16:14:03 2014 +0200 +commit f3fd6b5 +Author: Martin Kaiser +Date: Sun Dec 28 18:39:30 2014 +0100 - S1AP: Add an S1AP context to be able to determine which message and - message type an IE was sent in. Needed to dissect proprietarry data. + The symbol rate in the Cable Delivery System Descriptor is in Mega-Symbols/s - Change-Id: Ie75a2f6a544cb33e22c42457b0edd83e6456bfe5 - Reviewed-on: https://code.wireshark.org/review/4910 - Reviewed-by: Anders Broman + Change-Id: I1446500f1c5c89b8ed94c04b04bb6985ae827731 + Reviewed-on: https://code.wireshark.org/review/6095 + Reviewed-by: Martin Kaiser + Tested-by: Martin Kaiser -commit 589db1c -Author: Sergey Avseyev -Date: Wed Jul 9 15:58:13 2014 +0300 +commit 15a9f5d +Author: Graham Bloice +Date: Sat Aug 23 00:21:45 2014 +0100 - Add Couchbase dissector (binary protocol) - - Include new Couchbase Server 3.0 DCP support + Move Windows build to be VS2013 based using the Community Edition + Drop references to long obsolete compilers. + Added Chocolatey installer instructions for some packages. - Change-Id: I38d0edd7d135a92c130a60dab650aef0ab1205be - Reviewed-on: https://code.wireshark.org/review/2956 + Change-Id: I416d4091b6acaa1ed0d5e586f0427708c4b2d646 + Reviewed-on: https://code.wireshark.org/review/5986 + Reviewed-by: Graham Bloice + Petri-Dish: Graham Bloice + Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann -commit 2dbc852 -Author: Pascal Quantin -Date: Wed Oct 22 14:39:59 2014 +0200 +commit 1b6da9e +Author: Gerald Combs +Date: Sun Dec 28 08:05:15 2014 -0800 - Add packet-adb_service.h to epan/dissectors/Makefile.common + [Automatic manuf, services and enterprise-numbers update for 2014-12-28] - Change-Id: Idfcd18d09cc5aa2572a47117d3788bc3c0368fb3 - Reviewed-on: https://code.wireshark.org/review/4908 - Reviewed-by: Pascal Quantin + Change-Id: Ie1876a971a25a4c8f063ae0fce0c970a4c9efdf2 + Reviewed-on: https://code.wireshark.org/review/6092 + Reviewed-by: Gerald Combs -commit fc4471f -Author: Michal Labedzki -Date: Thu Oct 16 12:34:39 2014 +0200 +commit 1d598bb +Author: Michael Mann +Date: Sun Dec 21 12:38:13 2014 -0500 - Bluetooth: A2DP: APT-X does not use RTP while there is no content protection + Replace ip6_to_str and ip6_guint8_to_str with address_to_str and tvb_ip_to_str. - Change-Id: I5ff8ffdda827b08ee7e284c15e70dadc368b009e - Reviewed-on: https://code.wireshark.org/review/4906 - Petri-Dish: Michal Labedzki + Change-Id: I1d258923a7a63539ec8456d3e306bca5016a1e4b + Reviewed-on: https://code.wireshark.org/review/6060 + Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot - Reviewed-by: Michal Labedzki + Reviewed-by: Pascal Quantin + Reviewed-by: Michael Mann -commit c2f58d3 -Author: Michal Labedzki -Date: Sun Feb 2 19:12:55 2014 +0100 +commit 9fce4dd +Author: Guy Harris +Date: Sun Dec 28 02:28:27 2014 -0800 - Android: Add ADB dissector + If we can't open the GeoIP database, close and unlink the map file. - Previoulsy added "adb_cs" is only for adb client <-> adb daemon communication - by loopback interface (by TCP). But there is also communication between - adb daemon and device (by TCP or USB). This transport protocol is different, but - now support is done. + We can't write out the full map file, and we return an error, so just + get rid of the file. - ADB services are shared between ADB and ADB_CS so put them into "adb_service" - dissector. There is still some services to be added. + Fixes Coverity CID 1256521. - Change-Id: I754331d3dc6ccf3c17445f5563d01cf2fe1489c7 - Reviewed-on: https://code.wireshark.org/review/4651 - Tested-by: Michal Labedzki - Reviewed-by: Michal Labedzki + Change-Id: Ieee078f760c035d65b2fce199ea472ba915be9c6 + Reviewed-on: https://code.wireshark.org/review/6090 + Reviewed-by: Guy Harris -commit 0ce3640 -Author: Michael Mann -Date: Tue Oct 21 17:14:07 2014 -0400 +commit 120628e +Author: Guy Harris +Date: Sun Dec 28 02:18:05 2014 -0800 - Replace pinfo->circuit_id will passing data through functions. + Don't check the same character twice in a row, check it and the next character. - Change-Id: I5b35ad57c5c40a1393cbc174384b8a275abd763c - Reviewed-on: https://code.wireshark.org/review/4903 - Reviewed-by: Michael Mann - Petri-Dish: Michael Mann - Reviewed-by: Anders Broman + Fixes Coverity CID 1260460. + + Change-Id: Ic9ed109a863bcf20a5e67e4f52d628011f5e9ba5 + Reviewed-on: https://code.wireshark.org/review/6087 + Reviewed-by: Guy Harris -commit 527796b -Author: Michael Mann -Date: Tue Oct 21 21:45:51 2014 -0400 +commit 63ebe91 +Author: Dario Lombardo +Date: Fri Dec 26 23:48:39 2014 +0100 - Refactor pinfo->circuit_id behavior for ISUP dissector + Removed duplicated #include lines - Change-Id: Idf6e68c53a0a2126f3906bbfa16166821735fc1b - Reviewed-on: https://code.wireshark.org/review/4904 - Reviewed-by: Anders Broman + Change-Id: I9cafa3cd5c74121168777d8c656e7e94e89efd3c + Reviewed-on: https://code.wireshark.org/review/6065 + Petri-Dish: Pascal Quantin + Reviewed-by: Martin Mathieson + Reviewed-by: Pascal Quantin -commit 0c444f3 -Author: Gerald Combs -Date: Tue Oct 21 20:51:34 2014 -0700 +commit d094fca +Author: Guy Harris +Date: Sat Dec 27 15:17:07 2014 -0800 - OS X: Fix osx-dmg.sh bundle binary path. + Check for pkg-config. - Change-Id: Ia7c59de4f8b59dda9dbc484b8fa9ae0c3d88d594 - Reviewed-on: https://code.wireshark.org/review/4905 - Reviewed-by: Gerald Combs + 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 -commit fc75085 -Author: Alexis La Goutte -Date: Sun Oct 19 15:35:47 2014 +0200 +commit 73af2d6 +Author: Guy Harris +Date: Sat Dec 27 15:02:56 2014 -0800 - libnghttp2: Update to 0.6.4 + We require pkg-config to check for, for example, GLib. - Change-Id: Ic8878f818a89ebc1056777a5b0838e8a5b1215d5 - Reviewed-on: https://code.wireshark.org/review/4834 - Petri-Dish: Alexis La Goutte - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + 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. + + Change-Id: I530e8b62f5adff228ae8ff6f9798ac538c2ad684 + Reviewed-on: https://code.wireshark.org/review/6084 + Reviewed-by: Guy Harris -commit 9ddbc8d -Author: Gerald Combs -Date: Tue Oct 21 13:36:10 2014 -0700 +commit 51e5869 +Author: Guy Harris +Date: Sat Dec 27 12:56:07 2014 -0800 - Qt: Fill in time display menu items. Other fixes and updates. + Get rid of packet data members of header structures. - Reselect the current packet when we redraw the packet list. + Instead, have a special macro using the size of the header structure to + find the offset of the packet data. - Don't crash if we try to mark when no frame is selected. Try to - invalidate cached packet list strings when needed. Rename - PacketList::updateAll to redrawVisiblePackets so that its purpose is - more clear. When changing the font size, call redrawVisiblePackets - instead of rebuilding the entire list of visible rows. + This means that: - Change-Id: I6e7a15067e7063d0efc26082170e1795ae3c0779 - Reviewed-on: https://code.wireshark.org/review/4901 - Reviewed-by: Gerald Combs - -commit e5d967b -Author: Gerald Combs -Date: Tue Oct 21 16:30:24 2014 -0700 - - osx-app.sh: Add verbosity. + 1) you don't have to throw "-{size of data member}" into the + macros that calculate the sizes of the header structures; - Change-Id: I3cd1c49909af34badd0d5c5f29bfcddb753ef2bf - Reviewed-on: https://code.wireshark.org/review/4902 - Reviewed-by: Gerald Combs - -commit 24f0888 -Author: Michael Tüxen -Date: Tue Oct 21 22:26:15 2014 +0200 - - Fix the condition for an expert info + 2) you don't have a bunch of randomly-chosen data field sizes; - The condition triggering an expert info if the reliability - parameter is non-zero, but a reliable data channel is - negotiated was wrong. Now the type field is considered - correctly. - While there, update the reference. + 3) you don't have sizes of 0, which cause problems with + compilers that don't support zero-length arrays; - Change-Id: I1f2f78861d6a44c5334fd44e2038bbfdc52fa919 - Reviewed-on: https://code.wireshark.org/review/4900 - Reviewed-by: Michael Tüxen - -commit 4664ac6 -Author: Martin Kaiser -Date: Tue Oct 21 20:03:03 2014 +0200 - - fix wrong offset for ID Capability Flags 1 - reported by Jean-Marc Lamond + 4) you don't have some apparently-incorrect "-{size of data + member}" values (if they're correct, please fix the structure + definitions). - Bug: 10597 - Change-Id: I481fad9cd0b8d55e3dd3af00cde2897105547f13 - Reviewed-on: https://code.wireshark.org/review/4898 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + Change-Id: Iea368b83fa2d184bd6df453d51756e4749714e2c + Reviewed-on: https://code.wireshark.org/review/6082 + Reviewed-by: Guy Harris -commit 1463db3 -Author: Martin Kaiser -Date: Mon Oct 20 22:56:34 2014 +0200 +commit ea6f5a3 +Author: Hadriel Kaplan +Date: Sat Dec 27 13:29:06 2014 -0500 - tn5220: prevent another potential endless loop - exit the loop if dissect_unknown_data() returns 0 + Zebra dissector highlights wrong byte for version and is missing some fields - Change-Id: I681d170d4daf8efb06231790652ff7c941b46d89 - Reviewed-on: https://code.wireshark.org/review/4882 - Reviewed-by: Martin Kaiser + Bug: 10809 + Change-Id: I916d3ee0644570b689b35575e7277fc7d5ee3396 + Reviewed-on: https://code.wireshark.org/review/6081 + Petri-Dish: Hadriel Kaplan + Reviewed-by: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Hadriel Kaplan + Tested-by: Hadriel Kaplan -commit b757038 -Author: Martin Kaiser -Date: Tue Oct 21 19:39:39 2014 +0200 +commit 25c7e0d +Author: Pascal Quantin +Date: Sat Dec 27 16:46:32 2014 +0100 - no need for if(tree) + OpenFlow: fix dissection of async_config_prop structure - Change-Id: I529a601ce83c446247cee1e87386622462f24f56 - Reviewed-on: https://code.wireshark.org/review/4896 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + Bug: 10808 + Change-Id: I5ef46cd6b85c415e23dfdbe7a56c8b332eaae5a3 + Reviewed-on: https://code.wireshark.org/review/6078 + Reviewed-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman -commit 5f6be84 -Author: Martin Kaiser -Date: Mon Oct 20 23:01:22 2014 +0200 +commit 1ae0c4a +Author: Pascal Quantin +Date: Sat Dec 27 15:42:53 2014 +0100 - no need for continue at the end of a while loop, we loop anyway + Fix -z statistics command line parsing + + 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: I96ff9ee0967fcdb2c8122649a2363a36ea2a2882 - Reviewed-on: https://code.wireshark.org/review/4884 - Reviewed-by: Martin Kaiser + Change-Id: Iec4032fc10b00e606770533c5a567d7b49663593 + Reviewed-on: https://code.wireshark.org/review/6075 + Reviewed-by: Pascal Quantin -commit 8638624 -Author: Gerald Combs -Date: Fri Oct 17 18:56:58 2014 -0700 +commit 0ea310d +Author: Pascal Quantin +Date: Sat Dec 27 16:34:54 2014 +0100 - Make the "-qt" option the default in the OS X packaging scripts. + SRVLOC: fix some fields registration (regression introduced in ga1c6341) - Change-Id: I1e404c342d06381be71735ff6fbc47e9b2b13899 - Reviewed-on: https://code.wireshark.org/review/4895 - Reviewed-by: Gerald Combs + Change-Id: I318f4889b94021ece1e61ae080b77b1fb21eae7b + Reviewed-on: https://code.wireshark.org/review/6077 + Reviewed-by: Pascal Quantin -commit 39b631d -Author: AndersBroman -Date: Tue Oct 21 11:00:40 2014 +0200 +commit a1c6341 +Author: Michael Mann +Date: Fri Dec 26 21:13:48 2014 -0500 - Add OID callback for private IEs making it possible to call a dissector - for the private OID. + Eliminate proto_tree_add_text from packet-srvloc.c - Change-Id: Ibb86d8523f1aee14ba1a843ec3ad4becc7729013 - Reviewed-on: https://code.wireshark.org/review/4893 - Reviewed-by: Anders Broman + Change-Id: I73a2270e259414f21a695d2b279df5b3cac27bb8 + Reviewed-on: https://code.wireshark.org/review/6067 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann -commit 750d377 -Author: AndersBroman -Date: Fri Oct 17 16:54:28 2014 +0200 +commit c04aebd +Author: Guy Harris +Date: Sat Dec 27 02:57:22 2014 -0800 - Add OID dissector table for PER based dissection. + Declare cur_rt in the narrowest possible scope. - Change-Id: Iaf789017e997eddf7d6dc596eb40fdef413bfd68 - Reviewed-on: https://code.wireshark.org/review/4778 - Reviewed-by: Anders Broman + Change-Id: I0604d6f9f4bb2c58bb74a9b375f644474b68c28f + Reviewed-on: https://code.wireshark.org/review/6074 + Reviewed-by: Guy Harris -commit c4dc9ed -Author: Guy Harris -Date: Tue Oct 21 00:51:17 2014 -0700 +commit ca6f849 +Author: Pascal Quantin +Date: Sat Dec 27 09:17:36 2014 +0100 - Handle an hfindex of -1. + IP: try to fix OSX 10.5 x86 compilation - Code generated by the current version of Pidl dissects bitset fields - twice - once with proto_tree_add_item(), which puts the actual item into - the tree, so that we can create a subtree under it, and once with a - dissect_dcerpc_{type}() routine, to fetch the value and step past the - field. The second call passes an hf_ index value of -1; interpret that - as meaning "don't put this into the protocol tree", rather than just - blindly calling proto_tree_add_XXX with -1 and getting a dissector - assertion. + 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 - Change-Id: I42fc023e77514a8a8a25d5c9db11fa3ef053babf - Reviewed-on: https://code.wireshark.org/review/4892 - Reviewed-by: Guy Harris + Change-Id: I97fe33d2a01e982f057cce6d68f64378727be2da + Reviewed-on: https://code.wireshark.org/review/6073 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin -commit 7522497 +commit 4536271 Author: Guy Harris -Date: Mon Oct 20 22:29:11 2014 -0700 +Date: Fri Dec 26 18:46:10 2014 -0800 - With CMake, define WANT_PACKET_EDITOR in config.h. + Don't use a leading - in getopt_long() option strings. - Just as we do with autotools and nmake, define it in config.h, so it's - defined the same for every single file, rather than defining it in one - particular directory's Makefiles, so that it's defined for some code but - not all. + 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: Ic41cd10f2b502e0be76c134cbeaad94dff7623f8 - Reviewed-on: https://code.wireshark.org/review/4891 + Change-Id: I5610cf90a8218d48f7516abacc367e0affa3b549 + Based-On-A-Change-From: Peter Hatina + Reviewed-on: https://code.wireshark.org/review/6071 Reviewed-by: Guy Harris -commit 8dd032e +commit 0a0ce2b Author: Guy Harris -Date: Mon Oct 20 18:25:10 2014 -0700 +Date: Fri Dec 26 18:21:05 2014 -0800 - file.c isn't in a DLL, so what it exports shouldn't be WS_DLL_PUBLIC. + Check for optreset in CMake as well. - Change-Id: I1fcd0422703d21ce3d0764a23bd491708ffc6785 - Reviewed-on: https://code.wireshark.org/review/4890 + Change-Id: I74aae1d68f48702b0cd1289cdafdfff8d817b5f4 + Reviewed-on: https://code.wireshark.org/review/6068 Reviewed-by: Guy Harris -commit 8868cf1 -Author: Guy Harris -Date: Mon Oct 20 18:23:32 2014 -0700 +commit eff91ed +Author: Pascal Quantin +Date: Fri Dec 26 23:39:48 2014 +0100 - Fix the earlier checkin. + Fix building of color conversation filter - Remove some trailing white space while we're at it. + Right now eth filter (the last one tried) is always applied - Change-Id: If399077a799e24302640776760b4388687ecad4f - Reviewed-on: https://code.wireshark.org/review/4889 - Reviewed-by: Guy Harris + Change-Id: Ibe5d3c30033bd2d385bd1e68b20388114673cb5c + Reviewed-on: https://code.wireshark.org/review/6064 + Reviewed-by: Pascal Quantin -commit 29ab967 +commit c2c9a09 Author: Guy Harris -Date: Mon Oct 20 17:57:08 2014 -0700 +Date: Fri Dec 26 14:37:31 2014 -0800 - Fix a number of what appear to be errors. + Use getopt_long() for the first pass through the argument list. - Add checks for too-short length fields. + That way: - Increment the offset after some proto_tree_add_item() calls to skip past - the item. + 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; - Make some other length calculations use the start of the item to which - the length applies, not the start of the *list* of items. + 2) if necessary, we can handle long options in the first pass. - Fix a double-digit field to be 2 bytes long (as the documentation says - it is). + Switch to using getopt_long() for the *second* pass for the GTK+ version + of Wireshark. - Add a comment about a field that isn't always present but that's - specified in a tn5250_add_hf_items() list. + 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. - Fix DEFINE PITCH TABLE to match what the documentation appears to say it - is. + (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: Ibcdc580045c68e8d0d8f35011dfe72b9c245e157 - Reviewed-on: https://code.wireshark.org/review/4888 + Change-Id: Ide5069f1c7c66a5d04acc712551eb201080ce02f + Reviewed-on: https://code.wireshark.org/review/6063 Reviewed-by: Guy Harris -commit a19825b -Author: Gerald Combs -Date: Mon Oct 20 16:11:48 2014 -0700 +commit 2c6d2bb +Author: Pascal Quantin +Date: Fri Dec 26 23:21:35 2014 +0100 - CMake: Use WIRESHARK_LIB_DIR. Fix GThread check on Windows. + UDP: fix 'Follow Stream' button from conversations tab - Have FindWSWinLibs check for WIRESHARK_LIB_DIR before WIRESHARK_BASE_DIR - to match the behavior of config.nmake and the Windows buildbots, which - set the former but not the latter. + Add stream index to conversation table - It looks like the latest GLib DLL contains GThread. Adjust - FindGTHREAD2.cmake accordingly. - - Change-Id: I0232b1819eca9ba2c39ae6834daddf65af979d7d - Reviewed-on: https://code.wireshark.org/review/4887 - Reviewed-by: Gerald Combs + Change-Id: Id63b2cc0000d89297c8638b9a89315096fc5458b + Reviewed-on: https://code.wireshark.org/review/6062 + Reviewed-by: Pascal Quantin -commit f66e45b -Author: Guy Harris -Date: Mon Oct 20 16:36:19 2014 -0700 +commit a2beef9 +Author: Pascal Quantin +Date: Fri Dec 26 23:09:04 2014 +0100 - Export cf_set_frame_edited(). + Fix assertion when applying conversation color - Change-Id: I6569b020ff00d6748840a00ca418653d9e3fdb9b - Reviewed-on: https://code.wireshark.org/review/4886 - Reviewed-by: Guy Harris + Packet scoped memory cannot be used here; let's use the pinfo pool + + Change-Id: If76605f7a3021f5900fd46ce7d1c642a518c902f + Reviewed-on: https://code.wireshark.org/review/6061 + Reviewed-by: Pascal Quantin -commit 43a21c8 -Author: Evan Huus -Date: Mon Oct 20 16:32:42 2014 -0400 +commit ea6a578 +Author: Pascal Quantin +Date: Fri Dec 26 22:43:55 2014 +0100 - kafka: summarize number of messages in a set + Try to fix compilation broken by g3d3f973 - Change-Id: I62873a147426079aa4890289320c43ef7f1b26dc - Reviewed-on: https://code.wireshark.org/review/4877 - Reviewed-by: Evan Huus + Change-Id: I26833e9a4f7557b5824effaff16b38d2c4367772 + Reviewed-on: https://code.wireshark.org/review/6059 + Reviewed-by: Pascal Quantin -commit 77f9699 -Author: Guy Harris -Date: Mon Oct 20 14:36:52 2014 -0700 +commit 3d3f973 +Author: Michael Mann +Date: Sun Dec 21 08:02:26 2014 -0500 - Fix support for writing out edited records. + Replace ip_to_str with [ep_]address_to_str and tvb_ip_to_str. - Add a cf_set_frame_edited() routine to set the record header and data - for a record; have it do all the non-GUI work, and have it set the - file's "unsaved changes" flag. + Change-Id: I40d0c8253743183aecef252040b7dd6742ae5c71 + Reviewed-on: https://code.wireshark.org/review/5934 + Reviewed-by: Michael Mann + +commit b68fb9b +Author: Bill Meier +Date: Wed Dec 24 10:44:03 2014 -0500 + + Fix some dissectors doing termio (fprintf(stderr,..), g_warning()). - Have the GUI code just call that routine and then update the title bar - to reflect the unsaved changes. + - Use report_...failure() (in most cases). + - Also: Do some misc fixes in certain disectors + - re-arrange order of #includes + - Fixup preferences help text - While we're at it, unmark a no-longer-unused argument to save_record(). + Change-Id: I385f6f97257f365f53ce611df02f57f9257dc5f9 + Reviewed-on: https://code.wireshark.org/review/6039 + Petri-Dish: Bill Meier + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit 4cf6583 +Author: Michael Mann +Date: Fri Dec 26 09:44:30 2014 -0500 + + Remove proto_tree_add_text from ZigBee dissectors. - Change-Id: Ieb513fdf423b388519527621ecec4cf634b98caf - Reviewed-on: https://code.wireshark.org/review/4885 - Reviewed-by: Guy Harris + Change-Id: I0488cb0ab33f2cc6dee227f1bfacec58eafc4190 + Reviewed-on: https://code.wireshark.org/review/6055 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann -commit 0bbe483 -Author: Stig Bjørlykke -Date: Mon Oct 20 22:44:25 2014 +0200 +commit a442a1c +Author: Pascal Quantin +Date: Fri Dec 26 19:52:38 2014 +0100 - Proto: Fixed proto_unregister_field() + WCCP: initialize address table to 0 - This function did not work after svn revision 51396. - This fix affects http, imf and ldap preferences. + It prevents an uninitialized access later on if an exception is triggered before filling the table - Change-Id: I6fcb24c968d03c7d1fdc018cfa907f9cfd8809bb - Reviewed-on: https://code.wireshark.org/review/4881 - Reviewed-by: Stig Bjørlykke + Bug: 10806 + Change-Id: I8f75fb18cd8d033013c34093f9d6c8762f23452b + Reviewed-on: https://code.wireshark.org/review/6056 + Reviewed-by: Pascal Quantin -commit bc27265 -Author: Martin Kaiser -Date: Mon Oct 20 22:37:51 2014 +0200 +commit f2224bc +Author: Bill Meier +Date: Wed Dec 10 01:52:31 2014 -0500 - tn5250: fix an endless loop, exit when offset is not incremented + rpc: Prevent "malformed" for RPC 'NULL proc' packets. - Bug: 10596 - Change-Id: I64509aa49fce4893dee4e7a74a560e09a98830f6 - Reviewed-on: https://code.wireshark.org/review/4878 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + Bug: 10646 + Change-Id: Ifb96768969a43c59367b73e7bb940ceeb02cf6b0 + Reviewed-on: https://code.wireshark.org/review/5700 + Reviewed-by: Jeff Morriss + Reviewed-by: Anders Broman -commit a2508bd -Author: Gerald Combs -Date: Mon Oct 20 11:20:54 2014 -0700 +commit adb81f3 +Author: Martin Mathieson +Date: Thu Dec 25 22:34:06 2014 +0000 - OS X: Add retina / hidpi support to Info.plist. + Deleting unnecessary #includes from dissectors. + Fifth batch (packet-rtp.c -> end). - This should partially fix the problem described at - https://ask.wireshark.org/questions/37177/pixelated-ui-on-mac-os-x-with-development-1990 + Will look at cleaning up and committing script afterwards. - Change-Id: I436aae0d5b681e9ff549d257c2244ee67448ab07 - Reviewed-on: https://code.wireshark.org/review/4876 - Reviewed-by: Gerald Combs + Change-Id: I8ed61dc941d98d3f7259a9d1f74e214eb7b4bfa2 + Reviewed-on: https://code.wireshark.org/review/6052 + Reviewed-by: Martin Mathieson -commit d86b308 -Author: Evan Huus -Date: Mon Oct 20 10:08:56 2014 -0400 +commit 9c7c72d +Author: Alexis La Goutte +Date: Mon Dec 22 22:50:49 2014 +0100 - kafka: compression codec is unsigned + VoIP Calls: Missing break in switch (CID 1155515) - Change-Id: I238e93dd035caa359fed768aa2aac4df5a0ef47e - Reviewed-on: https://code.wireshark.org/review/4875 - Reviewed-by: Evan Huus + Change-Id: Ie62cd2901c791490fe6685f560815e09b921d03b + Reviewed-on: https://code.wireshark.org/review/6001 + Reviewed-by: Anders Broman -commit c3f14ab +commit e08eba9 Author: Guy Harris -Date: Mon Oct 20 02:03:21 2014 -0700 +Date: Thu Dec 25 13:03:09 2014 -0800 - Don't use toupper() in the test program. - - We're not including ctype.h in the test program, so don't use toupper(). - The test program might not be built with GLib, so don't use - g_ascii_toupper(), either. Just compare against both 'Y' and 'y'. + Only include if we need it. - Change-Id: Iabc04a5fecb04110c0d16b24a047de72eabbb2bc - Reviewed-on: https://code.wireshark.org/review/4870 + Change-Id: Idee0e7205969ac2e7b33c4748a1463a0bfffe0a6 + Reviewed-on: https://code.wireshark.org/review/6051 Reviewed-by: Guy Harris -commit 991743b +commit ceeeea0 +Author: Hadriel Kaplan +Date: Mon Dec 22 19:14:49 2014 -0500 + + Lua accessor for Protocol field type gets wrong data + + 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 + Petri-Dish: Alexis La Goutte + Reviewed-by: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Hadriel Kaplan + Tested-by: Hadriel Kaplan + +commit 2391a43 +Author: Hadriel Kaplan +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 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Hadriel Kaplan + Tested-by: Hadriel Kaplan + +commit de8c81c Author: Guy Harris -Date: Mon Oct 20 01:48:56 2014 -0700 +Date: Thu Dec 25 01:13:24 2014 -0800 - Get rid of another toupper() call in favor of g_ascii_toupper(). + Use getopt_long(). - Change-Id: If527af69ec96a91c4127c95307c3b93b79b53e2f - Reviewed-on: https://code.wireshark.org/review/4865 + Change-Id: I8ff74de7cedee64bc46d88f23a6d1e771d4a4a10 + Reviewed-on: https://code.wireshark.org/review/6048 Reviewed-by: Guy Harris -commit 9eb0080 +commit 20503c7 Author: Guy Harris -Date: Mon Oct 20 01:08:19 2014 -0700 +Date: Wed Dec 24 17:10:40 2014 -0800 - Sign, Flex strikes again; it generates code that produces warnings. + 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(); - Change-Id: Ibd92bd07e537a4ac19e2a5b159ece0e25aa366b1 - Reviewed-on: https://code.wireshark.org/review/4861 + 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 -commit 091aea8 +commit b6f70ed +Author: Ilya Gavrilov +Date: Tue Dec 23 19:48:56 2014 +0300 + + NBAP: fix ddi missed for non first macdflow_id in E-DCH channel + + Change-Id: Ib93cac8a4b186114f50ef4a26bdace2d72219644 + Reviewed-on: https://code.wireshark.org/review/6022 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + Reviewed-by: Michael Mann + +commit 2233ef5 Author: Guy Harris -Date: Mon Oct 20 00:59:26 2014 -0700 +Date: Wed Dec 24 16:13:11 2014 -0800 - And some more comment cleanup. + 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: + + include wsgetopt.c iff we don't have getopt(); + + include inet_aton.c iff we don't have inet_aton(); - Change-Id: Idfc541a08de2ed9e1ca8bccca366612830213ead - Reviewed-on: https://code.wireshark.org/review/4858 + include strptime.c iff we don't have strptime(). + + Change-Id: Ibd68306ac372a4ae102c3220a94cdf6ecb04e58c + Reviewed-on: https://code.wireshark.org/review/6044 Reviewed-by: Guy Harris -commit 700bfdc +commit 153c63d Author: Guy Harris -Date: Mon Oct 20 00:45:26 2014 -0700 +Date: Wed Dec 24 15:54:47 2014 -0800 - More comment cleanup. + Don't use extra variables for ws_mempbrk_sse42.c and popcount.c + + Instead, just add to WSUTIL_FILES as necessary. - Change-Id: Ifa65c3090e204b93ec526358b863fdf9bafc6a03 - Reviewed-on: https://code.wireshark.org/review/4857 + Change-Id: Iecadbd9a66ec54ee5d90aecfbfe5e636ae56e27e + Reviewed-on: https://code.wireshark.org/review/6043 Reviewed-by: Guy Harris -commit 9ffb72b +commit c01bad2 Author: Guy Harris -Date: Mon Oct 20 00:41:35 2014 -0700 +Date: Wed Dec 24 15:36:55 2014 -0800 - Clean up some comments. + Add -msse4.2 to the compiler flags if it's supported. - Change-Id: Ibe96878ba9ae94f9f22a221797fb36d713286d32 - Reviewed-on: https://code.wireshark.org/review/4856 + Change-Id: I354c5141f8fbe306a71395622effeb97df97f3ce + Reviewed-on: https://code.wireshark.org/review/6042 Reviewed-by: Guy Harris -commit 80e6f62 -Author: Guy Harris -Date: Sun Oct 19 23:14:50 2014 -0700 +commit 499a7d0 +Author: Alexis La Goutte +Date: Wed Dec 24 10:46:41 2014 +0100 - Get rid of calls to ctype.h functions. + TCP: TCP Fast Open Cookie is now standardised - They don't handle values outside the range -1 to 127, and their behavior - is locale-dependent. Use g_ascii_isXXX() and g_ascii_toXXX() instead of - isXXX() and toXXX(). + The kind for TFO is 34 - If you're checking for printable ASCII, don't use isascii() and don't - use iscntrl(), use g_ascii_isprint(). If you're checking for graphical - ASCII, i.e. printable ASCII except for a space, use g_ascii_isgraph(). + Split dissect TFO option in dedicated function (Using also in TCP Option Experimental with Magic 0xf989) - Use ws_xton() to convert a hex digit character to the corresponding - numeric value. + Change-Id: I18ff9ba110fba708a955f448f272ec7c4a7e264e + Reviewed-on: https://code.wireshark.org/review/6033 + Reviewed-by: Michael Mann + +commit 59bdad3 +Author: Stephen Fisher +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: Id3039bc586fbf66d8736c2df248c790c0d7a2330 - Reviewed-on: https://code.wireshark.org/review/4851 - Reviewed-by: Guy Harris + Change-Id: Ia78ea18beb1a13ab0ad1ad5a87f7b5a887fad918 + Reviewed-on: https://code.wireshark.org/review/6041 + Reviewed-by: Stephen Fisher -commit 0b9eb9f -Author: Guy Harris -Date: Sun Oct 19 23:01:17 2014 -0700 +commit 1bbe6e6 +Author: Alexis La Goutte +Date: Wed Dec 24 10:49:58 2014 +0100 - Get rid of unnecessary includes of ctype.h. + TCP: fix indent and reorder Multipath TCP - Change-Id: I2cf49f808558147ce77e7d086558966cfb2defca - Reviewed-on: https://code.wireshark.org/review/4850 - Reviewed-by: Guy Harris + Change-Id: I4ebe474f2a2787c350fe8c4a2de5c35d94d9b064 + Reviewed-on: https://code.wireshark.org/review/6032 + Reviewed-by: Matthieu Coudron + Reviewed-by: Michael Mann -commit 39c3a79 -Author: Stig Bjørlykke -Date: Thu Oct 16 14:04:57 2014 +0200 +commit 4b6141b +Author: Hadriel Kaplan +Date: Tue Dec 23 16:34:01 2014 -0500 - Check if mask_greatest_bit_offset is within limits. + GIOP dissector doesn't handle two packets in a row - The result of the '>>' expression is undefined if mask_greatest_bit_offset = 0. + Make the GIOP TCP-based dissector correctly handle multiple GIOP + messages in a TCP segment, and when the second is malformed. - Change-Id: I15b094a5220a5075878bad65ab0b8c5279e80e8a - Reviewed-on: https://code.wireshark.org/review/4723 - Reviewed-by: Evan Huus - Petri-Dish: Alexis La Goutte - Reviewed-by: Alexis La Goutte - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Bug: 10760 + Change-Id: Ie82a1d72a43218e50c6856028a5ef25ad1f0c340 + Reviewed-on: https://code.wireshark.org/review/6025 + Reviewed-by: Anders Broman -commit 4963d99 +commit e03ffe2 Author: Michael Mann -Date: Sun Oct 19 19:41:32 2014 -0400 +Date: Sun Dec 21 13:51:20 2014 -0500 - Eliminate proto_tree_add_text from packet-cdp.c + Replace fc_to_str with address_to_str or tvb_fc_to_str. - Change-Id: I77e1f5788e0567dcaef9f75e1f45e61c63d54b4e - Reviewed-on: https://code.wireshark.org/review/4849 - Petri-Dish: Michael Mann + Change-Id: I69bf25f5abb9d6ad325f922fab73b6f0cf8ca2ea + Reviewed-on: https://code.wireshark.org/review/6035 + Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Reviewed-by: Anders Broman -commit c9b84a5 -Author: Guy Harris -Date: Sun Oct 19 16:08:46 2014 -0700 +commit d3888ff +Author: Alexis La Goutte +Date: Wed Dec 24 16:42:23 2014 +0100 - This appears to be clean with my build; see if it needs work with others. + RSVP: fix display of unknown Juniper Attribut - Change-Id: I2c3e3ce8e29b26958d42b66eca3c7539b65695ab - Reviewed-on: https://code.wireshark.org/review/4848 - Reviewed-by: Guy Harris + Get "Trying to fetch an unsigned integer with length" when length > 4 + + Change-Id: If5e53b826d98f2c30253ea852754f856e1d29088 + Reviewed-on: https://code.wireshark.org/review/6038 + Reviewed-by: Anders Broman -commit 4d6b3db -Author: Guy Harris -Date: Sun Oct 19 16:00:41 2014 -0700 +commit 762bb18 +Author: Alexis La Goutte +Date: Wed Dec 24 16:16:26 2014 +0100 - Eliminate a use of a ctype.h function. + RSVP: Conversations / Endpoint: wrong filter when select a RSVP conversations / endpoint (INVALID == a.x.y.z ...) - That way, we avoid locale-dependent behavior. + Change-Id: I70f6afd41eefddb42829c3d5f890ea67dcd65537 + Reviewed-on: https://code.wireshark.org/review/6037 + Reviewed-by: Anders Broman + +commit 04a1f33 +Author: Alexis La Goutte +Date: Wed Dec 24 10:25:32 2014 +0100 + + test suite: (Minor) fix some double space - Change-Id: I429fde961dc7cb61013756a663d6cd511f19ca70 - Reviewed-on: https://code.wireshark.org/review/4845 - Reviewed-by: Guy Harris + Change-Id: I7fe7cd7ed471b8fcd2afd5fb4bbc180b580295b3 + Reviewed-on: https://code.wireshark.org/review/6031 + Reviewed-by: Anders Broman -commit 2b6c267 -Author: Guy Harris -Date: Sun Oct 19 15:41:04 2014 -0700 +commit bfa9ddf +Author: Alexis La Goutte +Date: Mon Dec 22 20:56:15 2014 +0100 - Eliminate use of ctype.h routines. + Qt (pref.gui_layout_type): Missing break in switch (CID 1159202 & 1159203) - That way, we don't do locale-sensitive case-insensitivity (yes, the - locale can affect case-mapping - in a Turkish locale, "I" isn't the - upper-case version of "i", for example). + Change-Id: I28af99cff5db310ef10258e3054afa7337df1e60 + Reviewed-on: https://code.wireshark.org/review/5996 + Reviewed-by: Anders Broman + +commit 4876016 +Author: Alexis La Goutte +Date: Mon Dec 22 20:54:10 2014 +0100 + + Qt (KeyPressEvent): Missing break in switch (CID 1159205, 1159206, 1159208, 1159209) - Change-Id: I5f7663e85160558ff3769617f924e45049c9c384 - Reviewed-on: https://code.wireshark.org/review/4843 - Reviewed-by: Guy Harris + Change-Id: I40b7c7eefb269570e6a1c5c9ec310fa97840d42d + Reviewed-on: https://code.wireshark.org/review/5995 + Reviewed-by: Anders Broman -commit ac55a6d -Author: Guy Harris -Date: Sun Oct 19 15:39:12 2014 -0700 +commit 2d8ec49 +Author: Stephen Fisher +Date: Tue Dec 23 14:58:38 2014 -0700 - Get rid of unnecessary include of ctype.h. + Move twelve show_version() functions from the varoius programs and + Wireshark UI files into a single one in wsutil. - Change-Id: I30c4d75e16e1816c4a792e023ffe04f5a970b6d3 - Reviewed-on: https://code.wireshark.org/review/4842 - Reviewed-by: Guy Harris + Change-Id: I0a64f0cc8106bd681bd185289c36272c4c43baad + Reviewed-on: https://code.wireshark.org/review/6026 + Reviewed-by: Stephen Fisher -commit 5e4e17c -Author: Michael Mann -Date: Sun Oct 19 00:29:35 2014 -0400 +commit 45daef6 +Author: Stephen Fisher +Date: Tue Dec 23 17:55:48 2014 -0700 - Remove unnecessary tvb_ensure_bytes_exist calls. + 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. - All of the calls removed are followed by proto_tree_add_xxx calls of the same offset/length of the tvb_ensure_bytes_exist call. The proto_tree_add_xxx calls should throw the exception, so we don't need the "double check". - There are probably more calls that can be removed, these were just obvious as first glance, spurred mostly by noticing the (ab)use in packet-wsp.c + Change-Id: Ib3131f63c965ae243f25f98f6209e049323d8360 + Reviewed-on: https://code.wireshark.org/review/6030 + Petri-Dish: Stephen Fisher + Tested-by: Petri Dish Buildbot + Reviewed-by: Stephen Fisher + +commit 29d02a3 +Author: Enrico Jorns +Date: Tue Nov 25 10:34:19 2014 +0100 + + canopen: Verbosity for INFO column - Change-Id: I37cee347c8cf8ab0559e21562c802d3b37f4871e - Reviewed-on: https://code.wireshark.org/review/4833 + Display basic information about what is going on in the INFO column to + ease protocol debugging. + + Change-Id: I2a3aba8008bf65ab9e236a3d81335cf723b2edd0 + Reviewed-on: https://code.wireshark.org/review/5521 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann + +commit a0e9fe5 +Author: Alexis La Goutte +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 Reviewed-by: Alexis La Goutte -commit 1427a8e -Author: Gerald Combs -Date: Sun Oct 19 08:05:58 2014 -0700 +commit 37773b7 +Author: Stephen Fisher +Date: Tue Dec 23 17:30:21 2014 -0700 - [Automatic manuf, services and enterprise-numbers update for 2014-10-19] + Insert URLs for finding Wireshark's dependencies in README.bsd - Change-Id: Ifc13fdb5898cad85ba7cd35c28024f3d4fefe70a - Reviewed-on: https://code.wireshark.org/review/4839 - Reviewed-by: Gerald Combs + Change-Id: Idb49181672b83eb4c074409f5b7487cce054833f + Reviewed-on: https://code.wireshark.org/review/6029 + Reviewed-by: Stephen Fisher + +commit bcbfe79 +Author: Stephen Fisher +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 + +commit afbdf10 +Author: Stephen Fisher +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 + +commit 7d87adf +Author: Stephen Fisher +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 -commit db316c9 +commit 0b6adfc Author: Alexis La Goutte -Date: Sun Oct 19 16:18:29 2014 +0200 +Date: Thu Dec 18 22:17:48 2014 +0100 - TDS: Make buildbot happy + Add .mailmap: fix duplicate/wrong e-mail or name in commit log - Fix Field 'Server Version' (tds.server_version) is an integral value (FT_UINT32) but is being displayed as BASE_NONE + It will be reused form generate AUTHORS file - Change-Id: I601e71ac8e7928ef90fdd16956af3a34bca269a9 - Reviewed-on: https://code.wireshark.org/review/4836 + Change-Id: I43c388df34551b898f15913c2625b1996ace0cbc + Reviewed-on: https://code.wireshark.org/review/5841 + Petri-Dish: Alexis La Goutte + Reviewed-by: Lukas Emersberger + Reviewed-by: Michael Tüxen Reviewed-by: Alexis La Goutte -commit 8def8ef -Author: Bill Meier -Date: Sun Oct 19 10:04:39 2014 -0400 +commit 7e8a4b0 +Author: Martin Mathieson +Date: Tue Dec 23 17:10:40 2014 +0000 - packet-amqp.c: Temporary/preliminary fix for Bug #10582 (crash) + Deleting unnecessary #includes from dissectors. + Fourth batch (packet-mac-lte.c -> packet-rtp.c). - This is a temporary/preliminary fix to prevent the buildbot fuzz-test - failures seen when testing the capture file attached to Bug #10582. + Will look at cleaning up and committing script afterwards. - As noted in the bug, a complete fix will require some reworking of - the amqp dissector. - - Change-Id: I2571f1eeb46a7eede04b8d809e87b95f1ff529df - Reviewed-on: https://code.wireshark.org/review/4835 - Reviewed-by: Bill Meier + Change-Id: Id921f07f4b274f0cfb77ce81abe4a285fdb8b644 + Reviewed-on: https://code.wireshark.org/review/6023 + Petri-Dish: Martin Mathieson + Reviewed-by: Martin Mathieson -commit 8842e2e -Author: Michael Mann -Date: Fri Oct 17 10:11:22 2014 -0400 +commit 9d7709e +Author: Martin Mathieson +Date: Tue Dec 23 15:15:15 2014 +0000 - Eliminate proto_tree_add_text from packet-tds.c + Restore prefs.h for ipv6 too - Change-Id: Ib3dc7f8a87e55ef34d4847f4837d645e418607a3 - Reviewed-on: https://code.wireshark.org/review/4826 - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Change-Id: Ibdc7098532c1aff7ec6135b8e4460056049f9089 + Reviewed-on: https://code.wireshark.org/review/6020 + Reviewed-by: Martin Mathieson -commit ec5159b -Author: Alexis La Goutte -Date: Sat Oct 18 15:48:28 2014 +0200 +commit 78edcff +Author: Martin Mathieson +Date: Tue Dec 23 15:02:35 2014 +0000 - PCAPNG (wiretap): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + Adding back epan/prefs.h to try to fix build - Change-Id: I6337fe88bbfd76161abc3b51c70402e7e63a435e - Reviewed-on: https://code.wireshark.org/review/4813 - Reviewed-by: Evan Huus + Change-Id: Ie532d81817653edfb20b7afefb28be21a627b239 + Reviewed-on: https://code.wireshark.org/review/6019 + Reviewed-by: Martin Mathieson -commit 54dfe3b -Author: Michael Mann -Date: Sat Oct 18 20:45:30 2014 -0400 +commit 86ed26f +Author: Martin Mathieson +Date: Tue Dec 23 14:37:44 2014 +0000 - Eliminate proto_tree_add_text from packet-smpp.c + Deleting unnecessary #includes from dissectors. + Third batch (packet-icmpv6.c -> packet-mac-lte.c). - Change-Id: I6e1e62ff7910be535229d7e1a15557879a5cee1f - Reviewed-on: https://code.wireshark.org/review/4832 - Reviewed-by: Michael Mann + Will look at cleaning up and committing script afterwards. + + Change-Id: Ib91e36ad200db01c3000605f6a7a21125b96a640 + Reviewed-on: https://code.wireshark.org/review/6018 + Petri-Dish: Martin Mathieson + Reviewed-by: Martin Mathieson -commit 7f53986 -Author: Michael Mann -Date: Sat Oct 18 20:45:12 2014 -0400 +commit 377555e +Author: Alexis La Goutte +Date: Tue Dec 23 11:25:10 2014 +0100 - Eliminate proto_tree_add_text from packet-nhrp.c + [column utils] fix warning: unknown command tag name [-Wdocumentation-unknown-command] - Change-Id: I51702e9372551a28ea604d21d4bbf0eb4d9588ae - Reviewed-on: https://code.wireshark.org/review/4831 + Change-Id: I5a14875b4b61ae7635095bdf9f2ab18dd9dbfc09 + Reviewed-on: https://code.wireshark.org/review/6012 Reviewed-by: Michael Mann -commit 6720c80 -Author: Michael Mann -Date: Sat Oct 18 18:09:57 2014 -0400 +commit c670adc +Author: Alexis La Goutte +Date: Mon Dec 22 20:52:47 2014 +0100 - Eliminate proto_tree_add_text from packet-ismp.c + DOCSIS: missing break in switch (CID 280485 & 280486) - Change-Id: Ie2a395b808a8879625185a6de458f61d386cff55 - Reviewed-on: https://code.wireshark.org/review/4830 + Change-Id: I5b756b96ca6c3c48a43948d456bfcb07aab527fd + Reviewed-on: https://code.wireshark.org/review/5994 Reviewed-by: Michael Mann -commit e0e03ee -Author: Michael Mann -Date: Sat Oct 18 09:26:52 2014 -0400 +commit 91cc343 +Author: Alexis La Goutte +Date: Mon Dec 22 22:49:08 2014 +0100 - Eliminate proto_tree_add_text from packet-arp.c + Qt (emitAppSignal): Missing break in switch (CID 1159204) - Change-Id: Ie9596df97a135b411693eefc39fdbd03316166a0 - Reviewed-on: https://code.wireshark.org/review/4828 - Petri-Dish: Michael Mann + Change-Id: Ia2ba40a4fc284dbf3da8e27edf336a4e27cdb4e3 + Reviewed-on: https://code.wireshark.org/review/6000 Reviewed-by: Michael Mann -commit c347eb9 -Author: Michael Mann -Date: Sat Oct 18 13:23:28 2014 -0400 +commit 35949f3 +Author: Martin Mathieson +Date: Tue Dec 23 12:56:29 2014 +0000 - Eliminate proto_tree_add_text from packet-ipx.c + Restore stdlib.h (should not have been deleted - mispelt in script) - Change-Id: Ie084a33be94d91eec7f5f70ef31fcb0835ad266c - Reviewed-on: https://code.wireshark.org/review/4829 - Reviewed-by: Michael Mann + Change-Id: I43387489ed29beff5a523e78cabcfb9e3ea8a182 + Reviewed-on: https://code.wireshark.org/review/6015 + Reviewed-by: Martin Mathieson -commit 283f478 -Author: Michael Mann -Date: Sat Oct 18 09:25:33 2014 -0400 +commit 28e24ad +Author: Martin Mathieson +Date: Tue Dec 23 12:37:32 2014 +0000 - Eliminate proto_tree_add_text from packet-igrp.c + epan/llcsaps.h was needed, so restore include - Change-Id: If73e3bb924036b7746d15058e9fca6f551f9538c - Reviewed-on: https://code.wireshark.org/review/4827 - Petri-Dish: Michael Mann - Reviewed-by: Michael Mann + Change-Id: I443db244bde04af9397bcb5bfa3a1888b0560bf0 + Reviewed-on: https://code.wireshark.org/review/6014 + Reviewed-by: Martin Mathieson -commit 147e7fe -Author: Stig Bjørlykke -Date: Thu Oct 9 10:10:36 2014 +0200 +commit 48db254 +Author: Martin Mathieson +Date: Tue Dec 23 11:34:43 2014 +0000 - Lua: Added ProtoField.none + Deleting unneccessary #includes from dissectors. + Second batch (packet-eth.c -> packet-icmpv6.d). - This field can be used for adding filterable subtree entries. + Will look at cleaning up and committing script afterwards. - Change-Id: Id395c9a8194dc00e6544170631b48d71ae9dd33e - Reviewed-on: https://code.wireshark.org/review/4573 - Reviewed-by: Evan Huus - Reviewed-by: Hadriel Kaplan + Change-Id: I14295758b81a59115d8c88899f166cc3d5d17594 + Reviewed-on: https://code.wireshark.org/review/6013 + Reviewed-by: Martin Mathieson -commit e7b07ae +commit 0e78f7e Author: Alexis La Goutte -Date: Sat Oct 18 16:08:58 2014 +0200 +Date: Mon Dec 22 19:44:29 2014 +0100 - IPv6: QuickStart option Nonce is read incorrectly - - In Wireshark, the option's TTL field looks ok, but the [TTL diff] field points to the byte after the TTL field, which is part of the nonce field. - The nonce field is being read one byte after where it should be read and so the value being read is incorrect. - Moreover, the option data length says 6 but because of the extra byte being read 7 bytes are being read for this option data and the next option is read one byte later incorrectly so the options after the QuickStart option are being read incorrectly. + RTPS: Missing break in switch (CID 996922) - Found by boaz - Bug:10575 - - Change-Id: Icd836b2a5c2f92cef7b6fea61957a85fca5e3352 - Reviewed-on: https://code.wireshark.org/review/4815 - Reviewed-by: Michael Mann + Change-Id: I2b8a12d54414a1b2d878285b8c840de9586fcb5e + Reviewed-on: https://code.wireshark.org/review/5992 + Reviewed-by: Anders Broman -commit 51f4962 +commit b87b3db Author: Alexis La Goutte -Date: Sat Oct 18 16:55:46 2014 +0200 +Date: Mon Dec 22 19:42:39 2014 +0100 - MIPv6: Mobility Option Mobile Node Link Layer Identifier Link-layer Identifier field is read beyond the option data - - there's a single IPv6 packet with Mobile Node Link Layer Identifier mobility option. - The option's data length is 9 but and since the Reserved field takes 2 bytes, the Link Layer Identifier field should take 7 bytes. - However, the Link Layer Identifier field is read until the end of the packet, which is 519 bytes. + NetScaler Trace: Missing break in switch (CID 281457, 727776 & 1021060) - Bug:10578 - Change-Id: I518de7f6b75e5b749cb029845fd4846954ca6d0e - Reviewed-on: https://code.wireshark.org/review/4818 - Reviewed-by: Michael Mann + Change-Id: I575114ba364da1b1d63eea8fc7b48c8c0e0bc99d + Reviewed-on: https://code.wireshark.org/review/5991 + Reviewed-by: Anders Broman -commit 8a10f77 +commit 216cc12 Author: Alexis La Goutte -Date: Sat Oct 18 16:45:01 2014 +0200 +Date: Mon Dec 22 19:20:15 2014 +0100 - MIPv6: Mobility Option Binding Authorization Data for FMIPv6 Authenticator field is read beyond the option data + NASDAQ ITCH: Missing break in switch (CID 280465) - There's a single IPv6 packet with Binding Authorization Data for FMIPv6 mobility option. - The option's data length is 14 but and since the SPI takes 4 bytes, the Authenticator field should take 10 bytes. - However, the Authenticator field is read until the end of the packet, which is 178 bytes. - - Found by boaz - Bug: 10577 - Change-Id: Ia79c5131d8477c1a7c111c47c2a94e990bbeae4d - Reviewed-on: https://code.wireshark.org/review/4817 - Reviewed-by: Michael Mann + Change-Id: I0f3ef7a39d9659b14ff472d2d3e59565db43ec3e + Reviewed-on: https://code.wireshark.org/review/5990 + Reviewed-by: Anders Broman -commit 31c119f +commit 4df2306 Author: Alexis La Goutte -Date: Sat Oct 18 16:31:01 2014 +0200 +Date: Mon Dec 22 19:16:52 2014 +0100 - MIPv6: Mobility Option IPv6 Address/Prefix marks too many bytes for the address/prefix field + ISNS: Missing break in switch (CID 280460) - One of the mobility options is the IPv6 Address/Prefix. - The prefix length of this option is 52. - Note that according to RFC 5568, the prefix length is in bits and not in bytes. - The IPv6 Address/Prefix field of this option marks 52 bytes. + Change-Id: Iaaa56e17e49cd42e18e55e316c691a22bbbdf8f1 + Reviewed-on: https://code.wireshark.org/review/5989 + Reviewed-by: Anders Broman + +commit f103865 +Author: Alexis La Goutte +Date: Sun Dec 21 16:15:10 2014 +0100 + + RSVP: RECORD_ROUTE IPv4 Subobject Flags field incorrect decoding - In addition, I'm not sure that the IPv6 Address/Prefix field is a variable size field. - RFC 5568 section 6.4.2 has a diagram of this options that shows this field as if it always takes 128 bits, and the prefix length field just says the length of the prefix (not the length of the field). + 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) - Found by boaz + Issue reported by Alexander Okonnikov - Bug:10576 - Change-Id: I2a9a35cb7c537ec3b91c9a089f14fa31f41d8c80 - Reviewed-on: https://code.wireshark.org/review/4816 - Reviewed-by: Michael Mann + Bug:10799 + Change-Id: I48f6aa35c08945aacf8f2bb871a72b5927511948 + Reviewed-on: https://code.wireshark.org/review/5944 + Reviewed-by: Anders Broman -commit 8d6fd8d +commit f1562e2 Author: Alexis La Goutte -Date: Sat Oct 18 15:50:32 2014 +0200 +Date: Fri Dec 19 12:11:53 2014 +0100 - GSM(_a_rr): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + NDPS: Missing break in switch (CID 281286) - Change-Id: I07fe19af11bff3d001193e4af472c05090728392 - Reviewed-on: https://code.wireshark.org/review/4814 - Reviewed-by: Pascal Quantin + Change-Id: I2363370249d7beb2ed8a29987ac2cb602979d0a3 + Reviewed-on: https://code.wireshark.org/review/5988 + Reviewed-by: Anders Broman -commit 27e4ac8 -Author: Mikael Kanstrup -Date: Sat Oct 11 22:59:14 2014 +0200 +commit cd55821 +Author: Alexis La Goutte +Date: Mon Dec 22 16:29:01 2014 +0100 - Add support for split wiphy dump to Wireless Toolbar + test suite: fix indent (use tabs) and add modelines - To populate the Wireless Toolbar menu the NL80211_CMD_GET_WIPHY - command is used. Some network interfaces must use split wiphy dump - feature for this command to function properly. One such example is the - D-Link DWA-160 USB adapter that does not show up when used without. - - Make use of split wiphy dump feature whenever kernel supports it - to populate the list of monitor interfaces for the Wireless Toolbar. + Change-Id: I648d02d41f92c7fd176ce194eee20a2d19643fe0 + Reviewed-on: https://code.wireshark.org/review/5985 + Reviewed-by: Anders Broman + +commit c3d7080 +Author: Alexis La Goutte +Date: Mon Dec 22 16:28:19 2014 +0100 + + Makefile (epan/dissectors): fix indent (use tabs) - Bug: 10564 - Change-Id: Idc28e92f91a2488fa48eeb282a0ef1e2bd40a5f0 - Reviewed-on: https://code.wireshark.org/review/4611 - Petri-Dish: Alexis La Goutte - Tested-by: Petri Dish Buildbot - Reviewed-by: Alexis La Goutte + Change-Id: I72d2dbc05f7cfbd7adf05ed66be81946942cef3b + Reviewed-on: https://code.wireshark.org/review/5984 + Reviewed-by: Anders Broman -commit 85e7c15 -Author: Hannes Mezger -Date: Thu Oct 16 19:25:08 2014 +0200 +commit 7208591 +Author: Alexis La Goutte +Date: Mon Dec 22 16:27:14 2014 +0100 - Use proto_tree_add_expert_format instead of proto_tree_add_text + CMake (epan/CMakeList.txt): fix indent (use tabs) - Change-Id: Ia017fa9535cbc7570ce6bd442972eedd2143825a - Reviewed-on: https://code.wireshark.org/review/4729 - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Change-Id: I40e05f1e4430eadc480134cd62dd01f978353b67 + Reviewed-on: https://code.wireshark.org/review/5983 + Reviewed-by: Anders Broman -commit 975b02f -Author: David Ameiss -Date: Tue Oct 14 09:14:41 2014 -0500 +commit b5ff13a +Author: Alexis La Goutte +Date: Mon Dec 22 16:24:24 2014 +0100 - Converted numerous proto_tree_add_none_format() calls for bitmask/flag items to proto_tree_add_bitmask(). - Correctly set the length of LBT-RM and LBT-RU header blocks. - Various other cosmetic cleanups. + UseLemon (CMake): Fix indent (use space) - Change-Id: If19bbdeb10176b8059fd4cf657719b3b9817bc6a - Reviewed-on: https://code.wireshark.org/review/4776 - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Change-Id: I619d64d62d2fb96ab904d5ea15e3c37aa0319540 + Reviewed-on: https://code.wireshark.org/review/5982 + Reviewed-by: Anders Broman -commit 01cf7fe -Author: Joerg Mayer -Date: Sat Oct 18 08:45:14 2014 +0200 +commit 3d05935 +Author: Bill Meier +Date: Tue Dec 23 01:01:13 2014 -0500 - Add URL to a description of the attributes - Add comments about additional attributes + kerberos: Re-add needed #include - Change-Id: Ic73039ee6fde954e147a44e0f98def76a7e88fb3 - Reviewed-on: https://code.wireshark.org/review/4812 - Reviewed-by: Jörg Mayer + Change-Id: I85c0e5f022b5c04df6079e118e376e8d598675aa + Reviewed-on: https://code.wireshark.org/review/6011 + Reviewed-by: Bill Meier -commit ed676ca -Author: Joerg Mayer -Date: Sat Oct 18 08:39:20 2014 +0200 +commit dd859ea +Author: Bill Meier +Date: Tue Dec 23 00:32:58 2014 -0500 - Commit 54b733ce9a0d1cd4ab9b142479368a5e696360be broke compilation of - echld by removing TS_PREC_AUTO_USEC. Replace its use by TS_PREC_AUTO. - No idea whether that's correct but it compiles again. - Trying to commit this brought complaints by checkapi, so fixed them as - well. + asn1 generated dissectors: cleanup #include usage - Maybe the echld code should be removed, it seems to be unmaintained. - - Change-Id: Id9a0a6fc129abd1b8c93629c31a89c2d9ea2243f - Reviewed-on: https://code.wireshark.org/review/4811 - Reviewed-by: Jörg Mayer + Change-Id: I36b2731d67f9345d2fd0c23800bba7d2be94c387 + Reviewed-on: https://code.wireshark.org/review/6008 + Reviewed-by: Bill Meier -commit 77acaa1 -Author: Guy Harris -Date: Fri Oct 17 18:22:05 2014 -0700 +commit 17582d3 +Author: Bill Meier +Date: Tue Dec 23 00:27:27 2014 -0500 - Get rid of unnecessary includes of ctype.h. + asn1/Makefile.nmake: packet-c1222.c not autogenerated using Windows nmake - Change-Id: I9e2cd7a9fed33fc2f4b0c0da3603690450f6952d - Reviewed-on: https://code.wireshark.org/review/4809 - Reviewed-by: Guy Harris + Change-Id: I21628bdd1a08348629350a373f1c20e02c3618f7 + Reviewed-on: https://code.wireshark.org/review/6007 + Reviewed-by: Bill Meier -commit 1de3a5b +commit 1b37f4c Author: Guy Harris -Date: Fri Oct 17 17:22:30 2014 -0700 +Date: Mon Dec 22 21:03:46 2014 -0800 - Check for printable ASCII in an ENBName. - - I'm not sure why the check is only for alphabetical characters; if - that's correct, change this to use g_ascii_isalpha, and change - is_printable_ascii to is_ascii_alpha or something such as that. + Cmake: check for popcount, and build it from wsutil/popcount.c if missing. - Don't use ctype.h routines, as they are locale-dependent. - - Change-Id: I61d0672350d35ad918e95d7e96ed5dd263102da9 - Reviewed-on: https://code.wireshark.org/review/4805 + Change-Id: Id646a9f0b1fc6acafa99a78725e3f0ec8a48c170 + Reviewed-on: https://code.wireshark.org/review/6006 Reviewed-by: Guy Harris -commit 9f2a878 -Author: Guy Harris -Date: Fri Oct 17 17:05:51 2014 -0700 +commit 4009231 +Author: Stephen Fisher +Date: Mon Dec 22 17:44:20 2014 -0700 - Get rid of unnecessary includes of ctype.h. + Try to fix Windows build for popcount() unresolved external symbol - Change-Id: Ibf9385715b85186f5c7289165acea7233b3fabde - Reviewed-on: https://code.wireshark.org/review/4804 - Reviewed-by: Guy Harris + Change-Id: Ie154caa1967ce4016dd52eefcf757e2e58d7ac68 + Reviewed-on: https://code.wireshark.org/review/6005 + Reviewed-by: Stephen Fisher -commit e3477bd -Author: Guy Harris -Date: Fri Oct 17 16:57:28 2014 -0700 +commit ae6df38 +Author: Stephen Fisher +Date: Mon Dec 22 17:18:20 2014 -0700 - Get rid of some no-longer-necessary casts. - - g_ascii_isXXX() can be handed a char value safely; they won't try to use - it as an index into a table before checking it. + packet-dtls.c still needs conversation.h - Change-Id: Icf80163fb5f9dccd0b97917e318b1db0bf3e0cf8 - Reviewed-on: https://code.wireshark.org/review/4801 - Reviewed-by: Guy Harris + Change-Id: I1e6a55c41cbab74790880da2b3691cd7d82bc276 + Reviewed-on: https://code.wireshark.org/review/6004 + Reviewed-by: Stephen Fisher -commit a91799e -Author: Guy Harris -Date: Fri Oct 17 16:42:40 2014 -0700 +commit 3d62d2c +Author: Stephen Fisher +Date: Mon Dec 22 13:50:10 2014 -0700 - Don't use ctype.h routines. + Move popcount() to an optionally built part of wsutil for systems that + provide their own popcount(). - That avoids locale dependency and handles possibly-signed chars(which - we weren't always doing before). - - Change-Id: I89e50678abb8c3e535081c92ca25bc1bab672c68 - Reviewed-on: https://code.wireshark.org/review/4798 - Reviewed-by: Guy Harris + Change-Id: Ic26f3b50cf0bd2b4af0d42e9c27488ebbac1ab33 + Reviewed-on: https://code.wireshark.org/review/5998 + Petri-Dish: Stephen Fisher + Reviewed-by: Stephen Fisher -commit 19b7819 +commit 59b4ab5 Author: Guy Harris -Date: Fri Oct 17 16:30:56 2014 -0700 +Date: Mon Dec 22 13:51:34 2014 -0800 - Get rid of unnecessary includes of ctype.h. + Include or as necessary to declare functions. - Change-Id: Ibb194cd839d174af9c96f7bb1e2941b3dd6c1ce1 - Reviewed-on: https://code.wireshark.org/review/4797 + Various floating-point math functions require , and abs() + requires . + + Change-Id: I6831cfdb17eac3ce129b6800f0fe82fbcfef2d28 + Reviewed-on: https://code.wireshark.org/review/6002 Reviewed-by: Guy Harris -commit 033f096 +commit d541774 Author: Guy Harris -Date: Fri Oct 17 16:10:53 2014 -0700 +Date: Mon Dec 22 13:23:51 2014 -0800 - Don't use ctype.h routines. + Include or as necessary to declare functions. - That avoids locale dependency and handles possibly-signed chars (which - we weren't always doing before). + Various floating-point math functions require , and abs() + requires . - Change-Id: Ieceb93029252f646397b6488f2df8a57c6d2a23d - Reviewed-on: https://code.wireshark.org/review/4794 + Change-Id: Iadba9e0d7168bba6e67d9221e757a85960507742 + Reviewed-on: https://code.wireshark.org/review/5999 Reviewed-by: Guy Harris -commit 344c2bb -Author: Guy Harris -Date: Fri Oct 17 14:59:09 2014 -0700 +commit 596669f +Author: Martin Mathieson +Date: Mon Dec 22 19:57:31 2014 +0000 - strptime.c needs ctype.h. + First batch of unincludes. Last attempt... - Change-Id: Icf4020426d3a5e0a6bd2012a266cf07be9928abf - Reviewed-on: https://code.wireshark.org/review/4793 - Reviewed-by: Guy Harris + Change-Id: I3681462aeb98ca62ed3ec5eb226b2553317391a9 + Reviewed-on: https://code.wireshark.org/review/5997 + Petri-Dish: Martin Mathieson + Reviewed-by: Martin Mathieson -commit 214a78c -Author: Guy Harris -Date: Fri Oct 17 14:27:07 2014 -0700 +commit b018128 +Author: Stephen Fisher +Date: Mon Dec 22 11:06:05 2014 -0700 - Get rid of unnecessary include of ctype.h. + Cast a parameter in the kerberos dissector so it compiles without + warnings on NetBSD. - Change-Id: Ib83e707ebbbb420ce269a652ede6b7366d24240e - Reviewed-on: https://code.wireshark.org/review/4792 - Reviewed-by: Guy Harris + Change-Id: Id1ab5020fa53656065b0b2438071342eae4f7adb + Reviewed-on: https://code.wireshark.org/review/5987 + Petri-Dish: Stephen Fisher + Tested-by: Petri Dish Buildbot + Reviewed-by: Stephen Fisher -commit e304f6d -Author: Guy Harris -Date: Fri Oct 17 14:22:24 2014 -0700 +commit 5cdad9f +Author: Gerald Combs +Date: Sun Dec 21 13:23:02 2014 -0800 - Get rid of unnecessary includes of ctype.h. + Qt: Add methods to CaptureFile and WiresharkApplication. - Change-Id: Ic23203f13fd6627b664e8ed1438d328c46328b9f - Reviewed-on: https://code.wireshark.org/review/4790 - Reviewed-by: Guy Harris + Add isValid, fileTitle, and retapPackets methods to CaptureFile. Add + application name and title separator convenience methods to + WiresharkApplication. + + 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 + Petri-Dish: Gerald Combs + Reviewed-by: Gerald Combs -commit 5fc398c -Author: Guy Harris -Date: Fri Oct 17 14:10:52 2014 -0700 +commit 30c3d39 +Author: Alexis La Goutte +Date: Mon Dec 22 10:49:21 2014 +0000 - Don't use ctype.h routines. + 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:" - That avoids locale dependency and handles possibly-signed chars (which - we weren't doing before). + This reverts commit d4ff430b4dc5cf0e3efaabd2ef53778070def558. - Change-Id: I189222eff624ad2d2e960bc0b69f3f22d35f351f - Reviewed-on: https://code.wireshark.org/review/4787 - Reviewed-by: Guy Harris + Change-Id: Icb0907e649555237b4a86f9f651ec4df8d79d99b + Reviewed-on: https://code.wireshark.org/review/5975 + Reviewed-by: Stephen Fisher -commit 36e4e6f -Author: Guy Harris -Date: Fri Oct 17 14:04:37 2014 -0700 +commit 352bd87 +Author: Sergey Avseyev +Date: Mon Dec 22 17:34:05 2014 +0300 - Get rid of unused includes of . + packet-couchbase.c: remove field which does not exists - Change-Id: Iab9eaeb0f5765748b2582177396264e4e69bc6d1 - Reviewed-on: https://code.wireshark.org/review/4786 - Reviewed-by: Guy Harris + Change-Id: Ia4a2a6127edbb6a92becf22cd6ee689e5e2a7966 + Reviewed-on: https://code.wireshark.org/review/5981 + Reviewed-by: Sergey Avseyev + Reviewed-by: Alexis La Goutte -commit 5bfde7c -Author: Guy Harris -Date: Fri Oct 17 13:37:11 2014 -0700 +commit 5248c0d +Author: Alexis La Goutte +Date: Mon Dec 22 12:13:34 2014 +0100 - Don't use ctype.h routines. + Fix unknown command tag name [-Wdocumentation-unknown-command] - That avoids locale dependency and handles possibly-signed chars (which - we weren't doing before). + Change-Id: I6c2564a86e13d9321001856ba1f51681a9f20976 + Reviewed-on: https://code.wireshark.org/review/5979 + Reviewed-by: Evan Huus + +commit ed2df3b +Author: Alexis La Goutte +Date: Mon Dec 22 11:42:58 2014 +0100 + + fix warning: parameter 'list' not found in the function declaration [-Wdocumentation] - Change-Id: I70f3d993c9a8fbf870901f12b430d733968c3fa8 - Reviewed-on: https://code.wireshark.org/review/4781 - Reviewed-by: Guy Harris + Change-Id: Id6d02f5c1383dd8f231707f519ec1b28fb007079 + Reviewed-on: https://code.wireshark.org/review/5978 + Reviewed-by: Evan Huus -commit 35a9b98 -Author: Hannes Mezger -Date: Thu Oct 16 20:02:51 2014 +0200 +commit f8720a6 +Author: Alexis La Goutte +Date: Mon Dec 22 12:06:36 2014 +0100 - Use proto_tree_add_bitmask for ExpandedNodeId EncodingMask + ANSI MAP: Remove from Dirty ASN1 list - Instead of adding the items using proto_tree_add_item, use proto_tree_add_bitmask in parseExpandedNodeId(). Also, the redundant 'NodeId ' text is removed from hf_opcua_nodeid_... items for better readability. + Change-Id: I192c447919ee9c3f430f058c2e5285501af962bf + Reviewed-on: https://code.wireshark.org/review/5977 + Reviewed-by: Evan Huus + +commit 414701d +Author: Alexis La Goutte +Date: Mon Dec 22 11:45:05 2014 +0100 + + ANSI_MAP: Fix unused function (by add to .OMIT list) - Change-Id: Ie68f1d280dd733fd2eede0b2b73ad8d7f28396b3 - Reviewed-on: https://code.wireshark.org/review/4730 - Reviewed-by: Michael Mann + 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 -commit 17a1a0d -Author: AndersBroman -Date: Fri Oct 17 16:48:48 2014 +0200 +commit 3cb816c +Author: Alexis La Goutte +Date: Mon Dec 22 11:32:27 2014 +0100 - SGsAP Update to V12.6.0 except for IE TMSI based NRI container. + PTP: Fix ptp_tree may be used uninitialized in this function [-Werror=maybe-uninitialized] - Change-Id: Iafb62a27589de1810d4d3bd1e32f1c89898e9171 - Reviewed-on: https://code.wireshark.org/review/4777 - Reviewed-by: Anders Broman + Change-Id: I0b82782deb568256dafd4c1bf163fd3e74f95545 + Reviewed-on: https://code.wireshark.org/review/5974 + Reviewed-by: Evan Huus -commit e5bbfa0 -Author: Hannes Mezger -Date: Thu Oct 16 19:06:31 2014 +0200 +commit 67cbafa +Author: Martin Kaiser +Date: Sun Dec 21 18:15:36 2014 +0100 - Add argument 'packet_info *pinfo' to all dissecting functions + remove unnecessary integer overflow checks - Change-Id: Ie02326e365ee3f620fcbe3f2e8e45dc5300d3418 - Reviewed-on: https://code.wireshark.org/review/4728 + ... and don't call THROW() from a dissector + + 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. + + Change-Id: Ibb142328837b6a583057531c76d08631fc731848 + Reviewed-on: https://code.wireshark.org/review/5948 Petri-Dish: Alexis La Goutte - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Reviewed-by: Alexis La Goutte -commit 0ceedde -Author: AndersBroman -Date: Fri Oct 17 13:57:56 2014 +0200 +commit 9b3f9b7 +Author: Alexis La Goutte +Date: Sun Dec 21 20:15:47 2014 +0100 - Dissect CDMA2000 PDU if GCSNA dissector exists. + Fix The left operand of '!=' is a garbage value issue found by Clang Analyzer - Change-Id: I866fb9bbc3e94df63231959d6745f3d45ca84020 - Reviewed-on: https://code.wireshark.org/review/4772 + Change-Id: Ia555fc8eca2a7288c159983578cbc88dc0bebbc2 + Reviewed-on: https://code.wireshark.org/review/5952 Reviewed-by: Anders Broman -commit 9d1afef -Author: AndersBroman -Date: Fri Oct 17 10:49:58 2014 +0200 +commit 37940ee +Author: Doug Brown +Date: Sun Dec 21 19:30:46 2014 -0800 - isdigit -> g_ascii_isdigit to make the build work. + Fix AARP AppleTalk address parsing - Change-Id: I670b7b83976a9db9491e017015d570a4dc8f433d - Reviewed-on: https://code.wireshark.org/review/4771 - Reviewed-by: Anders Broman + 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 previous code was assuming that the high two bytes were the network number, + followed by the 1-byte node number, followed by 0. + + Change-Id: I467ec6edac353796db0b96fbac65658d5c5491d3 + Reviewed-on: https://code.wireshark.org/review/5968 + Reviewed-by: Guy Harris -commit 4416988 +commit 7b721a1 Author: Guy Harris -Date: Fri Oct 17 00:02:08 2014 -0700 +Date: Sun Dec 21 22:42:28 2014 -0800 - Eliminate include of . + Squelch a compiler warning. - This is not built if we have glibc (as we already have getopt() from - it), and it's not part of glibc, so.... + ("Can't happen", but that requires more dataflow analysis than some + compilers do.) - Change-Id: Iae4ff944c78fc55a8cd2eaf523a3696c47b741d7 - Reviewed-on: https://code.wireshark.org/review/4769 + Change-Id: I5c6acbff64ea88f9b43d5580522bc144465dc9ac + Reviewed-on: https://code.wireshark.org/review/5972 Reviewed-by: Guy Harris -commit 87545f3 -Author: Guy Harris -Date: Thu Oct 16 23:57:03 2014 -0700 +commit 998a847 +Author: Bill Meier +Date: Sun Dec 21 23:54:35 2014 -0500 - Remove unnecessary includes of . + plugins: Cleanup #includes - Change-Id: I8eacec5fa8d57b10d40a3627197461dae89c6cb2 - Reviewed-on: https://code.wireshark.org/review/4768 - Reviewed-by: Guy Harris + Change-Id: Ic839f2995532d68308f8b5908c185acc7acaaa9c + Mostly: remove '#include ' and certain + other #includes already included in packet.h + Reviewed-on: https://code.wireshark.org/review/5971 + Reviewed-by: Bill Meier -commit f90d8dc -Author: Guy Harris -Date: Thu Oct 16 23:53:21 2014 -0700 +commit 971d4e4 +Author: Bill Meier +Date: Sun Dec 21 23:52:47 2014 -0500 - Use g_ascii_isspace() instead of isascii() && isspace(). + stats_tree: g_sprintf()-->g_snprintf(); cleanup #includes. - This eliminates one more use of macros; we're using - g_ascii_isXXX() instead of isXXX() elsewhere. + Change-Id: I862fed818cd1f14584b082f87b1d4d305cf78687 + Reviewed-on: https://code.wireshark.org/review/5970 + Reviewed-by: Bill Meier + +commit 94eeaf1 +Author: Bill Meier +Date: Sun Dec 21 23:50:49 2014 -0500 + + print.c: clean up #includes - Change-Id: I184caeefab95dda2cf207acf9539eabbd7c32a51 - Reviewed-on: https://code.wireshark.org/review/4767 - Reviewed-by: Guy Harris + Change-Id: I0ecf618cc79060d35b5480f3d8e7ebf8575761c4 + Reviewed-on: https://code.wireshark.org/review/5969 + Reviewed-by: Bill Meier -commit 63ab36b +commit 4cb19d4 Author: Guy Harris -Date: Thu Oct 16 23:41:29 2014 -0700 +Date: Sun Dec 21 19:33:10 2014 -0800 - Don't use macros, and eliminate an include of . + Use the messageLength field to indicate the message length. - This avoids locale-dependent tests, and fixes cases where we passed - signed char values to those macros (which is not safe with char being - signed, as it is on most, but not all, platforms). + 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. - Change-Id: Iea962cd7e4dfaf33c3c873ba43814cc6ed298d94 - Reviewed-on: https://code.wireshark.org/review/4764 + Bug: 10611 + Change-Id: I9af6aad5f07d405ebb14885dc986a73e430d7bdb + Reviewed-on: https://code.wireshark.org/review/5967 Reviewed-by: Guy Harris -commit 23b233d -Author: Guy Harris -Date: Thu Oct 16 23:29:07 2014 -0700 +commit 859360a +Author: Ebben Aries +Date: Sun Dec 21 19:27:58 2014 -0700 - Remove unnecessary include of . + BGP : Update BGP-LS Attribute + Display NEXT_HOP - Change-Id: I596b252d5fb41e654961483cb530754442f25bc7 - Reviewed-on: https://code.wireshark.org/review/4763 - Reviewed-by: Guy Harris + From IANA page: http://www.iana.org/assignments/bgp-parameters/bgp-parameters.xhtml + + Change-Id: Ibc85dccee94aa69306c88b48d680e48fede08f2e + Reviewed-on: https://code.wireshark.org/review/5965 + Reviewed-by: Michael Mann -commit 44d4339 -Author: Guy Harris -Date: Thu Oct 16 23:20:52 2014 -0700 +commit a5a2565 +Author: sfd +Date: Mon Dec 22 14:29:41 2014 +1300 - Don't use macros, and eliminate an include of . - - This avoids locale-dependent tests, and fixes cases where we passed - signed char values to those macros (which is not safe with char being - signed, as it is on most, but not all, platforms). + Removing ptp.v2.an.fcs as this erroneously refers to the Ethernet FCS which is properly handled by the Ethernet dissector. - Change-Id: I51d9716fe3eb02a6e98208334285c07597a6be79 - Reviewed-on: https://code.wireshark.org/review/4761 + Bug: 10611 + Change-Id: I735085edf5c0d2a66c30c940c4b780a2ce8db6d4 + Reviewed-on: https://code.wireshark.org/review/5964 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann Reviewed-by: Guy Harris -commit 25d9a7b -Author: Guy Harris -Date: Thu Oct 16 23:08:42 2014 -0700 +commit 8076f29 +Author: Gerald Combs +Date: Sun Dec 21 16:41:49 2014 -0800 - Don't use macros, and eliminate an include of . + Qt: Fix status bar signal. - This avoids locale-dependent tests. + Change-Id: Ie935269f6cbe9495b95bcc24b45198fbd284fb35 + Reviewed-on: https://code.wireshark.org/review/5963 + Reviewed-by: Gerald Combs + +commit 8228bcf +Author: Guy Harris +Date: Sun Dec 21 16:15:42 2014 -0800 + + Wrong array. - Change-Id: I709ff6b1a837fb0390b29f911d3b9ef1015a2d1e - Reviewed-on: https://code.wireshark.org/review/4758 + Change-Id: I69ceca8be624b13f910997dee3bc6852b61b0162 + Reviewed-on: https://code.wireshark.org/review/5962 Reviewed-by: Guy Harris -commit 762b8d7 +commit 147ca45 Author: Guy Harris -Date: Thu Oct 16 23:01:14 2014 -0700 +Date: Sun Dec 21 16:09:15 2014 -0800 - Don't use ctype.h routines. + Improve the message for "this field has an integral type" assertions. - That avoids locale dependency and handles possibly-signed chars (which - we weren't doing before). + (Along the lines of provious changes.) - Change-Id: I2afab254044e0d39dfa67acd840b9fe4ff1e6d08 - Reviewed-on: https://code.wireshark.org/review/4756 + Change-Id: I22d76f22400d4a93242392ff4688acc753eb0039 + Reviewed-on: https://code.wireshark.org/review/5961 Reviewed-by: Guy Harris -commit 0d9b449 +commit c30aa11 Author: Guy Harris -Date: Thu Oct 16 18:26:03 2014 -0700 +Date: Sun Dec 21 15:35:14 2014 -0800 - Don't use macros. - - They're locale-dependent (although those *particular* ones might not - be). + Register the ORFEntry IP address as an IPv4 address. - Remove no-longer necessary (or not-even-necessary-before-this-change) - includes of + 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: I1384e3ae4ccba6af9220a08773abcde7ea320573 - Reviewed-on: https://code.wireshark.org/review/4755 + Change-Id: I7d668fb2a707cdda4ad228afcbdcaf47ee6cba1b + Reviewed-on: https://code.wireshark.org/review/5960 Reviewed-by: Guy Harris -commit 359a32f +commit 48419fc Author: Guy Harris -Date: Thu Oct 16 18:21:20 2014 -0700 +Date: Sun Dec 21 15:17:13 2014 -0800 - No need for our own wrappers around tolower() and toupper(). + Improve the message for "this field doesn't have the right type" assertions. - We can just use g_ascii_tolower() and g_ascii_toupper(); + Give the field name in the message. - Change-Id: I8a88a096d16ce8c60dd9151e5bdddf6747702145 - Reviewed-on: https://code.wireshark.org/review/4754 + Change-Id: I046c74b451b473c9c87c2980122b025390f82cc8 + Reviewed-on: https://code.wireshark.org/review/5959 Reviewed-by: Guy Harris -commit e6fcff1 +commit 0be413e Author: Guy Harris -Date: Thu Oct 16 16:41:59 2014 -0700 +Date: Sun Dec 21 14:09:28 2014 -0800 - Use g_ascii_isalnum() rather than isalnum(). + Move another helper macro. - That way, we don't have to worry about casting the argument (which, in - one place, was done wrong - casting to int preserves the sign-extension - done with signed chars), and don't have to worry about a locale in which - particular 8-bit byte values are considered alphanumeric characters. - - Change-Id: I129b4bfdad70ade4ab6e0a1d2c13d59ae9e6f524 - Reviewed-on: https://code.wireshark.org/review/4751 + Change-Id: Id3801373526af57146a87abe9698b192074a0fa0 + Reviewed-on: https://code.wireshark.org/review/5958 Reviewed-by: Guy Harris -commit f249589 +commit 5d30a3c Author: Guy Harris -Date: Thu Oct 16 16:03:58 2014 -0700 +Date: Sun Dec 21 13:44:46 2014 -0800 - Just have get_mac_lte_rapid_description() return the description string. - - If get_mac_lte_rapid_description() returned FALSE, we always used "" as - the description string; just have it return the string, or return "" if - rapid ranges haven't been configured, and just use the string. + Define helper macros before they're used. - (If the code ever needs to determine in other places whether rapid ranges - have been configured, it can check s_rapid_ranges_configured, or - get_mac_lte_rapid_description() could return NULL in that case and the - code using the string can check for a null value.) + 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. - This should squelch some incorrect used-but-not-set warnings from at - least one compiler. - - Change-Id: I3ed495a4beb4a553e453e7bca764d1d8a07c5e53 - Reviewed-on: https://code.wireshark.org/review/4750 + Change-Id: I326894eea67d2db43fedf4567699cd9eaaa0e004 + Reviewed-on: https://code.wireshark.org/review/5956 Reviewed-by: Guy Harris -commit a517d50 +commit c96858b Author: Guy Harris -Date: Thu Oct 16 14:55:06 2014 -0700 +Date: Sun Dec 21 13:05:46 2014 -0800 - Make sort_alphabet() not fail too badly with characters in [128,255]. + Use the "netbios" heuristic dissector list elsewhere. - Treat all values in the alphabet as unsigned. + Use find_heur_dissector_list() to find the "netbios" heuristic dissector + list, rather than using code from packet-netbios.c. - Change-Id: I4476c75352f32673a9cd131ea233465f3376fa25 - Reviewed-on: https://code.wireshark.org/review/4747 + Change-Id: Ieeab58d7c6eb32491b026b242c687bd18c4d5cdb + Reviewed-on: https://code.wireshark.org/review/5955 Reviewed-by: Guy Harris -commit aa1f2c5 -Author: Martin Kaiser -Date: Thu Oct 16 23:23:20 2014 +0200 +commit 9407160 +Author: Pascal Quantin +Date: Sun Dec 21 20:56:33 2014 +0100 - use supported/unsupported for the bitfield elements - order them from MSB to LSB + Do not use packet scoped memory in GUI - Change-Id: Ie758285c2cf5d19e00d6d256c49acca15ce81168 - Reviewed-on: https://code.wireshark.org/review/4746 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser - -commit ee56b72 -Author: Martin Kaiser -Date: Thu Oct 16 21:58:59 2014 +0200 - - smartcard descriptor: start a bitfield for the features + It will trigger an assertion - Change-Id: I636cfdfcd61d6d5dc041f9dbc657244d94e88b7f - Reviewed-on: https://code.wireshark.org/review/4745 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + Change-Id: I2436c11b45e1505a94256a06ed3ad0c5480e034b + Reviewed-on: https://code.wireshark.org/review/5953 + Petri-Dish: Pascal Quantin + Reviewed-by: Pascal Quantin -commit b641832 -Author: AndersBroman -Date: Thu Oct 16 22:28:43 2014 +0200 +commit ccf0573 +Author: Pascal Quantin +Date: Sat Dec 20 23:18:05 2014 +0100 - GTPv2 in Complete Request Message call the NAS dissector with a tvb only - containing the IE not the rest of the tvb. + Qt: rename SummaryDialog class to CaptureFilePropertiesDialog - Change-Id: I3eead5047b4f8de47e280ac447c66b110592bccd - Reviewed-on: https://code.wireshark.org/review/4744 - Reviewed-by: Anders Broman + Change-Id: I79aa63621853ff15b8c568e1c7949fb8fa0caca2 + Reviewed-on: https://code.wireshark.org/review/5929 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin + Reviewed-by: Gerald Combs -commit 71a42e0 -Author: Guy Harris -Date: Thu Oct 16 13:03:52 2014 -0700 +commit bcaf1f4 +Author: Gerald Combs +Date: Sun Dec 21 10:13:00 2014 -0800 - Oops, I missed one "cast a char to int and use it as a subscript" case. + Qt: Better accordion frame layout. - Casting a signed char with a negative value to int will preserve the - value, so it'll still be a negative subscript. Cast to guchar instead, - to make sure 0x80 through 0xFF are treated as 128 to 255, not -128 to - -1. + Calling invalidate + activate on the parent layout has better results + than calling adjustSize on the parent widget. - Change-Id: I1f0b33ba3686e963d45317b45465ff335431d17f - Reviewed-on: https://code.wireshark.org/review/4742 - Reviewed-by: Guy Harris + Change-Id: I844bee49b868d988b0fc93a72687407adf232ef9 + Reviewed-on: https://code.wireshark.org/review/5951 + Reviewed-by: Gerald Combs -commit f6bc6f9 -Author: Guy Harris -Date: Thu Oct 16 12:05:26 2014 -0700 +commit bd19532 +Author: Pascal Quantin +Date: Sun Dec 21 19:25:39 2014 +0100 - Better fix - just check that the upper and lower nibbles are >= 0xA. - - An unsigned 8-bit integer is always <= 0xFF; that was the cause of the - warning. + Do not use packet scope memory outside packet dissectors - To see whether a byte, when represented as hex, has letters for its - upper and lower nibbles, just check whether both nibbles are >= 0xA. - Cast the extracted nibbles to make sure there's no sign-extension. + Otherwise it will trigger an assert + Fixes a regression introduced in gf002332 - Change-Id: If4c7717a5d2fe341c02e9309ee6b89973a6ac292 - Reviewed-on: https://code.wireshark.org/review/4739 - Reviewed-by: Guy Harris + Change-Id: I0cffa2c952b7eff085a1834ebabfec03342095bd + Reviewed-on: https://code.wireshark.org/review/5950 + Reviewed-by: Pascal Quantin -commit 7f74471 -Author: Dario Lombardo -Date: Thu Oct 16 09:12:25 2014 +0200 +commit 9fbede8 +Author: Martin Kaiser +Date: Sun Dec 21 18:26:19 2014 +0100 - Added italian translation to qt. + no need for if(tree) - Change-Id: If58ed29e78a9994fc488a4d01cf665f7e8d82830 - Reviewed-on: https://code.wireshark.org/review/4707 - Reviewed-by: Alexis La Goutte + Change-Id: Ie06738d99851b35e53effb50b2c109ce50e9c6df + Reviewed-on: https://code.wireshark.org/review/5949 + Reviewed-by: Martin Kaiser -commit 0db468e -Author: Guy Harris -Date: Thu Oct 16 11:44:06 2014 -0700 +commit 9c03655 +Author: Gerald Combs +Date: Sun Dec 21 08:04:50 2014 -0800 - gchar is not guaranteed to be signed; use gint8. - - C does not guarantee that char is signed (that's why there's a keyword - "signed"). Use gint8, to indicate that it's not a character, it's an - 8-bit signed integer. + [Automatic manuf, services and enterprise-numbers update for 2014-12-21] - Change-Id: Id632df23352840cbc86a4d88f4c7dade95ab7837 - Reviewed-on: https://code.wireshark.org/review/4736 - Reviewed-by: Guy Harris + Change-Id: I08b7be1ab911e8f578173a45dc2055a81e8cbffb + Reviewed-on: https://code.wireshark.org/review/5945 + Reviewed-by: Gerald Combs -commit 50add40 -Author: Guy Harris -Date: Thu Oct 16 11:16:11 2014 -0700 +commit f002332 +Author: Michael Mann +Date: Fri Dec 19 21:42:14 2014 -0500 - Fix some more "char is unsigned" issues, and a possible "char is signed" one. + Replace ether_to_str with either address_to_str or tvb_ether_to_str. - C neither guarantees that char is signed nor that it's unsigned. Make - the str_to_nibble tables arrays of gint8, to make sure they can hold - numbers between 0 and 15 as well as -1. Cast gchar to guchar, not int, - when using it as a subscript into that array, so that the subscripts are - in the range 0 to 255, not -128 to 127. - - Change-Id: Ib85de5aa4e83ae9efd808c78ce3f86f45b4a3f2a - Reviewed-on: https://code.wireshark.org/review/4734 - Reviewed-by: Guy Harris + Change-Id: I8cce9fddbfe950e27e96ea8a5a6d2e0921ff4260 + Reviewed-on: https://code.wireshark.org/review/5933 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + Reviewed-by: Michael Mann -commit 353f625 -Author: Guy Harris -Date: Thu Oct 16 11:06:06 2014 -0700 +commit cdaa669 +Author: Michael Mann +Date: Fri Dec 19 18:13:17 2014 -0500 - Fix issues in some ARM compilers, due to char being unsigned? + Replace ax25_to_str and get_ax25_name with address_to_str. - I'm not 100% certain the comparisons were right even with signed char; - make the comparisons unsigned vs. unsigned, regardless of whether char - is signed or not. (No, C doesn't require it to be signed; that's why - there's a "signed" keyword.) - - Change-Id: Icbbd1019a2f7d4ebb40d821255834f825cd7c5a7 - Reviewed-on: https://code.wireshark.org/review/4731 - Reviewed-by: Guy Harris + Change-Id: I74ddb6fc629ef32b217dede7a3ba652cbbf5ab12 + Reviewed-on: https://code.wireshark.org/review/5932 + Reviewed-by: Alexis La Goutte + Petri-Dish: Alexis La Goutte + Reviewed-by: Michael Mann -commit 381966b -Author: Hannes Mezger -Date: Thu Oct 16 14:59:53 2014 +0200 +commit 6f8de87 +Author: Michael Mann +Date: Sun Dec 21 07:27:01 2014 -0500 - Replace proto_tree_add_text in non-generated files + Allow "cba" filter prefix for hf_ fields (missed a Profinet file the first time) - As requested by Michael Mann, most of the occurences of proto_tree_add_text/proto_item_add_subtree are replaced with proto_tree_add_subtree(_format) or proto_tree_add_item/proto_item_append_text in the non-generated files. - - Change-Id: I27cccde88780adef43c78efd26333f47af098ad6 - Reviewed-on: https://code.wireshark.org/review/4726 - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot + Change-Id: I3ff65a8f6307a9ee08e173c0b2658d96985e0c45 + Reviewed-on: https://code.wireshark.org/review/5943 Reviewed-by: Michael Mann -commit 14b75d8 +commit da22067 Author: Pascal Quantin -Date: Thu Oct 16 17:58:05 2014 +0200 +Date: Sun Dec 21 10:28:03 2014 +0100 - ETSI CAT: fix a typo and remove deprecated API call + 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: I7df02d6a605ca0912c179caa04a405c5c18eb552 - Reviewed-on: https://code.wireshark.org/review/4727 + Change-Id: I11466e102fcf75a31aaa22225861ad8bf27f89a8 + Reviewed-on: https://code.wireshark.org/review/5942 Reviewed-by: Pascal Quantin -commit a34b252 -Author: Hannes Mezger -Date: Thu Oct 16 14:35:10 2014 +0200 +commit fda12fb +Author: Peter Wu +Date: Fri Dec 19 21:26:23 2014 +0100 - Replace proto_tree_add_text with proto_tree_add_subtree(_format) in generated files + Fix Python 3 compatibility in LocatePythonModule - As requested by Michael Mann, all occurences of proto_tree_add_text/proto_item_add_subtree are replaced with proto_tree_add_subtree(_format) in the generated files. Our generator templates have also been updated accordingly. + Regression introduced with cb345eb4bd0149b4a71d6069f957600a83cc3417. - Change-Id: I49ddd664dffef4b3ceda77edd1b2d7e01da363f3 - Reviewed-on: https://code.wireshark.org/review/4725 - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Change-Id: I625432ac4572d2449cb6981a158e46c560a81f1a + Reviewed-on: https://code.wireshark.org/review/5883 + Reviewed-by: Maarten Bezemer + Reviewed-by: Alexis La Goutte -commit d347b72 +commit deb49cb Author: Guy Harris -Date: Thu Oct 16 03:01:28 2014 -0700 +Date: Sat Dec 20 23:32:23 2014 -0800 - Don't try to compute time stamps for files from Packet Builder. + Add comments, change structure member name. - I don't trust Packet Builder's ability to convert time stamps between - Capsa format and pcap. + "GSList *" implies a list; call the pointer in a struct + heur_dissector_list "dissectors", to indicate what it's a list *of*. - Change-Id: I0ac2e14216e37127d81d5bf1c6d48a2c20841a8e - Reviewed-on: https://code.wireshark.org/review/4721 + Change-Id: Idf5011e08d35d28934cd52f818b945db1cc7f37b + Reviewed-on: https://code.wireshark.org/review/5941 Reviewed-by: Guy Harris -commit c74cefb +commit a138faf Author: Guy Harris -Date: Thu Oct 16 00:00:45 2014 -0700 +Date: Sat Dec 20 23:25:55 2014 -0800 - Fix a debugging printout. + Clean up some error messages. + + Correct one message, change another one from a g_assert() to a g_error() + with descriptive text. - Change-Id: I06bc40bece3ea98578a252217c9de4748276a440 - Reviewed-on: https://code.wireshark.org/review/4720 + Change-Id: I667beb08ac1677205a9323ab623ed0a9766bac79 + Reviewed-on: https://code.wireshark.org/review/5940 Reviewed-by: Guy Harris -commit 377a486 -Author: Guy Harris -Date: Wed Oct 15 23:53:45 2014 -0700 +commit 806ebca +Author: Bill Meier +Date: Sun Dec 21 01:55:48 2014 -0500 - Get rid of some set-but-no-longer-used variables. + packet-PROTOABBREV.c: Update re #includeusage - Change-Id: Iaf7267b6ee3d4ab288c8ffa487f5de736bc4aead - Reviewed-on: https://code.wireshark.org/review/4719 - Reviewed-by: Guy Harris + - packet.h should be first Wireshark #include + after config.h and "system" includes. + - '#include ' not needed. + + Change-Id: Ibec076818f3f509aabb4d240e939ef719f3798d6 + Reviewed-on: https://code.wireshark.org/review/5939 + Reviewed-by: Bill Meier -commit df83895 -Author: Guy Harris -Date: Wed Oct 15 18:15:15 2014 -0700 +commit ce211a4 +Author: Bill Meier +Date: Sun Dec 21 01:41:34 2014 -0500 - Make sure *err and *err_info are set when returning PCAPNG_BLOCK_NOT_SHB. + Cleanup use of #includes in a few recently committed dissectors. - Clean up a comment and indentation while we're at it. + Change-Id: Ie66d4c3f0c5d0037cac65ff39e4dedcedff462f1 + Reviewed-on: https://code.wireshark.org/review/5938 + Reviewed-by: Bill Meier + +commit b5d7b7a +Author: Bill Meier +Date: Sat Dec 20 16:23:59 2014 -0500 + + Cleanup use of #includes in non-generated epan/dissector/*.c - Change-Id: Ia2b0a3f642849dcd464e04cdca13ff05c2fbe2e6 - Reviewed-on: https://code.wireshark.org/review/4717 - Reviewed-by: Guy Harris + 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 + Petri-Dish: Alexis La Goutte + Reviewed-by: Bill Meier -commit 9cfab55 -Author: Guy Harris -Date: Wed Oct 15 17:55:04 2014 -0700 +commit 14cff7b +Author: Gerald Combs +Date: Sat Dec 20 20:33:45 2014 -0800 - The record offset block begins with a 1-byte(!) header. + Qt: Don't clear the capture file properties. - Clean up the code to read the block according to that description. + 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. - Change-Id: Icb332e293c4b41d91989aa17a7546f298068e908 - Reviewed-on: https://code.wireshark.org/review/4716 - Reviewed-by: Guy Harris + Change-Id: I6bf684e7bd996f22032ec3d0adcddc343bb17992 + Reviewed-on: https://code.wireshark.org/review/5937 + Reviewed-by: Gerald Combs -commit fa8d236 -Author: Guy Harris -Date: Wed Oct 15 17:19:33 2014 -0700 +commit 35571f8 +Author: Gerald Combs +Date: Sat Dec 20 20:06:43 2014 -0800 - Get rid of another unused variable. + Qt: Fix accordion frame height calculation. - Change-Id: Id3e9bdd9308342460f84b5d4aeb13e9d6d52616c - Reviewed-on: https://code.wireshark.org/review/4715 - Reviewed-by: Guy Harris + Change-Id: I32d2ea2ff34544e285b52e4e35e035306c33d3aa + Reviewed-on: https://code.wireshark.org/review/5935 + Reviewed-by: Gerald Combs -commit 7bca912 +commit 2b006ad Author: Guy Harris -Date: Wed Oct 15 16:55:54 2014 -0700 +Date: Sat Dec 20 20:13:28 2014 -0800 - Don't allocate the interfaces array until we've read the SHB. + Have a heur_dissector_list_t be an opaque handle. - Nothing from the SHB gets stored in the interfaces array - it's filled - in from IDBs - so it doesn't need to exist when we read the first SHB, - and thus doesn't need to be freed if the attempt to read the SHB gets an - error or a "this isn't a pcap-ng file" indication. + This allows dissector lists to be looked up by name, so they can be + shared by multiple dissectors. - Update a comment while we're at it. + (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.) - Change-Id: Ie67edb52dcf13c974607e95e290661bf48be68ae - Reviewed-on: https://code.wireshark.org/review/4711 + Change-Id: Ifb2d2c294938c06d348a159adea7a57db8d770a7 + Reviewed-on: https://code.wireshark.org/review/5936 Reviewed-by: Guy Harris -commit f518089 -Author: Guy Harris -Date: Wed Oct 15 16:45:51 2014 -0700 +commit 8179800 +Author: Pascal Quantin +Date: Sat Dec 20 22:27:54 2014 +0100 - Clean up the read routines. - - The block read routines don't need to return a "bytes read" amount any - more. - - Have pcapng_read_block() just return an indication: - - PCAPNG_BLOCK_OK - the read succeeded; + Qt: fix a crash when closing a file while capture file properties window is open - PCAPNG_BLOCK_NOT_SHB - the read failed in a fashion that - indicates that we might just not be reading a pcap-ng file; + refresh_button_ and copy_comment_button_ are not used neither initialized, get rid of them + Also clear text areas and disable buttons - PCAPNG_BLOCK_ERROR - the read failed in some other fashion - (i.e., we already have concluded that the file is a pcap-ng - file, or we got an I/O error). - - In the cases where it needs to know whether it's reading the first block - for an open, have it check the shb_read flag, rather than being passed a - separate Boolean argument. - - This means that pcapng_read_section_header_block() should return such an - indication as well. + Change-Id: I418d712313041dcf4f15aceee01497f01ae74918 + Reviewed-on: https://code.wireshark.org/review/5927 + Reviewed-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs + +commit 86d1b54 +Author: Pascal Quantin +Date: Sat Dec 20 23:30:12 2014 +0100 + + Qt: disable Capture File Properties toolbar icon by default - Make the other block-reading routines return a Boolean success/failure - indication. + 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: Id371457018a008ece9058d6042da44d631e51889 - Reviewed-on: https://code.wireshark.org/review/4710 - Reviewed-by: Guy Harris + Change-Id: I5ce5e0c24f3dfb44c2303c78114102c5c03ccc88 + Reviewed-on: https://code.wireshark.org/review/5930 + Reviewed-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Reviewed-by: Gerald Combs -commit 371e4ae +commit cadf1a5 Author: Michael Mann -Date: Wed Oct 15 12:55:08 2014 -0400 +Date: Thu Dec 18 22:12:55 2014 -0500 - Eliminate some proto_tree_add_text from GSM dissectors (so now there are no dissectors with 100+ proto_tree_add_text calls). + Remove profinet_type from packet_info structure. - Add tfs_allocated_by_receiver_sender to tfs.h because it seems "popular" enough. + 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. - Change-Id: I478461d9b951a2c3e3aec6aaf996d95ba2c0feee - Reviewed-on: https://code.wireshark.org/review/4708 - Reviewed-by: Michael Mann + Change-Id: I7b9c01b8d4f74d51fe9f9ef2f957479dff0a7157 + Reviewed-on: https://code.wireshark.org/review/5852 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman - -commit 9b7ee18 -Author: Dario Lombardo -Date: Fri Oct 10 11:30:59 2014 +0200 - - Typos in source code and in README.qt - - Change-Id: I5aef31ef7ad604352f6e108835f0e9c2d10cdf8a - Reviewed-on: https://code.wireshark.org/review/4706 - Reviewed-by: Pascal Quantin + Reviewed-by: Michael Mann -commit 0444c47 -Author: Alexis La Goutte -Date: Wed Oct 15 09:37:21 2014 +0200 +commit d7fd00d +Author: Luke Mewburn +Date: Sun Dec 21 01:05:07 2014 +1100 - IPv6: Calipso option length is not used properly + MIPv6: simplify fixed point degrees conversion - This field indeed indicates the length of the Compartment Bitmap but *in 32-bit words*, which means that the value of 12 means the compartment bitmap is 48 bytes long. + * 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(). - Issue found by boaz - Bug:10561 - - Change-Id: I6c6ac25d0680837594d7cc6d2e4807a60a523b80 - Reviewed-on: https://code.wireshark.org/review/4697 + Change-Id: Icb680d009fdd960e8668fa3020060799d6a74c2f + Reviewed-on: https://code.wireshark.org/review/5913 + Reviewed-by: Alexis La Goutte + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann -commit 5cdb032 -Author: Evan Huus -Date: Wed Oct 15 08:22:09 2014 -0400 +commit 210aaf1 +Author: Guy Harris +Date: Sat Dec 20 15:00:57 2014 -0800 - smb2: fully initialize dummy session + Use "" rather than <> for includes; that might fix ABI check failures. - A few fields weren't being zeroed and were causing valgrind warnings. - - Bug: 10569 - Change-Id: I30e1e70c9445376806f385f3578b65bf6e320f8b - Reviewed-on: https://code.wireshark.org/review/4702 - Reviewed-by: Evan Huus + Change-Id: I80e291031e4e8e347422e4a1e636d2ce40efc5c2 + Reviewed-on: https://code.wireshark.org/review/5931 + Reviewed-by: Guy Harris -commit 38ffca5 -Author: Stig Bjørlykke -Date: Wed Oct 15 14:18:21 2014 +0200 +commit ac69a6d +Author: Gerald Combs +Date: Sat Dec 20 14:11:31 2014 -0800 - WSUG: Fixed some typos. + Qt: Use an accordion frame in the welcome screen. - This was reported by Emre Baris. + Place the recent files list in an accordion frame so that showing and + hiding is more visually smooth. - Change-Id: Ia37527e2a612fcbabd3ce7c6d8faf33905bbe52d - Reviewed-on: https://code.wireshark.org/review/4701 - Reviewed-by: Stig Bjørlykke + Change-Id: Ifdc534a33aa9f93949c9f919cfe0765fbfcde750 + Reviewed-on: https://code.wireshark.org/review/5924 + Reviewed-by: Gerald Combs -commit 1a652bd -Author: AndersBroman -Date: Wed Oct 15 13:12:24 2014 +0200 +commit d11e94b +Author: Gerald Combs +Date: Sat Dec 20 14:08:04 2014 -0800 - GTPv2: Fully dissect Presence Reporting Area Action. + Remove debugging code. - Change-Id: If38f639049bd897587ed61cc2d94f974131ccd20 - Reviewed-on: https://code.wireshark.org/review/4700 - Reviewed-by: Anders Broman + Change-Id: If3a64a6914ae8ce2521c85766df6f733a13ca7e1 + Reviewed-on: https://code.wireshark.org/review/5926 + Reviewed-by: Gerald Combs -commit a25ae55 +commit b4e90bd Author: Stig Bjørlykke -Date: Wed Oct 15 11:58:40 2014 +0200 +Date: Sat Dec 20 20:09:00 2014 +0100 - LDAP: Improved a if-check to avoid a analyzis warning. + Fix filter test for multifield custom column - Change-Id: Iceeaa94a80543570a720281ac39d3ccd9ac924fa - Reviewed-on: https://code.wireshark.org/review/4699 - Reviewed-by: Stig Bjørlykke + This adds support for "field||field" without spaces. + + Change-Id: Ia738d6642d12a188d1629bbdd9701cc8f8bb7a68 + Reviewed-on: https://code.wireshark.org/review/5922 + Reviewed-by: Michal Labedzki + Tested-by: Michal Labedzki -commit bf5b872 +commit 8b24471 Author: Gerald Combs -Date: Tue Oct 14 21:52:15 2014 -0500 +Date: Fri Dec 19 16:27:57 2014 -0800 - CMake: When creating a bundle add convenience symlinks. + Qt: Revert back to an all-in-one main window. + + 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. - Change-Id: Ic6c02c8879e406b733d834e895a3ccb1e9322a9d - Reviewed-on: https://code.wireshark.org/review/4696 + Retain the "Capture", "Open", and "Learn" imperative text. Move "Open" + to the top as suggested by Michal. + + Change-Id: Iaf7d93f9caf686b5cbeb640e5e5f95ecb46f7f2d + Reviewed-on: https://code.wireshark.org/review/5896 Reviewed-by: Gerald Combs -commit 6206fa5 -Author: Bill Meier -Date: Tue Oct 14 21:12:13 2014 -0400 +commit 2b621e2 +Author: Alexis La Goutte +Date: Fri Dec 19 11:42:19 2014 +0100 - raknet: fix two checkfiltername errors; mcpe,raknet: minor cleanup; + 802.11: VHT NDP announcement frame is no correctly decode when there is FCS - Change-Id: Ieac370d232c6349f7acc45f4817637a80915e315 - Reviewed-on: https://code.wireshark.org/review/4695 - Reviewed-by: Bill Meier + The FCS at the end of the frame is decoded as additional STA info fields which does not seem correct. + + Issue reported by Sudheer + Bug:10786 + Change-Id: Idffaa41cd7c79ad4c9937e7f32aa2444c1b9033f + Reviewed-on: https://code.wireshark.org/review/5849 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte -commit 60e738c -Author: Bill Meier -Date: Tue Oct 14 20:10:13 2014 -0400 +commit 851909d +Author: Pascal Quantin +Date: Sat Dec 20 18:39:51 2014 +0100 - packet-raknet.c: value_string array (created at runtime) must be terminated with {0, NULL}. - - This should fix crash in 'tshark -G values' seen on 64 bit tshark. + FCoIB / Infiniband SDP: prevent a crash when 'enable manual settings' is set without filling address field - Change-Id: Ia183fc5d5604f71b824cf4f758c18ff1ccd4540f - Reviewed-on: https://code.wireshark.org/review/4694 - Reviewed-by: Bill Meier + Bug: 10796 + Change-Id: Ifdb7804ec5e1146b08f00e54647d802a69d52113 + Reviewed-on: https://code.wireshark.org/review/5914 + Tested-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot + Reviewed-by: Pascal Quantin -commit 0ac9449 -Author: Guy Harris -Date: Tue Oct 14 16:53:03 2014 -0700 +commit 326e496 +Author: Martin Kaiser +Date: Sat Dec 20 18:40:45 2014 +0100 - We can't check the length of an SHB until we determine the byte order. - - Don't check a possibly-byte-swapped length against the minimum SHB size; - it'll probably look huge if it's byte-swapped, so the test won't fail - even if it is too small, and a really huge SHB's length could look too - small if it's byte-swapped. + no need for if (tree) - Do the check *after* we've read the fixed-length portion of the block; - yes, that means we've read past the purported size of the block at that - point, but if that read succeeds, that doesn't matter, and if that read - fails, it just means we'll report "file cut short" rather than "bad SHB - length", *both* of which are problems with the file. - - Change-Id: Ie3b5700662f2a6da40d373a84f00a8fc2cf0ce1b - Reviewed-on: https://code.wireshark.org/review/4692 - Reviewed-by: Guy Harris + Change-Id: I0749f8e10d6f8d97b85da6bb52b0ab336ba06c38 + Reviewed-on: https://code.wireshark.org/review/5919 + Reviewed-by: Martin Kaiser -commit 4420461 -Author: Guy Harris -Date: Tue Oct 14 16:39:17 2014 -0700 +commit 7d18248 +Author: Martin Kaiser +Date: Sat Dec 20 18:41:16 2014 +0100 - Don't assume pcap_read_block() returns the number of bytes read. + hide the hf_msmms_data item, not the NULL item - Recent changes must have made it not do so in some cases, and - our current version of file_tell(), unlike ftell() around which the - older file_tell() was a wrapper, is known to be cheap (ftell() would - make a system call to get the position). Just use file_tell() before - each read. + Change-Id: If92c9bc281f44de8f3b1de71005240755748403a + Reviewed-on: https://code.wireshark.org/review/5918 + Reviewed-by: Martin Kaiser + +commit 7b2ae71 +Author: Michal Labedzki +Date: Fri Dec 19 09:21:20 2014 +0100 + + Fix filter valid/invalid test for multifield custom type - (Further cleanup is called for.) + 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. - Bug: 10568 - Change-Id: Ib92057b2b87ec6eb16fd612bc91baeb668d1e1c7 - Reviewed-on: https://code.wireshark.org/review/4691 - Reviewed-by: Guy Harris + Change-Id: I412b5dc1fca16fcd2b640aa74af81167300fd11e + Reviewed-on: https://code.wireshark.org/review/5848 + Petri-Dish: Michal Labedzki + Tested-by: Petri Dish Buildbot + Tested-by: Michal Labedzki + Reviewed-by: Michal Labedzki -commit 4a6e313 +commit abd90c3 Author: Guy Harris -Date: Tue Oct 14 13:41:36 2014 -0700 +Date: Sat Dec 20 09:47:01 2014 -0800 - Don't log warnings if no block-type handlers are registered. + 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. - Check whether the block-type hash table exists before trynig to look - up anything in it. + (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: I0aeb7f6454903bfcbdd0716909a0b72851d87233 - Reviewed-on: https://code.wireshark.org/review/4689 + Change-Id: I3046133de732c80410592272d1f7b961a64d9289 + Reviewed-on: https://code.wireshark.org/review/5915 Reviewed-by: Guy Harris -commit bfe3706 -Author: Bill Meier -Date: Tue Oct 14 15:58:21 2014 -0400 +commit 9ba9cd8 +Author: Gerald Combs +Date: Tue Sep 9 16:42:58 2014 -0400 - Always put editor-modelines at the end of the file ... + Qt: Add a CaptureFile class. - ... to ensure that there are no potential issues with respect to - editors limiting the number of lines scanned at the end of the file - when checking for editor modelines. + 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. - Change-Id: Ic85cbb108bb5159d6ec4116fea11f5eebb4e44a4 - Reviewed-on: https://code.wireshark.org/review/4688 - Reviewed-by: Bill Meier - -commit 71c5ac0 -Author: Bill Meier -Date: Tue Oct 14 14:19:59 2014 -0400 - - packet-assa_r3.c: Use editor modelines from http://www.wireshark.org/tools/modelines.html + Don't use a void pointer for the capture file struct. - Change-Id: I2d9accd2336448ced30dca1878a3e27cdba29566 - Reviewed-on: https://code.wireshark.org/review/4687 - Reviewed-by: Bill Meier + Change-Id: Ic5d5efb4bb1db64aa0247245890e5669b1da723a + Reviewed-on: https://code.wireshark.org/review/5885 + Petri-Dish: Gerald Combs + Tested-by: Petri Dish Buildbot + Reviewed-by: Gerald Combs -commit 0ce5b8c -Author: Nick Carter -Date: Tue Oct 7 19:21:46 2014 +0100 +commit 2bb8255 +Author: Gerald Combs +Date: Tue Dec 16 14:36:04 2014 -0800 - Add RakNet protocol dissector + Consolidate RTP stream structs. - Bug: 10534 - Change-Id: Id56008da0c21a5f3a0309cdf21aff287c7820dcf - Reviewed-on: https://code.wireshark.org/review/4372 - Petri-Dish: Michael Mann + 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. + + Change-Id: I2b3f8f2051394a6a98a5c7bc49c117f07161d031 + Reviewed-on: https://code.wireshark.org/review/5843 + Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Reviewed-by: Gerald Combs -commit 74a8ad7 +commit 79b5bb4 Author: Guy Harris -Date: Tue Oct 14 12:31:49 2014 -0700 +Date: Sat Dec 20 00:57:20 2014 -0800 - Get rid of no-longer-used #define. + Fix typo. - Change-Id: Ibaebda819094f09610dc9cf8a303440b93bf2da0 - Reviewed-on: https://code.wireshark.org/review/4686 + 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 -commit a18c9c5 +commit a61f6e4 Author: Guy Harris -Date: Tue Oct 14 12:30:00 2014 -0700 +Date: Sat Dec 20 00:23:05 2014 -0800 - Don't supply time stamps for Capsa packets for now. + When checking for floorl(), include math.h. - The time stamps aren't known to be right, so don't provide them - that - way, instead of users reading Capsa files and getting the wrong idea - about the time stamps, they'll get no time stamps and have to ask for - our help, at which point we can ask them for *their* help in seeing what - Capsa thinks the time stamps are. (The joys of reverse-engineering.) + 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: I77e12c09f2bc74b50a1b2b226fa6da3e8c0fedf9 - Reviewed-on: https://code.wireshark.org/review/4685 + Change-Id: Idaecac641fb0b87d399807d8bf1fcb74e7251a4e + Reviewed-on: https://code.wireshark.org/review/5911 Reviewed-by: Guy Harris -commit 87ea03b -Author: Bill Meier -Date: Tue Oct 14 12:54:34 2014 -0400 +commit 4b8639f +Author: Guy Harris +Date: Fri Dec 19 21:18:27 2014 -0800 - packet-gvsp.c: removed an unused #define + Add a check for floorl(). - Change-Id: If330124cdc459867b33e1bbbe960c969deb85b10 - Reviewed-on: https://code.wireshark.org/review/4684 - Reviewed-by: Bill Meier - -commit 10b83e6 -Author: Bill Meier -Date: Tue Oct 14 11:12:16 2014 -0400 - - Add editor-modelines; adjust whitespace. + Also, we don't use NEED_STRPTIME_H, we use HAVE_STRPTIME. - Change-Id: I8cad872cee972a6d22a72852dac57fd188daca84 - Reviewed-on: https://code.wireshark.org/review/4683 - Reviewed-by: Bill Meier + Change-Id: I330e8ce408c05b74c50f3369691283e35e68505c + Reviewed-on: https://code.wireshark.org/review/5910 + Reviewed-by: Guy Harris -commit 2359e67 -Author: AndersBroman -Date: Tue Oct 14 15:56:49 2014 +0200 +commit 4d3c7b5 +Author: Guy Harris +Date: Fri Dec 19 21:09:18 2014 -0800 - GTPv2 Dissect more bits in IE Indication. + Don't bother with __builtin_floorl(). - Change-Id: I19d0b67e06ec22bfc5bafc58fdeb445e30e25f95 - Reviewed-on: https://code.wireshark.org/review/4682 - Reviewed-by: Anders Broman - -commit 3ec9ddc -Author: Stig Bjørlykke -Date: Tue Oct 14 10:56:02 2014 +0200 - - PIM: Disable unused pimbdirdfvals. + 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). - Change-Id: I2b023868d9f84e891e36f2cfcfd4ad25e1e43592 - Reviewed-on: https://code.wireshark.org/review/4681 - Reviewed-by: Anders Broman + 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 -commit 0e2f128 -Author: AndersBroman -Date: Tue Oct 14 10:54:57 2014 +0200 +commit caf4cc6 +Author: Guy Harris +Date: Fri Dec 19 20:45:18 2014 -0800 - Add new Event-Trigger values. + Use AC_SEARCH_LIBS() for math functions. - Change-Id: Idd18a710fd8630d5b50c5ac180d7aa45a40596d7 - Reviewed-on: https://code.wireshark.org/review/4680 - Reviewed-by: Anders Broman + 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. + + Change-Id: Ic5d24ec35e060306351f4981c92e26879e597d81 + Reviewed-on: https://code.wireshark.org/review/5908 + Reviewed-by: Guy Harris -commit 0cbaae4 +commit 1a051af Author: Guy Harris -Date: Tue Oct 14 01:47:37 2014 -0700 +Date: Fri Dec 19 20:22:08 2014 -0800 - Fix return values. + Include to declare floor(). - Change-Id: I3f11d48f74d71367cc76c76dfc88763894f23f2c - Reviewed-on: https://code.wireshark.org/review/4679 + Change-Id: I39de31c3e38b83aaec76396048e6960f609bc63e + Reviewed-on: https://code.wireshark.org/review/5907 Reviewed-by: Guy Harris -commit 9cba3b6 -Author: Bill Meier -Date: Tue Oct 14 03:29:58 2014 -0400 +commit 07fb8cf +Author: Guy Harris +Date: Fri Dec 19 20:11:12 2014 -0800 - packet-gvsp.c: sort pixeltypenames[] for extended value-string use. + Remove trailing white space. - Change-Id: Iaf753d432603422922ad7ef4ba7a2c2b3cd84136 - Reviewed-on: https://code.wireshark.org/review/4678 - Reviewed-by: Bill Meier + Change-Id: I0777945a5234cf380e2f3bc2461cc638c316f499 + Reviewed-on: https://code.wireshark.org/review/5906 + Reviewed-by: Guy Harris -commit e70db8e +commit b445b3d Author: Guy Harris -Date: Tue Oct 14 00:11:16 2014 -0700 +Date: Fri Dec 19 19:44:03 2014 -0800 - And another warning. + Rename wsutil/floor.[ch] to wsutil/floorl.[ch]. - (So why can't GCC or Clang be taught to warn about *all* implicit - shortenings, as MSVC does, not just 64-bit-to-32-bit shortenings?) + 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(). - Change-Id: I88c0b0aa2f1b306f58952589ff8bcae17bc29768 - Reviewed-on: https://code.wireshark.org/review/4676 + Change-Id: Ib1278c51cdfc57680c28c51de87eafb2cb50c8eb + Reviewed-on: https://code.wireshark.org/review/5905 Reviewed-by: Guy Harris -commit abd657f +commit b925c35 Author: Guy Harris -Date: Tue Oct 14 00:08:45 2014 -0700 +Date: Fri Dec 19 19:36:21 2014 -0800 - Squelch another warning. + We assume all versions of MSVC have floorl(). - (Yes, we should, on platforms with a 32-bit time_t, check to make sure - the time stamp fits and do something if it doesn't. Or we should make - the seconds part of an nstime_t be 64-bit and handle overly-large values - when converting them to year/month/day/hour/minute/second.) + If not, we'll have to play some games in config.nmake. - Change-Id: If219534985dce29d00754ff151f6c4b5893080d8 - Reviewed-on: https://code.wireshark.org/review/4675 + Change-Id: I1dbc5d4ef41ede0e596dbe40b4e139e0f6c39dba + Reviewed-on: https://code.wireshark.org/review/5904 Reviewed-by: Guy Harris -commit 7d28a56 +commit 1088629 Author: Guy Harris -Date: Tue Oct 14 00:07:16 2014 -0700 +Date: Fri Dec 19 18:59:55 2014 -0800 - Squelch a compiler warning. + If we don't have GCC, fall back on using floor(). + + Add the closing brace for the function body while we're at it. - Change-Id: I5b383c967c465882819ac449fbd54915bc692687 - Reviewed-on: https://code.wireshark.org/review/4674 + Change-Id: I73170fdc0885972dce531b553ff8601cceea182e + Reviewed-on: https://code.wireshark.org/review/5902 Reviewed-by: Guy Harris -commit a5d35a2 +commit b736896 Author: Guy Harris -Date: Mon Oct 13 23:55:08 2014 -0700 +Date: Fri Dec 19 18:53:31 2014 -0800 - Clean up comment. + Handle floorl() the same way we handle other not-on-all-platforms functions. + + 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 . + + Also, use the standard export stuff in wsutil/floor.h. - Change-Id: I9a620da95c1dd9b173cebe28f790eeb50e3f9a8f - Reviewed-on: https://code.wireshark.org/review/4673 + Change-Id: Ic24aa69f65f2d15450d8b84b0c2b0c58f38edebe + Reviewed-on: https://code.wireshark.org/review/5901 Reviewed-by: Guy Harris -commit 4495753 +commit 201a7e7 +Author: Stephen Fisher +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 + +commit 556f9a5 Author: Guy Harris -Date: Mon Oct 13 23:47:24 2014 -0700 +Date: Fri Dec 19 18:00:50 2014 -0800 - Get rid of out-of-date comment. + Include floor.c and floor.h in the source tarball. - Change-Id: I68e85e2e29e1154170ccc50488ec943958978150 - Reviewed-on: https://code.wireshark.org/review/4672 + Change-Id: Iabc0403643a05eaa7dbd525a94bc720d100d54d5 + Reviewed-on: https://code.wireshark.org/review/5899 Reviewed-by: Guy Harris -commit fa6e907 +commit 2f44afe Author: Guy Harris -Date: Mon Oct 13 23:45:05 2014 -0700 +Date: Fri Dec 19 17:56:17 2014 -0800 - Initial version of support for Colasoft Capsa files. + Use ENCTYPE_NULL in the krb5_crypto_init() call. - The time stamp origin is not correct. Capsa's absolute time stamp for - the sample captures from their Web site would be helpful. + 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: I365daf7b42240e33f54df76939254f41ed57a9b2 - Reviewed-on: https://code.wireshark.org/review/4671 + Change-Id: I81b79223f789b8d1ec47180b7636ac1d83e03681 + Reviewed-on: https://code.wireshark.org/review/5898 Reviewed-by: Guy Harris -commit 0149015 -Author: Bill Meier -Date: Tue Oct 14 02:02:10 2014 -0400 +commit 2376953 +Author: Stephen Fisher +Date: Fri Dec 19 17:44:37 2014 -0700 - packet-gvsp.c: Fix license; Remove unneeded code from proto_reg_handoff..(); adjust whitespace. + Another missing change - Change-Id: I24a9033bbed3d50daf886f3d00239c1580894c35 - Reviewed-on: https://code.wireshark.org/review/4670 - Reviewed-by: Bill Meier + Change-Id: Icaaaeda75f411ecc7cf3027440c8af2b85021be3 + Reviewed-on: https://code.wireshark.org/review/5897 + Reviewed-by: Stephen Fisher -commit 96a1bf0 -Author: Alexis La Goutte -Date: Tue Aug 26 16:44:04 2014 +0200 +commit 71fc2f8 +Author: Stephen Fisher +Date: Fri Dec 19 17:27:30 2014 -0700 - NSIS: Wireshark GTK is Wireshark legacy (and no Wireshark 1...) ! + Another missing change, to include floor.h - Change-Id: I3b4f4ca28bc7d363474bc888b6a3a8ddbdb7dab9 - Reviewed-on: https://code.wireshark.org/review/3867 - Reviewed-by: Evan Huus - Reviewed-by: Gerald Combs - Reviewed-by: Anders Broman + Change-Id: Ice962bb9d62ab99f225228bf1e78850947eea625 + Reviewed-on: https://code.wireshark.org/review/5895 + Reviewed-by: Stephen Fisher -commit ea11378 -Author: warrenm -Date: Fri Oct 10 10:45:07 2014 -0700 +commit df1f919 +Author: Guy Harris +Date: Fri Dec 19 16:20:42 2014 -0800 - Adding GigEVision GVSP dissector + Don't use g_slist_free_full(). - Bug: 8673 - Change-Id: I4e8270c76291d6ea0e0187f00a342804275f2c11 - Reviewed-on: https://code.wireshark.org/review/4547 - Reviewed-by: Michael Mann - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman + It's only in GLib 2.28 or later, but we don't require 2.28. + + 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 -commit 03bc68c -Author: Hannes Mezger -Date: Mon Oct 13 17:51:15 2014 +0200 +commit dba361b +Author: Stephen Fisher +Date: Fri Dec 19 16:19:25 2014 -0700 - fix forward declarations in opcua_serviceparser.h + Add a missing line related to previous two commits - The declarations from opcua_complextypeparser.h were used instead of the serviceparser ones, this is also fixed in our generator + (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: I3d78d26a3b2b4995dfd4556720d29ecdd6960c4b - Reviewed-on: https://code.wireshark.org/review/4650 - Petri-Dish: Alexis La Goutte - Tested-by: Petri Dish Buildbot - Reviewed-by: Evan Huus + Change-Id: Ib031ae7d57ba9ea4b19fe13121643799e7563046 + Reviewed-on: https://code.wireshark.org/review/5893 + Reviewed-by: Stephen Fisher -commit fb27a68 -Author: Pascal Quantin -Date: Mon Oct 13 23:14:19 2014 +0200 +commit aa0a040 +Author: Stephen Fisher +Date: Fri Dec 19 16:11:33 2014 -0700 - NCP: cast to guint instead of gulong + Add missing files from last commit - Change-Id: Idc8f8f3177703ce5546b8a472034705cb6070707 - Reviewed-on: https://code.wireshark.org/review/4666 - Reviewed-by: Pascal Quantin + Change-Id: I4a6dd1b60893d19b91f5bc0f85be9ee99cd3eb5e + Reviewed-on: https://code.wireshark.org/review/5892 + Reviewed-by: Stephen Fisher -commit 8342eb8 -Author: Martin Kaiser -Date: Fri Oct 10 22:17:23 2014 +0200 +commit 47dc4e7 +Author: Stephen Fisher +Date: Fri Dec 19 23:03:14 2014 +0000 - smartcard descriptor: bitmask for pin support field + 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 - Change-Id: If0e5cd90ff73bfbb211970f9a24974119c6ec550 - Reviewed-on: https://code.wireshark.org/review/4664 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + This reverts commit e2586ec36d0d924b933d2127e809918b980cb413. + + Change-Id: Ie38b7f32b2d21e3beba5173eec22ca12b7f5da91 + Reviewed-on: https://code.wireshark.org/review/5891 + Reviewed-by: Stephen Fisher -commit 9dd515c -Author: Martin Kaiser -Date: Fri Oct 10 21:34:57 2014 +0200 +commit e2586ec +Author: Stephen Fisher +Date: Fri Dec 19 15:54:04 2014 -0700 - smartcard descriptor: - dissect number of lines, characters per line in the lcd layout + 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: I36c9c6f2e73cdfde8a9b7c4ad0450d93722fca2b - Reviewed-on: https://code.wireshark.org/review/4663 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + Change-Id: Ie0140ff195f0eae525c7bd70c7c3e23039fde569 + Reviewed-on: https://code.wireshark.org/review/5889 + Reviewed-by: Stephen Fisher -commit 15f23c7 -Author: Martin Kaiser -Date: Fri Oct 10 20:50:02 2014 +0200 +commit e7d2c8d +Author: Guy Harris +Date: Fri Dec 19 14:07:29 2014 -0800 - smartcard descriptor: the lcd layout is two bytes long + Get rid of some accidentally-checked-in debugging stuff. - Change-Id: Ie8fd82d652a9a3fc1d3139ab610bbaa7a5ecd32d - Reviewed-on: https://code.wireshark.org/review/4662 - Reviewed-by: Martin Kaiser - Tested-by: Martin Kaiser + Change-Id: Iea54df783cdff2424d23ecfba8f219dae42d0c83 + Reviewed-on: https://code.wireshark.org/review/5888 + Reviewed-by: Guy Harris -commit 89a95f2 -Author: Pascal Quantin -Date: Mon Oct 13 21:37:01 2014 +0200 +commit f4ffbbb +Author: Guy Harris +Date: Fri Dec 19 14:06:04 2014 -0800 - Add Kerberos 3.2.2 package for Win64 + Throw some casts at compiler warnings. - Change-Id: If02469aa1a01972d2032478dce3bf872802f37cb - Reviewed-on: https://code.wireshark.org/review/4661 - Petri-Dish: Pascal Quantin - Reviewed-by: Pascal Quantin + Change-Id: I609fcba0b015599f98edb1b3927edb5684bcf2b1 + Reviewed-on: https://code.wireshark.org/review/5887 + Reviewed-by: Guy Harris -commit 1f48125 -Author: Pascal Quantin -Date: Mon Oct 13 21:01:11 2014 +0200 +commit d4ff430 +Author: Stephen Fisher +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 - Upgrade Win64 GTK2 package to 2.24.23-3.39 +commit 0df4eec +Author: Stephen Fisher +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: I0f5f27aa2fc13f38af73a42e1c6e4a36636d2fc7 - Reviewed-on: https://code.wireshark.org/review/4656 - Petri-Dish: Pascal Quantin - Reviewed-by: Pascal Quantin + Change-Id: Ic750df3b4406f107fd850ade891ee093054c8d6d + Reviewed-on: https://code.wireshark.org/review/5882 + Reviewed-by: Stephen Fisher -commit 05a6615 -Author: Roland Knall -Date: Mon Oct 13 16:18:28 2014 +0200 +commit fbd6caa +Author: Stephen Fisher +Date: Fri Dec 19 11:31:07 2014 -0700 - extcap: Remove single-space argument for boolflags + 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. - Boolflags will be added with a NULL argument to the - list and therefore the original fix will work. + Change-Id: I00bfed22fb0d9bb183637ea5fb111904b8536949 + Reviewed-on: https://code.wireshark.org/review/5880 + Reviewed-by: Stephen Fisher + +commit 962fa21 +Author: Michael Mann +Date: Thu Dec 18 16:31:43 2014 -0500 + + Replace uses of proto_get_frame_protocols with proto_is_frame_protocol when only one protocol is desired. - Note: extcap_get_complex_as_string will convert any NULL - value into a single character argument (' '). Therefore - any argument type, where NULL is a special value should - be handled seperately here. For now, the only datatype - will be BOOLFLAG + Also use proto_get_frame_protocols in main_menubar.c instead of doing it "manually". - Change-Id: Icfc9b573214e05ea713a3b70ea37953d470dafae - Reviewed-on: https://code.wireshark.org/review/4649 - Reviewed-by: Roland Knall - Reviewed-by: Tomasz Moń - Reviewed-by: Pascal Quantin + Change-Id: Ie7a365c538700f2cebdd1e3d253f2fd9b189f5cf + Reviewed-on: https://code.wireshark.org/review/5851 + Reviewed-by: Michael Mann -commit 74c4358 -Author: Mikael Kanstrup -Date: Sat Oct 11 22:41:10 2014 +0200 +commit 398c2cee +Author: Stephen Fisher +Date: Fri Dec 19 10:01:55 2014 -0700 - Split ws80211_get_phys callback handler + Skip over the new 'switch' field in xproto/src/xinput.xml so we can + re-generate the x11 dissector again without the script breaking. - Split up the ws80211_get_phys parser callback handler function into - separate functions for each attribute parsed. This is done in - preparation for supporting split wiphy dump feature where the function - logics will need modications. + Change-Id: I6d24cf098f370f4c1ff191052e2ea67b7875b33a + Reviewed-on: https://code.wireshark.org/review/5878 + Reviewed-by: Stephen Fisher + +commit c11085a +Author: Alexis La Goutte +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] - Change-Id: Ic0b497fc628f0e7453cd62eb8199f17f9a308a7f - Reviewed-on: https://code.wireshark.org/review/4610 + Change-Id: I7f20311125e369cc90df808772323e8e98f8c94e + Reviewed-on: https://code.wireshark.org/review/5850 Petri-Dish: Alexis La Goutte - Tested-by: Petri Dish Buildbot - Reviewed-by: Evan Huus Reviewed-by: Anders Broman -commit ab7f9aa -Author: Stig Bjørlykke -Date: Mon Oct 13 14:05:29 2014 +0200 +commit f94eb27 +Author: Stephen Fisher +Date: Mon Dec 8 10:06:56 2014 -0700 - BER: Code cleanup in call functions + 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. - Change-Id: I0ba958485dffd3cc1e419fb27cf7f2bc492d05fe - Reviewed-on: https://code.wireshark.org/review/4643 - Petri-Dish: Anders Broman - Tested-by: Petri Dish Buildbot + Change-Id: I4c5af4cedd8c1927c1e00dd6b42faef3f31b84d4 + Reviewed-on: https://code.wireshark.org/review/5671 + Petri-Dish: Michael Mann Reviewed-by: Anders Broman -commit 6a9479e -Author: Bill Meier -Date: Mon Oct 13 15:04:21 2014 -0400 +commit 1f03180 +Author: Michael Mann +Date: Wed Dec 17 21:55:52 2014 -0500 - Add editor modelines and/or adjust whilespace. + Use new color_dissector_filters.[ch] to refactor (color) conversation generation in GTK menus. - Change-Id: I626b7bd8ac6e4b91c57cc9152e7ce038754e7278 - Reviewed-on: https://code.wireshark.org/review/4658 - Reviewed-by: Bill Meier + Change-Id: I5868a40b71a989a3a1522cb091064bb0aaec6daf + Reviewed-on: https://code.wireshark.org/review/5828 + Reviewed-by: Michael Mann + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman -commit 63faad6 -Author: Pascal Quantin -Date: Mon Oct 13 21:04:09 2014 +0200 +commit 792c01a +Author: Gerald Combs +Date: Thu Dec 18 13:56:47 2014 -0800 - NCP: add a missing cast following g6ca40c5 + Bluetooth: Remove unused value strings. - Change-Id: I0b93c4faab52d830b8160d89b9bb8026ab2a216e - Reviewed-on: https://code.wireshark.org/review/4657 - Reviewed-by: Pascal Quantin + Remove bluetooth_type_vals and bluetooth_direction_vals. + + Change-Id: I2d39a59fc815f06d1a5cd5ab838e2bde37597469 + Reviewed-on: https://code.wireshark.org/review/5842 + Reviewed-by: Gerald Combs + Reviewed-by: Alexis La Goutte + Petri-Dish: Alexis La Goutte + Reviewed-by: Michal Labedzki + Tested-by: Petri Dish Buildbot -commit b653564 -Author: Stig Bjørlykke -Date: Sun Oct 12 22:27:54 2014 +0200 +commit d3a4d92 +Author: Stephen Fisher +Date: Thu Dec 18 21:16:16 2014 -0700 - Lua: luaL_checkstring does not return NULL + Put a colon after the error message and before the field the error + is referring to for clarity. - Removed all checks for NULL strings to cleanup the code. - - Change-Id: Ia890cd9b206296f586e85214f07765f14984580b - Reviewed-on: https://code.wireshark.org/review/4632 - Tested-by: Stig Bjørlykke - Reviewed-by: Stig Bjørlykke + Change-Id: I7930e851647c847335b91435c7b0871c6db2defe + Reviewed-on: https://code.wireshark.org/review/5847 + Reviewed-by: Stephen Fisher -commit 9ce5ca5 -Author: Roland Knall -Date: Mon Oct 13 13:26:21 2014 +0200 +commit 23987b4 +Author: Stephen Fisher +Date: Thu Dec 18 20:49:50 2014 -0700 - extcap: Catch unknown arguments to fix spaces + Add a comment to each of these scripts to say that + epan/dissectors/README.X11 has instructions for running them. - - If boolflags are being used, an extra space is added - to the call of the extcap filter. This leads to the - argumentparser of python to exit with an error-code, - and the extcap filter will not start. This patch instead - catches the unknown arguments and prints them on stdout, - as well as running the dissection with the rest of the - arguments list. + Change-Id: Id3c1df1bf1f50b19372b9a0470822da9ca6504f7 + Reviewed-on: https://code.wireshark.org/review/5846 + Reviewed-by: Stephen Fisher + +commit b000ada +Author: Jeff Morriss +Date: Thu Dec 18 21:31:05 2014 -0500 + + Finish renaming si_code to mtp3_si_code. - Basically this is a work-around, for a behaviour not - yet fixed in extcap, but it stabilizes the usage of the demo + I5e183b997768c87f275569343afa69ca542aba46 missed a spot. - Change-Id: I7589292692b0b3c839909fd09d62a4714cbe869e - Reviewed-on: https://code.wireshark.org/review/4638 - Reviewed-by: Roland Knall - Reviewed-by: Tomasz Moń - Reviewed-by: Pascal Quantin + Change-Id: I0970f7e50719e71efc824bbb07a6c2a69c66e991 + Reviewed-on: https://code.wireshark.org/review/5845 + Reviewed-by: Jeff Morriss -commit 631834f -Author: Alexis La Goutte -Date: Mon Oct 13 10:21:39 2014 +0200 +commit acbef26 +Author: Michael Mann +Date: Wed Dec 17 21:59:56 2014 -0500 - IPv6: use proto_tree_add_item for IPv6 Routing Header Next and Length + Remove main-menubar-ui.xml because it's not used. - Like other header (Fragment, Hop by Hop...) + Noticed it because it had some really old menu information in it. Much of which is now programmatically done. - Change-Id: I5d0a85bf285b37eed38345d659439400c5f50d06 - Reviewed-on: https://code.wireshark.org/review/4634 + Change-Id: I0a24227df48c00310bc3223f72ba71c00b2c9fc7 + Reviewed-on: https://code.wireshark.org/review/5829 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Reviewed-by: Jeff Morriss -commit b9988e2 -Author: Evan Huus -Date: Mon Oct 13 12:55:40 2014 -0400 +commit 07eef05 +Author: Stephen Fisher +Date: Thu Dec 18 17:46:27 2014 -0700 - ncp2222: don't overflow buffer constructing string - - Fixes stack-smashing vuln. + Rename si_code variable to mtp3_si_code to avoid conflicts with NetBSD's + si_code #define in sys/siginfo.h - Somehow there was already an XXX in the code about this, but nobody realized at - the time it was worth fixing... really? - - Bug: 10552 - Change-Id: I849068bd6c45146339444f295b72430d3c6e08f2 - Reviewed-on: https://code.wireshark.org/review/4653 - Reviewed-by: Evan Huus + Change-Id: I5e183b997768c87f275569343afa69ca542aba46 + Reviewed-on: https://code.wireshark.org/review/5844 + Reviewed-by: Stephen Fisher -commit 8fb74b4 -Author: Evan Huus -Date: Mon Oct 13 12:08:43 2014 -0400 +commit 577e6a1 +Author: Michael Mann +Date: Thu Dec 18 14:40:15 2014 -0500 - extcap: remove use of g_list_free_full + 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. - It requires a newer glib than we support + Change-Id: I1db5314fdc77ab7b909c955415f66f24da7d2a0a + Reviewed-on: https://code.wireshark.org/review/5838 + Reviewed-by: Michael Mann + +commit 71d13b3 +Author: Bill Meier +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: Id8f14d4188a9ba55e0a5196bb877e2fe6a0c8d3f - Reviewed-on: https://code.wireshark.org/review/4652 - Reviewed-by: Evan Huus + Change-Id: Ie578a73742901c1837802da17c0aaf2e58d48c6f + Reviewed-on: https://code.wireshark.org/review/5835 + Reviewed-by: Bill Meier -commit 4f37f55 -Author: Stig Bjørlykke -Date: Mon Oct 13 14:04:23 2014 +0200 +commit f299f73 +Author: Maarten Bezemer +Date: Thu Dec 18 15:42:53 2014 +0100 - RTSE: Return dissected length from call_rtse_oid_callback + Add new cmake.in files to the distribution - Change-Id: I6766135ddcdfe25d9bcc060bb2a47376abb36794 - Reviewed-on: https://code.wireshark.org/review/4642 + Change-Id: I685b9376342087182cc0dc8d9b8ed8e17a5ff8e7 + Reviewed-on: https://code.wireshark.org/review/5833 Reviewed-by: Anders Broman - Reviewed-by: Evan Huus -commit 748e522 -Author: Stig Bjørlykke -Date: Mon Oct 13 13:59:38 2014 +0200 +commit e2d7b56 +Author: AndersBroman +Date: Thu Dec 18 12:33:03 2014 +0100 - ROS: Return dissected length from call_ros_oid_callback + Add new cmake files to the distribution - Change-Id: I8d119cd3dc9ac0a724497400680a70f39fc21ede - Reviewed-on: https://code.wireshark.org/review/4641 + Change-Id: Iae5ffac472c6d013cf5dd37310278f203a04f8d3 + Reviewed-on: https://code.wireshark.org/review/5831 Reviewed-by: Anders Broman - Reviewed-by: Evan Huus -commit 24b6a11 -Author: Alexis La Goutte -Date: Sun Oct 12 20:56:17 2014 +0200 +commit 361ea82 +Author: Michal Labedzki +Date: Wed Dec 17 11:38:49 2014 +0100 - IPv6 RPL option is read as less bytes than it is + Add support for multifields in custom column - Add check if the opt len equal to the "calculcate" length - and display expert info if not.. also replace offset by the opt len + You can now add column with Custom type with more than one field + by using OR "||" splitter. - Bug:10559 - Bug:10561 - Change-Id: I6e80e4055b6d0c5ef3f030c544cd1629e6b9abec - Reviewed-on: https://code.wireshark.org/review/4627 - Reviewed-by: Evan Huus + Bug: 9695 + + Change-Id: Ia82a91e7a35b867647d36cb9626e3870f46c0d85 + Reviewed-on: https://code.wireshark.org/review/5804 + Petri-Dish: Michal Labedzki + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte + Reviewed-by: Michal Labedzki -commit a9497be -Author: Tim (Thanh) Nguyen -Date: Sun Oct 12 10:31:03 2014 -0400 +commit f5cd215 +Author: Michal Labedzki +Date: Fri Dec 12 11:24:44 2014 +0100 - RoCE and CM dissector fixes + Bluetooth: Add generic Bluetooth dissector - - fixed cm.req cm.rep bit fields - - fixed packetLength and CRC length for RoCE - - use "RoCE" or "RRoCE" instead of "InfiniBand" in COL_PROTOCOL where appropriate + 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. - Change-Id: Id491658f9368034bb2267922fa5618e1c259cd56 - Reviewed-on: https://code.wireshark.org/review/4614 - Petri-Dish: Bill Meier + Also add Master/Slave Role and Connection Mode tracking. + + Change-Id: I67048080fb8ee16fa0f4ec429c1257de81ddd737 + Reviewed-on: https://code.wireshark.org/review/5771 + Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot - Reviewed-by: Evan Huus + Reviewed-by: Alexis La Goutte + Reviewed-by: Michal Labedzki -commit c4acc4b -Author: Alexis La Goutte -Date: Sun Oct 12 19:22:58 2014 +0200 +commit 4a467ff +Author: Michal Labedzki +Date: Fri Dec 12 11:11:00 2014 +0100 - extcap (GTK): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + Bluetooth: BTLE: Add src/dst addresses when they are known - Change-Id: Ifdba972e3a12e01ac80bc920a2100bd7aa0f733c - Reviewed-on: https://code.wireshark.org/review/4622 - Reviewed-by: Evan Huus + Generally where it is not connection then on LinkLayer protocol level + addresses for Source and Destination device are known. + + Change-Id: Id67703edc08df73d4c7a2f66ee8f4d6810a867c9 + Reviewed-on: https://code.wireshark.org/review/5776 + Petri-Dish: Michal Labedzki + Tested-by: Petri Dish Buildbot + Reviewed-by: Michal Labedzki -commit b3ad51d -Author: Pascal Quantin -Date: Mon Oct 13 14:17:35 2014 +0200 +commit ee4a7f2 +Author: Michal Labedzki +Date: Tue Dec 9 18:55:44 2014 +0100 - Follow-up of ged0b19b (Make boolean bitmask type 64-bit wide) + DisplayFilter: Check also another fields with the same name - - use G_GINT64_MODIFIER instead of "%ll" - - use G_GUINT64_CONSTANT instead of ULL - - add some missing explicit casts + 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. - Change-Id: Ic048d9ee8966ea504ea542cefe55688edcfb2dc7 - Reviewed-on: https://code.wireshark.org/review/4644 - Reviewed-by: Pascal Quantin - Petri-Dish: Pascal Quantin + Change-Id: I8b2a1708ac9648b7a4289777c72a0f3b18f3d8f8 + Reviewed-on: https://code.wireshark.org/review/5702 + Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Reviewed-by: Michal Labedzki -commit e8a63a5 -Author: Alexis La Goutte -Date: Mon Oct 13 12:30:26 2014 +0200 +commit a73b89b +Author: Maarten Bezemer +Date: Wed Dec 17 15:03:56 2014 +0100 - SPDY: Add Slot field for SYN_STREAM (and also unused field...) + Use LocatePythonModule to locate asn2wrs.py - Ping-Bug: 10566 - Change-Id: I4d3d991eb8b5ede349a361d1f6b605b4a67a98b6 - Reviewed-on: https://code.wireshark.org/review/4645 - Reviewed-by: Michael Mann + 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 + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman -commit 017fc82 -Author: Alexis La Goutte -Date: Mon Oct 13 11:55:34 2014 +0200 +commit cb345eb +Author: Maarten Bezemer +Date: Sun Nov 16 16:07:45 2014 +0100 - SPDY: Fix bitmask for priority bit - - Found by yurui ming + 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. - Ping-Bug: 10566 + Making it possible to generate out-of-source wireshark plugins. - Change-Id: I92e784eb91dc6c88af409e2936671b0ea473fba9 - Reviewed-on: https://code.wireshark.org/review/4637 - Reviewed-by: Michael Mann + Change-Id: I0bbe5b46205d39e229d31812341540b26a7336d6 + Reviewed-on: https://code.wireshark.org/review/5802 + Reviewed-by: Anders Broman -commit 2c23c7e -Author: Alexis La Goutte -Date: Mon Oct 13 10:50:50 2014 +0200 +commit 0885d29 +Author: Guy Harris +Date: Wed Dec 17 20:03:47 2014 -0800 - SPDY: Fix the display of COL_INFO... + Make sure err_info is always set, and print it iff it's non-null. - Clear the COL_INFO before start to dissect SPDY PDU - - Change-Id: I7a22515f1c2c89b5647003320ff455a74fbce42a - Ping-Bug: 10566 - Reviewed-on: https://code.wireshark.org/review/4636 - Reviewed-by: Michael Mann + Change-Id: Ib5c600c491a3d8adcfa91c00fa9445283610545b + Reviewed-on: https://code.wireshark.org/review/5830 + Reviewed-by: Guy Harris -commit ebbe70b -Author: Stig Bjørlykke -Date: Tue Oct 7 22:41:47 2014 +0200 +commit 6011a04 +Author: Guy Harris +Date: Wed Dec 17 16:41:21 2014 -0800 - ASN1: Register BER syntaxes as NEW + WTAP_ERR_UNWRITABLE_ errors aren't returned by reads or open-for-reading. - Change-Id: Id85eaecd84dbe1115935e1977dca321fd601d986 - Reviewed-on: https://code.wireshark.org/review/4639 - Petri-Dish: Stig Bjørlykke - Tested-by: Petri Dish Buildbot - Reviewed-by: Stig Bjørlykke + 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 -commit 71ae57e -Author: Alexis La Goutte -Date: Mon Oct 13 09:50:46 2014 +0200 +commit aa27e66 +Author: Guy Harris +Date: Wed Dec 17 16:31:49 2014 -0800 - IPv6: Fix typo for Fragment nxt (Next Header) + Rename WTAP_ERR_REC_TYPE_UNSUPPORTED to WTAP_ERR_UNWRITABLE_REC_TYPE. - Change-Id: Id7d6cd4a4c09238890394d5dc887ec840dc2d2af - Reviewed-on: https://code.wireshark.org/review/4633 - Reviewed-by: Michael Mann + 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 -commit 313c400 -Author: Stig Bjørlykke -Date: Mon Oct 13 13:37:24 2014 +0200 +commit 51522b3 +Author: Guy Harris +Date: Wed Dec 17 16:02:50 2014 -0800 - P1: Added ORAddress and ORName syntax. + Handle "I can't map this for that file format" better. - Change-Id: Icf8e8cb2988d9134aa65f04a3459e4a4c4a5721f - Reviewed-on: https://code.wireshark.org/review/4640 - Reviewed-by: Stig Bjørlykke - Tested-by: Stig Bjørlykke + 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. + + Report (and free) that err_info string in cases where + WTAP_ERR_UNWRITABLE_REC_DATA is returned. + + 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 -commit 4e1b5ea -Author: Stig Bjørlykke -Date: Mon Oct 6 15:31:47 2014 +0200 +commit 8ce0f12 +Author: Maarten Bezemer +Date: Wed Dec 17 11:06:19 2014 +0100 - ASN1: Register PDU-dissectors as NEW + Resync Debian symbols + Fix wrong symbol for proto_tree_add_bitmask_with_flags - Change-Id: I1a317b19d8076588c9305dae6287bb80cc14da64 - Reviewed-on: https://code.wireshark.org/review/4494 - Petri-Dish: Stig Bjørlykke + Change-Id: I6804aab8f4394653fbeb2b6343d20d43eaa2b93e + Reviewed-on: https://code.wireshark.org/review/5803 + Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann - Reviewed-by: Stig Bjørlykke - Tested-by: Stig Bjørlykke + Reviewed-by: Alexis La Goutte -commit 94d3548 -Author: Alexis La Goutte -Date: Mon Oct 13 10:32:38 2014 +0200 +commit 1a56990 +Author: Graham Bloice +Date: Wed Dec 17 15:42:57 2014 +0000 - SPDY: Fix typo about length for Control bit + Fix zbee errors introduced by change 5565, commit df639f509e812fff3c5eb4bdf4f77988c6ec122b - Found by yurui ming + Reworked zbee_mfr_code_names to be in monotonic order. + Fixed implicit shortening of time value with a cast. - Change-Id: Ibef07fa13af0de8357bdf98a038460706d0972f7 - Ping-Bug: 10566 - Reviewed-on: https://code.wireshark.org/review/4635 - Reviewed-by: Anders Broman + Change-Id: I629948fbe32543fd2672bbc40af790333b970b10 + Reviewed-on: https://code.wireshark.org/review/5808 + Petri-Dish: Graham Bloice + Reviewed-by: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Graham Bloice -commit 749832a -Author: Alexis La Goutte -Date: Sun Oct 12 19:37:02 2014 +0200 +commit db4232a +Author: Guy Harris +Date: Wed Dec 17 12:38:48 2014 -0800 - USB Mass Storage: Display target number for SCM USB-SCSI converters + This code is used in Wireshark, not TShark; fix messages. - The USB Mass Storage Class (Bulk Only Transport) has the LUN in bits [3:0] of byte 13 of the command block wrapper. Bits [7:4] of that byte are undefined/reserved. - - USB-SCSI converters based on a chipset from SCM Microsystems can work with multiple SCSI devices. After enabling multi-target mode (which the vendor driver and Linux do), the target number is given in bits [6:4] of CBW byte 13. - - Request from Mark - - Bug:10563 - Change-Id: I8e6d9b7d47ff4296d41e8b9b15f4bd44c89238c9 - Reviewed-on: https://code.wireshark.org/review/4625 - Reviewed-by: Anders Broman + Change-Id: I3c6b7686de478e42eeeb9c51c8bdb5b6843666af + Reviewed-on: https://code.wireshark.org/review/5814 + Reviewed-by: Guy Harris -commit 8cc7b0d -Author: Joseph Huffman -Date: Thu Sep 25 16:27:41 2014 -0700 +commit e00f585 +Author: Guy Harris +Date: Wed Dec 17 11:53:13 2014 -0800 - Fixed missing padding. Fixed ENC_NA/ENC_BIG_ENDIAN errors. - - There was no tree items for padding in the many instances where there were - bytes added to make certain data types align on even boundaries of 2, 4, or - 8 bytes. These instances now show up as "Padding" in the display. + Fix another incorrect message for WTAP_ERR_UNSUPPORTED. - There were many instances where ENC_NA was used for fields of more than one - byte. This wasn't noticed before because ENC_NA was ENC_BIG_ENDIAN for - historical reasons and all these fields are big endian fields. + 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: Iabadd46eacc9ceb8ca85f4a5ba42b6583375c5f0 - Signed-off-by: Joseph Huffman - Reviewed-on: https://code.wireshark.org/review/4413 - Reviewed-by: Anders Broman + Change-Id: Ib35e2a6b6c62517887e0386f0fed1795db335439 + Reviewed-on: https://code.wireshark.org/review/5810 + Reviewed-by: Guy Harris -commit 8d0becd -Author: Matthieu Texier -Date: Mon Sep 15 16:10:51 2014 +0200 +commit 97cc005 +Author: zeuz +Date: Tue Dec 16 19:23:55 2014 +0100 - Aliging PIM hello message type to IANA in order to fix BUG 10231 + 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: Ie9a126d106c08935eb385fd93d011e481913ab3c - Reviewed-on: https://code.wireshark.org/review/4448 + Change-Id: I33edbfa754cb37391614f7cf4d6d4a9b11bcd52d + Reviewed-on: https://code.wireshark.org/review/5755 + Petri-Dish: Alexis La Goutte Reviewed-by: Anders Broman -commit b563a84 -Author: Michael Mann -Date: Sun Oct 12 22:09:35 2014 -0400 +commit 2018404 +Author: zeuz +Date: Tue Dec 16 19:08:53 2014 +0100 - Eliminate proto_tree_add_text from IP dissectors + RDM: Made PID array global (can be reused in packet-artnet.c) + Fixed deprecated API warning - Change-Id: I81fc364cbff3c5b305d61b2d444bf8599fbd19e7 - Reviewed-on: https://code.wireshark.org/review/4631 - Reviewed-by: Michael Mann - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot + Change-Id: I761181baf9f5ae31a8a3807eb27d791d8868dcde + Reviewed-on: https://code.wireshark.org/review/5786 Reviewed-by: Anders Broman -commit 5518513 -Author: Alexis La Goutte -Date: Sun Oct 12 20:58:59 2014 +0200 +commit 2d6adb2 +Author: Evan Huus +Date: Wed Dec 17 13:00:25 2014 -0500 - IPv6 RPL: Display RPL flag on HEX + zbee-zcl: swap honeywell codes - Change-Id: I0b3bb9e1a0de388135a71bc6a97602d6abf6a9dc - Reviewed-on: https://code.wireshark.org/review/4628 - Reviewed-by: Michael Mann + they were out of order for the extended value-string, I suspect honeywell1 and + honeywell2 had just been put in backwards + + Change-Id: I4aacf27ba8aa20c137731f1ad652380cd5af5562 + Reviewed-on: https://code.wireshark.org/review/5809 + Reviewed-by: Evan Huus -commit 73613d4 -Author: Alexis La Goutte -Date: Sun Oct 12 17:51:29 2014 +0200 +commit 24965c6 +Author: Maarten Bezemer +Date: Wed Dec 17 16:25:17 2014 +0100 - Remove DIRTY_DISSECTOR_SRC + Fix missing space - x11 dissector don't have longer warning ! - and fix different between Autotools and CMake (about gsm_a_common dissector) - - Change-Id: Id9da62d84b8b0bb4b0ed5d8fc62abba4e2442ed2 - Reviewed-on: https://code.wireshark.org/review/4621 - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Change-Id: Ia56ff1d78d584ca062a714aac097c05034279e34 + Reviewed-on: https://code.wireshark.org/review/5807 + Reviewed-by: Anders Broman -commit 38c9ac8 -Author: Pascal Quantin -Date: Sun Oct 12 22:56:19 2014 +0200 +commit e4b4647 +Author: AndersBroman +Date: Wed Dec 17 16:24:40 2014 +0100 - GlusterFS: fix OSX compilation failure - - ged0b19b introduced support for 64 bits bitmask. Make use of it and add an explicit cast to fix a compilation error + [MIP] Add refreence to 3GPP2 documents for 3GPP2 CVSE GRE_KEY_EXT - Change-Id: I9f2202d851aedc0dc78655c505b5a0b26b224c0e - Reviewed-on: https://code.wireshark.org/review/4630 - Reviewed-by: Pascal Quantin - Tested-by: Pascal Quantin - Petri-Dish: Pascal Quantin - Reviewed-by: Alexis La Goutte + Change-Id: I24d77e3602afba4c522648a3fabd7672c7c1f736 + Reviewed-on: https://code.wireshark.org/review/5806 + Reviewed-by: Anders Broman -commit eed22ac -Author: Tomasz Moń -Date: Sun Oct 12 21:07:48 2014 +0200 +commit a13bbfc +Author: AndersBroman +Date: Mon Dec 15 15:00:04 2014 +0100 - Fix double free. + [TCP] Don't attempt reassembly on retransmitted segments. - This double free involves damaging GHashTable internals (key and value). - - Change-Id: I17c8a473b96ab28e611ccf79ddd2b3da56512184 - Reviewed-on: https://code.wireshark.org/review/4629 - Tested-by: Pascal Quantin - Reviewed-by: Tomasz Moń - Reviewed-by: Pascal Quantin + Change-Id: I140227416435589a8b83ccb440625ccb90d0673e + Reviewed-on: https://code.wireshark.org/review/5772 + Reviewed-by: Anders Broman -commit fc2f318 -Author: Tomasz Moń -Date: Sun Oct 12 17:26:04 2014 +0200 +commit 6b7a395 +Author: Ganesh Nawsupe +Date: Fri Dec 12 11:50:21 2014 +0530 - Fix handling of extcap boolflags which defaults to true. - - Example: - arg {number=0}{call=--test}{type=boolflag}{default=true} - - Before this change --test was never added to argument list (no matter if - user left it selected or explicitly deselected it). + Adding fix to convert latitude/longitude degrees to floating point format from fixed point format - After this change --test will be added to argument list unless user - explicitly deselects it. - - Change-Id: Ia5bc11f900b03e630aba882ef918dcb7f0b79291 - Reviewed-on: https://code.wireshark.org/review/4618 - Reviewed-by: Pascal Quantin - Tested-by: Pascal Quantin + Change-Id: Ibcfeae69e4f60423c87a0fdb8666192a1ca5dc0c + Reviewed-on: https://code.wireshark.org/review/5726 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Anders Broman -commit 1b8b2a8 +commit a3510cc Author: Bill Meier -Date: Sun Oct 12 14:56:12 2014 -0400 +Date: Tue Dec 16 18:02:33 2014 -0500 - Add editor modelines; Adjust whitespace as needed. + mip: Fix Rev Revocation [Ack] Flags dissection bugs. - Change-Id: I4da7b335d905dbca10bbce03aa88e1cdeeb1f8ad - Reviewed-on: https://code.wireshark.org/review/4626 + Change-Id: Ia1eb397ee6aba8211b1091636e4ac4f51c95cc2b + Reviewed-on: https://code.wireshark.org/review/5791 Reviewed-by: Bill Meier + Reviewed-by: Anders Broman -commit 4e328e4 -Author: Alexis La Goutte -Date: Sun Oct 12 17:44:04 2014 +0200 +commit 8ccdc07 +Author: Bill Meier +Date: Thu Dec 11 16:56:22 2014 -0500 - DCERPC: Remove DIRTY_PIDL_DISSECTOR_SRC - - Now mapi and drsuapi build without warning ! + mip: fix (what appear to be) bugs in CVSE GRE key extension dissection - Change-Id: Iae19af2fd06fd998a13696ba2adf6cd12d311f58 - Reviewed-on: https://code.wireshark.org/review/4619 + Change-Id: I43dc48de62eda3a62bef4bf4a40fd18cb45751f3 + Reviewed-on: https://code.wireshark.org/review/5733 + Reviewed-by: Anders Broman + +commit d99fe21 +Author: AndersBroman +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 + +commit df639f5 +Author: Chris Brandson +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 Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Reviewed-by: Anders Broman -commit d62b323 -Author: Alexis La Goutte -Date: Sun Oct 12 17:24:35 2014 +0200 +commit c5b7207 +Author: Maarten Bezemer +Date: Wed Nov 12 13:43:14 2014 +0100 - PIDL (DCERPC misc): enhance dissector - - * Fix -Wunused-function (Set NOEMIT winreg_Data and remove unused function) - * Remove dissector DCERPC misc from DIRTY list + Install cmake files to make them available for out of source builds - Change-Id: If59b14f8db33354a2d5248e8bc256cadee3ea4bf - Reviewed-on: https://code.wireshark.org/review/4345 - Reviewed-by: Alexis La Goutte - Reviewed-by: Michael Mann + Change-Id: I2cb4018f0214b6c0bdccfd1e83c7a7f22a818e8b + Reviewed-on: https://code.wireshark.org/review/5256 + Reviewed-by: Anders Broman -commit 148136c -Author: Alexis La Goutte -Date: Sun Oct 12 19:23:39 2014 +0200 +commit cc8ed84 +Author: Maarten Bezemer +Date: Wed Nov 12 13:39:07 2014 +0100 - ISUP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + Invoke asn2wrs.py using a custom command - Change-Id: I17163b18348919d19d3d336ccf9c1310d473a05d - Reviewed-on: https://code.wireshark.org/review/4624 - Reviewed-by: Michael Mann - -commit 44208b9 -Author: Alexis La Goutte -Date: Sun Oct 12 19:23:17 2014 +0200 - - LMP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + 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. - Change-Id: Ie651e8a7d0309330504a77664bb2eac75c00d968 - Reviewed-on: https://code.wireshark.org/review/4623 - Reviewed-by: Michael Mann + Change-Id: I84be5d408cfc87cf88d67b6073bea439febbe712 + Reviewed-on: https://code.wireshark.org/review/5255 + Reviewed-by: Anders Broman -commit 1b65cb6 -Author: Stig Bjørlykke -Date: Sun Oct 12 18:41:36 2014 +0200 +commit a1d4c0a +Author: Maarten Bezemer +Date: Wed Nov 12 13:32:41 2014 +0100 - Add back get_uinteger for boolean_type. + Do not force the output directory - This was removed in ed0b19b94bf07056b5e0cfe64d4d05c3ebae801a + 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: I548ca955eda6e0b6991a0f6731cbbb3bf82e0e2b - Reviewed-on: https://code.wireshark.org/review/4620 - Reviewed-by: Stig Bjørlykke - Tested-by: Stig Bjørlykke + Change-Id: I48b7486fcda982f0dce57cde3beacb99f946abd9 + Reviewed-on: https://code.wireshark.org/review/5254 + Reviewed-by: Anders Broman -commit 6e3a2b4 -Author: Gerald Combs -Date: Sun Oct 12 08:06:04 2014 -0700 +commit fb01f59 +Author: Maarten Bezemer +Date: Tue Nov 11 17:11:11 2014 +0100 - [Automatic manuf, services and enterprise-numbers update for 2014-10-12] + Use FindAsn2Wrs to find asn2wrs.py - Change-Id: Icc98f156e55bc8523490bb8a8d712ca80076649e - Reviewed-on: https://code.wireshark.org/review/4615 - Reviewed-by: Gerald Combs - -commit f7c5e3a -Author: Pascal Quantin -Date: Sun Oct 12 15:47:11 2014 +0200 - - E-LMI: add what seems to be a missing break (Coverity CID 1245648) + A first step to make it possible to reuse the UseAsn2Wrs for out of source builds. - Change-Id: I6b35ea96fba142bdabf17d3fc3f9db23dc390d31 - Reviewed-on: https://code.wireshark.org/review/4613 - Reviewed-by: Alexis La Goutte + Change-Id: Iefb34f943e06db3d6afed55ab69d3f26aa9d633d + Reviewed-on: https://code.wireshark.org/review/5253 + Reviewed-by: Anders Broman -commit ed0b19b -Author: Daniel Mack -Date: Wed Sep 17 18:39:22 2014 +0200 +commit c083f50 +Author: Maarten Bezemer +Date: Wed Nov 12 13:02:17 2014 +0100 - Make boolean bitmask type 64-bit wide - - There are protocols out there that have 64-bit wide bit mask fields, so - make the internal representation and bitfield decoders 64-bit aware. + Install GLib cmake helper files - For this, the ws_ctz() fallback and bits_count_ones() have to be tweaked - slightly. + GLib is always/mostly required when building wireshark plugins. These cmake fiels help finding the install glib components - Change-Id: I19237b954a69c9e6c55864f281993c1e8731a233 - Reviewed-on: https://code.wireshark.org/review/4158 - Petri-Dish: Alexis La Goutte + Change-Id: Ie59b50bf8c53c367d4bf89f53db5ae31e97e0575 + Reviewed-on: https://code.wireshark.org/review/5252 + Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot - Reviewed-by: Alexis La Goutte - Reviewed-by: Michael Mann + Reviewed-by: Anders Broman -commit 29afac2 -Author: Matthieu Patou -Date: Fri Oct 10 20:30:59 2014 -0400 +commit d2eddde +Author: Guy Harris +Date: Wed Dec 17 00:47:31 2014 -0800 - Add support for NTTIME_hyper and NTTIME_1sec + Report WTAP_ERR_UNSUPPORTED correctly. - It's hyper with 8 bytes alignment it can have 1/100000 sec resolution or 1sec resolution + 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. - Bug: 10541 - Change-Id: Iecc4c6d1bd1695a4c02db72e1617134254810cd9 - Reviewed-on: https://code.wireshark.org/review/4606 - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Change-Id: Ic675ffd501c52838d8944a6c61e1b01041b73098 + Reviewed-on: https://code.wireshark.org/review/5799 + Reviewed-by: Guy Harris -commit b3490c2 +commit ddcc2ae Author: Guy Harris -Date: Sat Oct 11 16:06:57 2014 -0700 +Date: Wed Dec 17 00:29:31 2014 -0800 - Use the wtap_read_bytes{_or_eof}() routines. + Rename WTAP_ERR_UNSUPPORTED_FILE_TYPE to WTAP_ERR_UNWRITABLE_FILE_TYPE. - Change-Id: I4f707bc714b2643d0f6c568f3367e712ee635d8e - Reviewed-on: https://code.wireshark.org/review/4612 + 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 -commit eb72d2a -Author: Stig Bjørlykke -Date: Sat Oct 11 22:39:17 2014 +0200 +commit dbdcae8 +Author: Guy Harris +Date: Tue Dec 16 22:40:45 2014 -0800 - Use variable name 'len' when handling length. + Rename WTAP_ERR_UNSUPPORTED_ENCAP to WTAP_ERR_UNWRITABLE_ENCAP. - Change-Id: Icb1d81316d1ead3455c68ad55e52b8120b7dccf9 - Reviewed-on: https://code.wireshark.org/review/4609 - Reviewed-by: Stig Bjørlykke - Tested-by: Stig Bjørlykke + 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 -commit 8eefa4d +commit 40f69b2 Author: Guy Harris -Date: Sat Oct 11 13:10:14 2014 -0700 +Date: Tue Dec 16 22:22:29 2014 -0800 - Use the count-of-records fields to figure out how many records to read. - - Fetch the count of records from one of the locations where it appears to - be, and, currently, require that it be equal to the count at the other - location where it appears to be; if they ever differ, we'll need the - file in order to reverse-engineer some more. - - Fix the way we *write* .rf5 files - it turns out that we were - - 1) not writing the full file size; + Use WTAP_ERR_UNSUPPORTED for input file stuff we can't handle. - 2) not writing the packet count in the right location. + 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". - Detect files written by the old code, and get the packet count from the - right location for those files. - - Change-Id: I7ce83afbc9dbbd300c81c96ef8f7785a0aeefa7a - Reviewed-on: https://code.wireshark.org/review/4608 + Change-Id: I53cadf9913d20efb2bccb29f61877b71d53807be + Reviewed-on: https://code.wireshark.org/review/5794 Reviewed-by: Guy Harris -commit e331083 -Author: Matthieu Patou -Date: Fri Oct 10 19:34:48 2014 -0400 +commit b56d4d0 +Author: Guy Harris +Date: Tue Dec 16 22:08:03 2014 -0800 - Add dissection of MIDL_NDRHEADERBLOB used in drsuapi and some other protocols + Clean up the "unknown per-packet encapsulation" message. - Bug: 10540 - Change-Id: If4a8603a7cb62894cc46094056dd5313039884b2 - Reviewed-on: https://code.wireshark.org/review/4604 - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + 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 -commit 81f9976 -Author: Gerald Combs -Date: Fri Oct 10 17:19:55 2014 -0700 +commit 625ba02 +Author: Guy Harris +Date: Tue Dec 16 21:29:41 2014 -0800 - CMake: Don't add Custom.make to the bundle. + Clean up handling of files without a known encapsulation. - Change-Id: I08f2701e4450f34aa9d840cc5f507e9348e115bd - Reviewed-on: https://code.wireshark.org/review/4605 - Reviewed-by: Gerald Combs + 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 -commit 6e42a72 -Author: Michael Mann -Date: Fri Oct 10 19:22:45 2014 -0400 +commit ad299df +Author: Pascal Quantin +Date: Tue Dec 16 22:42:48 2014 +0100 - Dissection of sid28 needs null check. + 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 - Bug: 10542 - Change-Id: I8fcfbbd96833af2c57754a4c8f96cf702972e22a - Reviewed-on: https://code.wireshark.org/review/4603 + Change-Id: Iffda96046cc687004f403dd4d8e735375790b07b + Reviewed-on: https://code.wireshark.org/review/5789 + Reviewed-by: Pascal Quantin Reviewed-by: Michael Mann -commit 5c5bf3b +commit f400252 Author: Gerald Combs -Date: Fri Oct 10 15:03:26 2014 -0700 +Date: Tue Dec 16 11:03:46 2014 -0800 - Update READMEs to reflect recent CMake environment changes. + 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: Idbf879f20448eea0b69e793271439dec877832e9 - Reviewed-on: https://code.wireshark.org/review/4602 + Change-Id: Ie08d6aba2dcb82e4e49d6dbe96a2a3639e3cafc4 + Bug: 8256 + Reviewed-on: https://code.wireshark.org/review/5788 Reviewed-by: Gerald Combs + Reviewed-by: Michael Mann -commit ffa377b -Author: Guy Harris -Date: Fri Oct 10 13:20:02 2014 -0700 +commit 972d347 +Author: Maarten Bezemer +Date: Wed Nov 12 12:56:26 2014 +0100 - Use names more like the other names in open_info. - - For open_info, use names based on the names in other lists. + Add Wireshark_LIBRARY variable - Also, in comments, indicate what the three count 'em three tables are - used for, and clean up the type/subtype table. + This variable can be used to obtain the wireshark library(ies) (from the correct location). - Change-Id: I7a763119e790d5970f87dff05284f465eebfb7e7 - Reviewed-on: https://code.wireshark.org/review/4599 - Reviewed-by: Guy Harris + Change-Id: I90cd5b098eb746ac573a2c611113287b06c3b82b + Reviewed-on: https://code.wireshark.org/review/5251 + Petri-Dish: Michael Mann + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann -commit d330cd4 -Author: cbontje -Date: Fri Oct 10 14:00:48 2014 -0600 +commit 6ee78f3 +Author: Peter Wu +Date: Fri Nov 28 15:52:07 2014 +0100 - DNP3 Protocol Bugfix / Enhancement + http: properly calculate end of chunked response - - Fix for Single-bit Objects offset-pointer - - Enhancement for Obj 12 Var 2 (Pattern Control Block) and Var 3 (Pattern Mask) Decoding + 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". - Bug: 10558 - Change-Id: I8d3f6cee4acbab09d0b93dab6b868cddd842b682 - Reviewed-on: https://code.wireshark.org/review/4597 - Reviewed-by: Michael Mann - -commit f7588ea -Author: Anish Bhatt -Date: Wed Oct 8 22:02:31 2014 -0700 - - [ELMI] Add missing information elements, add support for sub-information elements. - Bug 10532 + 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. - Updated with Bandwidth Profile support + 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). - Change-Id: I0f31eb6c78a5e34bcb1c286a9a10730b3b63481c - Reviewed-on: https://code.wireshark.org/review/4571 - Reviewed-by: Alexis La Goutte - Petri-Dish: Alexis La Goutte + 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 + Reviewed-by: Evan Huus + Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann -commit a168c44 -Author: Michael Mann -Date: Fri Oct 10 08:44:13 2014 -0400 +commit db93414 +Author: zeuz +Date: Tue Dec 16 15:34:29 2014 +0100 - Remove (almost all) proto_tree_add_text calls in ISUP dissector. + 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: I57a01eacaa02e45c23bb4827ae982c897fb308ee - Reviewed-on: https://code.wireshark.org/review/4592 + Change-Id: Ia2c024b503d6a4b8c18020699bdc676a8459dcbd + Reviewed-on: https://code.wireshark.org/review/5783 Reviewed-by: Michael Mann - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Anders Broman -commit a193302 -Author: Pascal Quantin -Date: Fri Oct 10 07:16:21 2014 +0200 +commit 1cbf951 +Author: Alexis La Goutte +Date: Sun Dec 14 19:59:38 2014 +0100 - NCP: switch to wmem memory and ensure that all fields are initialized + HTTP2: Update to draft-16 - Change-Id: Ia17e189baed05d8020654e6702a51f51bd384f26 - Reviewed-on: https://code.wireshark.org/review/4589 - Reviewed-by: Evan Huus + Also update HTTP Header Compression (to draft-10) + + No framing change on HTTP2 draft-16 + + Change-Id: I7f8ffd7ab37bc22fd6fbe156b0bf52543025e3a8 + Reviewed-on: https://code.wireshark.org/review/5782 Reviewed-by: Michael Mann -commit 685d303 -Author: Guy Harris -Date: Fri Oct 10 11:40:08 2014 -0700 +commit ce68707 +Author: Maarten Bezemer +Date: Tue Nov 11 14:41:01 2014 +0100 - Version 3 has only absolute timestamps; don't set nsg_creltime. - - Version 3's time stamps are all absolute, so we can directly use the - value in the file; we don't need to keep track of the time in the - private data structure, and some compilers issue warnings due to setting - it and then not using the value to which we set it. + Add cmake helper files for finding wireshark - Change some names and indentation to match other file versions while - we're at it. + These files make it possible to use the cmake command find_package(Wirehark) to obtain information about the wireshark installation. - Change-Id: I97698d933b87a8ad58d9e88ceedd75004797df69 - Reviewed-on: https://code.wireshark.org/review/4596 - Reviewed-by: Guy Harris + Change-Id: I5af7c4e7b53b99cd473e04905a92bac267cd9b83 + Reviewed-on: https://code.wireshark.org/review/5235 + Petri-Dish: Alexis La Goutte + Tested-by: Petri Dish Buildbot + Reviewed-by: Michael Mann -commit 6463d2a -Author: Pascal Quantin -Date: Thu Oct 9 22:48:59 2014 +0200 +commit ec28d87 +Author: Marc Fournier +Date: Tue Dec 16 07:13:45 2014 +0100 - GSM MAP: fix detection of SMS direction when application context version is < 3 + Riemann: attach metric_d field to parent event - Bug: 10547 - Change-Id: I4708fd9977e635c66ef1350ce5098520e4c2ce1e - Reviewed-on: https://code.wireshark.org/review/4579 - Reviewed-by: Michael Mann + Bug: 10781 + Change-Id: I93ad2704f200afb303f3638fe0af65693d4c8f52 + Reviewed-on: https://code.wireshark.org/review/5781 + Reviewed-by: Alexis La Goutte -commit 98d77e2 -Author: Gerald Combs -Date: Fri Oct 10 08:32:51 2014 -0700 +commit 8d1a555 +Author: Yann Lejeune +Date: Sat Dec 13 01:01:33 2014 +0100 - CMake: Bundle the "share" directory files and directories. + ISIS LSP: Add Segment Routing Algorithm Sub TLV dissection - Work around a CMake bug using file globbing. + This commit implements a part of draft-ietf-isis-segment-routing-extensions: + - 3.2. SR-Algorithm Sub-TLV - Change-Id: I67dc8268154e05834e5d4e7d8f22c6eb25b24c1f - Reviewed-on: https://code.wireshark.org/review/4595 - Reviewed-by: Gerald Combs + Change-Id: Ibb419de234bf5a199f8067989b1321064fa93983 + Ping-Bug: 10520 + Reviewed-on: https://code.wireshark.org/review/5742 + Reviewed-by: Alexis La Goutte -commit 23e78cd -Author: Bill Meier -Date: Fri Oct 10 10:41:10 2014 -0400 +commit 84c6c74 +Author: Yann Lejeune +Date: Fri Dec 12 22:32:50 2014 +0100 - Add editor modelines; Adjust whitespace as needed. + ISIS LSP: Add Segment Routing Capabilities Sub-TLV dissection - Change-Id: I3dc57f4c2ca57585103e3b71503ac4c332903e50 - Reviewed-on: https://code.wireshark.org/review/4594 - Reviewed-by: Bill Meier + This commit implements a part of draft-ietf-isis-segment-routing-extensions: + - 3.1 Routing Capabilities Sub-TLV + - 2.3 SID/Label Sub-TLV + + Change-Id: I3ee5e6d949cc6add412da761ffc55ef3101ddb97 + Ping-Bug: 10520 + Reviewed-on: https://code.wireshark.org/review/5739 + Reviewed-by: Alexis La Goutte -commit bdbc8e3 -Author: AndersBroman -Date: Fri Oct 10 15:41:53 2014 +0200 +commit e709a34 +Author: Martin Kaiser +Date: Sat Dec 13 19:50:06 2014 +0100 - GTPv2: Presence-Reporting-Area-Elements-List do full dissection of ECGI - and TAI. + exit if the key wasn't found in the parameters list - Change-Id: I95d9ebf1d6f4eabe30b557fdc937d56006f8b123 - Reviewed-on: https://code.wireshark.org/review/4593 - Reviewed-by: Anders Broman + Bug: 10761 + Change-Id: I072cd3a68d852cb8dc57b9b9f807f792caba7259 + Reviewed-on: https://code.wireshark.org/review/5750 + Reviewed-by: Martin Kaiser + Tested-by: Martin Kaiser -commit 7e49f06 -Author: Guy Harris -Date: Fri Oct 10 03:21:57 2014 -0700 +commit 9187456 +Author: Alexis La Goutte +Date: Mon Dec 15 19:09:57 2014 +0100 - wtap_file_read_till_separator() can return values other than 1 on success. + MP4: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang > 3.3 - It returns the length of the string it read, so only treat 0 and -1 as - errors. (0 either means "EOF" or "string is zero length", but this is - only in the code that reads numbers, and a number needs at least 1 - digit, so both EOF and "zero-length string" mean "this isn't a valid - Peek tagged file".) + Change-Id: I0befc8846b9af43e1563adb369ba4d332775ef76 + Reviewed-on: https://code.wireshark.org/review/5778 + Reviewed-by: Martin Kaiser + Tested-by: Martin Kaiser + +commit 82e6304 +Author: Alexis La Goutte +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: Ib83eb2f1e53d912a2138be01480e2b464cf936db - Reviewed-on: https://code.wireshark.org/review/4591 - Reviewed-by: Guy Harris + Change-Id: I95f0ab387570c0c56e19990cb9b9063051bb792f + Reviewed-on: https://code.wireshark.org/review/5779 + Reviewed-by: Martin Kaiser -commit f5b06c5 -Author: Guy Harris -Date: Fri Oct 10 01:14:06 2014 -0700 +commit fafa686 +Author: Evan Huus +Date: Tue Dec 9 21:35:01 2014 -0500 - Fix some more int-to-enum conversion complaint. + Enable case-insensitive string dissector tables - While we're at it, log a message if a Lua file format module lacks a - read or a seek-read routine, rather than completely silently ignoring - that module if it claims a file. + Permit passing TRUE as the parameter during table registration to achieve that + effect. - Change-Id: I9778f7835922439e2d3708614689280ef7b61d33 - Reviewed-on: https://code.wireshark.org/review/4590 - Reviewed-by: Guy Harris + Use it in RTP media type table. + + Bug: 10708 + Change-Id: I892fb1a421d349f0c05197dec90f14fc34ad6b97 + Reviewed-on: https://code.wireshark.org/review/5695 + Reviewed-by: Evan Huus + Petri-Dish: Evan Huus + Reviewed-by: Pascal Quantin -commit 3a4cab7 -Author: Gerald Combs -Date: Thu Oct 9 18:24:18 2014 -0700 +commit 27095f9 +Author: Gerald Combs +Date: Mon Dec 15 09:24:01 2014 -0800 - CMake: Bundle our libraries. + Add Bug 10488 (multiple capture files) to the release notes. - Change-Id: I5df4d794602f7e53c2f4f496597f8eaf7c7b6eaa - Reviewed-on: https://code.wireshark.org/review/4588 + Change-Id: I405b2ecd3cbf33cbf882430686e29d2c8723e2b5 + Reviewed-on: https://code.wireshark.org/review/5777 Reviewed-by: Gerald Combs -commit 33d20c6 -Author: Gerald Combs -Date: Thu Oct 9 18:36:12 2014 -0700 +commit c504772 +Author: Pascal Quantin +Date: Mon Dec 15 16:26:31 2014 +0000 - Add back a value_string conversion lost in g58cc452. + Revert "Bluetooth: BTLE: Add src/dst addresses when they are known" - I don't have a capture to check but this appears to be correct. + This reverts commit a89c17fb52ec1270076abd82e6e5cd56d94fa682. - Change-Id: I93405d1e3ec4aac3761d06e257db3ec2e32b2fc2 - Reviewed-on: https://code.wireshark.org/review/4587 - Reviewed-by: Gerald Combs + Change-Id: I99029d72b82aaec1b398dffee0beec30829a3939 + Reviewed-on: https://code.wireshark.org/review/5775 + Reviewed-by: Pascal Quantin -commit 45f2afc -Author: Guy Harris -Date: Thu Oct 9 18:30:18 2014 -0700 +commit dab9f76 +Author: AndersBroman +Date: Mon Dec 15 15:45:20 2014 +0100 - Oops, missed one. + [ISUP] Add dissection of Japan TTC EMERGENCY CALL INDICATOR - Change-Id: I0847846d50d6979f0f50a00438a834c7c7c2acc0 - Reviewed-on: https://code.wireshark.org/review/4586 - Reviewed-by: Guy Harris + Change-Id: I63cdb7eead49207cf66ea36d1da966d1bbec4320 + Reviewed-on: https://code.wireshark.org/review/5774 + Reviewed-by: Anders Broman -commit 4f4e01b -Author: Guy Harris -Date: Thu Oct 9 18:14:12 2014 -0700 +commit a89c17f +Author: Michal Labedzki +Date: Fri Dec 12 11:11:00 2014 +0100 - Don't treat int return values as valid wtap_open_return_val values. + Bluetooth: BTLE: Add src/dst addresses when they are known - They happen to be, at least now, but that's not valid in C++, and it's - probably unwise in any case. + Generally where it is not connection then on LinkLayer protocol level + addresses for Source and Destination device are known. - Change-Id: Ifd49920cfaa376e5e7788329ee83db3956a7cdff - Reviewed-on: https://code.wireshark.org/review/4585 - Reviewed-by: Guy Harris + Change-Id: I28da88381a26826ad4897b56da993909130683d3 + Reviewed-on: https://code.wireshark.org/review/5768 + Reviewed-by: Michal Labedzki -commit 9754192 -Author: Guy Harris -Date: Thu Oct 9 18:09:06 2014 -0700 +commit afacb1c +Author: Michal Labedzki +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 + +commit 79d6a15 +Author: Michal Labedzki +Date: Wed Dec 3 11:06:49 2014 +0100 - Cast size_t to to gulong as the length argument to g_snprintf(). + Bluetooth: BTLE: SN, NESN should be numbers not booleans - Sadly, the GTK+ folks decided not to use size_t for the size argument, - so it doesn't do the right thing on LLP64 platforms such as Windows. + SN = Sequence Number, so it is not bool. - Change-Id: I2aa9096215c488b48f1cf68d2a285a48abb6f07f - Reviewed-on: https://code.wireshark.org/review/4584 - Reviewed-by: Guy Harris + Change-Id: I0691b17150bbbdd34a0e7cbe3cb90058c9183ff7 + Reviewed-on: https://code.wireshark.org/review/5769 + Reviewed-by: Michal Labedzki -commit 5947291 -Author: Guy Harris -Date: Thu Oct 9 18:04:16 2014 -0700 +commit 657e42b +Author: Michal Labedzki +Date: Mon Nov 17 19:26:12 2014 +0100 - Fix declared types of open routines. + cmake: Do not hide possible options for other platforms - Change-Id: Ifa38dfec31ec5b03f00d6e077902184a9ae2ee0e - Reviewed-on: https://code.wireshark.org/review/4583 - Reviewed-by: Guy Harris + Change-Id: I408620cb39a25a4104e9ea562f6512f4196ae32f + Reviewed-on: https://code.wireshark.org/review/5766 + Reviewed-by: Michal Labedzki -commit bea24cf -Author: Gerald Combs -Date: Thu Oct 9 16:41:37 2014 -0700 +commit fddbbdd +Author: Michal Labedzki +Date: Sun Nov 16 13:18:50 2014 +0100 - CMake: Bundle our plugins. + Translates: Update Polish translation - plugins/*/CMakeLists.txt has a lot of repitition. We might want to - create a module or include file to simplify things. + Also fix typo. - Change-Id: Iadd453c286a4127beacd80edf6dc200aa9148852 - Reviewed-on: https://code.wireshark.org/review/4582 - Reviewed-by: Gerald Combs + Change-Id: If494e7ae8e24cf394b4c67208799e6fb358cf8f0 + Reviewed-on: https://code.wireshark.org/review/5767 + Reviewed-by: Michal Labedzki -commit 45e4629 -Author: Guy Harris -Date: Thu Oct 9 16:44:15 2014 -0700 +commit 6919734 +Author: Alexis La Goutte +Date: Sun Dec 14 19:48:43 2014 +0100 - Use an enum for the open-routine return value, as per Evan Huus's suggestion. + HTTP2: Update nghttp2 lib (0.6.7) - Clean up some things we ran across while making those changes. + lot of change but it is majority reindent change (Using clang-format) - Change-Id: Ic0d8943d36e6e120d7af0a6148fad98015d1e83e - Reviewed-on: https://code.wireshark.org/review/4581 - Reviewed-by: Guy Harris + Change-Id: Idcd0fa79ca977e25d69eb80a89d3c61d228885e9 + Reviewed-on: https://code.wireshark.org/review/5764 + Reviewed-by: Alexis La Goutte -commit 112c90a -Author: Pascal Quantin -Date: Wed Oct 8 23:58:18 2014 +0200 +commit 9815dc1 +Author: maisheri +Date: Sun Dec 14 01:44:20 2014 +0530 - Kerberos: fix decryption of DCERPC with Kerberos encryption + Add support for EAPOL-MKA (802.1x-2010) - Bug: 10538 - Change-Id: I4e6feaf218da7f977f6c63d8bc204635f387672c - Reviewed-on: https://code.wireshark.org/review/4566 - Reviewed-by: Pascal Quantin + Use by MACSec + + Change-Id: I27eee40ddc476435aecd57711c1b3597c2049901 + Reviewed-on: https://code.wireshark.org/review/5751 + Reviewed-by: Alexis La Goutte -commit 7690afb +commit 16f38e9 Author: Pascal Quantin -Date: Thu Oct 9 00:09:50 2014 +0200 +Date: Sun Dec 14 17:03:08 2014 +0100 - Kerberos: remove debug logs when loading a keytab + Kerberos: import KRB5_AD_WIN2K_PAC dissection from old non ASN.1 based dissector - Bug: 10543 - Change-Id: I9ea20cd4d046cc072c21fd3f87f6d6be40b08b27 - Reviewed-on: https://code.wireshark.org/review/4567 - Reviewed-by: Michael Mann + Bug: 10539 + Change-Id: I06d1179210bdcc63800ef9580bb274c714a77c6e + Reviewed-on: https://code.wireshark.org/review/5761 + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin -commit 40e6d76 +commit e9f9683 Author: Pascal Quantin -Date: Thu Oct 9 22:14:01 2014 +0200 +Date: Sun Dec 14 18:57:03 2014 +0100 - GTPv2: fix an infinite loop + 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 - Bug: 10548 - Change-Id: I916e15cecf0ec9dc607362b902709567d69243df - Reviewed-on: https://code.wireshark.org/review/4578 + Change-Id: Ib319e2ef8f0e7297cd2e119b6d0d98638e6a3d61 + Reviewed-on: https://code.wireshark.org/review/5763 Reviewed-by: Pascal Quantin - Tested-by: Pascal Quantin -commit e00ac05 -Author: Gerald Combs -Date: Thu Oct 9 11:37:27 2014 -0700 +commit 44e14b7 +Author: Gerald Combs +Date: Sun Dec 14 09:49:02 2014 -0800 - CMake: Build an application bundle (Wireshark.app) on OS X. - - Add an ENABLE_APPLICATION_BUNDLE option which is enabled by default on - OS X and disabled elsewhere. The bundle is currently bare-bones and only - contains the main executables, Info.plist, and application icon. - - Capitalize the main application name when ENABLE_APPLICATION_BUNDLE is - set and on Windows. - - Start updating CPackConfig.txt for OS X packaging. + Qt: Defer startup messages. - To do: + Wait until we've completely started up to show accumulated warnings and + errors. - - Add supporting libraries and frameworks. + Replace three periods with an ellipsis. - - Make the bundle standalone. I.e. call FIXUP_BUNDLE or - replicate the relevant parts of osx-app.sh + Change-Id: Ic3b268836e4e4429786c5eba4862cbc0458a19b5 + Reviewed-on: https://code.wireshark.org/review/5762 + Reviewed-by: Gerald Combs + +commit 85ed008 +Author: Gerald Combs +Date: Sun Dec 14 08:04:53 2014 -0800 + + [Automatic manuf, services and enterprise-numbers update for 2014-12-14] - Change-Id: I4e25abd3b8cbe121ec8615b98706a15c58812cdb - Reviewed-on: https://code.wireshark.org/review/4577 - Petri-Dish: Gerald Combs - Tested-by: Petri Dish Buildbot + Change-Id: Ic1cf4600f35ca5e573c88e758971c578489ab673 + Reviewed-on: https://code.wireshark.org/review/5758 Reviewed-by: Gerald Combs -commit 58cc452 -Author: Michael Mann -Date: Thu Oct 9 09:09:58 2014 -0400 +commit 1725eee +Author: Bill Meier +Date: Sat Dec 13 16:26:07 2014 -0500 - Eliminate proto_tree_add_text from packet-lmp.c + Use ENC_BIG_ENDIAN when fetching FT_U?INT8 fields ... - Also "refactored" a few fields into proto_tree_add_bitmask calls. + Change-Id: Ie8cb993bb9dd3e8dbfa1876a4e731bca10ee0507 + Reviewed-on: https://code.wireshark.org/review/5754 + Reviewed-by: Bill Meier + +commit 5992ef4 +Author: Bill Meier +Date: Sat Dec 13 15:17:21 2014 -0500 + + plugins: replace ENC_NA by ENC_..._ENDIAN when fetching integral types - Change-Id: I3a222b38e1992943d6ee4bd300026bc28c5bbb78 - Reviewed-on: https://code.wireshark.org/review/4575 - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Change-Id: I3958bbd0eadd4472a003ea272e596026ad8731d1 + Reviewed-on: https://code.wireshark.org/review/5753 + Reviewed-by: Bill Meier -commit 608207f -Author: Sean O. Stalley -Date: Thu Oct 9 11:27:17 2014 -0700 +commit 94d7e8d +Author: Bill Meier +Date: Sat Dec 13 14:59:26 2014 -0500 - Add Dissection of MA packets over UDP + Use ENC_LITTLE_ENDIAN when fetching FT_U?INT8 fields ... - Change-Id: Ic6e1cbb623f3e84b73ce7e4608f291baadc77bf6 - Reviewed-on: https://code.wireshark.org/review/4576 - Reviewed-by: Pascal Quantin + (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 -commit 39b2814 -Author: Michael Mann -Date: Wed Oct 8 19:45:41 2014 -0400 +commit ff46ac5 +Author: Bill Meier +Date: Sat Dec 13 12:36:23 2014 -0500 - Eliminate proto_tree_add_text from packet-nbns.c + rfid-pn532.c: Use FT_UINT24 to display complete hex value for three 3-byte fields. - Some other cleanup while in the neighborhood. Not sure the all the proto_tree_add_expert calls are needed after each field (having implicit bounds error thrown should be sufficient), but left them in there. + 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: I3ca75ec9f51ccbed6b6ca792789daa8e7cebf34a - Reviewed-on: https://code.wireshark.org/review/4574 - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + Change-Id: I06ea7b9527ae788be7f19278e8ba4dc2d34b2777 + Reviewed-on: https://code.wireshark.org/review/5747 + Reviewed-by: maisheri + Reviewed-by: Bill Meier -commit 1c51075 -Author: Anish Bhatt -Date: Wed Oct 8 22:21:34 2014 -0700 +commit ae844d9 +Author: Bill Meier +Date: Sat Dec 13 13:51:33 2014 -0500 - [BACnet][trivial] change strings as per Bug 9640 + gsm_sms: Use ENC_BIG_ENDIAN when fetching FT_U?INT8 fields - Change-Id: I542b5a96bcff6c779359b80ddce513524852272c - Reviewed-on: https://code.wireshark.org/review/4572 - Reviewed-by: Anders Broman + Change-Id: If41cf6c10e4af8554cd8f6a69bd8654ad7262c85 + Reviewed-on: https://code.wireshark.org/review/5749 + Reviewed-by: Bill Meier -commit 4edda1b -Author: Stig Bjørlykke -Date: Wed Oct 8 19:32:55 2014 +0200 +commit f412c9a +Author: Bill Meier +Date: Sat Dec 13 12:52:20 2014 -0500 - Lua: Improved TreeItem:add documentation. + Use ENC_BIG_ENDIAN when fetching FT_U?INT8 fields ... - The protofield is optional and can not be replaced with 'nil' - as with the other fields for this function. + (for some dissectors which fetch all other integral fields using + ENC_BIG_ENDIAN). - Change-Id: I2b1dd7f290264394b400cea2110b65b657c71456 - Reviewed-on: https://code.wireshark.org/review/4549 - Reviewed-by: Hadriel Kaplan - Tested-by: Hadriel Kaplan - Reviewed-by: Stig Bjørlykke - Tested-by: Stig Bjørlykke + Change-Id: Ic18e3172aad76af12b12d6732c88497be22aed56 + Reviewed-on: https://code.wireshark.org/review/5748 + Reviewed-by: Bill Meier -commit e7e2f9c -Author: Guy Harris -Date: Wed Oct 8 17:27:08 2014 -0700 +commit 7592d39 +Author: Pascal Quantin +Date: Sat Dec 13 18:15:52 2014 +0100 - Make the OPEN_INFO_ values members of an enum. + GSM SMS: fix 'msg_class' may be used uninitialized in this function warning - Change-Id: I93dbd14f81492764bf5854ee40eebcd1e04f3e01 - Reviewed-on: https://code.wireshark.org/review/4570 - Reviewed-by: Guy Harris + Change-Id: Ie1c53929df2dfec1b4935ca1088f375c666d3b36 + Reviewed-on: https://code.wireshark.org/review/5746 + Reviewed-by: Pascal Quantin -commit 3ee8efd -Author: Gerald Combs -Date: Wed Oct 8 15:43:58 2014 -0700 +commit 21d6ed4 +Author: Martin Kaiser +Date: Sat Dec 13 18:10:58 2014 +0100 - Be less lazy about disabling a Visual C++ warning. + fix compile error - As Graham pointed out, "#pragma warning(disable..." affects the rest - of the file. Add a push+pop so that we only operate on the line in - question. Ideally we'd be able to use "suppress" but an "#endif" - prevents that. + 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 - Change-Id: Ia01d6c245879f1c845dc68c18caea2cbceb273ef - Reviewed-on: https://code.wireshark.org/review/4569 - Reviewed-by: Gerald Combs + 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 + Tested-by: Martin Kaiser -commit d1ec1e8 -Author: Guy Harris -Date: Wed Oct 8 15:48:37 2014 -0700 +commit 758ec16 +Author: Pascal Quantin +Date: Sat Dec 13 17:38:30 2014 +0100 - Use WTAP_ERR_DECOMPRESS for decompression errors. + GSM SMS: fix (U)SIM Data Download Class 2 dissection - Distringuish "the compression data has a problem" from "the capture file - (not compressed, or after decompression) data has a problem", with - WTAP_ERR_DECOMPRESS used for the former (whether it's the gzipping - decoded by our gunzip code or the Sniffer compression) and - WTAP_ERR_BAD_FILE used for the latter. - - Change-Id: I8e6bff7edb480deba00c52a9e5afff607492e085 - Reviewed-on: https://code.wireshark.org/review/4568 - Reviewed-by: Guy Harris + Change-Id: Id4ea574e34c0bd35bc757fdc68d0e6b72129ef04 + Reviewed-on: https://code.wireshark.org/review/5744 + Reviewed-by: Pascal Quantin -commit 0066776 -Author: Tomasz Moń -Date: Wed Oct 8 19:45:11 2014 +0200 +commit 80d44af +Author: Pascal Quantin +Date: Sat Dec 13 17:27:28 2014 +0100 - Fix --extcap-dlts call in extcap_example.py. + dissector_try_uint(_new) and dissector_try_string now return the number of bytes consumed - There is regular expression that extracts only the number from - --extcap-interface argument and only that number (as string) is being - passed to extcap_dlts(). - - Change-Id: I5159f9405a766c1edff792213b2aef72b9a29ba4 - Reviewed-on: https://code.wireshark.org/review/4550 + Change-Id: I528ad736caee1f29e2f0abfc0afcca6587d74eca + Reviewed-on: https://code.wireshark.org/review/5743 Reviewed-by: Pascal Quantin -commit c83169f -Author: Guy Harris -Date: Wed Oct 8 14:12:54 2014 -0700 +commit cc12c72 +Author: Pascal Quantin +Date: Fri Dec 12 23:37:05 2014 +0100 - Only set err_info on an error, and use g_strdup_printf(). - - If the goal is to look like a libwiretap routine, we only need to set - *err_info on an error, and we should set it to a g_mallocated string (or - NULL). + Riemann: add support for TCP transport - Handle WTAP_ERR_UNSUPPORTED while we're at it - we never return it, but - we never return WTAP_ERR_UNSUPPORTED_ENCAP, either, but we handle it. - - Change-Id: I9d93c43278d22f0fa77ec1cf7f29b476c8dd0dd0 - Reviewed-on: https://code.wireshark.org/review/4565 - Reviewed-by: Guy Harris + Bug: 10770 + Change-Id: I101d0152f41c0ab3d7f0fa0ccab6dec3b9e68f0d + Reviewed-on: https://code.wireshark.org/review/5741 + Reviewed-by: Evan Huus + Petri-Dish: Evan Huus + Tested-by: Petri Dish Buildbot + Reviewed-by: Alexis La Goutte -commit dbf8024 -Author: Guy Harris -Date: Wed Oct 8 14:04:45 2014 -0700 +commit 5d6eb80 +Author: Martin Mathieson +Date: Fri Dec 12 16:53:05 2014 +0000 - No need to set *err_info if there's no error. + Use g_direct_ functions for hash tables where possible - Change-Id: I98ae9ec50e079d48b6247bb208528b7c5ad16027 - Reviewed-on: https://code.wireshark.org/review/4564 - Reviewed-by: Guy Harris + Change-Id: Ie364cbdcf500d7a04e64d7adcdd03bd1926dda86 + Reviewed-on: https://code.wireshark.org/review/5736 + Reviewed-by: Evan Huus -commit a307ed6 -Author: Guy Harris -Date: Wed Oct 8 13:54:13 2014 -0700 +commit b0cdee6 +Author: Alexis La Goutte +Date: Wed Dec 10 16:26:42 2014 +0100 - Robopatch and remove #MISSING comments. + DNS: Remove whitespace on DNS Col info before type name - Change-Id: I611882a8b268046665488381be64aca89cdf3194 - Reviewed-on: https://code.wireshark.org/review/4563 - Reviewed-by: Guy Harris + Change-Id: I33a9a54a318a1a3ea106f4531db4e79a6b6d42ac + Reviewed-on: https://code.wireshark.org/review/5716 + Reviewed-by: Evan Huus -commit 21e844b -Author: Guy Harris -Date: Wed Oct 8 13:50:17 2014 -0700 +commit 33c26a0 +Author: Pascal Quantin +Date: Fri Dec 12 22:20:35 2014 +0100 - Use WTAP_ERR_BAD_FILE for malformed compressed data in DOS Sniffer files. - - Get rid of WTAP_ERR_UNC_TRUNCATED and WTAP_ERR_UNC_BAD_OFFSET, and lump - them under WTAP_ERR_BAD_FILE, with an error string; they're just another - form of "this file isn't a valid file of the type in question". + doc: remove some references to the now defunct python support - Change-Id: I0e9ac7c2ee66c8d789234a301c1dc2173aef1312 - Reviewed-on: https://code.wireshark.org/review/4562 - Reviewed-by: Guy Harris + Change-Id: Ibba3168516ef28ad050f5f70045acf3935f2b233 + Reviewed-on: https://code.wireshark.org/review/5738 + Reviewed-by: Pascal Quantin -commit c303a2e +commit 56697c2 Author: Gerald Combs -Date: Wed Oct 8 13:44:46 2014 -0700 +Date: Fri Dec 12 12:35:31 2014 -0800 - Make sure we don't dereference a null pointer. + Qt: Add name resolution menu items. - Change-Id: I033c60cdc5b78f4db31903277c659661e0dc5123 - Reviewed-on: https://code.wireshark.org/review/4561 + 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 -commit ea5587a -Author: Guy Harris -Date: Wed Oct 8 13:24:57 2014 -0700 +commit 2898f13 +Author: Bill Meier +Date: Thu Dec 11 15:21:28 2014 -0500 - Fix a comment. + cip: Access FT_UINT16 hf_cip_sc_create_instance with proper encoding-arg. - Change-Id: I0ebaa1b99bc9c7e51be10f3f8825280782f26190 - Reviewed-on: https://code.wireshark.org/review/4560 - Reviewed-by: Guy Harris + Specifically: Use ENC_LITTLE_ENDIAN (not ENC_NA) to match all + other integral fetches in the cip dissector. + + Change-Id: I5d330084168493f53135dbb97674a2dba9ed7477 + Reviewed-on: https://code.wireshark.org/review/5732 + Reviewed-by: Bill Meier + Reviewed-by: Michael Mann -commit 23286b7 -Author: Stig Bjørlykke -Date: Wed Oct 8 21:50:15 2014 +0200 +commit 64cb510 +Author: Bill Meier +Date: Thu Dec 11 18:37:07 2014 -0500 - ANSI 683: Removed unused assignments. + Change ENC_NA to ENC_BIG_ENDIAN for all fetches of integral type fields. - Change-Id: I952ce5329f69fa947e39b020a70a06f2bbf8a014 - Reviewed-on: https://code.wireshark.org/review/4558 - Reviewed-by: Alexis La Goutte + Change-Id: Ia4f5735c61eedcbe8354eabd5da05d02e167f25e + Reviewed-on: https://code.wireshark.org/review/5734 + Reviewed-by: Bill Meier -commit 97e462d -Author: Guy Harris -Date: Wed Oct 8 13:09:46 2014 -0700 +commit 29c1b58 +Author: Bill Meier +Date: Thu Dec 11 14:21:09 2014 -0500 - "long" does not necessary mean "64-bit". Use G_GINT64_MODIFIER. + rsvp: Convert encoding-arg ENC_NA to ENC_BIG_ENDIAN for all integer fields - Change-Id: I2521bf368ea30ac691af50c760a63b81efedeeae - Reviewed-on: https://code.wireshark.org/review/4559 - Reviewed-by: Guy Harris + Change-Id: Ib0f863f08a3ef420832cc05e988b5bc64ff0b121 + Reviewed-on: https://code.wireshark.org/review/5731 + Reviewed-by: Bill Meier -commit c55d697 -Author: Gerald Combs -Date: Tue Oct 7 10:11:45 2014 -0700 +commit 76c5568 +Author: Pascal Quantin +Date: Fri Dec 12 16:26:53 2014 +0100 - Try to speed up ping-dependent capture tests. + Riemann: fix compilation - Ping four times a second for ~60 seconds. Save the subprocess PID so that - we can kill it when we're done with each test instead of waiting for it - to finish. - - Change-Id: I64f889c700e8a6fa1bc1c3916ef045341ef59cc6 - Reviewed-on: https://code.wireshark.org/review/4557 - Reviewed-by: Gerald Combs + Change-Id: I0cf069860715fd6781a613478c29a7e7ed224733 + Reviewed-on: https://code.wireshark.org/review/5735 + Reviewed-by: Pascal Quantin -commit 70ba2f8 -Author: Guy Harris -Date: Wed Oct 8 11:44:03 2014 -0700 +commit 8e96830 +Author: Pascal Quantin +Date: Fri Dec 12 15:19:58 2014 +0100 - Set err_info to null for errors that don't have an informaton string. + LPP: avoid doing an out of bound access in case the PER decoding gives an invalid value - Change-Id: Ibbcf3496ebfb20c53b953db84b2ddb69083dcb86 - Reviewed-on: https://code.wireshark.org/review/4556 - Reviewed-by: Guy Harris + Bug: 10773 + Change-Id: I4fcde84d7be1e42729b6ec0763064e9885951468 + Reviewed-on: https://code.wireshark.org/review/5729 + Reviewed-by: Pascal Quantin -commit 5c0a3be -Author: Tomasz Moń -Date: Wed Oct 8 19:35:25 2014 +0200 +commit a2a6e31 +Author: Pascal Quantin +Date: Fri Dec 12 10:14:26 2014 +0100 - Remove redundant and erroneous debug log message. + Riemann: fix "Decode as" feature - Change-Id: I91d6131b3b4b7ef670f0d188ebd6da3947c49bdc - Reviewed-on: https://code.wireshark.org/review/4548 - Reviewed-by: Michael Mann + 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 + Reviewed-by: Pascal Quantin -commit fb6e043 +commit bd4d291 Author: Alexis La Goutte -Date: Wed Oct 8 19:57:49 2014 +0200 +Date: Wed Nov 26 16:59:22 2014 +0100 - DCERPC (DRSUAPI) Fix typo found on idl file + Qt: Move Follow TCP, UDP, SSL to a Follow folder (like when right click) - Change-Id: I79ad05122ae48de671c9c919bab6b3e8d94a50de - Reviewed-on: https://code.wireshark.org/review/4554 - Reviewed-by: Alexis La Goutte + Change-Id: I24213aa4f9f134a05b1344e160e5688ce9c495cf + Reviewed-on: https://code.wireshark.org/review/5508 + Reviewed-by: Gerald Combs -commit 7207d2f -Author: Johan Wahl -Date: Wed Oct 8 10:55:57 2014 +0200 +commit 1ce64e7 +Author: Gerald Combs +Date: Wed Dec 10 16:50:56 2014 -0800 - SIP Enhance dissecion of PATH + CMake: Make it easier to generate the release notes & NEWS. - Change-Id: I0508a886fb664f36b51464a9dfd6936092e197f8 - Reviewed-on: https://code.wireshark.org/review/4543 - Reviewed-by: Anders Broman + 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. + + 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 + Reviewed-by: Gerald Combs -commit 57a7aca -Author: Anish Bhatt -Date: Tue Oct 7 21:18:18 2014 -0700 +commit 425bc30 +Author: Bill Meier +Date: Thu Dec 11 14:01:10 2014 -0500 - elmi: Fix bug in message type coding + eth,mp2t: Rename ei[] filter names duplicating hf[] filter names. - Bug: 10531 - Change-Id: Ide6237afb71c79243347dedd1c744b3e97ff612e - Reviewed-on: https://code.wireshark.org/review/4542 - Reviewed-by: Evan Huus + Change-Id: I1a9e8344866ce5a5bbd48b07c49baa398ce161f7 + Reviewed-on: https://code.wireshark.org/review/5724 + Reviewed-by: Bill Meier -commit 439c0b8 -Author: Anish Bhatt -Date: Wed Oct 8 03:42:55 2014 -0700 +commit 8f56378 +Author: Bill Meier +Date: Thu Dec 11 13:50:17 2014 -0500 - [tools] Add missing GPL license to generate-bacnet-vendors.py + rsvp: Fix dup display-filter name possibly leading to crash if used. - Change-Id: I15336a5f759fea6b1fb4f6c5a05807d797a7f5aa - Reviewed-on: https://code.wireshark.org/review/4544 - Reviewed-by: Alexis La Goutte + Change-Id: I8b903fb1137800a84473a82cff9c45f965cb869f + Reviewed-on: https://code.wireshark.org/review/5723 + Reviewed-by: Bill Meier -commit 6c41f50 -Author: Evan Huus -Date: Tue Oct 7 17:43:18 2014 -0400 +commit 0ef1aef +Author: Yann Lejeune +Date: Wed Dec 10 23:15:07 2014 +0100 - Qt capture interfaces dialogue string tweaks + BGP: add support of RFC6368 - Internal BGP as the Provider/Customer Edge + Protocol for BGP/MPLS IP Virtual Private Networks (VPNs). - To clarify that capturing always uses a file, the checkbox only controls whether - that file is temporary or persisted. + Bug: 10762 + Change-Id: Ifbe2af639ee5a2d96ec3546708060cadcc349df2 + Reviewed-on: https://code.wireshark.org/review/5664 + Reviewed-by: Alexis La Goutte + +commit 9036f09 +Author: Yann Lejeune +Date: Wed Dec 10 22:36:36 2014 +0100 + + BGP: extract the bgp path attribute dissection to a dedicated function. - Change-Id: I939e1fdf488f53245166612193c60a366f63a18b - Reviewed-on: https://code.wireshark.org/review/4537 + Change-Id: I228f1402007d8570bfdeb0105ce5e89c48357481 + Reviewed-on: https://code.wireshark.org/review/5721 Reviewed-by: Alexis La Goutte -commit ceda0f9 +commit 7d905be Author: Alexis La Goutte -Date: Sun Oct 5 19:34:46 2014 +0200 +Date: Thu Dec 11 11:36:34 2014 +0100 - Remove #pragma warning (MSVC) for PIDL generate dissector + GSM BSSMAP LE: fix indent (use tabs) - Change-Id: I1e4c7944a2cd877f5c707703dcff44fe9f955a2c - Reviewed-on: https://code.wireshark.org/review/4479 - Reviewed-by: Alexis La Goutte + Change-Id: Ic05a52d095fd581150fc69ca8d2a0e05eaddf81a + Reviewed-on: https://code.wireshark.org/review/5722 + Reviewed-by: Anders Broman -commit e881036 -Author: Tomasz Moń -Date: Tue Oct 7 23:14:21 2014 +0200 +commit 772fbfb +Author: Alexis La Goutte +Date: Thu Dec 11 11:32:48 2014 +0100 - Fix extcap boolean flag handling. + GSM a BSSMAP : fix warning: no previous prototype for 'dissect_bssmap' [-Wmissing-prototypes] - Change-Id: I4c6b32805d4138ef0912fbf1b129a5e97776ab9c - Reviewed-on: https://code.wireshark.org/review/4535 - Reviewed-by: Roland Knall - Reviewed-by: Pascal Quantin + Change-Id: Ibc03864498cb88e93cb3f774d1f4987aa10dd32e + Reviewed-on: https://code.wireshark.org/review/5720 + Reviewed-by: Anders Broman -commit 41b8c6b +commit 230ce30 Author: Alexis La Goutte -Date: Tue Oct 7 08:40:19 2014 +0200 +Date: Thu Dec 11 11:32:25 2014 +0100 - DCERPC DFS: Remove from Dirty PIDL list + GSM bssmap le: fix warning: no previous prototype for 'dissect_bssmap_le' [-Wmissing-prototypes] - Change-Id: I87bd196d1c4ba14d9af6d174754b37d2b4d772c8 - Reviewed-on: https://code.wireshark.org/review/4527 - Petri-Dish: Anders Broman - Tested-by: Petri Dish Buildbot + Change-Id: Ifa8c7a15dfb37cf1dbd2f539dd0bbc87e6da1aea + Reviewed-on: https://code.wireshark.org/review/5719 Reviewed-by: Anders Broman -commit f31836d -Author: Anish Bhatt -Date: Tue Oct 7 00:53:18 2014 -0700 +commit def4313 +Author: Alexis La Goutte +Date: Thu Dec 11 11:27:39 2014 +0100 - [bacnet] update vendors list, fix whitespace issues, all generated via script + 6lowpan : fix warning: no previous prototype for 'lowpan_context_free' [-Wmissing-prototypes] - Change-Id: Ieb4b169dfcf5e89b7b2a2cb90b6572a3d973d744 - Reviewed-on: https://code.wireshark.org/review/4519 - Reviewed-by: Michael Mann + Change-Id: I3fa66aa0713a0455639b04ecf129f48baa8c096f + Reviewed-on: https://code.wireshark.org/review/5718 + Reviewed-by: Anders Broman -commit 65321df -Author: Lorand Jakab -Date: Mon Sep 22 11:10:45 2014 -0700 +commit b7f8cd8 +Author: Martin Kaiser +Date: Sun Dec 7 19:47:54 2014 +0100 - Add support for LISP over TCP control messages + skip the extra field in the gzip header + it consists of two bytes xsize + xsize bytes of data - draft-kouvelas-lisp-rloc-membership-00 specifies 9 new LISP control - message types using TCP transport instead of UDP (which is used by all - existing messages). These new messages are related to each other and - are used to exchange RLOC membership information between a tunnel router - and a map server. + use an unsigned type for xsize - Bug: 10494 - Change-Id: I129f0d6344693092bd5d0efb06b025e89fd26bf2 - Signed-off-by: Lorand Jakab - Reviewed-on: https://code.wireshark.org/review/4253 - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann + fail gracefully if the field is present but truncated + + tvb_length_remaining > tvb_captured_length_remaining + + Change-Id: I7f5138743c2d88abdd4f5f18d3c0292612ddb559 + Reviewed-on: https://code.wireshark.org/review/5654 + Reviewed-by: Anders Broman + +commit 5570f8e +Author: AndersBroman +Date: Thu Dec 11 10:30:08 2014 +0100 + + [SIP] Try to fix another corner case of reassembly. + + Change-Id: I38a80ebcadf0ef6d7fada692753188f2a6c3515b + Reviewed-on: https://code.wireshark.org/review/5717 + Reviewed-by: Anders Broman -commit d3e3cb2 +commit 339df3d Author: Guy Harris -Date: Tue Oct 7 16:22:53 2014 -0700 +Date: Wed Dec 10 20:15:36 2014 -0800 - Provide an error message for WTAP_ERR_CANT_WRITE. + Add a heur_dissector_table_foreach() function. - Change-Id: Iffc762ba60ac523148310ea2a432d4953bc64a94 - Reviewed-on: https://code.wireshark.org/review/4541 + This is, for heuristic dissector tables, the equivalent of + dissector_table_foreach() for keyed dissector tables. + + Change-Id: I4b2f870e1c1179fda1adddd93930b83aaaaf8763 + Reviewed-on: https://code.wireshark.org/review/5715 Reviewed-by: Guy Harris -commit a566f61 +commit 151164d Author: Guy Harris -Date: Tue Oct 7 16:18:47 2014 -0700 +Date: Wed Dec 10 19:04:50 2014 -0800 - No need for WTAP_ERR_CANT_READ. + Give dissector_all_heur_tables_foreach_table() a sort function. - Unlike the standard I/O routines, the code we introduced that supports - fast random seeking on gzipped files will always supply some specific - error code for read errors, so we don't need WTAP_ERR_CANT_READ. + This makes it a bit more like dissector_all_tables_foreach_table. - Add WTAP_ERR_CANT_WRITE for writing, as we're still using the standard - I/O routines for that. Set errno to WTAP_ERR_CANT_WRITE before calling - fwrite() in wtap_dump_file_write(), so that it's used if fwrite() fails - without setting errno. + Improve comments and clean up whitespace while we're at it. - Change-Id: I6bf066a6838284a532737aa65fd0c9bb3639ad63 - Reviewed-on: https://code.wireshark.org/review/4540 + Change-Id: I5147427f864add285e3bb6cb35ad9fa83bea516c + Reviewed-on: https://code.wireshark.org/review/5714 Reviewed-by: Guy Harris -commit 5e0e4fa +commit 9855bef Author: Guy Harris -Date: Tue Oct 7 15:48:29 2014 -0700 +Date: Wed Dec 10 17:50:34 2014 -0800 - Replace another file_read() call with wtap_read_bytes(). + Make the type of the second argument to a DATFunc_heur_table explicit. + + It's always pased a heur_dissector_list_t *, so give it that type, + rather than having it be a generic pointer. - Change-Id: I7b5e82c3a2fc4b4c16bf466508546558c584c150 - Reviewed-on: https://code.wireshark.org/review/4539 + Change-Id: Ia6a045bb1b96c2f6ef3e23f27928e0b52f7cfb9f + Reviewed-on: https://code.wireshark.org/review/5713 Reviewed-by: Guy Harris -commit d6f217f +commit 144855c Author: Guy Harris -Date: Tue Oct 7 15:07:25 2014 -0700 +Date: Wed Dec 10 16:21:41 2014 -0800 - Close some memory leaks for bad K12 RF5 files. + Fix a comment. - Change-Id: Ic4272a5637463fdb4d23f80d81341a0e6ea33de3 - Reviewed-on: https://code.wireshark.org/review/4538 + Change-Id: I46885d028fe9ff5254baefc15283626b9bdb6bce + Reviewed-on: https://code.wireshark.org/review/5711 Reviewed-by: Guy Harris -commit 515f09f -Author: Anish Bhatt -Date: Tue Oct 7 00:55:33 2014 -0700 +commit 2f8030f +Author: Pascal Quantin +Date: Wed Dec 10 19:57:56 2014 +0100 - [tools] add script to automatically generate bacnet vendors - - Requires beautifulsoup4 for parsing, translitcodec for converting accents/diaeresis etc to regular text + LCSAP: fix dissection of negative longitude and latitude - Change-Id: I4d400f15916ee3ab07fa14b09fca12beac2010f3 - Reviewed-on: https://code.wireshark.org/review/4518 - Reviewed-by: Evan Huus + Bug: 10767 + Change-Id: I4ab0ffd3bd22f1884895f3118673b433d980de2f + Reviewed-on: https://code.wireshark.org/review/5704 + Reviewed-by: Pascal Quantin + Petri-Dish: Pascal Quantin + Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman -commit cf4fc57 -Author: Evan Huus -Date: Tue Oct 7 17:24:17 2014 -0400 - - ANSI683: Fix mobile country code base - - Fixes error: - Field 'Mobile country code (MCC_T)' (ansi_683.mcc_t) is an integral value - (FT_UINT16) but is being displayed as BASE_NONE - - Change-Id: I2d87075b0c982bcaf0e855653d49eb891e83b70d - Reviewed-on: https://code.wireshark.org/review/4536 - Reviewed-by: Evan Huus - -commit 43dffab +commit 088e5fe Author: Alexis La Goutte -Date: Tue Oct 7 08:40:03 2014 +0200 +Date: Wed Dec 10 20:33:38 2014 +0100 - GSM (bssmap): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang + GPRSCDR: Remove from Dirty ASN1 list - Change-Id: I9fadd0edc26e5525cfdd15fc62062f19fef16d10 - Reviewed-on: https://code.wireshark.org/review/4526 + Change-Id: I0d19836aa63ac77a1b19aec0ae66921bf4770005 + Reviewed-on: https://code.wireshark.org/review/5707 Reviewed-by: Anders Broman -commit a9e6c2c -Author: Michael Mann -Date: Tue Oct 7 07:51:52 2014 -0400 - - Overhaul the filterability of packet-ansi_683.c - - It's (ab)use of proto_tree_add_text was "hidden" behind a single FT_NONE hf item, that effectively had the same behavior of proto_tree_add_text, but wouldn't show up in checkAPIs.pl. Replaced the (over 200+) proto_tree_add_none_format calls with proto_tree_add_text and then ran convert_proto_tree_add_text.pl on the dissector. That started the cleanup, and I did more while in the neighborhood. - - Change-Id: I89e09cf23e8998bcc9197f9a4043e1fc2850fc8c - Reviewed-on: https://code.wireshark.org/review/4521 - Petri-Dish: Michael Mann - Tested-by: Petri Dish Buildbot - Reviewed-by: Michael Mann - -commit 1280015 -Author: Anish Bhatt -Date: Mon Oct 6 22:34:02 2014 -0700 - - [iSCSI] Fix incorrect heuristic. - - The only valid check for Expected Data Transfer Length is : - R and W MUST NOT both be 0 when the Expected Data Transfer Length and/or - Bidirectional Read Expected Data Transfer Length are not 0 - - Bug #10469 - Change-Id: I5503a5ad524c4e237b143696fc8eda895bcb9172 - Reviewed-on: https://code.wireshark.org/review/4514 - Reviewed-by: Michael Mann - -commit 6831652 -Author: Stig Bjørlykke -Date: Tue Oct 7 18:18:32 2014 +0200 - - asn2wrs: Added support for #.SYNTAX_NEW - - This allows syntaxes to be registered as "new" dissectors. - - Change-Id: Ibb76688d9d3cbf47222610956aa627fa374bcbce - Reviewed-on: https://code.wireshark.org/review/4524 - Reviewed-by: Stig Bjørlykke - Tested-by: Stig Bjørlykke - -commit d89cc1c -Author: Stig Bjørlykke -Date: Mon Oct 6 15:17:46 2014 +0200 +commit 0980dd5 +Author: Alexis La Goutte +Date: Wed Dec 10 20:23:07 2014 +0100 - ASN1: Added support for using #.REGISTER_NEW - - This will register BER PDU-dissectors as "new". - Return number of bytes dissected from dissector_try_* functions. - Return number of bytes dissected in DissectorTable:try() + GPRSCDR: fix warning: 'dissect_gprscdr_MBMSInformation' defined but not use - This will make it possible to get dissected length when using - dissector_try_*() and dissected ASN.1 length in Lua when using - DissectorTable:try() (as we already have for Dissector:call). - - Change-Id: Iee17a68dc214fa0fb50b25fc927026ad7c1cbce4 - Reviewed-on: https://code.wireshark.org/review/4531 - Reviewed-by: Stig Bjørlykke - Tested-by: Stig Bjørlykke + Change-Id: I4bdbaeb3c1e3327af6f5e3de22ebcd4472b9f3e7 + Reviewed-on: https://code.wireshark.org/review/5706 + Reviewed-by: Anders Broman -commit 47a1735 -Author: Michał Orynicz -Date: Thu Oct 2 10:37:53 2014 +0200 +commit dc289d7 +Author: Gerald Combs +Date: Wed Dec 10 11:55:04 2014 -0800 - Add proper decoding for type field in OBEX headers + Update the release notes. - Change type field type from byte sequence to string. + Add a note about HiDPI / retina. Remove the Kerberos known problem. - Change-Id: I3e2ac6fbb5ce7187ba1183d63236e9a2bcd824ee - Reviewed-on: https://code.wireshark.org/review/4417 - Petri-Dish: Michal Labedzki - Tested-by: Michal Labedzki - Reviewed-by: Michal Labedzki - Reviewed-by: Pascal Quantin + Change-Id: I452bc5ed9db51f7bf32b25eab39371fafd3102aa + Reviewed-on: https://code.wireshark.org/review/5708 + Reviewed-by: Gerald Combs -commit 71550ba -Author: Guy Harris -Date: Tue Oct 7 12:49:14 2014 -0700 +commit 3f08a85 +Author: Gerald Combs +Date: Wed Dec 10 11:15:16 2014 -0800 - Make the code a bit more like the pre-new-APIs code. + 1.99.1 → 1.99.2. - Change-Id: I40282d8825936d24480c9b77e2e7d9374b1de6b5 - Reviewed-on: https://code.wireshark.org/review/4534 - Reviewed-by: Guy Harris + Change-Id: Ie2e9e81ce1b1d876ae550fc0c17c4367aaa35d98 + Reviewed-on: https://code.wireshark.org/review/5705 + Reviewed-by: Gerald Combs diff --git a/NEWS b/NEWS index 0ed55e35b9..980d6a9b50 100644 --- a/NEWS +++ b/NEWS @@ -14,6 +14,20 @@ What's New New and Updated Features + The following features are new (or have been significantly updated) + since version 1.99.1: + * Qt port: + + The welcome screen layout has been updated. + + The Preferences dialog no longer crashes on Windows. + + The packet list header menu has been added. + + Statistics tree plugins are now supported. + + The window icon is now displayed properly in the Windows + taskbar. + + A packet list an byte view selection bug has been fixed + ([1]Bug 10896) + + The RTP Streams dialog has been added. + + The Protocol Hierarchy Statistics dialog has been added. + The following features are new (or have been significantly updated) since version 1.99.0: * Qt port: @@ -35,6 +49,11 @@ What's New distribution, number of resource record per response section, and stats data (min, max, avg) for values such as query name length or DNS payload. + * HPFEEDS stats: + A new stats tree has been added to the statistics + menu. Now it is possible to collect stats per channel (messages + count and payload size), and opcode distribution. + * HTTP2 stats: + A new stats tree has been added to the statistics + menu. Now it is possible to collect stats (type distribution). The following features are new (or have been significantly updated) since version 1.12.0: @@ -67,7 +86,7 @@ What's New 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, HiQnet, IPMI Trace, iSER, KNXnetIP, MACsec Key + (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 @@ -84,8 +103,9 @@ What's New Major API Changes The libwireshark API has undergone some major changes: - * Many of the ep_ and se_ memory allocation routines and methods that - invoked them implicitly have been removed. + * The emem framework (including all ep_ and se_ memory allocation + routines) has been completely removed in favour of wmem which is + now fully mature. * The (long-since-broken) Python bindings support has been removed. If you want to write dissectors in something other than C, use Lua. __________________________________________________________________ @@ -93,14 +113,14 @@ What's New Getting Wireshark Wireshark source code and installation packages are available from - [1]https://www.wireshark.org/download.html. + [2]https://www.wireshark.org/download.html. Vendor-supplied Packages Most Linux and Unix vendors supply their own Wireshark packages. You can usually install or upgrade Wireshark using the package management system specific to that platform. A list of third-party packages can be - found on the [2]download page on the Wireshark web site. + found on the [3]download page on the Wireshark web site. __________________________________________________________________ File Locations @@ -113,69 +133,70 @@ File Locations Known Problems - Dumpcap might not quit if Wireshark or TShark crashes. ([3]Bug 1419) + Dumpcap might not quit if Wireshark or TShark crashes. ([4]Bug 1419) - The BER dissector might infinitely loop. ([4]Bug 1516) + The BER dissector might infinitely loop. ([5]Bug 1516) - Capture filters aren't applied when capturing from named pipes. ([5]Bug + Capture filters aren't applied when capturing from named pipes. ([6]Bug 1814) Filtering tshark captures with read filters (-R) no longer works. - ([6]Bug 2234) + ([7]Bug 2234) - Resolving ([7]Bug 9044) reopens ([8]Bug 3528) so that Wireshark no + Resolving ([8]Bug 9044) reopens ([9]Bug 3528) so that Wireshark no longer automatically decodes gzip data when following a TCP stream. - Application crash when changing real-time option. ([9]Bug 4035) + Application crash when changing real-time option. ([10]Bug 4035) - Hex pane display issue after startup. ([10]Bug 4056) + Hex pane display issue after startup. ([11]Bug 4056) - Packet list rows are oversized. ([11]Bug 4357) + Packet list rows are oversized. ([12]Bug 4357) Wireshark and TShark will display incorrect delta times in some cases. - ([12]Bug 4985) + ([13]Bug 4985) The 64-bit version of Wireshark will leak memory on Windows when the - display depth is set to 16 bits ([13]Bug 9914) + display depth is set to 16 bits ([14]Bug 9914) - Wireshark should let you work with multiple capture files. ([14]Bug + Wireshark should let you work with multiple capture files. ([15]Bug 10488) __________________________________________________________________ Getting Help - Community support is available on [15]Wireshark's Q&A site and on the + Community support is available on [16]Wireshark's Q&A site and on the wireshark-users mailing list. Subscription information and archives for - all of Wireshark's mailing lists can be found on [16]the web site. + all of Wireshark's mailing lists can be found on [17]the web site. Official Wireshark training and certification are available from - [17]Wireshark University. + [18]Wireshark University. __________________________________________________________________ Frequently Asked Questions - A complete FAQ is available on the [18]Wireshark web site. + A complete FAQ is available on the [19]Wireshark web site. __________________________________________________________________ - Last updated 2015-01-20 20:55:56 UTC + Last updated 2015-02-04 18:54:49 UTC References - 1. https://www.wireshark.org/download.html - 2. https://www.wireshark.org/download.html#thirdparty - 3. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1419 - 4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1516 - 5. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1814 - 6. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2234 - 7. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9044 - 8. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528 - 9. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4035 - 10. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4056 - 11. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4357 - 12. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4985 - 13. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9914 - 14. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10488 - 15. http://ask.wireshark.org/ - 16. https://www.wireshark.org/lists/ - 17. http://www.wiresharktraining.com/ - 18. https://www.wireshark.org/faq.html + 1. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10896 + 2. https://www.wireshark.org/download.html + 3. https://www.wireshark.org/download.html#thirdparty + 4. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1419 + 5. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1516 + 6. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1814 + 7. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2234 + 8. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9044 + 9. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528 + 10. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4035 + 11. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4056 + 12. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4357 + 13. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4985 + 14. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9914 + 15. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10488 + 16. http://ask.wireshark.org/ + 17. https://www.wireshark.org/lists/ + 18. http://www.wiresharktraining.com/ + 19. https://www.wireshark.org/faq.html diff --git a/make-version.pl b/make-version.pl index 5242282ad3..c5295ea809 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 = "";