commit 9076bf3 Author: Alexis La Goutte Date: Wed Mar 4 08:54:23 2015 +0100 Qt: Display only filename on status bar and display full path and size on tooltip Ping-Bug: 10949 Change-Id: Ic735afdb7994a4c10b527217327831138362ffc9 Reviewed-on: https://code.wireshark.org/review/7538 Reviewed-by: Gerald Combs commit cdab442 Author: Alexis La Goutte Date: Thu Mar 5 17:44:33 2015 +0100 Fix makedist (Add new packet-bgp.h) Change-Id: I0dbe43d5faa241fed5eaa6459e384761c11851a8 Reviewed-on: https://code.wireshark.org/review/7546 Reviewed-by: Alexis La Goutte commit f2b35a1 Author: Gerald Combs Date: Mon Feb 23 17:56:14 2015 -0800 Qt: Add extra related packet indicator types. Add the ability to set frame number types: none, request, or response. Use the types to draw different related packet indicators in the packet list. Track the conversation in PacketListRecord. Use it to draw dashed lines for unrelated frames. Set frame number types for DNS and ICMP. Instead of drawing a transparent QImage, alpha blend our foreground color and draw directly in our painter. Blend more toward the foreground color. Add FRAMENUM_TYPE to checkAPIs. Change-Id: I2495945bb436413e05d6ec697184a0b4fd5ad214 Reviewed-on: https://code.wireshark.org/review/7436 Reviewed-by: Gerald Combs commit a065fef Author: Dario Lombardo Date: Wed Mar 4 12:45:30 2015 +0100 icmp: more precise decoding for destination unreachable. Change-Id: Ie3b5ea8d6965dd39d8d7ad7c14026896fc4f973c Reviewed-on: https://code.wireshark.org/review/7518 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit ec4e7e0 Author: Alexis La Goutte Date: Thu Feb 26 10:46:53 2015 +0100 ICMP: Add ICMP Original Datagram Length generated field Change-Id: Ib268512b56e90f09aad42a7b7a42573a119d5b6f Ping-Bug: 10991 Reviewed-on: https://code.wireshark.org/review/7406 Reviewed-by: Alexis La Goutte commit c4cab87 Author: Anish Bhatt Date: Tue Feb 24 01:52:38 2015 -0800 [ICMP] icmp_original_dgram_length is being used incorrectly icmp_original_dgram_length is of no use, we need to always account for icmp_original_dgram_length + ip header, where icmp_original_dgram_length is available Bug: 10991 Change-Id: Ibd0ce538eaf1a7851e4f3e928bad29310ebbcc81 Reviewed-on: https://code.wireshark.org/review/7345 Reviewed-by: Michael Mann Reviewed-by: Alexis La Goutte commit b679295 Author: Anish Bhatt Date: Tue Feb 24 00:55:33 2015 -0800 [ICMP] Don't use icmp_original_dgram_length for redirect packet icmp_original_dgram_length was being incorrectly used to clamp tvb size for ICMP redirect packet. This is a bogus value, use ip header len + 64 bits instead Bug: 10992 Change-Id: Iebd70d72df34185446a239280bb19c0268977490 Reviewed-on: https://code.wireshark.org/review/7340 Reviewed-by: Alexis La Goutte commit 23c6a0f Author: Ebben Aries Date: Wed Mar 4 19:13:43 2015 -0800 [bmp] Support for decoding of BGP Peer Distinguisher re-utilize decode_bgp_rd() logic from packet-bgp Change-Id: I588a58e0b2f7da5d3c9b86b28abb9c5b29e0dc8f Reviewed-on: https://code.wireshark.org/review/7537 Reviewed-by: Alexis La Goutte commit 3948d82 Author: Alexis La Goutte Date: Tue Mar 3 11:20:56 2015 +0100 TX: Update translations (Manual sync 2015-03-05) Change-Id: I7469fbfa799dae5857c6f0df710438f28d77f43a Reviewed-on: https://code.wireshark.org/review/7505 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Uli Heilmeier Reviewed-by: Alexis La Goutte commit fe578d6 Author: Alexis La Goutte Date: Sun Feb 22 20:13:00 2015 +0100 Readme.qt: Add information about Transifex ! Change-Id: I22780721dcc32caee0eae782142e7dad31e0ed07 Reviewed-on: https://code.wireshark.org/review/7313 Reviewed-by: Michael Mann Reviewed-by: Alexis La Goutte commit 120ee7f Author: Michal Labedzki Date: Thu Mar 5 11:05:07 2015 +0100 Logcat: Fix typo Fix funny "...replace all new characters by spaces" to "replace all new line characters by spaces" Change-Id: I8322ccd9f01220d300a0ba2982b2a61252b51242 Reviewed-on: https://code.wireshark.org/review/7540 Reviewed-by: Michal Labedzki commit 9848b22 Author: Dario Lombardo Date: Tue Mar 3 14:39:00 2015 +0100 rtps: added magic Change-Id: I52861b6893abf36b304ea58a12c7987e0f7bc5ba Reviewed-on: https://code.wireshark.org/review/7512 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit aa9497b Author: Pascal Quantin Date: Wed Mar 4 14:31:55 2015 +0100 USB: add support for alternate setting selection With this, the traffic of a device implementing both NCM and MBIM protocols is properly identified as MBIM when selected by the host Bug: 11018 Change-Id: I438ab1917945d9c5ba13329d515abc7e2cd13896 Reviewed-on: https://code.wireshark.org/review/7519 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 9312c2d Author: Dario Lombardo Date: Wed Mar 4 10:27:52 2015 +0100 bthci-evt: added reserved Change-Id: I66b93fa35d14b4674fcd897dfb2b1f8810642977 Reviewed-on: https://code.wireshark.org/review/7517 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki commit 51c3d27 Author: Alexis La Goutte Date: Mon Feb 16 09:30:17 2015 +0100 Add Transifex Configuration Change-Id: I7fa4593b086d285553eaa4334303dab019446a76 Reviewed-on: https://code.wireshark.org/review/7156 Reviewed-by: Evan Huus Reviewed-by: Michael Mann Reviewed-by: Gerald Combs Reviewed-by: Alexis La Goutte commit e2bf218 Author: Luke Mewburn Date: Thu Mar 5 09:30:28 2015 +1100 Add SCCP SSN 0xf8 for CSS (MAP) 3GPP TS 23.003 11.9.0 adds subsystem number 0b 1111 1000 (0xF8) for CSS (MAP). Change-Id: Iaa2b97f14f4f3c732aeff05419c0300c3a1fb121 Reviewed-on: https://code.wireshark.org/review/7533 Reviewed-by: Michael Mann commit ce3ec6a Author: Gerald Combs Date: Wed Mar 4 18:08:35 2015 -0800 Qt: Redraw the packet list when a column is resized. ...otherwise the packet list and header columns don't match until the next redraw. Change-Id: Ice9c17c93badec93839be7c100ca27d8dc493daa Reviewed-on: https://code.wireshark.org/review/7536 Reviewed-by: Gerald Combs commit 0a4f93a Author: Gerald Combs Date: Wed Mar 4 08:12:58 2015 -0800 Qt: Show the full file path in the status bar. Add file_size_to_qstring and use it to show the file size. Add a "shrinkable" property to LabelStack. Make the info status shrinkable. Elide text so that long file paths don't widen the main window. Change-Id: Ieb1caaf7e016384609d41fcabaa63d8f7a293eff Bug: 10949 Reviewed-on: https://code.wireshark.org/review/7534 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 9df502a Author: Jeff Morriss Date: Wed Mar 4 14:21:28 2015 -0500 Note that the Lua tests don't work in cmake. (Also point out that we really want cross-compilation to work since people do use it--with autotools.) Change-Id: I0570e0d3e4063c53699233e950687d86aa34b651 Reviewed-on: https://code.wireshark.org/review/7528 Reviewed-by: Graham Bloice commit fb03d49 Author: Gerald Combs Date: Wed Mar 4 12:32:25 2015 -0800 Add CMake SOVERSIONs to make-version.pl. Change-Id: Ifd011288ca23263738ca50842d59a23cc25e7952 Reviewed-on: https://code.wireshark.org/review/7532 Reviewed-by: Gerald Combs commit afc8589 Author: Gerald Combs Date: Wed Mar 4 12:20:56 2015 -0800 Add some items to the release notes. Change-Id: I57e8bef7ff9370f4f1d1515d2a82dd65936ba259 Reviewed-on: https://code.wireshark.org/review/7531 Reviewed-by: Gerald Combs commit e4b8e9f Author: Michal Labedzki Date: Sun Mar 1 18:08:20 2015 +0100 Logcat: Add preference for oneline info column In fact user may want to disable oneline info column what changes view to multiple lines of log then increases readability. Change-Id: I8aeb1af10abfe8cd56e441d4ebf17cd1526efc89 Reviewed-on: https://code.wireshark.org/review/7524 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki commit 23b07cb Author: Michal Labedzki Date: Wed Mar 4 16:11:50 2015 +0100 Set packet encapsulation for HCIDUMP captures Change-Id: I2a523694a38b6fe296b6dbceb5a00e4202364e99 Reviewed-on: https://code.wireshark.org/review/7523 Reviewed-by: Michal Labedzki commit d63df87 Author: Joerg Mayer Date: Wed Mar 4 16:32:13 2015 +0100 Print the content of an unknown message type as hex. May help reverse engineering type 11 (dec) messages. Change-Id: I41df5f1cd433b04e9067228a2a7487b90f7e5bd1 Reviewed-on: https://code.wireshark.org/review/7522 Reviewed-by: Jörg Mayer commit efd53ad Author: Alexis La Goutte Date: Tue Feb 17 19:32:38 2015 +0100 Fuzz test : Add -a(SAN) option to disable ulimit when fuzzing from https://code.google.com/p/address-sanitizer/wiki/AddressSanitizer#ulimit_-v The ulimit -v command makes little sense with ASan-ified binaries because ASan consumes 20 terabytes of virtual memory (plus a bit). Change-Id: I8c8c77dd51d5440fb2f9bd95f90873e59a64d409 Reviewed-on: https://code.wireshark.org/review/7204 Reviewed-by: Peter Wu Reviewed-by: Evan Huus commit 763b6d3 Author: Pascal Quantin Date: Mon Mar 2 22:51:38 2015 +0100 Added JSMN_STRICT that allow a more precise json parsing. Bug: 10977 Change-Id: I725c10d895fdec4530d0761db3ac2659171f2f03 Reviewed-on: https://code.wireshark.org/review/7249 Reviewed-by: Peter Wu Tested-by: Peter Wu commit d2720ec Author: Alexis La Goutte Date: Tue Mar 3 13:16:52 2015 +0100 Address types: fix no previous prototype for ... [-Wmissing-prototypes] address_types.c:230:14: warning: no previous prototype for 'ipv4_name_res_str' [-Wmissing-prototypes] address_types.c:237:5: warning: no previous prototype for 'ipv4_name_res_len' [-Wmissing-prototypes] address_types.c:386:14: warning: no previous prototype for 'ipv6_name_res_str' [-Wmissing-prototypes] address_types.c:393:5: warning: no previous prototype for 'ipv6_name_res_len' [-Wmissing-prototypes] address_types.c:509:14: warning: no previous prototype for 'fcwwn_name_res_str' [-Wmissing-prototypes] address_types.c:538:5: warning: no previous prototype for 'fcwwn_name_res_len' [-Wmissing-prototypes] Change-Id: I6cf44b887d9e35fb76bd1840444074c9102b4d2b Reviewed-on: https://code.wireshark.org/review/7508 Reviewed-by: Alexis La Goutte Reviewed-by: Michael Mann Reviewed-by: Anders Broman commit a308aef Author: Jeff Morriss Date: Sat Feb 28 22:20:07 2015 -0500 Look for and use gethostbyname() if we don't have getaddrinfo(). Fail to configure if we can't find any name resolver (autotools only). This puts back the gethostbyname()/gethostbyname2() code removed in I3348179626e97daaddfbc89e3ed21e39915e3de4 and If59ce8a038776eadd6cd1794ed0e2dad8bf8a22c but as a last-resort option (only if we don't have a better or more modern name resolver). As suggested/requested by Guy in https://code.wireshark.org/review/#/c/7423/ Change-Id: I706dbbd65135f47c67d3d8d88a61ad7273914c47 Reviewed-on: https://code.wireshark.org/review/7447 Petri-Dish: Jeff Morriss Tested-by: Petri Dish Buildbot Reviewed-by: Jeff Morriss commit 9070656 Author: Alexis La Goutte Date: Tue Mar 3 13:13:29 2015 +0100 SSTP: fix no previous prototype for proto_register_sstp/proto_reg_handoff_sstp [-Wmissing-prototypes] Change-Id: I65c6cf59ec9e7eb64a665ea3b253db5200d19f4b Reviewed-on: https://code.wireshark.org/review/7507 Reviewed-by: Alexis La Goutte Reviewed-by: Jeff Morriss commit 2780a30 Author: Pascal Quantin Date: Tue Mar 3 14:26:13 2015 +0100 GSM MAP: do not use a global variable to store OID Fixes an ASAN failure reported by Alexis Change-Id: I63b07ec4b6eb0698c4abf27f8fb0b1f11a19396d Reviewed-on: https://code.wireshark.org/review/7510 Petri-Dish: Pascal Quantin Reviewed-by: Alexis La Goutte Reviewed-by: Pascal Quantin commit 8933cbb Author: Graham Bloice Date: Tue Mar 3 13:30:49 2015 +0000 HTTP: Fix small typo in a field description Change-Id: I31a676f5e514b32f891496230eb70cac571730f9 Reviewed-on: https://code.wireshark.org/review/7511 Reviewed-by: Alexis La Goutte commit 4e32899 Author: Petr Gotthard Date: Mon Feb 9 17:18:15 2015 +0100 AMQP: Introduce support for AMQP over TLS/SSL (AMQPS). Modified dissect_amqp to the new-style dissector. Added amqp.ssl.port to protocol preferences. Registered the AMQP dissector with SSL. Fixed an error in dissect_amqp that appeared when the first segment was smaller than the minimum header size required to determine the protocol version (8b). ...plus enhanced the AMQP 0-9-1 to display also the protocol id, so the packets list shows "0-9-1" instead "9-1". Change-Id: Ia44e0791b6ee78ad594de342c4f2401bad9beb4e Reviewed-on: https://code.wireshark.org/review/7044 Reviewed-by: Michael Mann Reviewed-by: Petr Gotthard Tested-by: Peter Wu Reviewed-by: Peter Wu commit 5c2810e Author: Martin Kaiser Date: Sun Mar 1 18:43:54 2015 +0100 build the list of .qm files from the list of .ts files (2nd attempt: yesterday's builbot failure wasn't caused by this commit) Change-Id: If87d6b55cc733ff35a3677860b4559a7082a15b2 Reviewed-on: https://code.wireshark.org/review/7502 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 1864deb Author: Mikhail Koreshkov Date: Tue Feb 24 11:38:47 2015 +0300 GSM_A-GCC: dissector for GCC Protocol Added dissector for GSM-A GCC (Group Call Control) Protocol (GSM 04.68) Change-Id: I46fafc3fd3eba674202f2c34932edf83a6d1d096 Reviewed-on: https://code.wireshark.org/review/7338 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte Reviewed-by: Pascal Quantin commit 499d959 Author: Guy Harris Date: Tue Mar 3 02:47:53 2015 -0800 Eliminate e_uuid_t in favor of e_guid_t. That eliminates a redundant and confusing data type, and avoids issues with one piece of code using e_uuid_t but wanting to use routines expecting an e_guid_t. Change-Id: I95e172d46d342ab40f6254300ecbd2a0530cde60 Reviewed-on: https://code.wireshark.org/review/7506 Reviewed-by: Guy Harris commit a0ce286 Author: Dario Lombardo Date: Tue Mar 3 11:03:31 2015 +0100 sflow: added agent type Change-Id: I01bb3dba0c27544539fdca75d655255ff25b12a3 Reviewed-on: https://code.wireshark.org/review/7504 Reviewed-by: Alexis La Goutte commit b7ef891 Author: Michael Mann Date: Sun Mar 1 23:03:27 2015 -0500 Replace tvb_get_ptr calls with a better API choice. Just reduces the overall tvb_get_ptr usage count in the dissector directory. Change-Id: I455dc4cc9b082ecccdd254a2e5121f3353b5a812 Reviewed-on: https://code.wireshark.org/review/7491 Reviewed-by: Anders Broman commit 599dd4f Author: Michael Oed Date: Sun Mar 1 13:56:34 2015 +0100 Qt: Do not close file while trying to open new one Wireshark QT will close current opened file when popup open dialogue (File -> open), instead of keeping current file opened till new file is to be opened Bug: 10962 Change-Id: I2062514ae648c95492e0160953c80d5303b8aba2 Reviewed-on: https://code.wireshark.org/review/7452 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki commit 1a54112 Author: Michael Mann Date: Mon Mar 2 09:33:52 2015 -0500 Add tvb_get_ether_name This is mostly to reduce tvb_get_ptr calls that were used to pass into get_ether_name. Some optimizations were made to packet-ieee80211.c in the process of conversion. Change-Id: I81d3c65d4c09a15237fc287c2e989eb6e6936b1f Reviewed-on: https://code.wireshark.org/review/7492 Reviewed-by: Anders Broman commit 43fd878 Author: Michael Mann Date: Sun Mar 1 10:46:31 2015 -0500 Add "seed" capabilities to crc16_x25_ccitt (now crc16_x25_ccitt_seed) so we can remove CRC algorithm calculation in packet-assa_r3.c. Change-Id: I3143800f6ff922a309f5506d9acbc2c4293363b7 Reviewed-on: https://code.wireshark.org/review/7490 Reviewed-by: Jeff Morriss Petri-Dish: Jeff Morriss Reviewed-by: Anders Broman commit 091d2db Author: Michael Mann Date: Sun Mar 1 10:11:17 2015 -0500 Reduce the number tvb_get_ptr calls in packet-arp.c Change-Id: Ic91088c38833be2463f069a646fbfea6b87b33aa Reviewed-on: https://code.wireshark.org/review/7489 Reviewed-by: Anders Broman commit 48d376f Author: Peter Wu Date: Mon Mar 2 00:16:16 2015 +0100 plugins: fix dissector registration with CMake Noticed when comparing output of `tshark -G fields` between autofoo and cmake builds. With this change, I see no differences anymore. While only WiMax needs this change, do a similar thing for consistency with autofoo and between dissectors (actually, the contents of ${PLUGIN_FILES} minus plugin.c was used). Change-Id: Ib61f69dcc0b8eda713da931b6cc3e946848bea9d Reviewed-on: https://code.wireshark.org/review/7462 Reviewed-by: Evan Huus Reviewed-by: Jeff Morriss commit 963fbf3 Author: Pascal Quantin Date: Mon Mar 2 19:11:42 2015 +0100 MBIM: add it to "Decode As" menu Change-Id: If961ac8fcfa0d760e112036ea3e439c4e061af8b Reviewed-on: https://code.wireshark.org/review/7498 Reviewed-by: Pascal Quantin commit 21a0bc7 Author: Dario Lombardo Date: Mon Mar 2 17:11:17 2015 +0100 cgmp: added reserved field Change-Id: Iaf3c8c776507803e28b4372f7da1290a19dd5efd Reviewed-on: https://code.wireshark.org/review/7497 Reviewed-by: Michael Mann commit 342c55b Author: Gerald Combs Date: Mon Mar 2 11:50:36 2015 -0800 Qt: Add @2x images to the layout preferences. Run compress-pngs on the normal and @2x images. Change-Id: Ic5bc3c42273078f32511d986b299d8606c016f6d Reviewed-on: https://code.wireshark.org/review/7499 Reviewed-by: Gerald Combs commit 6878122 Author: Alexis La Goutte Date: Mon Mar 2 14:43:05 2015 +0100 Main window (Qt): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: Ia8d37b33ee30f09cfe5e0cd00820d84e171deb1c Reviewed-on: https://code.wireshark.org/review/7494 Reviewed-by: Evan Huus commit 0ebbb60 Author: Alexis La Goutte Date: Mon Mar 2 16:01:17 2015 +0100 Byte view text (Qt): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I507b27bbf3c2877517cc9613ada1b182becfa98f Reviewed-on: https://code.wireshark.org/review/7495 Reviewed-by: Gerald Combs commit 768e37b Author: Michal Labedzki Date: Thu Feb 26 14:38:57 2015 +0100 Bluetooth: Fix tools/checkAPI issues Change-Id: I8ffbd4a0da800594d9888f6a30612d4fc5273119 Reviewed-on: https://code.wireshark.org/review/7474 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki commit 77d2dc5 Author: Michal Labedzki Date: Thu Sep 18 13:19:52 2014 +0200 Bluetooth: HFP: Temporary disable partial message dissection Maybe this case never happen, so disable broken feature. Also fix unexpected Data dissectors and command tree items. Bug: 10460 Change-Id: I4ea76f20db21c6c9b5dca912b94a0aff99c42160 Reviewed-on: https://code.wireshark.org/review/7473 Reviewed-by: Michal Labedzki commit cb8876c Author: Alexis La Goutte Date: Mon Mar 2 16:12:55 2015 +0100 OPENSAFETY: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: Ie566ae541d0d6cf5ac17150006de4f4498e790d6 Reviewed-on: https://code.wireshark.org/review/7493 Reviewed-by: Roland Knall Reviewed-by: Michael Mann commit 52b4c61 Author: Dario Lombardo Date: Mon Mar 2 14:27:09 2015 +0100 [r,i]gmp: added reserved field Change-Id: I628b1711e683d57ab5dcbf7ad615b1740399b65f Reviewed-on: https://code.wireshark.org/review/7482 Reviewed-by: Michael Mann commit e4018f2 Author: Dario Lombardo Date: Mon Mar 2 15:29:53 2015 +0100 fip: added reserved field Change-Id: I12878d91dfaf11c96a9d3df965fc659928b7f58a Reviewed-on: https://code.wireshark.org/review/7488 Reviewed-by: Michael Mann commit fe7b52c Author: Dario Lombardo Date: Mon Mar 2 14:04:12 2015 +0100 rmcp: added reserved field Change-Id: I6661494295b076d8762ea9502a7f9b23b70fc56e Reviewed-on: https://code.wireshark.org/review/7481 Reviewed-by: Michael Mann commit 077405f Author: Dario Lombardo Date: Mon Mar 2 15:18:17 2015 +0100 isl: added reserved field Change-Id: I028ebe27a55ababf9d3557cff531332313c38535 Reviewed-on: https://code.wireshark.org/review/7484 Reviewed-by: Michael Mann commit 3f62394 Author: Dario Lombardo Date: Mon Mar 2 15:09:00 2015 +0100 dvmrp: added reserved field Change-Id: Ic46acac05638bf59910e3cb0986ed14b2257ed55 Reviewed-on: https://code.wireshark.org/review/7483 Reviewed-by: Michael Mann commit c35ca6c Author: Evan Huus Date: Sun Mar 1 18:45:24 2015 -0500 scsi-osd: fix overflow leading to infinite loop Thanks to Vlad Tsyrklevich for the report. Bug: 11024 Change-Id: I9defc6fc72339b2f6ba12b46172b776d798647cd Reviewed-on: https://code.wireshark.org/review/7463 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit 608cf32 Author: Evan Huus Date: Sun Mar 1 18:33:10 2015 -0500 tnef: fix overflow leading to infinite loop Thanks to Vlad Tsyrklevich for the report, and Fabian Yamaguchi for the "joern" tool which found the bug. Bug: 11023 Change-Id: I53bc998c9934736698e7db5eba09a14e79a7c633 Reviewed-on: https://code.wireshark.org/review/7461 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit 724c2ed Author: Michal Labedzki Date: Mon Aug 12 10:59:33 2013 +0200 Bluetooth: HFP: Improve HFP dissector by dissecting all commands Decode as far as possible AT commands according to specifications: HFP 1.6 Change-Id: Ib2cee4df4d9338cc98f28e0fadd067378fba63a9 Reviewed-on: https://code.wireshark.org/review/7472 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki commit d949b3c Author: Michal Labedzki Date: Wed Feb 11 13:35:08 2015 +0100 Bluetooth: HCI: Fix "Host Number of Completed Packets" Update internal packet offset to avoid unexpect data expert warning. Change-Id: I9c0f7e8ec35365e8f8bcca6f37a26ed8da56e166 Reviewed-on: https://code.wireshark.org/review/7471 Petri-Dish: Michal Labedzki Reviewed-by: Michal Labedzki commit 51e12e2 Author: Michal Labedzki Date: Thu Feb 26 13:24:12 2015 +0100 Bluetooth: L2CAP: Add link to Connect and Disconnect frames Add ability to jumps to connect or disconnect frame from any frame binded to specific PSM session, what should improves analyse by user. Change-Id: Icdf6634bf128ba83721d39cf8986cf16bfb4e7a4 Reviewed-on: https://code.wireshark.org/review/7470 Reviewed-by: Michal Labedzki commit 701be1f Author: Jeff Morriss Date: Sun Mar 1 21:15:27 2015 -0500 RTP player: don't crash when drawing channel graphs for very long calls. X11 can't handle pixmaps more than 32k pixels wide so don't try to feed it one. This avoids crashes with the complaint "BadAlloc (insufficient resources for operation)". Instead we simply truncate the graph (and tell the user). Do this in a way that shows the user the empty portion of the graph. Hopefully the Qt port can fix this properly. Note: the bug report says that MacOS is not affected but it should be. So apply this fix for all on-Windows systems. Bug: 2630 Change-Id: I71e1bd2f9a62792db06ce887e2bbe7a96d110e0a Reviewed-on: https://code.wireshark.org/review/7464 Petri-Dish: Jeff Morriss Reviewed-by: Anders Broman commit f9f7ff2 Author: Jeff Morriss Date: Sun Mar 1 21:59:49 2015 -0500 Don't read aliases from the personal hosts file. We only store the last name added (i.e., the last alias) which is the opposite of what the name resolver does (it returns the first name in the hosts file). Just comment the code out for now with a comment explaining why. Maybe some day we'll have a reason to store the aliases. Change-Id: I560ac05868a429d31e9d41f3a34af36c4fca1f6c Reviewed-on: https://code.wireshark.org/review/7466 Reviewed-by: Anders Broman commit 99ceab8 Author: Guy Harris Date: Sun Mar 1 20:01:17 2015 -0800 Don't create a packet dialog if we don't have a packet. Move the "find the frame" stuff to openPacketDialog(), and don't even bother creating a new PacketDialog if we don't find the frame. This should squelch Coverity CID 1270934, by giving up quickly if fdata is null. Change-Id: I4605ba7e271a55724f02cafed4122f9dd9b1b6f7 Reviewed-on: https://code.wireshark.org/review/7467 Reviewed-by: Guy Harris commit 3108bf8 Author: Guy Harris Date: Sun Mar 1 18:59:50 2015 -0800 Fix typo caught by Coverity - wrong structure members being tested. CID 1271732 Change-Id: I12b610a0a28fcc790ffb041ca88624e014f68ab5 Reviewed-on: https://code.wireshark.org/review/7465 Reviewed-by: Guy Harris commit 51f45af Author: Gerald Combs Date: Sun Mar 1 09:18:34 2015 -0800 Qt: Don't autoscroll if we're not capturing. Change-Id: I3164d8a12981970f127cd68adb7e52f2a1fe5c39 Reviewed-on: https://code.wireshark.org/review/7457 Reviewed-by: Gerald Combs commit 85c589f Author: Martin Kaiser Date: Sun Mar 1 19:35:43 2015 +0100 Revert "build the list of .qm files from the list of .ts files" This seems to break the build on OSX 10.5 (?) This reverts commit b46bd2c7798d1c9e808625250928b40adf11a8bb. Change-Id: I720de7182804c5c669934e3514e789f2da066867 Reviewed-on: https://code.wireshark.org/review/7459 Reviewed-by: Martin Kaiser commit a3c6003 Author: Martin Kaiser Date: Sun Mar 1 18:43:54 2015 +0100 build the list of .qm files from the list of .ts files Change-Id: If87d6b55cc733ff35a3648860b4559a7082a19b0 Reviewed-on: https://code.wireshark.org/review/7458 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 5309591 Author: Gerald Combs Date: Sun Mar 1 08:05:59 2015 -0800 [Automatic manuf, services and enterprise-numbers update for 2015-03-01] Change-Id: I771a79940efcbf0fcd16ccf5894169d232bdaa9d Reviewed-on: https://code.wireshark.org/review/7454 Reviewed-by: Gerald Combs commit 9c55903 Author: Michael Mann Date: Thu Feb 26 22:03:12 2015 -0500 Use COPY_ADDRESS_SHALLOW instead of duplicating TVB_SET_ADDRESS and SET_ADDRESS calls for the same address. Change-Id: I0c9cc5d574fdd73ecf1f8b32dbbf0ddb2b885116 Reviewed-on: https://code.wireshark.org/review/7437 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 5f2c8e9 Author: Martin Kaiser Date: Thu Feb 19 22:52:42 2015 +0100 zvt: functions for dissecting a bitmap and an apdu as a sequence of bitmaps Change-Id: I87233df8fc17ac0aca0d9daefcebd95f47699808 Reviewed-on: https://code.wireshark.org/review/7450 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 5644627 Author: Guy Harris Date: Sat Feb 28 23:12:12 2015 -0800 "Break" the Acme reader so that the tests work. We don't want to have to change the pcap-ng file against which we compare, so we hardcode the year here to be the same as the year from the pcap-ng capture. Change-Id: Ibd83d06e035341f617b8285f6ba51c749c38a177 Reviewed-on: https://code.wireshark.org/review/7448 Reviewed-by: Guy Harris commit 0f3ae32 Author: Guy Harris Date: Sat Feb 28 18:57:47 2015 -0800 Call TIMEDEFVn macros in all PACKET_DESCRIBE() macros. Create TIMEDEFV10() and, for it and for V20, V21, and V22, undefine the ones used for the read routine and define dummy ones for the read-seek routines (as those record formats have relative, not absolute, times). Have all of them set presence_flags. That way: 1) if we *can* set the time stamps in the seek-read routine, we do; 2) we always set presence_flags in read and seek-read routines. Change-Id: I837507245e8a0cbc68c7c5fd8365f474d085488e Reviewed-on: https://code.wireshark.org/review/7445 Reviewed-by: Guy Harris commit 7130875 Author: Guy Harris Date: Sat Feb 28 12:35:16 2015 -0800 Convert fixed-point binary to floating-point in a portable fashion. No need to try to construct an IEEE floating-point number by hand, piece by piece; just sign-extend the value to 32 bits, convert that integral value to a floating-point value, and divide the result by 32768 to properly scale the value. (Yes, in practice, the chances are overwhelming that we'll be running on a machine with IEEE floating point - people probably won't be running us on a VAX, and the UN*Xes on which we're likely to run on a System/3x0 or z/Architecture machine require, and use, the new IEEE floating-point capabilities - but no need to be gratuitiously non-portable.) Change-Id: Ie90a61847e68c3b849de2984139a97004a4ad659 Reviewed-on: https://code.wireshark.org/review/7444 Reviewed-by: Guy Harris commit 5892d3c Author: Guy Harris Date: Sat Feb 28 01:13:41 2015 -0800 Don't use ctime(). The API checks warn about it being deprecated - that doesn't seem to cause a problem with the buildbot, but does result in failures from the Petri dish. Format the first and last packet time in an ISO 8601-style format. Call them "First packet time" and "Last packet time", rather than "Start time" and "End time", as they're not necessarily the times when the capture started or ended. (Both make the output a bit more like the Statistics -> Summary window.) Change-Id: Ibf02999851f49c7951c6f6152c70efa271414bd9 Reviewed-on: https://code.wireshark.org/review/7442 Reviewed-by: Guy Harris commit 65303ef Author: Guy Harris Date: Fri Feb 27 19:51:37 2015 -0800 Remove some unneeded includes of . Change-Id: I9e4e6efa9f8c7dbff7627f8d5fc3278ab383618d Reviewed-on: https://code.wireshark.org/review/7441 Petri-Dish: Guy Harris Reviewed-by: Guy Harris commit 3b23561 Author: Guy Harris Date: Fri Feb 27 19:49:28 2015 -0800 Don't use struct timeval if we only care about seconds. time_t suffices in that case. Change-Id: Ica7a79fb6f8c7cc7fb6decd5fcd391dccfdb3fc6 Reviewed-on: https://code.wireshark.org/review/7440 Reviewed-by: Guy Harris commit 30d878f Author: Roland Knall Date: Fri Dec 12 15:11:07 2014 +0100 openSAFETY: Add support for openSAFETY 1.5 openSAFETY 1.5 will be the next version of the openSAFETY protocol. This will include all renditions necessary for future versions of the IEC 61784-3 specifications. - SNMT service for CT preseeding - 40 bit counter value flag support - Adapt CRC calculation for 40bit counter - Display 40bit counter value Change-Id: Ia9f8e11de813d27bc14437d32ee3d0486810c634 Reviewed-on: https://code.wireshark.org/review/5728 Reviewed-by: Roland Knall Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit abd8be3 Author: Guy Harris Date: Fri Feb 27 18:46:44 2015 -0800 Get rid of unused variable. Change-Id: I4141f00285cbb6080a782ea2837ea87b7100e081 Reviewed-on: https://code.wireshark.org/review/7439 Reviewed-by: Guy Harris commit 60cc2e0 Author: Guy Harris Date: Fri Feb 27 18:23:14 2015 -0800 Clean up timestamp handling. Use nstime_t rather than struct timeval when we want seconds-and-fractions, so that, when writing the file, we can handle nanosecond-resolution time stamps. Calculate the relative time stamp as a 64-bit integer rather than using floating-point. Use time_t rather than struct timeval if we only want seconds. Have the routines that write out 16-bit and 32-bit numbers convert them to little-endian themselves, rather than having to be passed a little-endian number. Have a routine that writes out 48-bit values in little-endian order, and use that to write out packet time stamps. Change-Id: Ia6e047079e48915647502178e0a1c61177010c62 Reviewed-on: https://code.wireshark.org/review/7438 Reviewed-by: Guy Harris commit dbbb1d3 Author: Guy Harris Date: Fri Feb 27 15:48:45 2015 -0800 We don't need to check for strings.h. We never use it; the autoconf script does, but that's as a result of some macros that checks for various standard and non-standard-but-common headers. It's been ages since strings.h was anything other than a BSD source-compatibility hack, not even needed these days when writing code for *BSD-flavored OSes, as they have . Change-Id: Iad2dc6e55207b52fc8af494ddfca4089c2eb426b Reviewed-on: https://code.wireshark.org/review/7434 Reviewed-by: Guy Harris commit 8c86fbc Author: Guy Harris Date: Fri Feb 27 14:55:30 2015 -0800 , not , is the header file for memcpy(). Don't include when using memcpy(), include . We don't need to check for memory.h, so don't do it in CMake (we don't explicitly check for it in autoconf, but it's checked for by some macro we do use). Change-Id: I7aa93d4ea93bab9beff597939d3c24aecda3d52e Reviewed-on: https://code.wireshark.org/review/7433 Reviewed-by: Guy Harris commit 81fa9e0 Author: Guy Harris Date: Fri Feb 27 14:18:01 2015 -0800 wmem, unlike emem, doesn't use mmap(); remove some no-longer-needed checks. Change-Id: Ic9b57c7c7042fadf938bfa48a3aabe23ad33370f Reviewed-on: https://code.wireshark.org/review/7432 Reviewed-by: Guy Harris commit 823766b Author: Guy Harris Date: Fri Feb 27 13:55:00 2015 -0800 We don't use gethostbyname2(), don't check for it. Change-Id: Iff2e5ffe31692b06e1fd07ec0b259ac885a7ed63 Reviewed-on: https://code.wireshark.org/review/7431 Reviewed-by: Guy Harris commit 5e2dcb3 Author: Jeff Morriss Date: Fri Feb 27 09:46:23 2015 -0500 Remove a couple useless variables. This may fix a compile warning-turned-error on an old version of SLES that Anders reported. Change-Id: I72e5dec00bc0088cd77a206284221cb43ae89547 Reviewed-on: https://code.wireshark.org/review/7429 Petri-Dish: Jeff Morriss Reviewed-by: Jeff Morriss commit edb5e4b Author: Jeff Morriss Date: Thu Feb 26 21:10:25 2015 -0500 Use getnameinfo() instead of gethostbyaddr(). Also fix up some formatting. Change-Id: I3348179626e97daaddfbc89e3ed21e39915e3de4 Reviewed-on: https://code.wireshark.org/review/7423 Petri-Dish: Jeff Morriss Tested-by: Petri Dish Buildbot Reviewed-by: Jeff Morriss commit e5e8af9 Author: Jeff Morriss Date: Wed Feb 25 20:40:55 2015 -0500 Restore synchronous name resolution (revert SVN rev52115). These gethostbyaddr() calls should be changed to getaddrinfo() but only in master. Change-Id: I7e2d31ceb0e072beb7f324336d7b145c3adbe3a0 Reviewed-on: https://code.wireshark.org/review/7402 Reviewed-by: Jeff Morriss commit 2d48179 Author: Michal Labedzki Date: Fri Feb 20 15:30:23 2015 +0100 Qt: Automatically scroll the packet list. Add an "Auto Scroll in Live Capture" action to the Go menu. It's in the View menu in the GTK+ UI but it seems to make more sense as a navigation item. Use a timeout interval for automatic scrolling. I haven't run any tests to see if this makes a difference but it would seem that the less drawing we do during a high speed capture the better, particularly for remote displays. Update the x-stay-last icons. Note that we might want to make prefs.capture_auto_scroll a "recent" setting. Mark auto_scroll_live and packet_list_check_end GTK+ only. Bug: 10601 Co-authored-by: Gerald Combs Change-Id: I645d27c0814f0e4a0d5b01ae68be366847e2522d Reviewed-on: https://code.wireshark.org/review/7292 Reviewed-by: Gerald Combs commit 2462c0d Author: Dmitry Bazhenov Date: Fri Feb 27 10:31:32 2015 +0500 Use VCINSTALLDIR environment variable in order to locate MSVCR_DLL. This fixes Windows build in cases when MSVS is installed in non-default directory. Change-Id: I9cfa3f728d64e9d5952c68b2b2b70e627d3f5c3e Reviewed-on: https://code.wireshark.org/review/7426 Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice commit e4afcc8 Author: Sean O. Stalley Date: Thu Feb 19 13:31:46 2015 -0800 Fixed MAUSB Flags subfield dissection Previously, the version field was being dissected as flags. Change-Id: Ic7d5fd6262e844c9e578dbc29cd5b6e40078ae9f Signed-off-by: Sean O. Stalley Reviewed-on: https://code.wireshark.org/review/7398 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 2366113 Author: Sean O. Stalley Date: Thu Feb 19 13:20:56 2015 -0800 Added basic MA USB isochronous packet support Iso fields in a MA USB header are now dissected, instead of treating them as non-iso fields. Change-Id: I13c9ba5b0c54ef0b5130c2e87c7de3de9dbe9e22 Signed-off-by: Sean O. Stalley Reviewed-on: https://code.wireshark.org/review/7397 Reviewed-by: Michael Mann commit bc8228b Author: Sean O. Stalley Date: Thu Nov 13 17:15:31 2014 -0800 Added Dissection of CancelTransfer MA packets Type-specific subfields of CancelTransferReq/Resp are now dissected. Change-Id: I0f03e14df936409125b263409de605dde96d53c0 Signed-off-by: Sean O. Stalley Reviewed-on: https://code.wireshark.org/review/7396 Reviewed-by: Michael Mann commit 9cc49a7 Author: Sean O. Stalley Date: Tue Nov 11 17:52:31 2014 -0800 Updated MAUSB Packet Type values Packet type values are now consistant with spec. Also, values in enum mausb_pkt_type are now consistant with mausb_type_string array. Change-Id: I515332bdbc1d1f06bd03e3da314c44d7e842f2f9 Signed-off-by: Sean O. Stalley Reviewed-on: https://code.wireshark.org/review/7395 Reviewed-by: Michael Mann commit 0002424 Author: Michael Mann Date: Tue Feb 24 13:46:44 2015 -0500 Remove most of the tvb_get_ptr calls in the packet-batadv.c dissector. These calls were all getting ether addresses which can be gotten by other means. Change-Id: I9a3d564483c9ee9b8e5183bb9086da8a315c41fc Reviewed-on: https://code.wireshark.org/review/7421 Reviewed-by: Anders Broman commit 14697b8 Author: Michael Mann Date: Tue Feb 24 14:16:48 2015 -0500 Pass tvb and offset into print_nsap_net() and print_area() to "hide" the tvb_get_ptr call that dissectors are using. Change-Id: Ibc5a51be462d431b85b34cac7a358d736ec7b9db Reviewed-on: https://code.wireshark.org/review/7422 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 64c0678 Author: Guy Harris Date: Thu Feb 26 20:35:31 2015 -0800 Again, we need a separate pointer to advance through the buffer. In this case, sometimes we step through the buffer and sometimes we don't, so we always use strlen(); use a separate pointer when we're stepping through the buffer. Change-Id: Id69898760b4c255146c6eae0ab44c1d358c9ccbd Reviewed-on: https://code.wireshark.org/review/7425 Reviewed-by: Guy Harris commit 9ac60ff Author: Guy Harris Date: Thu Feb 26 20:16:22 2015 -0800 address_to_string routines need to remember the beginning of the buffer. Either they don't have a pointer into the buffer that they advance, in which case strlen(buf)+1 works just fine, or they do, in which case 1) they'd better save the pointer to the beginning of the buffer, so they can figure out how long the string is when they're done and 2) they don't need to use strlen(), they can just subtract the pointers. Bug: 11016 Change-Id: I81ce9d517336a15bd81f0c6225756ce5178ec6cf Reviewed-on: https://code.wireshark.org/review/7424 Reviewed-by: Guy Harris commit 1e66e74 Author: Dmitry Bazhenov Date: Thu Feb 26 16:47:50 2015 +0500 Add dissector for "Bad Password Threshold" IPMI LAN configuration parameter. Add dissectors for IPv6-related IPMI LAN configuration parameters. Bug:11012 Change-Id: I9b7380d2451acb6d68a03361e26dc3a6ebc129a0 Reviewed-on: https://code.wireshark.org/review/7404 Reviewed-by: Alexis La Goutte Tested-by: Alexis La Goutte Reviewed-by: Michael Mann commit 0f29e5d Author: Dario Lombardo Date: Thu Feb 26 13:51:50 2015 +0100 isis: bugfix in csnp source id length. Change-Id: Ib9f8507ed0a5a0788970b5fa150917f7c1b10de3 Reviewed-on: https://code.wireshark.org/review/7418 Reviewed-by: Alexis La Goutte commit 8ae714d Author: Gerald Combs Date: Thu Feb 26 10:22:28 2015 -0800 Remove a dead assignment found by Clang. The code in question was copied from ui/gtk/capture_file_dlg.c. The dead assignment there was removed in 68ceffe. Change-Id: I605f181b623fbd87ab41505d30a79d7a4fe649df Reviewed-on: https://code.wireshark.org/review/7419 Reviewed-by: Gerald Combs commit 3e5c0bf Author: Gerald Combs Date: Thu Feb 26 08:18:04 2015 -0800 Qt: Fix packet detail and byte view scrolling Make sure we call scrollToByte ByteViewText::setFieldHighlight. Explicitly scroll to our selected QTreeWidgetItem in ByteViewText::mousePressEvent. Bug: 11013 Change-Id: I0a6381f6760ed48a4f496be8a06b1e56faa5a05b Reviewed-on: https://code.wireshark.org/review/7416 Petri-Dish: Gerald Combs Reviewed-by: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 123be13 Author: Pascal Quantin Date: Thu Feb 26 14:01:08 2015 +0100 ANSI IS-637 A: ensure that num_fields is not null before calling text_decoder Bug: 11014 Change-Id: Id2c7913d96743424380bd75c4005ec747ee7dd50 Reviewed-on: https://code.wireshark.org/review/7412 Reviewed-by: Pascal Quantin commit e914bd5 Author: AndersBroman Date: Thu Feb 26 16:18:38 2015 +0100 [GTP CDR] Add support for CDR data record format version 12.6.0 Bug: 11015 Change-Id: Iea4a4cd4e4e8b41ef781c92c838f17ea6d16e499 Reviewed-on: https://code.wireshark.org/review/7413 Reviewed-by: Anders Broman commit 50b15cc Author: Alexis La Goutte Date: Thu Feb 26 14:00:22 2015 +0100 Translations : fix trailing whitespace when generate translations file Change-Id: I4142912c7a139f57f0ac5291bf3ed6762abec35c Reviewed-on: https://code.wireshark.org/review/7410 Reviewed-by: Alexis La Goutte commit d60d473 Author: Alexis La Goutte Date: Sun Feb 22 20:00:20 2015 +0100 Qt: Update translation lupdate/lrelease ui/qt/Wireshark.pro Change-Id: Ic77adf7ff48d528553ac57bdf04d1ff6e036efdd Reviewed-on: https://code.wireshark.org/review/7312 Reviewed-by: Alexis La Goutte commit 3546914 Author: Dario Lombardo Date: Thu Feb 26 11:03:21 2015 +0100 rsync: improved info for protocol. Change-Id: I9d1ae0bf1d6df0b9da0220aeff2dd73b5f18f38a Reviewed-on: https://code.wireshark.org/review/7407 Reviewed-by: Michael Mann commit bcf870e Author: Pascal Quantin Date: Thu Feb 26 13:35:26 2015 +0100 SMPP: AT_STRINGZ address allocation must use the pinfo pool Fixes an ASAN failure reported by Alexis Change-Id: I33b21d148e631e8a554882283a1c7284d701af1a Reviewed-on: https://code.wireshark.org/review/7409 Reviewed-by: Pascal Quantin commit 29feae5 Author: Jeff Morriss Date: Mon Feb 23 17:03:43 2015 -0500 Use tcp_dissect_pdus() in the SSTP dissector. I happened across the discussion in Ia44e0791b6ee78ad594de342c4f2401bad9beb4e which indicates that protocols running over SSL can use tcp_dissect_pdus() too. So do it in the SSTP dissector. Change-Id: I3de14c1b2af5e4e5fe3630121366b71a5ad223cf Reviewed-on: https://code.wireshark.org/review/7333 Reviewed-by: Peter Wu Reviewed-by: Jeff Morriss commit 96d1ce0 Author: Dario Lombardo Date: Wed Feb 25 15:23:32 2015 +0100 chdlc: Added "control" to proto tree. Change-Id: I027b6cd274673a5ae78a23f7a3d484ff83791eae Reviewed-on: https://code.wireshark.org/review/7388 Reviewed-by: Anders Broman commit b034870 Author: Dmitry Bazhenov Date: Thu Feb 26 12:59:42 2015 +0500 Fix a couple of bugs in IPMI dissector: * Fix incorrect offset for Block Selector field in Get LAN Configuration Parameter request. * Expect 0x83 completion code ("Attempt to read write-only parameter") for Get LAN Configuration Parameter command instead of Set LAN Configuration Parameter command. Change-Id: I5be37c5f96db91b70329bfce906ce76f7b8b6958 Reviewed-on: https://code.wireshark.org/review/7403 Reviewed-by: Alexis La Goutte commit 3336f71 Author: Jeff Morriss Date: Wed Feb 25 21:29:10 2015 -0500 Actually define HAVE_GETADDRINFO if we find it. AC_CHECK_FUNC() doesn't define HAVE_XXX but AC_CHECK_FUNCS() does. And AC_CHECK_LIBS() certainly doesn't define HAVE_. Also remove some ancient comments. Change-Id: I49d701bb96d3bd3c55c4beb99d532e397ec554ad Reviewed-on: https://code.wireshark.org/review/7400 Petri-Dish: Jeff Morriss Tested-by: Petri Dish Buildbot Reviewed-by: Jeff Morriss commit 4e12b59 Author: Jeff Morriss Date: Wed Feb 25 21:39:34 2015 -0500 Check whether we HAVE_GETADDRINFO before using it. One spot was missing the check. Change-Id: I72d1d3d2dec2cc71b02861ace59dc9e189721cfb Reviewed-on: https://code.wireshark.org/review/7401 Reviewed-by: Jeff Morriss commit 0692d75 Author: Guy Harris Date: Wed Feb 25 13:04:59 2015 -0800 Make the V10 path a bit more like the other paths. Provide {FULL,PART}SIZEDEFV10 macros, similar to what's provided for the other versions, containing the code to set the packet length and captured data length, and use the TRACE_V10_REC_LEN_OFF() macro directly after that to set the various length and offset values in the pseudo-header. Change-Id: I3513371057601b44821d89ebaa7565ab370a67f5 Reviewed-on: https://code.wireshark.org/review/7393 Reviewed-by: Guy Harris commit 1a3dd34 Author: Pascal Quantin Date: Wed Feb 25 17:49:31 2015 +0100 ATN-CPDLC: never put a break in a TRY block It will skip the execution of ENDTRY block Bug: 9952 Change-Id: I55af248b7d31cf1b75aae695ef8c149367791820 Reviewed-on: https://code.wireshark.org/review/7391 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 618eaec Author: Martin Mathieson Date: Wed Feb 25 15:50:49 2015 +0000 delete_includes.py: add target for ui/qt Change-Id: I9dc51fbef50941f04ccf5b0b5a8cd71f3693ade4 Reviewed-on: https://code.wireshark.org/review/7389 Reviewed-by: Martin Mathieson commit be68cdb Author: Tibensky Date: Wed Feb 25 15:57:35 2015 +0100 [Diameter] Add some AVPs and AVP values from 3GPP TS 32.299 version 12.7.0 (2015-01) Ping-Bug:11008 Change-Id: Ib7f52c743f43d8a1c70c9fb100663292d7c4a87e Reviewed-on: https://code.wireshark.org/review/7387 Reviewed-by: Anders Broman commit 03988e9 Author: Jeff Morriss Date: Wed Feb 25 09:12:04 2015 -0500 Add the ATN dissectors to the CMake build. Change-Id: Ic4963994ed9d1996c74c5ba3db723e93073f4649 Ping-bug: 9952 Reviewed-on: https://code.wireshark.org/review/7386 Petri-Dish: Jeff Morriss Reviewed-by: Evan Huus commit 9dfade3 Author: Guy Harris Date: Wed Feb 25 00:11:56 2015 -0800 Make the _offset values static constants. No need to export them outside this file, and making them constants might convince the compiler not to bother fetching their values from memory when referring to them. Change-Id: Ib8605bf0bb9091721a51827c45fe75d19a15ba26 Reviewed-on: https://code.wireshark.org/review/7378 Reviewed-by: Guy Harris commit 6b6c11c Author: Guy Harris Date: Tue Feb 24 22:11:57 2015 -0800 Have a PACKET_DESCRIBE() for V30's seek-read routine. That way it'll set the captured length and reported length the same way it's done in the read routine. Change-Id: I8b1f2d0d8fa688f44b6f61f16dc2e21b5648fc12 Reviewed-on: https://code.wireshark.org/review/7376 Reviewed-by: Guy Harris commit 98e8d52 Author: Guy Harris Date: Tue Feb 24 21:23:32 2015 -0800 Make the V10 PACKET_DESCRIBE() macro a little more like the others. Rename the V10 PACKET_DESCRIBE()'s "fpp" argument to "type", and have it declare the pointer variable. Change-Id: I3ac52ebdef0aec7bc95052277537185132886b57 Reviewed-on: https://code.wireshark.org/review/7374 Reviewed-by: Guy Harris commit 0856de5 Author: Guy Harris Date: Tue Feb 24 20:25:13 2015 -0800 Rename the "type" argument to V10's PACKET_DESCRIBE() to "ver". Move it in the argument list, and use it instead of a hard-coded 10 (even though it's always passed as 10), to match the other PACKET_DESCRIBE() macros. Change-Id: Idd0a23a58cc6bb0d2de799b039db776d279cc03e Reviewed-on: https://code.wireshark.org/review/7372 Reviewed-by: Guy Harris commit 825a833 Author: Guy Harris Date: Tue Feb 24 20:14:36 2015 -0800 Call the version-number argument to GENERATE_CASE_xxx() "ver". The name "type" is thrown around to mean both a version number and a part of a structure member, and some other macros use "ver" for the version number; try to make things a little less inconsistent. Change-Id: I61405cf41cca43fe607154af7498944c5ec0ef11 Reviewed-on: https://code.wireshark.org/review/7370 Reviewed-by: Guy Harris commit fc6df64 Author: Guy Harris Date: Tue Feb 24 19:12:35 2015 -0800 Use FULL/PART as an argument to all PACKET_DESCRIBE() macros. Makes the various flavors of that macro more similar. Change-Id: Ie95ee8db0b226458146b055b54b7d61835f1e508 Reviewed-on: https://code.wireshark.org/review/7368 Reviewed-by: Guy Harris commit 22b4b63 Author: Guy Harris Date: Tue Feb 24 19:00:17 2015 -0800 Get rid of an unused argument to PACKET_DESCRIBE(). Change-Id: Ic2037f5bf7eb43f93ba39f91bca3fc267c8fb850 Reviewed-on: https://code.wireshark.org/review/7366 Reviewed-by: Guy Harris commit 04b6b56 Author: Guy Harris Date: Tue Feb 24 16:15:13 2015 -0800 Give all PACKET_DESCRIBE() macros a HEADERVER argument. A bit of regularization. Change-Id: I60e0bd50891e1ba3e9c40f8d1d14d63534e08138 Reviewed-on: https://code.wireshark.org/review/7364 Reviewed-by: Guy Harris commit 08c85ec Author: Guy Harris Date: Tue Feb 24 16:06:49 2015 -0800 Call header version arguments HEADERVER. Use that rather than TYPE or acttype (to indicate that it's a header version number to use as the "xxx" in NSPR_HEADER_VERSIONxxx, and to use the same name throughout). Change-Id: I14cfc819e44ce4388c27d521a1256dec8d80df2e Reviewed-on: https://code.wireshark.org/review/7361 Reviewed-by: Guy Harris commit c4b76a9 Author: Guy Harris Date: Tue Feb 24 14:32:28 2015 -0800 More indentation cleanups. Change-Id: Ia448727e6340723800d92097f0ef7f3582ef6340 Reviewed-on: https://code.wireshark.org/review/7359 Reviewed-by: Guy Harris commit 0dc5edf Author: Guy Harris Date: Tue Feb 24 14:28:21 2015 -0800 Clean up indentation. Change-Id: I80f8c5c642ebc1fe0169e39c1af9584cfbb89d1a Reviewed-on: https://code.wireshark.org/review/7357 Reviewed-by: Guy Harris commit 37c09e3 Author: Guy Harris Date: Tue Feb 24 14:22:24 2015 -0800 Pull more into PACKET_DESCRIBE() for the V10 seek-read routine. Just like the read routine. Change-Id: If6bd98bea15f1c8dc7454a5dac0ea57920bddc8c Reviewed-on: https://code.wireshark.org/review/7355 Reviewed-by: Guy Harris commit 592ee9e Author: Guy Harris Date: Tue Feb 24 13:56:16 2015 -0800 Swallow up more V10 stuff into PACKET_DESCRIBE(). That makes it even more like V2x and V3x and slightly less unclear. Change-Id: I798ead123ba6418be0252067773a951390e26ce8 Reviewed-on: https://code.wireshark.org/review/7353 Reviewed-by: Guy Harris commit 2a31311 Author: Guy Harris Date: Tue Feb 24 13:21:51 2015 -0800 Have PACKET_DESCRIBE() for V10. Have it set the record type and initialize the presence bits. That makes it a bit more like V2x and V3x, and makes the code slightly less unclear. Change-Id: Ibfbe2143b24a68c3fa3f576616fde81918b01feb Reviewed-on: https://code.wireshark.org/review/7351 Reviewed-by: Guy Harris commit fe5aea7 Author: Guy Harris Date: Tue Feb 24 13:02:31 2015 -0800 Move the setting of rec_type. This makes the code slightly less unclear. (You are in a maze of twisty little C macros, all different.) Change-Id: I9f1bcc7a9a1a7afe87ede8b1ba513e3d8e53845c Reviewed-on: https://code.wireshark.org/review/7349 Reviewed-by: Guy Harris commit ced6fba Author: Guy Harris Date: Tue Feb 24 19:34:37 2015 +0000 Revert "exntest: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang" This reverts commit f9fc25241ca0c735c0945bebf04669f17c3ffbff. Apparently, clang is wrong about those increments being dead, as the tests done by exntest fail as a result of this change. Perhaps it doesn't understand setjmp/longjmp. Change-Id: I248fba972e52bcbc97a228777139ca22a835f4b6 Reviewed-on: https://code.wireshark.org/review/7347 Reviewed-by: Guy Harris commit c280a40 Author: Gerald Combs Date: Tue Feb 24 10:31:29 2015 -0800 Qt: Escape ampersands in checkboxes and radio buttons. Convert "&" to "&&" in checkbox and radio button preference labels so that they aren't interpreted as shortucts. Fixes QKeySequence::mnemonic: "Attempt to dissect LCID 1&2 as srb1&2" contains multiple occurrences of '&' Change-Id: Iacab6f81db01e6eca2cfdbaeda666f2e9c1016ed Reviewed-on: https://code.wireshark.org/review/7346 Reviewed-by: Gerald Combs commit c0c6278 Author: Roland Knall Date: Tue Feb 24 10:15:47 2015 +0100 openSAFETY: Remove Macro and clear dissection Removing the macros for packet sender/receiver as it makes the code hard to read and maintain. the more generic routine opensafety_packet_node is also used for displaying the time request sender and recipient. Also clearing up the message id field, as it is the wrong size and making the detection for the value an hf_field with an array value. Change-Id: I31cf0f944fe803fb503f4c5d29e106dfae0f6938 Reviewed-on: https://code.wireshark.org/review/7344 Reviewed-by: Roland Knall Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 30ed6a1 Author: Gerald Combs Date: Wed Feb 18 17:18:27 2015 -0800 Qt: Apply recent settings. Add PacketList::applyRecentColumnWidths which set the packet list column widths from our recent settings. Make sure it gets called at startup and when we change profiles. Save the packet list header state so that we can restore it when we reset the model (i.e. freezing and thawing) and load a new capture file. Save the state when the user resizes a column. As a side effect this works around a weird bug that adjusts the width of column 1 at an inopportune time. Add a profileChanging signal so that we can save the main window geometry in each profile. Get rid of MainWindow::configurationProfileChanged. It was unused. Apply saved pane widths and heights. Note that we might want to add a separate pair of recent settings for the Qt panes. Use the last opened directory in the capture file dialog. Git rid of some unneeded Q_UNUSEDs while we're here. Bug: 10953 Change-Id: I812aff59818cf0b4d1598b580627d32728d2e9d7 Reviewed-on: https://code.wireshark.org/review/7247 Reviewed-by: Michal Labedzki Tested-by: Michal Labedzki Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit f9fc252 Author: Alexis La Goutte Date: Thu Feb 19 22:41:32 2015 +0100 exntest: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I91ec67e8c2168dd9a93c3894abdf304c0a75845d Reviewed-on: https://code.wireshark.org/review/7263 Reviewed-by: Michael Mann commit b125fea Author: Daniel Mack Date: Tue Feb 24 09:32:38 2015 +0100 epan: fix build error with gcc5 gcc5 bails out with the below error. CC libwireshark_la-tvbparse.lo CC libwireshark_la-tvbuff_base64.lo tvbparse.c: In function 'cond_not_char': tvbparse.c:254:18: error: logical not is only applied to the left hand side of comparison [-Werror=logical-not-parentheses] if (! offset < tt->end_offset ) { ^ cc1: all warnings being treated as errors Makefile:1843: recipe for target 'libwireshark_la-tvbparse.lo' failed Change-Id: I4e8654e97079da6b39be580fc766eecefb4c7ea6 Reviewed-on: https://code.wireshark.org/review/7339 Reviewed-by: Guy Harris commit 4ee6bcb Author: Peter Wu Date: Sat Feb 21 18:43:14 2015 +0100 websocket: avoid recursion, use tcp_dissect_pdus Use tcp_dissect_pdus to handle reassembly and avoid a recursion in dissect_websocket. The HTTP dissector is modified to preserve desegmentation functionality (tested with the capture from bug 8448). As tcp_dissect_pdus is used now, the workaround for bug 8448 can be removed and the actual frame dissection logic becomes simpler (the length is checked in get_websocket_frame_length). Bug: 10989 Change-Id: I67af96a6c7be88c2a77e1c4138abe90bdb880774 Reviewed-on: https://code.wireshark.org/review/7285 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit c466d40 Author: ranushekhar Date: Mon Feb 23 18:17:33 2015 +0530 NS Trace (NetScaler Trace) file format is not able to export specified packets Bug: 10998 Change-Id: Ic2c5ad5b01be3e0c39b1e93badcc4f2246c420fe Reviewed-on: https://code.wireshark.org/review/7327 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 30651ab Author: Alexis La Goutte Date: Sun Feb 22 12:43:25 2015 +0100 DNS: Ignore Client Subnet option's data length when > 16 When DNS Client Subnet length is > 16, the limit coming from avoid stack smashing with tvb_memcpy Issue reported by Boaz Bug:10988 Change-Id: I6103ba47fac9817410c7fc399c18e96c66ab8438 Reviewed-on: https://code.wireshark.org/review/7308 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu Reviewed-by: Anders Broman commit b9af5a5 Author: Pascal Quantin Date: Mon Feb 23 16:50:18 2015 +0100 proto.c: avoid corrupting stack when printing a 64 bits field in BASE_DEC_HEX or BASE_HEX_DEC format Bug: 10994 Change-Id: Id5049054d5b04838df325f03a6bfa238a2063fb7 Reviewed-on: https://code.wireshark.org/review/7329 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 770ac91 Author: Gerald Combs Date: Sun Feb 22 14:56:38 2015 -0800 Qt: Fix a crash when changing the layout. Freeze and thaw the packet list when changing the layout. This has the side effect of clearing the proto tree and byte view, which avoids reading a bad tvb pointer. Note that we might want to add a cleanup callback to free_data_sources. Save and restore the current row. Add CaptureFile::currentRow. Fix a couple of comparisons in PacketList. Change-Id: I26f9b97ae5a7cdb4fb6e5e6e675570884900e995 Reviewed-on: https://code.wireshark.org/review/7337 Reviewed-by: Gerald Combs commit a6f4bdb Author: Daniel Mack Date: Tue Feb 24 00:50:19 2015 +0100 pcap-common: fix build error with gcc5 gcc5 complains about the issue below, so add a trivial fixup. CC libwiretap_la-pcap-common.lo pcap-common.c: In function 'pcap_byteswap_nflog_pseudoheader': pcap-common.c:1290:30: error: logical not is only applied to the left hand side of comparison [-Werror=logical-not-parentheses] if (!(nfhdr->nflog_version) == 0) { ^ cc1: all warnings being treated as errors Change-Id: I9f5b090ffd564f203cc3fb4ff302f2e4752865f0 Reviewed-on: https://code.wireshark.org/review/7336 Reviewed-by: Guy Harris commit 5e34492 Author: unknown Date: Mon Feb 23 21:19:30 2015 +0300 BSSMAP: VGCS/VBS Assignment Request wrong first parameter According to specification first mandatary parameter is Channel Type (BE_CHAN_TYPE) but not Current Channel Type 1 (BE_CURR_CHAN_1). And also "Channel Type" is TLV but not TV type. Change-Id: I740dc10930a854fcb1cf2e09a19d57a16f8cf33e Reviewed-on: https://code.wireshark.org/review/7330 Reviewed-by: Anders Broman commit 4a07667 Author: Guy Harris Date: Mon Feb 23 12:51:23 2015 -0800 Get rid of no-longer-needed variables. Change-Id: I2758c4f57fdaaa61c1d73ca9b5ccaf427599a624 Reviewed-on: https://code.wireshark.org/review/7332 Reviewed-by: Guy Harris commit 2899cf4 Author: Guy Harris Date: Sun Feb 22 18:59:43 2015 -0800 Don't add redundant information to the top-level flags item for NBNS. We already add the opcode, a "this is a response" indication for responses and, for non-WACK responses, the response code. No need to add it again. Change-Id: I2dd0f937568057a96cd70511c872f811ea838106 Reviewed-on: https://code.wireshark.org/review/7331 Reviewed-by: Guy Harris commit 255de16 Author: Pascal Quantin Date: Mon Feb 23 14:50:28 2015 +0100 RSVD: add missing initialization of lun parameter Bug: 10993 Change-Id: I0232cf616f880a02d50f20c67d9f76a642153737 Reviewed-on: https://code.wireshark.org/review/7328 Reviewed-by: Pascal Quantin commit 9667666 Author: Peter Wu Date: Mon Feb 23 13:05:46 2015 +0100 ui/gtk: use GTK+ 2 name for control keys The GDK_KEY_* names are part of GTK+ 3, GTK+ 2 does not have the _KEY_ infix. See https://developer.gnome.org/gtk3/stable/gtk-migrating-2-to-3.html#id-1.6.3.3.6 Fixes regression from "ui/gtk: fix control combos such as ctrl-a, ctrl-c". Change-Id: I4d470212d172f978c171e54ff7377ddc211817ac Reviewed-on: https://code.wireshark.org/review/7325 Reviewed-by: Balint Reczey commit d488d63 Author: Peter Wu Date: Wed Feb 18 20:06:57 2015 +0100 ssl-utils: refactor keyfile matching Merge the three separate regexes into a single pattern and use named groups. This avoid magic numbers (group positions) and removes a possible error source when the ht array gets out of sync with the patterns array (by human error). This is supposed to be more readable and allows for easier extension of the regex. Change-Id: I816525f358cdb89ff9f8ebc1211139b1f8c23840 Reviewed-on: https://code.wireshark.org/review/7245 Reviewed-by: Evan Huus Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 306c819 Author: Alexis La Goutte Date: Thu Feb 19 22:32:31 2015 +0100 jmirror packet dissector expects ipv6 flow label = 0 When the ipv6 flow label is non-zero the dissector does not detect the payload as being ipv6. Issue reported by Shehan Perera Bug:10976 Change-Id: I1de4966dfefd1afa9bb51b9a7570091aad59fbdd Reviewed-on: https://code.wireshark.org/review/7260 Reviewed-by: Anders Broman commit 4c994e3 Author: Jeroen Sack Date: Sun Feb 22 21:37:42 2015 +0100 L2CAP information message contained two bits that were wrongly dissected. Change-Id: I308b6ed1a3953676212b9c0bb6cd7fc180210534 Reviewed-on: https://code.wireshark.org/review/7323 Reviewed-by: Michal Labedzki commit 6765bf7 Author: Guy Harris Date: Sun Feb 22 18:50:50 2015 -0800 Fix generation of address-with-resolution strings. XXX_to_str routines should return the length, in bytes, of the generated string, including the terminating '\0'. As their reutrn values include the terminating '\0', we need to subtract 1 from the return value if, when appending the ")" after the address string, we want to skip past the address string rather than skipping past the terminating '\0'. Change-Id: Ibfd41e6d7152d05070706e6d76fc3e56a097a75b Reviewed-on: https://code.wireshark.org/review/7324 Reviewed-by: Guy Harris commit 1c4053f Author: Alexis La Goutte Date: Thu Feb 19 22:38:45 2015 +0100 BMP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I322be0953ce8c872f8464c3e095dfe9006d3b67b Reviewed-on: https://code.wireshark.org/review/7261 Reviewed-by: Anders Broman commit b9296b7 Author: Guy Harris Date: Sun Feb 22 12:21:47 2015 -0800 Fix handling of longitude and latitude values. The formatting routine is getting passed the 5-byte value, not some 8-byte value that includes the 3 bytes after it, so shifting it produces the wrong value. Make the longitude and latitude FT_UINT40, as they're only 5 bytes long. Change-Id: I35aa05887bcfdfc1107fef2ac5069f1fe96fda3a Reviewed-on: https://code.wireshark.org/review/7321 Reviewed-by: Guy Harris commit 08bee7d Author: Guy Harris Date: Sun Feb 22 12:04:48 2015 -0800 Clean up display of raw hex latitude/longitude values. 1) It's only 40 bits long, so show only 10 hex digits. 2) If you're putting "0x" before the number, blank-padding on the left looks weird; use zero-padding. 3) Fix unbalanced parentheses. Change-Id: I76aedb1fb82f699ee08102b97b0d72e09d8c5917 Reviewed-on: https://code.wireshark.org/review/7320 Reviewed-by: Guy Harris commit 066ae91 Author: Guy Harris Date: Sun Feb 22 11:54:56 2015 -0800 Put back address family field. Change-Id: I89d60f78a0c834663c426f5ec50c6033ba9f99e1 Reviewed-on: https://code.wireshark.org/review/7318 Reviewed-by: Guy Harris commit 99ff8ba Author: Guy Harris Date: Sun Feb 22 11:24:33 2015 -0800 Use file extensions even more as a heuristic. If a file type has a list of "typical" extensions, and a file has an extension that is *not* one of those extensions, the file is unlikely to be of that type. For files that have extensions, after we try the heuristics that have a list of "typical" extensions that includes the file's extension, try the heuristics that have no such list, and after that try the heuristics that have such a list but where the list *doesn't* include the file's extension. This fixes, for example, some cases where non-PacketLogger files were getting identified as PacketLogger files. Change-Id: I2d8c3b983ed6ccd692beb888668f77eb9b5f437b Reviewed-on: https://code.wireshark.org/review/7315 Reviewed-by: Guy Harris commit 73508e8 Author: Gerald Combs Date: Sun Feb 22 08:05:29 2015 -0800 [Automatic manuf, services and enterprise-numbers update for 2015-02-22] Change-Id: Ida0ae626be0753c05435f3828d5137863309ebf1 Reviewed-on: https://code.wireshark.org/review/7309 Reviewed-by: Gerald Combs commit d1865e0 Author: Guy Harris Date: Sun Feb 22 00:56:00 2015 -0800 Make FT_{U}INT{40,48,56,64} handle BASE_CUSTOM. Finish the job of handling integral values > 32 bits similarly to who we handle values 32 bits or less. In cases that "should not happen", and where we might *not* be executing in the context of a dissector (filling in the field label can be done lazily, being deferred to "print" time, and that doesn't happen in the context of a dissector), use g_assert_not_reached() rather than DISSECTOR_ASSERT_NOT_REACHED() - the latter throws an assertion that's not caught if we're not doing dissection, so we crash anyway. Bug: 10983 Change-Id: Ia81a0a4925394f99aa35193a333f3e9659a9b93d Reviewed-on: https://code.wireshark.org/review/7307 Reviewed-by: Guy Harris commit 1157aa8 Author: Guy Harris Date: Sat Feb 21 23:26:06 2015 -0800 Set 64-bit signed values with proto_tree_set_int64(). As in "don't set it with proto_tree_set_uint64(), signed vs. unsigned matters". Change-Id: I23ef3d172fa40c0867dfb6a078ce292bd5282170 Reviewed-on: https://code.wireshark.org/review/7306 Reviewed-by: Guy Harris commit 2196378 Author: Guy Harris Date: Sat Feb 21 19:45:08 2015 -0800 Fetch values appropriately according to the value's type. This fixes some crashes. Change-Id: I47583777486486114675ba98cb58971adb8b1b10 Reviewed-on: https://code.wireshark.org/review/7305 Reviewed-by: Guy Harris commit 8d5da72 Author: Michael Mann Date: Sat Feb 14 18:01:53 2015 -0500 Add tvb_address_with_resolution_to_str. Convert dissectors to using the API where appropriate. Change-Id: I059582f73a75635d4a0338d02d4c4b212162480b Reviewed-on: https://code.wireshark.org/review/7296 Petri-Dish: Michael Mann Reviewed-by: Michael Mann commit ddafa7e Author: Guy Harris Date: Sat Feb 21 14:53:39 2015 -0800 Update Debian symbols list. Change-Id: Iaf5d8022f2005ac32133896c74f45246a2310684 Reviewed-on: https://code.wireshark.org/review/7303 Reviewed-by: Guy Harris commit bfb4327 Author: Guy Harris Date: Sat Feb 21 12:39:00 2015 -0800 Remove tvb_ from the names of wsutil mempbrk routines. Routines that don't take a tvbuff as an argument shouldn't have tvb_ in the name. Change-Id: I3550256551e30b3f329cbbfca71ef27c727d29c0 Reviewed-on: https://code.wireshark.org/review/7302 Reviewed-by: Guy Harris commit f3a68f0 Author: Guy Harris Date: Sat Feb 21 12:17:30 2015 -0800 Rename the slower-but-portable mempbrk to ws_mempbrk_portable_exec(). That parallels ws_mempbrk_sse42_exec(). Change-Id: I1662badc6d1efab5bdd827f29bbad3712464ec43 Reviewed-on: https://code.wireshark.org/review/7301 Reviewed-by: Guy Harris commit e35aa1f Author: Guy Harris Date: Sat Feb 21 12:13:54 2015 -0800 Move declarations of internal ws_mempbrk routines to a separate header. Put the internal routines, which are only to be used by the implementation of the mempbrk functions, to a separate header file, so that they're not exported even in the standard header file. Change-Id: I92c39b138de3e4f9da1b102210b39d50728e2fd6 Reviewed-on: https://code.wireshark.org/review/7300 Reviewed-by: Guy Harris commit f12d231 Author: Guy Harris Date: Sat Feb 21 12:07:21 2015 -0800 More wrapping of constants with G_GUINT64_CONSTANT(). Change-Id: I11771b08cc4e57692c42dd3fc8976fe390b3025d Reviewed-on: https://code.wireshark.org/review/7299 Reviewed-by: Guy Harris commit f868da2 Author: Guy Harris Date: Sat Feb 21 11:43:08 2015 -0800 Update Debian symbols file. Change-Id: Ide84741afffbd7c8c6dac44cf456291e2609af9d Reviewed-on: https://code.wireshark.org/review/7298 Reviewed-by: Guy Harris commit 0808fc0 Author: Guy Harris Date: Sat Feb 21 11:40:39 2015 -0800 64-bit constants need to be wrapped in G_G{U}INT64_CONSTANT(). Otherwise, they don't get the right suffix to tell the compiler that they're 64-bit even on ILP32 platforms. Change-Id: I5c52a999d21707602e0a4174a142d1d1036242be Reviewed-on: https://code.wireshark.org/review/7297 Reviewed-by: Guy Harris commit 1694e81 Author: Guy Harris Date: Sat Feb 21 11:35:08 2015 -0800 The shortening to 32 bits is intentional, so add a cast. The cast reassures the compiler that we do, in fact, know what we're doing, so it doesn't issue a warning. Change-Id: Ie3bc4e1c955f9c5cad5506e26fc72e12f7a8f854 Reviewed-on: https://code.wireshark.org/review/7295 Reviewed-by: Guy Harris commit ffeadb7 Author: Michal Labedzki Date: Thu Jan 22 12:27:23 2015 +0100 Bluetooth/GUI: ATT: Use alphabetical order in makefile Change-Id: Ia34dd6b783a1c8214956166b07ffb1537f04aa1d Reviewed-on: https://code.wireshark.org/review/7291 Reviewed-by: Michal Labedzki commit b8388c6 Author: Michal Labedzki Date: Thu Feb 5 11:57:27 2015 +0100 Ftypes: Double: Minor fixes Fix comments typos and use safe equivalent of sprintf. Change-Id: Icc9d69532dc35e8a58a78c0eacdb42214b679069 Reviewed-on: https://code.wireshark.org/review/7290 Reviewed-by: Michal Labedzki commit 9ad00fd Author: Michal Labedzki Date: Sat Feb 14 18:49:36 2015 +0100 Qt: Fix for QT < 4.8 QApplication::queryKeyboardModifiers() was introduced in 4.8. Try to be compatibile with my old Qt 4.7.2. Change-Id: Ie4abdd397cf2f10bb50132b09fed198d30425ee7 Reviewed-on: https://code.wireshark.org/review/7289 Reviewed-by: Michal Labedzki commit 8e43698 Author: Michal Labedzki Date: Mon Feb 9 12:34:11 2015 +0100 Set phdr encap for pcap file Change-Id: Id600b395d6fd2711c9b392a60454e5bd9a3eb465 Reviewed-on: https://code.wireshark.org/review/7288 Reviewed-by: Michal Labedzki commit 2d1d83a Author: Michal Labedzki Date: Sat Feb 21 17:42:28 2015 +0100 Use correct mem scope for source address in Text Logcat Change-Id: I94594e5c7ad8a398dd86ee3fe496077196f81fb9 Reviewed-on: https://code.wireshark.org/review/7287 Reviewed-by: Michal Labedzki commit c093797 Author: Michal Labedzki Date: Sat Feb 21 17:40:40 2015 +0100 Fix GTK-shark Looks like a copy/paste issue. ERROR: wireshark/color_filters.c:100:color_filters_add_tmp: assertion failed: (strlen(prefs.gui_colorized_fg)==69) Change-Id: I7b8309cfc178fd834951078a098bbce986639ed2 Reviewed-on: https://code.wireshark.org/review/7286 Reviewed-by: Michal Labedzki commit e2bcee6 Author: JC Wren Date: Wed Dec 17 15:19:20 2014 -0500 Make FT_{U}INT64 behave more like FT_{U}INT32, add support for FT_{U}INT{40,48,56} Change-Id: I57354c309ecf3a0c8f0c7cff485638027f30bb19 Reviewed-on: https://code.wireshark.org/review/5813 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Reviewed-by: Anders Broman commit 13531d3 Author: Michael Mann Date: Thu Feb 12 19:51:11 2015 -0500 Convert dissectors to use address_with_resolution_to_str instead of two separate calls for address string and name resolution. Change-Id: I7c8cfbcf201b3b73afe731302572646ce7833d64 Reviewed-on: https://code.wireshark.org/review/7284 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit c1b672c Author: Peter Wu Date: Thu Feb 19 23:58:41 2015 +0100 checkAPIs: match packet-*.[ch], independent of locale In perl, the \w character group seems to match '-' depending on the locale. On Linux (with the C or en_US.UTF-8 locale), packet-ssl-utils.c does not match. This patch makes the regex match anything except for the path separator. Change-Id: I27543072295af5f2bd5ea8ab36e5d913bebf7d85 Reviewed-on: https://code.wireshark.org/review/7266 Reviewed-by: Michael Mann commit 5012cf8 Author: Gerald Combs Date: Fri Feb 20 15:49:35 2015 -0800 Call pre_init_prefs each time our profile changes. Manually back out gafa96c3 so that we can set our preferences to their default values each time we switch profiles. Zero the prefs struct at startup. Change-Id: Ic28db44cd0c4cdf640e977d7277f7357db10ebe8 Reviewed-on: https://code.wireshark.org/review/7282 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit ae9cc88 Author: Gerald Combs Date: Fri Feb 20 17:03:48 2015 -0800 Qt: Fix unsaved changes behavior. Check the return value of testCaptureFileClose in MainWindow::openCaptureFile and add testCaptureFileClose to MainWindow::closeEvent. Some of the file opening and closing behavior still needs to be cleaned up but this should at least keep the user from losing unsaved data. Bug: 10944 Change-Id: I7d7b563a6b72f48b41a5a3aff2837655557869ff Reviewed-on: https://code.wireshark.org/review/7283 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit ead79e6 Author: Gerald Combs Date: Fri Feb 20 13:44:27 2015 -0800 Clear the filter expression list in prefs.c. Move filter_expression_nuke from ui/gtk to epan and rename it to filter_expression_free. Call it in prefs_reset along with the other preference reset routines. This keeps the Qt filter toolbar from filling up with duplicate expressions when the profile changes. Change-Id: I9fae9a7b48944079ea342a126979d9e79af0d22b Reviewed-on: https://code.wireshark.org/review/7281 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 422ad10 Author: Gerald Combs Date: Fri Feb 20 10:32:15 2015 -0800 Qt: Apply the main window geometry directly. As of g2c00d66 we create the main window after we've read the recent settings. This means that we can get rid of the property animation workaround in MainWindow::loadWindowGeometry. Change-Id: I028061c5bdab9261f9394a1840bcdcb752a4f0c8 Reviewed-on: https://code.wireshark.org/review/7278 Reviewed-by: Gerald Combs commit 1a10f5f Author: Peter Wu Date: Fri Feb 20 16:09:06 2015 +0100 ui/gtk: fix control combos such as ctrl-a, ctrl-c Ignore any Ctrl combinations to allow pasting to work. Regression introduced in "gtk: fix crash on Broadway GDK backend". Change-Id: I3d53db2d224cb604b52081002ff923c8684a8d0a Reviewed-on: https://code.wireshark.org/review/7276 Reviewed-by: Balint Reczey Tested-by: Balint Reczey commit bccb7f7 Author: AndersBroman Date: Fri Feb 20 15:02:08 2015 +0100 [Diameter] It's MCC first in 3GPP AVP 909 RAI Change-Id: If4dd0d64d5a8d313ae9e62d2fcce3606ef8eb4f4 Reviewed-on: https://code.wireshark.org/review/7274 Reviewed-by: Anders Broman commit 9fe9505 Author: Pascal Quantin Date: Fri Feb 20 12:47:52 2015 +0100 addr_resolv.c: fix a stack buffer overflow detected by ASAN Issue reported by Alexis Change-Id: I0ef19625b6844fbc2996b75d51e86f949e358c8d Reviewed-on: https://code.wireshark.org/review/7273 Reviewed-by: Pascal Quantin commit a99cc2f Author: Pascal Quantin Date: Fri Feb 20 12:35:06 2015 +0100 address_types.c: fix a "conditional jump or move depends on uninitialised value" error found by Valgrind Change-Id: Ic752bb6aa1ba56e113895fcbed52f417ac0128f7 Reviewed-on: https://code.wireshark.org/review/7272 Reviewed-by: Pascal Quantin commit c84b022 Author: Alexis La Goutte Date: Thu Feb 19 22:55:11 2015 +0100 MQTT: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I730b752680c85777a074a6b2bb4aef0c9f4d3ff5 Reviewed-on: https://code.wireshark.org/review/7265 Reviewed-by: Anders Broman commit 56356b8 Author: Alexis La Goutte Date: Thu Feb 19 22:43:47 2015 +0100 MCPE: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I7053c3c9e42cb4246ae504d31213bf95917a34f2 Reviewed-on: https://code.wireshark.org/review/7264 Reviewed-by: Anders Broman commit f89edfd Author: Alexis La Goutte Date: Thu Feb 19 22:40:57 2015 +0100 addr_resolv: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I559151afab48892c51b702d008c1583570bd8754 Reviewed-on: https://code.wireshark.org/review/7262 Reviewed-by: Anders Broman commit 95382c3 Author: Gerald Combs Date: Thu Feb 19 16:05:49 2015 -0800 Suppress a bunch of cast-qual warnings. Squelch warning: cast discards ‘__attribute__((const))’ qualifier from pointer target type [-Wcast-qual] similar to g630f54f. Change strtod to g_ascii_strtod to squelch a checkAPIs error. Change-Id: Ib2d26ef89f08827a5adc07e35eaf876cd7b8d14e Reviewed-on: https://code.wireshark.org/review/7269 Reviewed-by: Gerald Combs commit 9423a13 Author: Guy Harris Date: Thu Feb 19 16:23:39 2015 -0800 Just have init_progfile_dir() take a void pointer. dladdr() takes a void * as a code pointer; have init_progfile_dir() do so, and do the casting in the calls. We don't care about the signature of the function whose address we're passing, we just want to pass a pointer to *something* in the main program. Change-Id: I9372620a97b0eb53c2bb3c0c41a238b4408f3709 Reviewed-on: https://code.wireshark.org/review/7270 Reviewed-by: Guy Harris commit ec6ec49 Author: Gerald Combs Date: Thu Feb 19 15:18:44 2015 -0800 Qt: Fix automatic update status in welcome screen. Wait until the application has been initialized before checking prefs.gui_update_enabled. Change-Id: I6e52ba26064b6c5b882992c30c76b65d4a618848 Reviewed-on: https://code.wireshark.org/review/7268 Reviewed-by: Gerald Combs commit 0d3b51a Author: Gerald Combs Date: Thu Feb 19 15:04:15 2015 -0800 Remove quotes from an Nmake macro. Change-Id: Ibe6a544af49c39c12ce13264fb010ccdc54d471b Reviewed-on: https://code.wireshark.org/review/7267 Reviewed-by: Gerald Combs commit 999bbc9 Author: Gerald Combs Date: Tue Feb 10 13:48:48 2015 -0800 Qt: Add more version and packaging information to the main window. Add a "flavor" (for lack of a better word) banner, which can be set at build time via WIRESHARK_VERSION_FLAVOR / VERSION_FLAVOR. Set it to "Development Build" by default. This effectively migrates the "DEVELOPMENT VERSION" logo image text from the GTK+ UI. Add full release and automatic update information at the bottom. Remove the short version from the welcome banner (top left). To do: - Add back support for gui_version_placement. - Move the version and repository branch to the flavor label? - Add update links as appropriate to the bottom. - Clean up layout and spacing. Change-Id: I28af33e6c2beb855f803a2dfedef49f3e8389057 Reviewed-on: https://code.wireshark.org/review/7071 Reviewed-by: Gerald Combs commit c200f1e Author: Guy Harris Date: Thu Feb 19 13:29:20 2015 -0800 Rename packet-nbns.c to packet-nbt.c to reflect that it's not just NBNS. packet-nbt.c handles all of NetBIOS-over-TCP, not just the name service; the file name is historical. Change-Id: I333d331fd9453cea8d1d7595b4fd2650f0a92e98 Reviewed-on: https://code.wireshark.org/review/7259 Reviewed-by: Guy Harris commit a6c44c2 Author: Ebben Aries Date: Mon Feb 9 10:20:20 2015 -0800 [bmp] Adding dissector for BGP Monitoring Protocol * Support per draft-ietf-grow-bmp-07 Change-Id: Iadb833157e7832077429c048e28e9814da29e2c6 Reviewed-on: https://code.wireshark.org/review/7192 Reviewed-by: Alexis La Goutte commit 20e2c38 Author: Alexis La Goutte Date: Wed Feb 18 20:00:38 2015 +0100 libnl: disable pedantic warning of libnl lib Part 2... Change-Id: I47b74c81ee7b7cd8296ce9da5a60ad6aecef8c78 Reviewed-on: https://code.wireshark.org/review/7239 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 5c60289 Author: Alexis La Goutte Date: Tue Feb 10 11:02:42 2015 +0100 Qt Wireshark - Once a live capture is stopped the title bar persists in reporting "Capturing from interface name" With Qt Wireshark the title bar persists in reporting "Capturing from " even though capturing has stopped. With GTK Wireshark once a live capture is stopped the title bar is updated to report the interface name(s) used for the unsaved capture file. Issue reported by Jim Young Bug:10948 Change-Id: Ia6099f63f82b6610ade5c81af0cf257236f076ec Reviewed-on: https://code.wireshark.org/review/7050 Reviewed-by: Gerald Combs Reviewed-by: Anders Broman commit 2bc71d3 Author: Roland Knall Date: Thu Feb 19 15:16:51 2015 +0100 openSAFETY: Merge both CT values Both values mean the same thing and should be found using the same hf_field, as this eases debugging scenarios. Change-Id: I23f675e22623b5e66354708319a41dcf34143e30 Reviewed-on: https://code.wireshark.org/review/7257 Reviewed-by: Roland Knall Reviewed-by: Pascal Quantin commit b43fecb Author: Osman Sakalla Date: Thu Feb 19 15:46:38 2015 +0100 patch for PMIPv6 MAG GPS coordinates Change-Id: I25bbd67775e19c2a0199507538b7dcfe5ce28bf6 Reviewed-on: https://code.wireshark.org/review/7256 Reviewed-by: Anders Broman commit 9fba8c8 Author: Dario Lombardo Date: Wed Feb 18 23:55:51 2015 +0100 Bugfix in nbns dissector. Change-Id: I5375a1ae2e48fe0c7ff6e3dde24b8d7b02b1f27f Reviewed-on: https://code.wireshark.org/review/7251 Reviewed-by: Anders Broman commit d330cf7 Author: Dario Lombardo Date: Wed Feb 18 19:07:22 2015 +0100 Documentation fix (reported by Richard Sharpe). Change-Id: Ie4979c1be0e325178e3c662e0b2c5bbfc58456d9 Reviewed-on: https://code.wireshark.org/review/7252 Reviewed-by: Anders Broman commit ca68a7a Author: AndersBroman Date: Thu Feb 19 15:21:34 2015 +0100 Add some casts to satisfy the various compilers. Change-Id: I7687fc0b433774fe447757af00bdaa2fc44ac59d Reviewed-on: https://code.wireshark.org/review/7254 Reviewed-by: Anders Broman commit adf6f89 Author: Jeff Morriss Date: Thu Feb 19 09:11:06 2015 -0500 Add some casts to satisfy the various compilers. Change-Id: Ic6a1124da986555d07cfeb71167b74f192c1c062 Reviewed-on: https://code.wireshark.org/review/7253 Reviewed-by: Jeff Morriss commit 8d16ac4 Author: Michael Mann Date: Thu Feb 12 12:03:49 2015 -0500 Add name resolution support to address type. Add address_with_resolution_to_str API that returns address string + name resolution in the format %s (%s), first string is resolved name (if available) and second string is raw address string. Convert AT_FCWWN to using proper name resolution format First use of address_with_resolution_to_str with field types in proto.c Change-Id: I2ae77c29a4ffc30bb919fbec00f06629830898c2 Reviewed-on: https://code.wireshark.org/review/7196 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 7208355 Author: Guy Harris Date: Thu Feb 19 02:14:39 2015 -0800 Don't put CORBA IDL dissectors in ASN1_ variables. Put them into separate CORBA_IDL_ variables, to keep the two types of generated dissectors separate. Change-Id: I4eb091a76ba5bc7d73533ef38fb29adc12a8ec42 Reviewed-on: https://code.wireshark.org/review/7250 Reviewed-by: Guy Harris commit 6eae09f Author: Vincenzo Reale Date: Tue Feb 17 18:39:32 2015 +0100 lupdate for Italian (new strings translated) Change-Id: I22ecf6950d47b63d5512c029d745b75be932554d Reviewed-on: https://code.wireshark.org/review/7197 Reviewed-by: Dario Lombardo Reviewed-by: Alexis La Goutte Reviewed-by: Anders Broman commit c8f6d21 Author: Hofer Manuel Date: Wed Jan 14 21:15:05 2015 -0500 Add a dissector for Microsoft's SSTP protocol. ... with some changes from Jeff Morriss: - Change how SSTP is "registered": rather than trying something complicated, just put the intelligence for recognizing SSTP into the HTTP dissector. (This does mean the SSTP dissector needs to do its own desegmentation now but it makes things much cleaner.) - Use proto_tree_add_subtree_format() instead of proto_tree_add_text() + proto_item_add_subtree(). - The messagetype is 16 bits, use tvb_get_guint16() instead of tvb_get_guint8() (fixes COL_INFO display) - A few other few misc. cleanups (I didn't update NEWS because I can no longer build NEWS without adding UTF8 fancy quotes and so forth.) Bug: 8239 Change-Id: I3631ae65f67bea69815ccf43472fdbcac3ca3499 Reviewed-on: https://code.wireshark.org/review/7227 Petri-Dish: Jeff Morriss Reviewed-by: Anders Broman commit ff1c33c Author: Peter Wu Date: Wed Feb 18 13:01:33 2015 +0100 ssl: check for minimal SSLv3/TLS record size When a TLS record is fragmented over multiple TCP segments, with its first byte in one segment, and the remainder over the others, ssl_looks_like_sslv3() throws an exception because it tries to access the third byte. This breaks the encryption state, resulting in very weird (scrambled) decrypted data. To fix this, check the record size before using it. Also add TLSv1.1 and TLSv1.2 as known version. Change-Id: Ie0ca78302a5d6c4241ea699d2ef6f7b873dd51ee Reviewed-on: https://code.wireshark.org/review/7234 Reviewed-by: Peter Wu Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 7d66c25 Author: Guy Harris Date: Wed Feb 18 20:33:49 2015 -0800 That's not an ASN.1 dissector (and gets warnings). Change-Id: I55b49080c64a44c1e5752ab986cb6b27772d14db Reviewed-on: https://code.wireshark.org/review/7248 Reviewed-by: Guy Harris commit 58f7788 Author: Guy Harris Date: Wed Feb 18 12:51:43 2015 -0800 Move some ASN.1 dissectors to the clean list. Change-Id: If642132eb4a2b77db5e56b150b85f064b4b10b30 Reviewed-on: https://code.wireshark.org/review/7244 Petri-Dish: Guy Harris Reviewed-by: Guy Harris commit 493ab6b Author: Guy Harris Date: Wed Feb 18 17:16:04 2015 -0800 Check whether emmintrin.h can be used *without* -msse4.2. If not, we can't use SSE 4.2, as we need to be able to include it in files that use tvb_pbrk_compile()/tvb_pbrk_exec() even if they're not compiled with -msse4.2 (most files aren't, as we need to isolate SSE 4.2 instructions to a small bit of code that uses them only if running on hardware that supports them). Change-Id: I62262a3c45fa14e200967916ac0ffc283f8e322c Reviewed-on: https://code.wireshark.org/review/7246 Reviewed-by: Guy Harris commit e29dca7 Author: Guy Harris Date: Wed Feb 18 12:11:34 2015 -0800 Not all compilers support turning of "format=". The clang on my machine doesn't; just do "format" instead. (The best way to handle this may be to do the formatting ourselves, so that we can get thousands separators on *all* platforms, regardless of whether its printf formatter supports it.) Change-Id: I1948d1799688cb3cf1d7b0de0696c09f6bf23f1c Reviewed-on: https://code.wireshark.org/review/7241 Reviewed-by: Guy Harris commit fcc05a4 Author: Gerald Combs Date: Wed Feb 18 12:00:36 2015 -0800 Use plain old ASCII for the SimpleDialog delimiter. Use a UUID for the SimpleDialog primary delimiter instead of trying to leverage Unicode. Bug: 10953 Change-Id: Ib518b32ef65b50f311b061ab5a267e7d1aa9f01b Reviewed-on: https://code.wireshark.org/review/7240 Reviewed-by: Gerald Combs commit 3a79d04 Author: Pascal Quantin Date: Tue Feb 17 18:30:14 2015 +0100 H.248: fix dissection of ServiceChangeReason for version 1 My understanding of RFC 3015 is that the encoding of this field was not different in version 1 compared to newer releases Bug: 10879 Change-Id: Iaa81679388860c0df4adc673ca6e56aff6f4591c Reviewed-on: https://code.wireshark.org/review/7195 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit fb4252e Author: Alexis La Goutte Date: Tue Feb 17 21:29:37 2015 +0100 RADIUS: Add new dicto from FreeRADIUS commit 6c51e945a73844029f347c3fdaa0de1ec96473f1 Author: Alan T. DeKok Date: Tue Feb 10 13:22:39 2015 -0500 New dictionary Change-Id: I60ba21dbadd3e35c1b0b01d7cea14b683f7f2a0c Reviewed-on: https://code.wireshark.org/review/7237 Reviewed-by: Anders Broman commit dd15191 Author: Gerald Combs Date: Wed Feb 18 10:34:20 2015 -0800 Suppress a printf grouping warning. Suppress warning: ISO C does not support the ''' printf flag [-Wformat=] We verify that we *do* support it via HAVE_GLIB_PRINTF_GROUPING. Change-Id: Iedcf1d1856238e05babde5fe8ec23f64fbf2cdcf Reviewed-on: https://code.wireshark.org/review/7238 Reviewed-by: Gerald Combs commit 0dd7714 Author: Alexis La Goutte Date: Thu May 22 21:44:06 2014 +0200 Add AddressSanitizer (ASAN) build option --enable-asan for autotools -D ENABLE_ASAN:BOOL=TRUE for CMake Need Clang/LLVM >= 3.1 or GCC >= 4.9 More information about ASAN https://code.google.com/p/address-sanitizer/wiki/AddressSanitizer Change-Id: I833d4216d9508b8f7550ebc1dff6326734bdb53a Reviewed-on: https://code.wireshark.org/review/1727 Reviewed-by: Peter Wu Reviewed-by: Alexis La Goutte commit b356887 Author: Dario Lombardo Date: Wed Feb 18 14:45:53 2015 +0100 Bugfix in ui/qt/CMakeLists.txt (missing file). Change-Id: I1db046f2e0555c8fc78d71ec6646c18cbb6f31eb Reviewed-on: https://code.wireshark.org/review/7235 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Jeff Morriss commit 4342333 Author: Alexis La Goutte Date: Tue Feb 17 21:30:59 2015 +0100 libnl: disable pedantic warning of libnl lib /usr/include/libnl3/netlink/types.h:25:15: warning: comma at end of enumerator list [-Wpedantic] /usr/include/libnl3/netlink/handlers.h:65:9: warning: comma at end of enumerator list [-Wpedantic] /usr/include/libnl3/netlink/handlers.h:81:18: warning: comma at end of enumerator list [-Wpedantic] /usr/include/libnl3/netlink/handlers.h:113:18: warning: comma at end of enumerator list [-Wpedantic] /usr/include/libnl3/netlink/utils.h:43:13: warning: comma at end of enumerator list [-Wpedantic] /usr/include/libnl3/netlink/attr.h:47:16: warning: comma at end of enumerator list [-Wpedantic] /usr/include/libnl3/netlink/route/link.h:95:23: warning: comma at end of enumerator list [-Wpedantic] ... Change-Id: I3f14e9d4887569e5d7befe1adb77561c8793437e Reviewed-on: https://code.wireshark.org/review/7201 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Reviewed-by: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 7263af8 Author: Guy Harris Date: Wed Feb 18 00:03:42 2015 -0800 Eliminate some DIRTY_ file lists. We don't want to encourage people to add to those lists, we want to encourage people to subtract *from* those lists (either by fixing warnings or, if an infelicitous API, or an infelicitous declaration of an API on some platforms, or a program generator that doesn't take sufficient care to avoid warnings - I'm looking at *you*, Flex - makes it impossible to fix without introducing other problems, using the DIAG_OFF()/DIAG_ON() macros if possible). Eliminate the empty lists, to make it harder to fill them up again. Change-Id: I298d07952c0cb1842a4ea71ba7e07c68e94a04e9 Reviewed-on: https://code.wireshark.org/review/7229 Reviewed-by: Guy Harris commit 9707ff8 Author: Gerald Combs Date: Tue Feb 17 21:18:43 2015 -0800 Uninstall wireshark.appdata.xml. Change-Id: Ic955e008b686af448f2091de891f8457623ae7d5 Reviewed-on: https://code.wireshark.org/review/7228 Reviewed-by: Gerald Combs commit 630f54f Author: Gerald Combs Date: Tue Feb 17 13:33:15 2015 -0800 Fix various warnings in wireshark-qt.cpp. Squelch warnings due to (char *) casts. Use "include_directories(SYSTEM..." in CMakeLists.txt so that we don't get pedantic warnings about things we can't easily fix such as QList loop optimizations. Not sure if there's an easy way to do this in Autotools. Pass get_gui_compiled_info to init_progfile_dir. C++ don't have to show you any stinkin' ::main. warning: ISO C++ forbids taking address of function ‘::main’ [-Wpedantic] Change-Id: If1c77284ab0d1b4786bce4e926a4109dd9b1ae34 Reviewed-on: https://code.wireshark.org/review/7207 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit b3f3d66 Author: Gerald Combs Date: Tue Feb 17 18:11:01 2015 -0800 Update Qt version checks. It looks like QPaintDevice::devicePixelRatio() was added in 5.1. Back out some debugging code. Change-Id: I40f19c0d7901ce95f587531983e5c6644daf64f4 Reviewed-on: https://code.wireshark.org/review/7226 Reviewed-by: Gerald Combs commit a5aab24 Author: Jeff Morriss Date: Thu Sep 18 11:47:21 2014 -0400 Add an appdata entry for Wireshark. Based on the one from Richard Hughes. A French translation of the description field is included. Links to two screenshots are provided--they are stored in my home directory on wireshark.org (for lack of a better place that I can put them). Bug: 10479 Change-Id: Ida9b9e46c0fb23a7baff50f98afa597b25b8ca54 Reviewed-on: https://code.wireshark.org/review/4178 Reviewed-by: Jeff Morriss commit 909d891 Author: Guy Harris Date: Tue Feb 17 17:21:25 2015 -0800 Some additional UAT update callback changes. I guess the signature mismatch must just be a warning with Clang; it's not with MSVC. Change-Id: Ic1f4cb88471f7e13019e891f111978310dfada73 Reviewed-on: https://code.wireshark.org/review/7225 Reviewed-by: Guy Harris commit b10bad1 Author: Gerald Combs Date: Tue Feb 17 16:01:39 2015 -0800 Fix QCustmPlot retina problems. Make sure our intermediate pixmaps have the same number of pixels as the screen. A merge request with the same changes has been made upstream. Change-Id: I19950181d52f347e3aa7f5abb6e9ad33a4097abf Reviewed-on: https://code.wireshark.org/review/7224 Reviewed-by: Gerald Combs commit 9d1ea65 Author: Guy Harris Date: Tue Feb 17 16:48:10 2015 -0800 Fix comments to reflect reality. Change-Id: I63aeb49e442eb6eba5cdf35ded221894c1d0ea6c Reviewed-on: https://code.wireshark.org/review/7223 Reviewed-by: Guy Harris commit 859511d Author: Guy Harris Date: Tue Feb 17 16:40:28 2015 -0800 Make UAT record update callbacks return a success/failure indication. Have them return TRUE on success and FALSE on failure. Check the return value rather than whether the error string pointer is null or not. Change-Id: I800a03bcd70a6bbb7b217cf7c4800e9cdcf2189c Reviewed-on: https://code.wireshark.org/review/7222 Reviewed-by: Guy Harris commit 3f765b3 Author: Gerald Combs Date: Sun Feb 15 17:58:12 2015 -0800 Add a CF_FUNC macro for casting BASE_CUSTOM functions. Add a CF_FUNC macro to match VALS, TFS, etc. This should help us to avoid the following warning: warning: ISO C forbids initialization between function pointer and 'void *' [-Wpedantic] We could start adding DIAG_OFF+DIAG_ON everywhere but this seems to be more consistent with the other macros in proto.h. Update each instance of BASE_CUSTOM to use CF_FUNC. Adjust a dummy variable name generated by asn2wrs.py that was triggering an invalid error in checkhf.pl. Fix an encoding arguement in packet-elasticsearch.c found by fix-encoding-args.pl. Change-Id: Id0e75076c2d71736639d486f47b87bab84e07d22 Reviewed-on: https://code.wireshark.org/review/7150 Reviewed-by: Gerald Combs commit be5e595 Author: Guy Harris Date: Tue Feb 17 14:56:31 2015 -0800 Make it a bit more like the way it was before all these changes. Change-Id: I9fc0ef50574a7e068c32e3f6ffeb3634df9474d4 Reviewed-on: https://code.wireshark.org/review/7212 Reviewed-by: Guy Harris commit efd18e6 Author: Guy Harris Date: Tue Feb 17 14:54:37 2015 -0800 A UAT's update is expected to set *error; do so. Its callers treat a non-null error pointer as a failure and a null error pointer as a success, so it has to set *error, even if it's only setting it to NULL. Change-Id: I48b2faa4bc013e4a754180dfae487829c8fe35a6 Reviewed-on: https://code.wireshark.org/review/7211 Reviewed-by: Guy Harris commit 23c8bb8 Author: Martin Kaiser Date: Tue Feb 17 23:13:00 2015 +0100 [zvt] dissect some more fields Change-Id: I93ffcfddd59a196a7e4f9f354b99884a7f5a814c Reviewed-on: https://code.wireshark.org/review/7208 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit eca4d29 Author: Alexis La Goutte Date: Tue Feb 17 19:31:14 2015 +0100 STUN : fix indent (use 4spaces) Change-Id: Ifbaf0f396b24d5506722f0e0df0dd17c1969a435 Reviewed-on: https://code.wireshark.org/review/7202 Reviewed-by: Anders Broman commit 47f27e3 Author: Martin Kaiser Date: Fri Feb 13 17:19:48 2015 +0100 [Qt] don't clear the display filter when a capture file is closed Bug: 10951 Change-Id: I958aa9e88c30ac20cd7d7971ee903ac97265c1f4 Reviewed-on: https://code.wireshark.org/review/7098 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit da62086 Author: Gerald Combs Date: Tue Feb 17 12:35:07 2015 -0800 WSUG: Add more dialog guidelines. Change-Id: I59a14bf9712c05d75398b8ed2dc103fe3443f7af Reviewed-on: https://code.wireshark.org/review/7203 Reviewed-by: Gerald Combs commit 2c43b68 Author: Gerald Combs Date: Tue Feb 17 12:29:31 2015 -0800 Set a window icon for WiresharkDialog. Otherwise it ends up with a generic icon. Change-Id: I47292c966332073d07ef358316cf8b40bcf1329b Reviewed-on: https://code.wireshark.org/review/7200 Reviewed-by: Gerald Combs commit e61f3d5 Author: Alexis La Goutte Date: Tue Feb 17 21:21:06 2015 +0100 802.11: fix no previous prototype for 'wlan_col_filter_str' & 'wlan_bssid_col_filter_str' [-Wmissing-prototypes] Fix also some indent typo (3spaces -> 2spaces) Change-Id: I1aa9df1540e80946b85dde0e6bd87bf39e8d8f19 Reviewed-on: https://code.wireshark.org/review/7199 Reviewed-by: Michael Mann commit fd870e3 Author: Pascal Quantin Date: Fri Feb 13 17:58:25 2015 +0100 CMIP: get rid of some evil global variables Fixes an ASAN failure reported by Alexis Note that some global variables remain as I do not know enough on this protocol to safely remove them Change-Id: If392a8f09ef2fc2f2d46871a71149e29fe5e292c Reviewed-on: https://code.wireshark.org/review/7099 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte Reviewed-by: Pascal Quantin commit edf05db Author: Robert Cragie Date: Tue Feb 17 17:56:06 2015 +0000 Corrected display format for EUI-64 Change-Id: I0913337a29efac5c39e30897cad7e90195fa984a Reviewed-on: https://code.wireshark.org/review/7198 Reviewed-by: Michael Mann commit c621a77 Author: Ryan Doyle Date: Sat Jan 31 14:00:08 2015 +1100 PCP: updated protocol dissection for new PDU types Introduce basic dissection for AUTH PDU type as well as detecting if a conversation is about to initiate a secure sockets connection (kind of like STARTTLS) and then pass all packets through the SSL dissector if that is the case. Also clean up some duplication with constants. Change-Id: I66f663ca6ab4291f8d0321430e3e126a0be77a93 Reviewed-on: https://code.wireshark.org/review/7109 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit a355daf Author: Jeff Morriss Date: Mon Feb 16 15:14:57 2015 -0500 Give users a more helpful error message if they enter an SSL protocol we don't know. First, if we know the protocol (by filter name) tell them that the dissector just isn't set up to run over SSL but it could be--if they contact the Wireshark developers. Second, don't tell them that the dissectors which have called ssl_dissector_add() are the only ones that are valid; those are just commonly used ones. Change-Id: I1b72bccd4c96c21c73a19fa2d87fe2c0b875a0fa Reviewed-on: https://code.wireshark.org/review/7185 Reviewed-by: Richard Sharpe Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 0da88ba Author: Jeff Morriss Date: Mon Feb 16 22:32:25 2015 -0500 Don't send an effectively empty message (no TVBs) to the SCTP tap. This prevents the tap from crashing (asserting out) because there's no (initialized) TVB to look at. Bug: 9849 Change-Id: I370a49ef32a67e504c30cf1762a2180bf13c56ca Reviewed-on: https://code.wireshark.org/review/7190 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 9150a92 Author: AndersBroman Date: Tue Feb 17 13:12:53 2015 +0100 Add missing json.h Change-Id: Ib1d67fdcc016532ab6e4140df357a6d0dd5cf09d Reviewed-on: https://code.wireshark.org/review/7193 Reviewed-by: Anders Broman commit bd91109 Author: Dario Lombardo Date: Mon Jan 19 19:54:41 2015 +0100 Added JSON native file support. libjsmn has also been moved from epan/ to wsutil/ to make it visible from wiretap. Change-Id: I59abb3419acb1baa83194b38152d3651ed5c123c Bug: 10878 Reviewed-on: https://code.wireshark.org/review/6716 Reviewed-by: Pascal Quantin commit 1478db0 Author: Jeff Morriss Date: Mon Feb 16 22:39:27 2015 -0500 Fix up formatting and indentation a bit. Change-Id: Ifdc6b8b2525efdc9e0f73519e73afbd4adbf65f4 Reviewed-on: https://code.wireshark.org/review/7191 Reviewed-by: Jeff Morriss commit 5ebc577 Author: Guy Harris Date: Mon Feb 16 13:35:16 2015 -0800 Fix FSF address. Change-Id: I3881fcd211bbfbecd92c3a8c2a440da30b20393f Reviewed-on: https://code.wireshark.org/review/7188 Reviewed-by: Guy Harris commit be5259d Author: Joerg Mayer Date: Mon Feb 16 22:26:23 2015 +0100 OK, at least on my system uic is called uic-qt5, same for moc and rcc. Found while doing an accidental autofoo build instead of cmake build. Change-Id: Ie8ab648561f88e0a28a64c06d4d78652643c91dd Reviewed-on: https://code.wireshark.org/review/7187 Reviewed-by: Jörg Mayer commit a5f4389 Author: Joerg Mayer Date: Sat Feb 7 20:56:53 2015 +0100 Whitespace fix (space before tab) Change-Id: Iccbac2ff5d95639d478437eefa16d1dd2757128b Reviewed-on: https://code.wireshark.org/review/7186 Reviewed-by: Jörg Mayer commit db2395f Author: Guy Harris Date: Mon Feb 16 11:50:40 2015 -0800 Fix declaration and export the routines. Add a missing semicolon, and export the routines with WS_DLL_PUBLIC, so they can be used by plugins. Change-Id: Iaf52e70ce9fbfce3cfa675c453b7d39a0341dfeb Reviewed-on: https://code.wireshark.org/review/7184 Reviewed-by: Guy Harris commit 907f4e8 Author: Guy Harris Date: Mon Feb 16 11:37:21 2015 -0800 We now get that from common libwireshark code. Change-Id: If3b15d01689c6bbfad6422c4a30f9ece5e2b3b83 Reviewed-on: https://code.wireshark.org/review/7183 Reviewed-by: Guy Harris commit cfb1bc3 Author: Guy Harris Date: Mon Feb 16 11:32:39 2015 -0800 Put the 64-bit hash routines into a common file. Some or all are used by the Infiniband, MBIM, and RSVD dissectors; put them into a common source file, with a header for them, and just include the header in the dissectors. Change-Id: I724f0c2232ba751ccbd491222af6f03bafd6d63c Reviewed-on: https://code.wireshark.org/review/7182 Reviewed-by: Guy Harris commit 4765bbc Author: Pascal Quantin Date: Mon Feb 16 20:24:51 2015 +0100 RSVD: fix compilation with GLib < 2.22.0 Change-Id: Ia82d42faa766f68e167b1c1affa5307980909fb8 Reviewed-on: https://code.wireshark.org/review/7181 Reviewed-by: Pascal Quantin commit febc2e1 Author: Richard Sharpe Date: Mon Feb 16 07:48:57 2015 -0800 Fix a portability problem raised by Guy Harris. My first implementation would not work on 32-bit platforms because I assumed that pointers were 64-bit items. I have now moved to a slightly different scheme suggested by Evan Huus. Change-Id: I34f4dceea9952d5633603e71a8e8ae8f4b9154cc Signed-of-by: Richard Sharpe Reviewed-on: https://code.wireshark.org/review/7179 Petri-Dish: Richard Sharpe Reviewed-by: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Richard Sharpe commit 6331755 Author: Guy Harris Date: Mon Feb 16 10:37:58 2015 -0800 Get rid of duplicate typedef. Change-Id: I389132ec27405394ca73fb9c09950d8a91ea32a7 Reviewed-on: https://code.wireshark.org/review/7180 Reviewed-by: Guy Harris commit 5955efc Author: Anish Bhatt Date: Sat Feb 14 22:24:58 2015 -0800 [80211ac] Change VHT MIMO Control to use add_bitmask Change-Id: If3d597dd6dbf746e0f971e52073f9790b6a0ceda Reviewed-on: https://code.wireshark.org/review/7128 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 17828b5 Author: Anish Bhatt Date: Thu Feb 12 01:32:02 2015 -0800 [80211ac] Add partial beamforming support Adds support to decode beamforming report, but actual beamforming matrices are not decoded. Requires bit level manipulation of varying lengths of data which is not currently supported, and section spec only seems to mention size and contents, not representation Bug 10169 Change-Id: Icc2188b79f95b5e38b64ded348b7a0696b5504ed Reviewed-on: https://code.wireshark.org/review/7111 Reviewed-by: Michael Mann Reviewed-by: Alexis La Goutte commit 7fee7df Author: AndersBroman Date: Mon Feb 16 15:13:25 2015 +0100 [Diameter] Use proto_tree_add_bitmask() to add the diameter flags. Change-Id: I9cb6e46551b0a25a458311a53365469552d5c195 Reviewed-on: https://code.wireshark.org/review/7177 Reviewed-by: Anders Broman commit b2c81bb Author: Michael Mann Date: Wed Feb 11 22:16:01 2015 -0500 Make get_manuf_name return a const string. Model get_manuf_name after get_ether_name so that a string (either name resolved or colon-separated bytes) is always stored in a hash table. This will make name resolution of addresses perform a little better because it doesn't have to worry about the wmem_allocator. Change-Id: If976fe7b0c3f9cd053225096c2ac05418f061af6 Reviewed-on: https://code.wireshark.org/review/7081 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit b2d23ec Author: Anders Date: Mon Feb 16 10:53:05 2015 +0100 [STUN] Avoid fetching stuff twice from the tvb. Change-Id: I923818ea41791b2f41c5bce3c5927014580eb2b7 Reviewed-on: https://code.wireshark.org/review/7174 Reviewed-by: Anders Broman commit 0ce7fd4 Author: Peter Wu Date: Mon Feb 16 00:14:18 2015 +0100 Trivial Dead assignment fixes in configure Fixes a Dead assignment and unused variable warning. With this patch and http://www.cmake.org/Bug/view.php?id=15203, `scan-build cmake` will give zero warnings! Change-Id: Idc7a03fbf1e8196bc139a2c6663ec48b897f2897 Reviewed-on: https://code.wireshark.org/review/7144 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit a4b3be5 Author: Richard Sharpe Date: Sat Feb 14 15:28:01 2015 -0800 Complete the RSVD Dissector further by handling SCSI requests. Still have to handle response, but this points the way, I think. Handle responses. Still have to handle sense info. Change-Id: Ic692de15b8178fbe274791ffbc000e8f35b40653 Signed-off-by: Richard Sharpe Reviewed-on: https://code.wireshark.org/review/7127 Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit e56f34e Author: Gerald Combs Date: Sun Feb 15 19:25:05 2015 -0800 Suppress more pedantic warnings. Suppress warning: initialization of a flexible array member [-Wpedantic] Change-Id: I49c2cf8b97539660742ef1b19752a0f56404d78a Reviewed-on: https://code.wireshark.org/review/7155 Reviewed-by: Gerald Combs commit 7c3fd2a Author: Guy Harris Date: Mon Feb 16 03:13:25 2015 +0000 Revert "Revert "Fix duplicate Display Filter Macro check"" This reverts commit 876c322df8b6a944cb4358c313c4fc46afe99719. Wrong branch. It builds in master; it does *not* build in 1.12 or 1.10. Change-Id: I3a2409d5a37f08965d6caac64dc97a48a1c5d1b8 Reviewed-on: https://code.wireshark.org/review/7152 Reviewed-by: Guy Harris commit 876c322 Author: Guy Harris Date: Mon Feb 16 03:10:46 2015 +0000 Revert "Fix duplicate Display Filter Macro check" This reverts commit f5902a677e24ff96869d3c335f4fb8aaa6d0e543. This is not a simple cherry-pick; backporting this fix will have to be done manually. Change-Id: I53efc06a8e35c6b1aa793edf4e702cabee2e929b Reviewed-on: https://code.wireshark.org/review/7151 Reviewed-by: Guy Harris commit 45674b7 Author: Peter Wu Date: Mon Feb 16 00:37:03 2015 +0100 Qt: fix "Assigned value is garbage or undefined" Clang Static Analyzer reported that function link_changed uses a garbage value for "device.links" which is indeed the case when global_capture_opts.all_ifaces->len == 0. There seem to be some issues here: - When global_capture_opts.all_ifaces->len == 0, then device is uninitialized. - When no interface name matches, the last entry will always be updated. - There is duplicate code querying for the interface by name. This patch addresses the above issues by extracting the interface name check into a new utility function which returns NULL when a device is not found. Then the callers (such as link_changed) will check this value. While at it, stop storing a copy of (interface_t), use a pointer instead. This allows for removal of g_array_remove_index followed by g_array_insert_val. Verified with clang 3.5.1. Change-Id: I03e0f179577a23a3f1efdca768e67922273192f0 Reviewed-on: https://code.wireshark.org/review/7145 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit ea5f5be Author: Alexis La Goutte Date: Sun Feb 15 18:32:14 2015 +0100 Update Release Notes Add QNEX6 (QNET) and add description for some other protocol (GVSP, corosync...) Change-Id: Ia515a134e73835e6d2c81e8ccc210e9fcc424701 Reviewed-on: https://code.wireshark.org/review/7134 Reviewed-by: Michael Mann commit 2bec642 Author: Alexis La Goutte Date: Sun Feb 15 18:08:38 2015 +0100 proto(.h): fix parameter 'offset' not found in the function declaration [-Wdocumentation] Change-Id: Ib79831e02a9a6457ca49c21536ce46df7d4cafa0 Reviewed-on: https://code.wireshark.org/review/7133 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu Reviewed-by: Michael Mann commit 4f3646f Author: Peter Wu Date: Sat Feb 14 15:36:09 2015 +0100 Fix handling of invalid UAT items If the UAT file failed a field check, then the user_data pointer may be empty. As a result uat_save() triggers an invalid write. (Discovered while working with a dfilter_macros file having duplicate names for bug 10957, caught by ASAN.) The second issue fixed in this patch is that the validity of an item is only calculated when a new record is added. So even if the user edits the UAT and makes the entry valid, it would not be saved. This is solved by adding a new uat_update_record() function which got wires up into GTK and Qt. Some open-coded g_array_index and UAT[_USER]_INDEX_PTR are also converted. Even after this patch, Qt has some issues with UAT handling. In particular, it saves new, but empty/invalid, items. It also it does not check individual fields when saving all fields (unlike Gtk). This patch focused on getting Gtk fixed first so ignores those existing issues. Change-Id: Ia35cfe9d2b793c65144ae7e29a1ed706b6668d99 Reviewed-on: https://code.wireshark.org/review/7120 Petri-Dish: Michael Mann Reviewed-by: Peter Wu Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit f5902a6 Author: Peter Wu Date: Sat Feb 14 17:59:27 2015 +0100 Fix duplicate Display Filter Macro check Since commit 4a1bd75b60171d781dc9f2d3ffd6d498acc74b1a (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7471), the data pointer does not match anything from the macros array. This patch fixes a false warning by checking for duplicates before the name is committed. Bug: 10957 Change-Id: Id61110bf63de1de80b85524705a2df6a5e7be33a Reviewed-on: https://code.wireshark.org/review/7119 Reviewed-by: Peter Wu Reviewed-by: Michael Mann commit fea325d Author: Guy Harris Date: Sun Feb 15 14:46:30 2015 -0800 Handle DLT_LOOP differently from DLT_NULL. That's a little cleaner, and lets us preserve the LINKTYPE_ value for DLT_LOOP captures. ("Preserve" here doesn't mean "write files with a link-layer header type of 12", as that's ambiguous; we write it with a link-layer header type of LINKTYPE_LOOP, i.e. 108. If programs on OpenBSD don't recognize that as DLT_LOOP, that's a bug in OpenBSD's libpcap or in the program.) Change-Id: I48a2e04aed41c013823ffb5c588d2a8e8b376e15 Reviewed-on: https://code.wireshark.org/review/7143 Reviewed-by: Guy Harris commit 1917023 Author: Guy Harris Date: Sun Feb 15 14:03:12 2015 -0800 Don't base interpretation of LINKTYPE_ values on DLT_ value definitions. Instead, explicitly check for particular build platforms. This means that the interpretation of the link-layer type values with different meanings on different platforms won't be dependent on the particular version of libpcap with which Wireshark happens to be built, and also means that we don't have to fix pcap-common.c to include pcap.h or net/bpf.h. Fix some comments while we're at it. Bug: 10956 Change-Id: If331d9b92081fb0bdf416620fb2ad8dce57dea6b Reviewed-on: https://code.wireshark.org/review/7140 Reviewed-by: Guy Harris commit ad6d259 Author: Gerald Combs Date: Sun Feb 15 10:25:17 2015 -0800 EtherCAT: Suppress pedantic warnings. Try to suppress warning: type of bit-field 'foo' is a GCC extension [-Wpedantic] Change-Id: If161a509db2d6aaad3bb656318902f0bc7b0d0a9 Reviewed-on: https://code.wireshark.org/review/7136 Reviewed-by: Gerald Combs commit bfde04b Author: Bill Meier Date: Sun Feb 15 13:58:39 2015 -0500 ui/gtk/*.c: Add editor modelines; As needed: Fix indentation Change-Id: I8cd9d9fe5f12c284f46b8f725766f681faccd753 Reviewed-on: https://code.wireshark.org/review/7138 Reviewed-by: Bill Meier commit 7229c54 Author: Bill Meier Date: Sat Feb 14 22:31:53 2015 -0500 epan/ftypes/*.[hc]: As needed: Add editor modelines & Fix indentation Change-Id: Ib0bd1ea7801ab450b300a94c4757f16d0dd75760 Reviewed-on: https://code.wireshark.org/review/7137 Reviewed-by: Bill Meier commit 0ed1b0f19 Author: Pascal Quantin Date: Sat Feb 14 23:36:47 2015 +0100 Add ws_mempbrk_sse42_compile to Valgrind suppression list When running Valgrind 3.10.0 on an Ubuntu 10.10 x64 guest with Virtualbox 4.3.22, ws_cpuid_sse42() call triggers a false positive when checking ECX bit 20 Guy kindly verified the assembler code and confirmed that everything seems fine Let's remove the error to avoid noise when running Valgrind on a capture Change-Id: I357633950249a0c781482865c3221a1babdc74e2 Reviewed-on: https://code.wireshark.org/review/7124 Reviewed-by: Pascal Quantin Reviewed-by: Evan Huus commit e326318 Author: Anders Date: Sun Feb 15 18:54:28 2015 +0100 Only call tvb_get_ptr() once to set src and dst addresses- Change-Id: I206b25ec512b3665b36307276ab3748e0a5ff73b Reviewed-on: https://code.wireshark.org/review/7135 Reviewed-by: Anders Broman commit bf15134 Author: Gerald Combs Date: Sun Feb 15 08:04:51 2015 -0800 [Automatic manuf, services and enterprise-numbers update for 2015-02-15] Change-Id: Ie7aa5657e123ef609e05fc6f09782cc5d2443308 Reviewed-on: https://code.wireshark.org/review/7130 Reviewed-by: Gerald Combs commit 29e1b45 Author: Alexis La Goutte Date: Sun Feb 15 12:37:36 2015 +0100 IS-IS (LSP): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I1b68151f0cb09afd6a6aeba2a71a15624c2fbc97 Reviewed-on: https://code.wireshark.org/review/7129 Reviewed-by: Michael Mann commit 65763cf Author: Gerald Combs Date: Sat Feb 14 13:36:45 2015 -0800 Try to fix diagnostic suppression. Test the compiler for "-Wpedantic" instead of "-pedantic" since DIAG_OFF and DIAG_ON expect a "-W" flag prefix. Be more strict about the compiler versions that DIAG_OFF and DIAG_ON support. Change-Id: I9304c544912102f1719b79e9250f97b40a324430 Reviewed-on: https://code.wireshark.org/review/7123 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris commit 1b43a80 Author: Guy Harris Date: Sat Feb 14 14:52:24 2015 -0800 Note why some header checks are done even if unnecessary on UN*X. Change-Id: I0ea8cbaed65922e4dd5e49bbb7578b392deb8c02 Reviewed-on: https://code.wireshark.org/review/7125 Reviewed-by: Guy Harris commit bade5f3 Author: Richard Sharpe Date: Sat Feb 14 11:41:47 2015 -0800 A small correction to the documentation to bring it in line with the code. Change-Id: I5818b9f3348a70d817bf885697cd67440d812889 Signed-off-by: Richard Sharpe Reviewed-on: https://code.wireshark.org/review/7121 Reviewed-by: Gerald Combs commit f80a720 Author: Gerald Combs Date: Sat Feb 14 10:18:26 2015 -0800 WSUG and image updates. Update the protocol hierarchy, conversation, and endpoint sections of the User's Guide. When everything is an admonition nothing stands out. Make a series of "NOTE"s plain old paragraphs. Scale the new conversation and endpoint images to fit the page width. This looks funny in my browser but I'm not sure about the best way to fix it. Move image/compress-pngs to the tools directory. Use it to reduce the size of the WSUG and WSDG images. Fixup traffic table column names and window titles. Change-Id: I674342ed901fc64563b384ee5e1f35413736cb19 Reviewed-on: https://code.wireshark.org/review/7122 Reviewed-by: Gerald Combs commit e11d7ef Author: Gerald Combs Date: Fri Feb 13 13:51:05 2015 -0800 Fix diagnostics macros and squelch a gcc warning. Both clang and gcc define __GNUC__. Make sure we account for that when defining diagnostic macros. Use DIAG_OFF + DIAG_ON to suppress gcc -pedantic warnings about frame_data. Get rid of packet_char_enc casts. Change-Id: Idbcc61bcdb35c1d20f185461c69451dcdf73bae9 Reviewed-on: https://code.wireshark.org/review/7106 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 5cc0ad8 Author: Gerald Combs Date: Sat Feb 14 09:00:36 2015 -0800 Remove a duplicate typedef. Change-Id: Ie26785cc3577bda84cb4d244aab5a607797b99fb Reviewed-on: https://code.wireshark.org/review/7118 Reviewed-by: Gerald Combs commit ca534b1 Author: Alexis La Goutte Date: Sat Feb 14 13:03:45 2015 +0100 MIP6: Local Mobility Anchor Address mobility option code is treated incorrectly The first packet is an IPv6 packet with Local Mobility Anchor Address mobility option with Option-Code=1. Wireshark parses its address as IPv4 address. The second packet is an IPv6 packet with Local Mobility Anchor Address mobility option with Option-Code=2. Wireshark parses its address as IPv6 address. According to RFC 5949 (https://tools.ietf.org/html/rfc5949#section-6.2.2), Option-Code=1 means IPv6 and Option-Code=2 means IPv4, exactly the opposite to what Wireshark does. Bug: 10961 Change-Id: I03b76dda8beae211e67e6c9e1f40d122e851b1b5 Reviewed-on: https://code.wireshark.org/review/7113 Reviewed-by: Michael Mann commit 847f590 Author: Alexis La Goutte Date: Sat Feb 14 12:47:38 2015 +0100 MIP6: AUTH mobility option parses Mobility SPI and Authentication Data incorrectly The authentication data in the AUTH option in attached IPv6 packet contains one byte too much. This byte is read beyond the option data. In Wireshark, clicking on the AUTH shows that the option ends at 0xCE while clicking on the Authentication Data shows that it ends at 0xCF. Reported by Boaz Bug:10626 Change-Id: I0bcfd6331bc1de30f25d16590487c0e3bf5c002f Reviewed-on: https://code.wireshark.org/review/7112 Reviewed-by: Michael Mann commit 91b5042 Author: Michael Mann Date: Wed Feb 11 20:13:36 2015 -0500 "Hide" hashether_t structure. One use in a GUI function isn't really enough to justify making the structure public. Change-Id: Ic7dee275ba0a2bd4e19c06702a867417c5624c27 Reviewed-on: https://code.wireshark.org/review/7080 Reviewed-by: Michael Mann commit a64fc6c Author: Guy Harris Date: Sat Feb 14 00:04:36 2015 -0800 Don't check for C89 headers. 1988 called, they want their lack of a C standard back. We don't need to check whether we have stdarg.h, stddef.h, stdlib.h, or string.h, as they're specified by C89 and I don't think there are any platforms we care about that don't have a C89 environment in which we could be built. Change-Id: I447551181284fab7722354b62774625ed8ee94bc Reviewed-on: https://code.wireshark.org/review/7110 Petri-Dish: Guy Harris Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris commit f623537 Author: Guy Harris Date: Fri Feb 13 18:08:47 2015 -0800 We use GLib's directory-reading routines, so we don't need . Change-Id: Id86e5d6d0ab24adb1bfff0688f33a40f2fdaed8d Reviewed-on: https://code.wireshark.org/review/7108 Petri-Dish: Guy Harris Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris commit b5a3b65 Author: Gerald Combs Date: Fri Feb 13 16:18:57 2015 -0800 Qt: Fix side effects of recent WiresharkDialog changes. Quit the application when the main window closes. This cleans up any other top-level windows that might be open. Don't dereference a NULL pointer when opening the sequence dialog from the VoIP calls dialog. Change-Id: I9902d40ead1c5f2e541b6d79f3d957228e4e9687 Reviewed-on: https://code.wireshark.org/review/7107 Reviewed-by: Gerald Combs commit f85d1c8 Author: Gerald Combs Date: Fri Feb 13 11:18:30 2015 -0800 WSUG: Add a note about dialogs vs windows. Change-Id: I38d7838db2be59af8a31d94b7cafeeef62698215 Reviewed-on: https://code.wireshark.org/review/7105 Reviewed-by: Gerald Combs commit 3e3fc9f Author: Bill Meier Date: Fri Feb 13 14:02:43 2015 -0500 epan/dfilter/*.c: As needed: Add editor modelines & Fix indentation Change-Id: I410839329a98bd806c60961dfb9693d5eeeeb702 Reviewed-on: https://code.wireshark.org/review/7104 Reviewed-by: Bill Meier commit 6040bcd Author: Bill Meier Date: Fri Feb 13 13:43:32 2015 -0500 caputils/*.c: As needed: Add editor modelines & Fix indentation Change-Id: I081446fbbc242c01f8ac9dede575c3ea77421c42 Reviewed-on: https://code.wireshark.org/review/7103 Reviewed-by: Bill Meier commit 82f081d Author: Bill Meier Date: Fri Feb 13 13:25:19 2015 -0500 wslua*: Add editor modelines; Fix indentation, etc as needed. Change-Id: I6df5d46f4b263104aa9cb6353cc987087cdb867e Reviewed-on: https://code.wireshark.org/review/7102 Reviewed-by: Bill Meier commit 9c866ff Author: Bill Meier Date: Fri Feb 13 12:05:26 2015 -0500 Replace tabs by spaces when editor modelines has "expandtab" Change-Id: If7a6f2697be732ae4f94ed8b845fd293c32510f7 Also: tabs-stops should be 8 Reviewed-on: https://code.wireshark.org/review/7100 Reviewed-by: Bill Meier commit 936f685 Author: Gerald Combs Date: Fri Feb 13 08:36:53 2015 -0800 Qt: Allow shift-double-clicking on a frame link. You can open a new packet window in the GTK+ UI by holding down the shift key and double-clicking on a frame link in the protocol tree. Add this behavior to the Qt UI. Document the different ways of opening a new packet window and update the image. Change-Id: I55caf6cc8089a6c305fafd47b4870e7c69dbfb10 Reviewed-on: https://code.wireshark.org/review/7101 Reviewed-by: Gerald Combs commit 4d5bdf4 Author: Richard Sharpe Date: Sat Jan 24 21:08:06 2015 -0800 A dissector for the RSVD Protocol (see [MS-RSVD].pdf). There is still a little more work to do here, especially we should call the SCSI dissector for handling SCSI CDBs etc ... This is a potential fix for bug 10913. Ping-Bug: 10913. Change-Id: Ia8ff1a8207bb5b1cd18079086ff8c472ae3f8736 Signed-off-by: Richard Sharpe Reviewed-on: https://code.wireshark.org/review/7022 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 8843606 Author: Gerald Combs Date: Thu Feb 12 19:31:13 2015 -0800 Qt: Try to make some dialogs behave like windows. Initialize WiresharkDialog with a NULL parent. This should make its subclasses behave like independent windows. Change-Id: If84609eeba53a92780c0873a1243888998d2b26b Reviewed-on: https://code.wireshark.org/review/7094 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 48a95de Author: Jeff Morriss Date: Thu Feb 12 17:23:46 2015 -0500 Register the Mongo dissector by name so it can be used with TLS. Change-Id: Ic9d688603747312aa29e5af038363f70c3cbae33 Reviewed-on: https://code.wireshark.org/review/7097 Reviewed-by: Jeff Morriss commit c1610c7 Author: AndersBroman Date: Fri Feb 13 14:40:29 2015 +0100 Micro optimization, only do tvb_get_ptr() once for dst and src respectivly. Change-Id: I1cdc5742057830a47ea71769fb54ab8dfdd3de14 Reviewed-on: https://code.wireshark.org/review/7096 Reviewed-by: Anders Broman commit 91a6e5e Author: Vincenzo Reale Date: Fri Feb 13 07:51:47 2015 +0100 Italian translation update Change-Id: Ibf66f25a257051ba12c3fb9687ac57377117138f Reviewed-on: https://code.wireshark.org/review/7036 Petri-Dish: Michal Labedzki Reviewed-by: Dario Lombardo Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki commit f0b4b72 Author: Gerald Combs Date: Thu Feb 12 20:13:09 2015 -0800 Qt: Revert g6e88978 for main_status_bar. It made some slot signatures unusable. Change-Id: I0f7cdad9e84a5ffb2bdfe4042ac93b3ea19b4893 Reviewed-on: https://code.wireshark.org/review/7095 Reviewed-by: Gerald Combs commit 80342e4 Author: Gerald Combs Date: Thu Feb 12 19:03:50 2015 -0800 Qt: Make WiresharkDialog act like a window. Set Qt::Window when we initialize QDialog. This should add a minimize button to most of the dialogs that need one. Change-Id: I8595dee9c6a28a4e0a8518213176ba10a6d8dcc6 Reviewed-on: https://code.wireshark.org/review/7093 Reviewed-by: Gerald Combs commit a0498f1 Author: Gerald Combs Date: Thu Feb 12 19:00:59 2015 -0800 Qt: Double clicking a packet opens the packet window. Connect the packet list's doubleClicked signal to the main window's openPacketDialog slot. Change-Id: I5bc20c113fb1f22e2257fc1dbdef76c9920e05d0 Reviewed-on: https://code.wireshark.org/review/7092 Reviewed-by: Gerald Combs commit 6e88978 Author: Gerald Combs Date: Thu Feb 12 15:35:59 2015 -0800 Qt: More #include → forward declarations. Change-Id: Ib6de71f801cd3053374b6c867370acd594dcd396 Reviewed-on: https://code.wireshark.org/review/7089 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit a5652c7 Author: Gerald Combs Date: Thu Feb 12 10:17:05 2015 -0800 Qt: ElidedLabel doesn't support rich text / HTML. Change-Id: Ia5ca9784c60325c01ba5e6378997008f8ef1dd6e Reviewed-on: https://code.wireshark.org/review/7091 Reviewed-by: Gerald Combs commit f1d1354 Author: Gerald Combs Date: Thu Feb 12 16:11:21 2015 -0800 Try to fix compilation on OS X. Change-Id: I63d1f639bf5fd56aeaea112c797efedca8c0bf6e Reviewed-on: https://code.wireshark.org/review/7090 Reviewed-by: Gerald Combs commit 931807e Author: Gerald Combs Date: Wed Feb 11 15:00:27 2015 -0800 Qt: Add the "new packet" window^Wdialog^Wwindow. Allow persistence across files. Preserve the use of "window" even though we're really a dialog. Update ByteViewTab and ProtoTree to support multiple instances. Remove the need for a cast in frame_data. Add more forward declarations. Change-Id: I50d3d9d1455b8ecc158a37218f9e41fe696d5ae2 Reviewed-on: https://code.wireshark.org/review/7086 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit b3e2c56 Author: Gerald Combs Date: Thu Feb 12 13:49:31 2015 -0800 Docbook: Don't build PDF release notes by default. Move the release-notes-*.pdf targets to a release_notes_pdf metatarget which must be built manually. Change-Id: I067a4e248e6e68d1ff60aafad5d75c1180536e0f Reviewed-on: https://code.wireshark.org/review/7088 Reviewed-by: Gerald Combs commit d2aa2c6 Author: Gerald Combs Date: Thu Feb 12 12:33:24 2015 -0800 WSDG: Start adding Qt material. Move some text from README.qt to the Developer's Guide. Add an overview. Change-Id: Ia20ed837939e34871b157566c38cd0c6e590bc38 Reviewed-on: https://code.wireshark.org/review/7087 Reviewed-by: Gerald Combs commit bdcac17 Author: Pascal Quantin Date: Thu Feb 12 09:07:02 2015 +0100 Fix crash at startup in SSE4.2 code when running a 32 bits Windows build There is no guarantee that a g_malloc'ed memory block will be aligned on a 128 bits boundary Instead use a static variable definition (at the cost of exposing the HAVE_SSE4_2 compilation flag in ws_mempbrk.h) Change-Id: I661bf479a9d458d64c96bafc940c519d29a4780b Reviewed-on: https://code.wireshark.org/review/7070 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman Reviewed-by: Pascal Quantin commit 678a9b6 Author: Pascal Quantin Date: Thu Feb 12 17:14:12 2015 +0100 BT ATT: memory given to add_new_data_source() must be allocated in pinfo scope Bug: 10952 Change-Id: I0eb8e6891c35c70c9d405db87824c442caaa2f30 Reviewed-on: https://code.wireshark.org/review/7085 Reviewed-by: Pascal Quantin commit ef21740 Author: Pascal Quantin Date: Thu Feb 12 14:32:12 2015 +0100 Gryphon: do not use col_set_str with non constant strings Fixes an ASAN failure reported by Alexis Change-Id: I68e5c55ec4090766ef5f003f44093ce3c268a82a Reviewed-on: https://code.wireshark.org/review/7082 Petri-Dish: Pascal Quantin Reviewed-by: Alexis La Goutte Reviewed-by: Pascal Quantin commit 7594d96 Author: Roland Knall Date: Thu Feb 12 10:03:37 2015 +0100 nmake: Allow Cygwin path to be provided I have installed cygwin at a different location then the default location. Therefore the nmake steps tend to fail, and I will have to adapt the config.nmake script every time. This patch allows the CYGWIN_PATH variable to be set outside the build-script Change-Id: Iaecdd2aa72a0529574fab7e6aeae18fbfd621721 Reviewed-on: https://code.wireshark.org/review/7078 Reviewed-by: Roland Knall Reviewed-by: Anders Broman commit 34acb73 Author: Anish Bhatt Date: Mon Feb 9 18:39:27 2015 -0800 [IS-IS-LSP] Add support for Prefix-SID subTLV Bug: 10679 Change-Id: I4f2627aa22c64593258121a7e70b3f341e025d2e Reviewed-on: https://code.wireshark.org/review/7048 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 60cc8b4 Author: Dario Lombardo Date: Wed Feb 4 10:25:16 2015 +0100 Support for looking for incomplete dissectors. Change-Id: I03e592dd3d54fc0e1c4af09d5d5336dda93f950e Reviewed-on: https://code.wireshark.org/review/6978 Reviewed-by: Evan Huus Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 207b52a Author: Guy Harris Date: Thu Feb 12 02:25:31 2015 -0800 tvb_length is a macro wrapper for tvb_captured_length; use tvbuff_length. This squelches a compiler warning on some platforms. Change-Id: Ibee5c2fe07fc58e22a860b4c4467a501c2b8a979 Reviewed-on: https://code.wireshark.org/review/7079 Reviewed-by: Guy Harris commit 7075223 Author: Michal Labedzki Date: Mon Feb 9 08:56:28 2015 +0100 Little tuning of proto_tree_add_bytes_with_length Change name from proto_tree_add_new_bytes to proto_tree_add_bytes_with_length and other tweaks pointed by Peter Wu. Change-Id: I6058c28a74a154e2882e4eb04558bedcede6f508 Reviewed-on: https://code.wireshark.org/review/7039 Reviewed-by: Michal Labedzki commit 4359cb8 Author: Anders Broman Date: Thu Feb 12 08:33:21 2015 +0000 Revert ""Hide" hashether_t structure." This reverts commit 297ef07b9b2f5b681234d0c31269996413262cbc. Change-Id: Id47f5fd221b631c95ca71e3f9315f5263bab22de Reviewed-on: https://code.wireshark.org/review/7077 Reviewed-by: Anders Broman commit 53228c4 Author: Anders Broman Date: Thu Feb 12 08:33:02 2015 +0000 Revert "Make get_manuf_name return a const string." This reverts commit 797ea88aefc2f45dba7e77d2dcaebe68ac1a4fac. Change-Id: I9bc2cef0051d88c6374c6f1868b0250cba3edbd4 Reviewed-on: https://code.wireshark.org/review/7076 Reviewed-by: Anders Broman commit 797ea88 Author: Michael Mann Date: Wed Feb 11 22:16:01 2015 -0500 Make get_manuf_name return a const string. Model get_manuf_name after get_ether_name so that a string (either name resolved or colon-separated bytes) is always stored in a hash table. This will make name resolution of addresses perform a little better because it doesn't have to work about the wmem_allocator. Change-Id: I80f465ae0845290255a659ab63310ac3cc35506e Reviewed-on: https://code.wireshark.org/review/7075 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 297ef07 Author: Michael Mann Date: Wed Feb 11 20:13:36 2015 -0500 "Hide" hashether_t structure. One use in a GUI function isn't really enough to justify making the structure public. Change-Id: I6d70b9bacbc0fa1898150f59c0c69779a6cd5d51 Reviewed-on: https://code.wireshark.org/review/7074 Reviewed-by: Anders Broman commit d3d0a0a Author: Guy Harris Date: Wed Feb 11 14:19:57 2015 -0800 Fix SSE 4.2 checks. CMake has "normal" and "cache" variables, and unexpected things happen if you have a normal and a cache variable with the same name. Apparently, check_c_compiler_flag() currently sets its result variable as a cache variable, and set(), by default, sets it as a normal variable. This means that there are two different HAVE_SSE4_2 variables, and the top-level CMakeLists.txt looks at the cache variable when it creates config.h; this means that if the nmmintrin.h test fails, config.h still says we have SSE 4.2. Instead, use separate variables for the "compiler can be made to generate SSE 4.2 code" test and the "nmmintr.h works" test; that way we don't have to worry about normal vs. cache variables (and don't have to worry about CMake changing what type of variable particular functions/macros set). Change-Id: I618ad402b248f35fffd822974b6a569d4e5d6398 Reviewed-on: https://code.wireshark.org/review/7073 Reviewed-by: Guy Harris commit 0dbf741 Author: Jiří Engelthaler Date: Wed Feb 11 13:57:15 2015 +0100 packet-iec104: fix packet information text Change I6abc157368a78e1abfde672728b88a36ba6e76cc adds break in "switch case" but there was missing break deliberately. Code modified to let break on his place - copied code from the following condition. Change-Id: Id008955fbc122c0f8cfe06af2b96f0b643e9417f Reviewed-on: https://code.wireshark.org/review/7066 Reviewed-by: Anders Broman commit 0cd2582 Author: Bill Meier Date: Wed Feb 11 11:56:25 2015 -0500 Prevent two false positive MSVC2013 Code Analysis warnings Message: "Using uninitialized memory" Change-Id: Ib7d381beb9f9c1f3ec19a376c0c8c0d5ef85f373 Reviewed-on: https://code.wireshark.org/review/7069 Reviewed-by: Bill Meier commit 3c9c9bc Author: Bill Meier Date: Wed Feb 11 11:51:56 2015 -0500 capture_dlg.c: Fix (possibly valid) "Using uninitialized memory" MSVC2013 Code Analysis warning Change-Id: I849b731420d779b68ab4335eb8d06482ecd649e7 Reviewed-on: https://code.wireshark.org/review/7068 Reviewed-by: Bill Meier commit 9db51df Author: Michael Mann Date: Tue Feb 10 22:57:47 2015 -0500 Remove address_to_str_buf from hsrp dissector "heuristics" as its much faster to just compare the IPv4 address as a 32-bit value. Change-Id: If5a819b74112e92636d036509cb30ea15b2d5e3d Reviewed-on: https://code.wireshark.org/review/7067 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit a822d85 Author: AndersBroman Date: Wed Feb 11 12:27:52 2015 +0100 Try to fix the debian symbols Change-Id: I234f42e5488d2044d0c68f499814fe9a51b220dd Reviewed-on: https://code.wireshark.org/review/7064 Reviewed-by: Anders Broman commit a837570 Author: Hadriel Kaplan Date: Fri Feb 6 13:52:37 2015 -0500 Combine SSE and pre-compiled patterns for faster pbrk This combines the SSE4.2 instructions usage, with pre-compiled pattern searching usage, for a faster pbrk search method. Testing against large files of HTTP and SIP, there is about a 5% performance improvement by using pre-"compiled" patterns for guint8_pbrk() instead of passing it the search string and having it build the match array every time. Similar to regular expressions, "compiling" the pattern match array in advance only once and using the "compiled" patterns for the searches is faster than compiling it every time. Change-Id: Ifcbc14a6c93f32d15663a10d974bacdca5119a8e Ping-Bug: 10798 Reviewed-on: https://code.wireshark.org/review/6990 Petri-Dish: Hadriel Kaplan Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit a618f1c Author: Pascal Quantin Date: Tue Feb 10 11:04:48 2015 +0100 USB: put back interface class when dissecting URB_CONTROL Also ensure that USB COM dissection is done with the parent tree and not setup one Change-Id: Iae9f933ff29b3854879375df320a23e623ea785f Reviewed-on: https://code.wireshark.org/review/7051 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit c34ded4 Author: Gerald Combs Date: Sun Feb 8 12:24:19 2015 -0800 Qt/C++: Change a bunch of includes to forward declarations. In theory this this should reduce compilation times. On my particular system it makes no difference but hopefully it will elsewhere. Change-Id: I570177d3ca4eec691c82d46b4dbbce74092aac1d Reviewed-on: https://code.wireshark.org/review/7060 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 88d62df Author: Martin Mathieson Date: Tue Feb 10 17:30:58 2015 +0000 Remove unneeded includes from plugins folder Change-Id: Ifdad0fb786a97a6f84a64d442fcca0c20116552f Reviewed-on: https://code.wireshark.org/review/7059 Petri-Dish: Martin Mathieson Reviewed-by: Martin Mathieson commit d5f0df4 Author: Martin Mathieson Date: Tue Feb 10 15:48:57 2015 +0000 Add script to automatically remove includes that appear not be needed Change-Id: I5474d8a906e96c688020737ca4bd4c3319ae279f Reviewed-on: https://code.wireshark.org/review/7058 Reviewed-by: Martin Mathieson commit e915db7 Author: Pascal Quantin Date: Tue Feb 10 13:49:28 2015 +0100 Do not iterate over reported length when using tvb_find_line_end if captured length < reported length, this will trigger an infinite loop Change-Id: I6557b455e7bbff12658a934e5bb13a42c023e133 Reviewed-on: https://code.wireshark.org/review/7053 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann Reviewed-by: Pascal Quantin commit 7369c25 Author: Pascal Quantin Date: Tue Feb 10 12:07:47 2015 +0100 IMAP: do not iterate over reported length when using tvb_find_line_end This function can only search in captured length buffer This fixes an ASAN failure reported by Alexis Change-Id: Ib936f918e057423d63ff34a5fc79fed602e56dfc Reviewed-on: https://code.wireshark.org/review/7052 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Petri-Dish: Alexis La Goutte Reviewed-by: Alexis La Goutte commit 29be26c Author: Pascal Quantin Date: Tue Feb 10 07:09:56 2015 +0100 FTAM: get rid of an evil global variable Fixes an ASAN failure reported by Alexis Change-Id: Id0ddad6451e22ffc53d42985e9b2071c7388d15b Reviewed-on: https://code.wireshark.org/review/7049 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Reviewed-by: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 3b29542 Author: Kevin Grigorenko Date: Mon Feb 9 17:20:38 2015 -0800 Add a "Sum" column to the Service Response Time (SRT) window. The Service Response Time (SRT) window currently provides the columns: Index, Procedure, Calls, Min SRT, Max SRT, and Avg SRT. A Sum column has been found useful in some customer situations to understand the total time spent doing a set of procedures. For example, in one case we were trying to isolate whether most time was being spent on a client thread or in the act of making outbound calls. We knew the start and end time of the client call, so with the "Sum" of time spent in that period, we could isolate a particular set of procedures driving the slow down. Additional changes made in this patch: * Add " (s)" to Min, Max, Avg, and Sum columns to make it clear that times are in seconds. * Refactor out width and height constants used in calls to gtk_window_set_default_size in most of the SRT users into #define SRT_PREFERRED_WIDTH and SRT_PREFERRED_HEIGHT. Also increase the common width of 550 to 650 to account for the additional column. Change-Id: I20f152eecbcd0bbf69f71c6c6b9f9463e8867e23 Reviewed-on: https://code.wireshark.org/review/7047 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 895b013 Author: Guy Harris Date: Mon Feb 9 11:31:59 2015 -0800 Use G_GINT64_MODIFIER when formatting g{u}int64 values. Remove extra trailing blank from output while we're at it. Change-Id: Ie415afa76a3eaba630ee3d59b177b44de75413a4 Reviewed-on: https://code.wireshark.org/review/7046 Reviewed-by: Guy Harris commit e88a11f Author: Bill Meier Date: Mon Feb 9 13:42:51 2015 -0500 (Trivial) Fix printf-related 'Mismatch on sign' warnings Found by MSVC2013 Code Analysis Change-Id: I58063946dd558e98308c87b36eeac0ddbe1a6e79 Reviewed-on: https://code.wireshark.org/review/7045 Reviewed-by: Bill Meier commit 2078a95 Author: Peter Wu Date: Fri Feb 6 12:31:46 2015 +0100 pgsql,imap: add STARTTLS support The PGSQL "STARTTLS" protocol is documented at http://www.postgresql.org/docs/9.4/static/protocol-flow.html While at it, convert some tvb_length[_remaining] users. Tested against pgsql-ssl.pcapng, Tested against imap-ssl.pcapng, http://wiki.wireshark.org/SampleCaptures#SSL_with_decryption_keys Change-Id: I1a00a6daa7f03de93339c2c13b07b4cfb8cdbd86 Reviewed-on: https://code.wireshark.org/review/6821 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit a58cf52 Author: Martin Mathieson Date: Mon Feb 9 14:18:27 2015 +0000 file-jpeg: Allow 'Exif' as identification in first App block, but flag as expert info warning if seen Change-Id: Id16e0b4fbca3b29b01138a9aea758b8beb8d9ed8 Reviewed-on: https://code.wireshark.org/review/7042 Reviewed-by: Martin Mathieson commit e36a2ad Author: Martin Mathieson Date: Mon Feb 9 11:48:25 2015 +0000 Netflow: rework how transport (port) resolution is done, adding support for SCTP Change-Id: I09b2cc3739628b5de706659731e37fa345804254 Reviewed-on: https://code.wireshark.org/review/7043 Petri-Dish: Martin Mathieson Reviewed-by: Michael Mann Reviewed-by: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson commit 929a4f2 Author: Peter Wu Date: Fri Feb 6 11:43:54 2015 +0100 ldap: simplify Start TLS handling RFC 2830 describes the Start TLS operation as follows: 1. ExtendedRequest is sent by client with the requestName OID set to "1.3.6.1.4.1.1466.20037". 2. Server responds with an ExtendedResponse having a resultCode and optionally a responseName (OID). The text mentions that the field *must* be set but the definition allows it to be optional. The previous code then made assumption that once (1) was seen, then any ExtendedResponse signals an acknowledgement. That is not entirely correct, a server could reject the request. This patch corrects that by checking the ExtendedResponse_resultCode for success, and then uses the new ssl_starttls_ack() helper to kick off SSL. This simplifies the code a bit. Tested against ldap-ssl.pcapng (which has no responseName) from http://wiki.wireshark.org/SampleCaptures#SSL_with_decryption_keys The result is the same as before, except that "Protocols in frame" changed from "...:ldap:ssl:ldap" to "...:ssl:ldap". Change-Id: Id7e40c5a50a217c4d3d46f08241d704f19d195dd Reviewed-on: https://code.wireshark.org/review/6982 Reviewed-by: Michael Mann commit e190253 Author: Peter Wu Date: Fri Feb 6 12:35:09 2015 +0100 Fix STARTTLS handling in various dissectors This patch lets a dissector hand over control to the SSL dissector which simplifies dissector code ("TCP | App | SSL | App" becomes "TCP | SSL | App"). After this patch, all of the affected dissectors will now be dissected as SSL with its Application Data being treated as the protocol before STARTTLS. This was previously not the case because the port was not registered for dissection via ssl_dissector_add. The desegmentation issue within the MySQL dissector is now also gone. Convert some tvb_length[_remaining] users in pop and smtp as well. Tested against mysql-ssl.pcapng and mysql-ssl-larger.pcapng(*1), Tested against pop-ssl.pcapng (note: only first stream is decrypted, either the key after negotiation is wrong or there is a bug), Tested against smtp-ssl.pcapng and smtp2525-ssl.pcapng (with Decode As) and smtp-ssl.pcapng with filter "tcp.len>0", Tested against xmpp-ssl.pcapng, http://wiki.wireshark.org/SampleCaptures#SSL_with_decryption_keys *1) mysql-ssl-larger has MySQL dissector errors for the fragmented SSL packet, but reassembly seems to work. Needs further investigation. Bug: 9515 Change-Id: I408ef8ff30d9edc8954dab9b3615900666dfa932 Reviewed-on: https://code.wireshark.org/review/6981 Reviewed-by: Michael Mann commit 93ed726 Author: Peter Wu Date: Thu Feb 5 19:54:52 2015 +0100 ssl,dtls,ssl-utils: Prepare for STARTTLS handling All STARTTLS-like dissectors (protocols which can switch to SSL/TLS after a protocol command) currently fail to get called after decryption. The reason for this is that the port is not registered for SSL dissection via ssl_dissector_add. Besides this, the MySQL dissector breaks in the event of multiple segments because it does not properly set desegmentation. The call path TCP | App | SSL | App is a bad, error-prone pattern which requires duplication of required functionality in dissectors. This patch enables to bypass the App (TCP | SSL | App) by registering a SSL as conversation dissector after a STARTTLS switch. Logical overview of changes: - Move srv_addr, srv_ptype and srv_port to SslSession and adjust the users. This allows passing SslSession around which will never be null unlike SslDecryptSession. This is needed for looking up the packet direction (server or client) before calling a subdissector. - Add app_handle to store the dissector and last_nontls_frame the frame that initiated STARTTLS. - The same app_handle is now used to store the dissector handle from a ssl association. - Moved conversation data (SslDecryptSession) to ssl-utils to avoid code duplication. Merge ssl_session_init into it. The new ssl_session_get() is needed for STARTTLS frame/handle storage. - Introduce new "ssl_starttls_ack" function to signal the last non-TLS packet. - Ensure that match_uint is set before calling the conversation dissector. This ensures that dissectors using match_uint to check the direction of a packet (client vs. server) see the TCP port instead of the IP proto. At least the MySQL and SMTP dissectors require such special treatment. - Move epan/conversation.h outside HAVE_LIBGNUTLS, remove from dtls (as it is already included by ssl-utils). - Various comment/debug string updates. Remove outdated comment before SSL association lookup. Besides setting match_uint and caching the app_handle, existing dissectors should not be affected by this patch. Follow-up patches will update existing dissectors to use the new ssl_starttls_ack interface. Bug: 9515 Change-Id: I795d16b6a901e672a5d89e922adc7e5bbcda0333 Reviewed-on: https://code.wireshark.org/review/6872 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 5b2a05c Author: Anish Bhatt Date: Fri Feb 6 02:07:53 2015 -0800 [IS-IS LSP] Add support for Adj-SID & LAN-Adj-SID subTLV Bug: 10677 Change-Id: Ia936ee4af6779b2b7dde61f33c490f545060dbe8 Signed-off-by: Anish Bhatt Reviewed-on: https://code.wireshark.org/review/6980 Reviewed-by: Alexis La Goutte commit 3222cd1 Author: Peter Wu Date: Sat Feb 7 13:16:59 2015 +0100 ssl-utils: use ALPN hint for improved spdy/http2 recognition This patch improves detection of a SPDY/3.1 in SSL capture. While at it, add other protocols from the RFC/drafts. spdy was tested against a private capture from spdy/3.1 communication between Chromium 40 and ssl.gstatic.com. http2 was tested against http2-16-ssl.pcapng from http://wiki.wireshark.org/SampleCaptures#SSL_with_decryption_keys Change-Id: I111efae34d614b7d8e37eaaa686b391d332753dd Reviewed-on: https://code.wireshark.org/review/7000 Petri-Dish: Alexis La Goutte Reviewed-by: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 702618f Author: Peter Wu Date: Sat Feb 7 10:02:13 2015 +0100 Fix use-after free in RTP player Clicking "Decode" in the RTP player triggered an ASAN heap-use-after-free in update_progress_bar(). Explicitly set progress_bar to NULL to prevent this. Change-Id: Ice3105a11642a1cc5a54b8fbdf7dbf0ed430d965 Ping-Bug: 10714 Reviewed-on: https://code.wireshark.org/review/6999 Reviewed-by: Anders Broman commit d56a3c9 Author: Lev Stipakov Date: Sun Feb 8 17:21:18 2015 +0200 This adds support for P_DATA_V2 OpenVPN packets. On the wire P_DATA_V2 is same as P_DATA-V1 plus 3 bytes "peer-id" value after opcode. Client-side support has been added since OpenVPN 2.3.6, server side is in master branch and will appear in 2.4. Peer-id is especially useful for mobile clients (they often float between 3G/Wi-Fi) and in general for Wi-Fi clients (solves UDP NAT timeout issue). Change-Id: Ic5d2e05e62c27bed18c2368a1bbc5c7bf4d358f1 Reviewed-on: https://code.wireshark.org/review/7023 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 8ff944d Author: Michael Mann Date: Sun Feb 8 20:36:03 2015 -0500 Add fixed length function for address types. This allows for even more cleanup with respect to how address types are handled, including removing address_to_str.c. Most of the functionality was folded into address_types.c, but the remainder was just dispersed because it didn't make sense to keep the file. Change-Id: Id4e9391f0c3c26eff8c27b362e4f7a1970d718b4 Reviewed-on: https://code.wireshark.org/review/7038 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 2875cd3 Author: Michael Mann Date: Sun Feb 8 16:36:07 2015 -0500 Eliminate the hf member out of the address structure. Using the new address type registration, dissectors can create their own address types with their own (column) filters attached to them, eliminating the need for an address to keep track of a hf_ field. Change-Id: I2bbec256a056f403a7ac9880d5d76a0b2a21b221 Ping-Bug: 7728 Reviewed-on: https://code.wireshark.org/review/7037 Reviewed-by: Michael Mann commit 2042385 Author: Michael Mann Date: Sun Feb 8 13:49:57 2015 -0500 Add "column filter string" support to address types. Information about dissector (filter) fields should be kept in a dissector as much as possible. Supporting "column filter string" also allows other dissectors to create their own "address types" with different column filters (because AT_ETHER isn't always an "Ethernet" address). This feature also allowed a few "dissector specific" address types to be moved to their own dissector. Change-Id: Ie9024af4db62bc2ee4f8c9d28a1d807f706f45bf Ping-Bug:7728 Reviewed-on: https://code.wireshark.org/review/7029 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 4497bb4 Author: Michael Mann Date: Sat Feb 7 22:15:55 2015 -0500 Add address type registration. Now address types are setup just like field types and must be registered with a structure that provides its string representation (and more things in the future). Address types that are limited to a single dissector are registered by the dissector. More "common" ones are globally registered. There are still a few that really belong in a dissector, but have other dependencies currently not accounted for in the address type support. Many of the "address to string" conversions that involved g_sprintf have be changed to use more "performance friendly" methods (some at the cost of needing to_str-int.h) Leaving all comments regarding this "solution" in address_to_str.c in until all have been implemented Change-Id: I494f413e016b22859c44675def11135f228796e0 Reviewed-on: https://code.wireshark.org/review/7019 Reviewed-by: Michael Mann commit 3b81c36 Author: Alexis La Goutte Date: Sat Feb 7 21:54:39 2015 +0100 DNS: LOC Precision missing units The DNS packet's 3rd additional RR is a LOC RR. In the LOC RR, Wireshark marks the Size field with meters unit. However, the Horizontal and Vertical Precision fields have no units Issue reported by Boaz Bug:10940 Change-Id: If177757d2bba6ea012a320aceaea2f8d8e50155c Reviewed-on: https://code.wireshark.org/review/7014 Reviewed-by: Michael Mann commit 0a2832c Author: Alexis La Goutte Date: Sun Feb 8 20:31:49 2015 +0100 WMEM (allocator): fix warning: redeclaration of already-defined enum '_wmem_allocator_type_t' is a GNU extension [-Wgnu-redeclared-enum] Change-Id: Ied0428324c14f248bf6857fd288b4fb5d4591230 Reviewed-on: https://code.wireshark.org/review/7033 Petri-Dish: Alexis La Goutte Reviewed-by: Michael Mann commit 58f8076 Author: Alexis La Goutte Date: Sun Feb 8 20:28:48 2015 +0100 Menubar (GTK): fix warning: no previous prototype for ‘set_menus_capture_start_sensitivity’ [-Wmissing-prototypes] Change-Id: I11c805b285d277ecb963622385154c310f6d1c67 Reviewed-on: https://code.wireshark.org/review/7032 Reviewed-by: Michael Mann commit 3c10841 Author: Alexis La Goutte Date: Sun Feb 8 20:28:20 2015 +0100 USB HID: fix no previous prototype for 'dissect_usb_hid_get_report_descriptor' [-Wmissing-prototypes] Change-Id: Icb7fec658f895e91069e51bab50d57a0a93f5cba Reviewed-on: https://code.wireshark.org/review/7031 Reviewed-by: Michael Mann commit 0310132 Author: Alexis La Goutte Date: Mon Oct 27 23:00:54 2014 +0100 Multicast Stream: Move mcast_stream.[ch] to ui Preparation to add Multicast Stream Dialog on Qt (Add extern C...) Change-Id: Ic8bc39a18dba607d6da116df799de7847ce8e4c8 Reviewed-on: https://code.wireshark.org/review/6984 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte Tested-by: Alexis La Goutte Reviewed-by: Michael Mann commit d7ee095 Author: Martin Kaiser Date: Sun Feb 8 20:15:42 2015 +0100 [ZVT] start dissecting the registration apdu Change-Id: Ic8f93913396de3d97cdba4473e6837056c8250a6 Reviewed-on: https://code.wireshark.org/review/7030 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 3b6998d Author: Bill Meier Date: Sun Feb 8 12:42:32 2015 -0500 riemann: Minor cleanup Mostly: Rename a number of macros to be RIEMANN_... Change-Id: I2b8beb5f9241a0a2a380b8a38222ef07beb1703c Reviewed-on: https://code.wireshark.org/review/7028 Reviewed-by: Bill Meier commit 4c1c76a Author: Gerald Combs Date: Sun Feb 8 08:05:49 2015 -0800 [Automatic manuf, services and enterprise-numbers update for 2015-02-08] Change-Id: Ib8a2e297ccf561f782f2bd462269f180e9155b19 Reviewed-on: https://code.wireshark.org/review/7025 Reviewed-by: Gerald Combs commit 14c37af Author: Bill Meier Date: Sat Feb 7 22:44:10 2015 -0500 dwarf: fix bug found by MSVC2013 Code Analysis The following doesn't quite do what it might seem to be doing: *value |= (byte & 0x7F) << shift; //guint64 *value // guint8 byte The warning from MSVC2013: Arithmetic overflow: 32-bit value is shifted, then cast to 64-bit value. Results might not be an expected value Change-Id: I06e196559ec0e84da77d8866355ae7f86ba43f73 Reviewed-on: https://code.wireshark.org/review/7020 Reviewed-by: Bill Meier commit f494abd Author: Evan Huus Date: Sat Feb 7 22:03:38 2015 -0500 qnet6: don't calculate crc if length is negative Bug: 10941 Change-Id: I8c844487fa8ed1fb93ad9f69315fe1559238c845 Reviewed-on: https://code.wireshark.org/review/7018 Reviewed-by: Evan Huus commit 3066d6b Author: Guy Harris Date: Sat Feb 7 14:51:06 2015 -0800 Don't call the Bluetooth code's UUID type "uuid_t". uuid_t is a data type provided by a number of environments, thanks to the Open Software Fuundation; calling the Bluetooth code's data type, which includes an actual OSF-style UUID as a member, "uuid_t" can lead to confusion and *does* lead to compile errors on platforms where, for better or worse, system headers such as define uuid_t (and are included by, for example, Qt headers). Just rename it "bluetooth_uuid_t". Change-Id: Ic742723913ba4105cd3269dd24fc821147285176 Reviewed-on: https://code.wireshark.org/review/7017 Reviewed-by: Guy Harris commit 96527e2 Author: Bill Meier Date: Sat Feb 7 16:23:12 2015 -0500 riemann: Fix bug found by MSVC203 Code Analysis The following doesn't quite do what it might seem to be doing: guint64 num; guint8 b; num |= ((b & 0x7f) << shift); The warning from MSVC2013: Arithmetic overflow: 32-bit value is shifted, then cast to 64-bit value. Results might not be an expected value Change-Id: Ic8c939355b54317f0b459c60342f3cb5dfa29624 Reviewed-on: https://code.wireshark.org/review/7015 Reviewed-by: Bill Meier commit 22b4619 Author: Gerald Combs Date: Sat Feb 7 12:56:03 2015 -0800 Add the profile name to the Coloring Rules window title. Matches GTK+ behavior. Change-Id: I3dedb1532b5e14cc18a3ff34fd5be89438912834 Reviewed-on: https://code.wireshark.org/review/7012 Reviewed-by: Gerald Combs commit 6dd1296 Author: Gerald Combs Date: Sat Feb 7 11:21:17 2015 -0800 WSUG: Update the Packet Colorization section. Change-Id: I0f880293bd185e202d230f0db1a6bc4cbe6cfbfb Reviewed-on: https://code.wireshark.org/review/7011 Reviewed-by: Gerald Combs commit 4282304 Author: Martin Kaiser Date: Sat Feb 7 19:58:40 2015 +0100 set protocol to USBHID for get descriptor request and response if they're dealing with HID descriptors Change-Id: Ia529fe373653ddf18e05e8ad148a2f5b5686fa95 Reviewed-on: https://code.wireshark.org/review/7010 Reviewed-by: Martin Kaiser commit 5457865 Author: Martin Kaiser Date: Sat Feb 7 19:47:37 2015 +0100 use the value string for HID descriptor type Change-Id: I19544eeccd5206de88fe480f9b02bc57fcc278bd Reviewed-on: https://code.wireshark.org/review/7009 Reviewed-by: Martin Kaiser commit 1a5b5fa Author: Martin Kaiser Date: Sat Feb 7 19:31:33 2015 +0100 remove the offset parameter from dissect_usb_standard_setup_request() Change-Id: Iaf339310c3b606885e945d10cffc1956ce24578a Reviewed-on: https://code.wireshark.org/review/7008 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 8bf6516 Author: Martin Kaiser Date: Mon Jan 19 08:02:26 2015 +0100 dissect a get descriptor request and response for the HID report descriptor treat those two messages as class-specific control messages, handle them inside the USB HID dissector Change-Id: I42d201df4a8fdb94c947b6118c0b50945c306423 Reviewed-on: https://code.wireshark.org/review/7006 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 5403478 Author: Martin Kaiser Date: Thu Feb 5 22:37:54 2015 +0100 refactor the dissection of USB setup requests pass the data only to one subsequent dissection function either we have a standard request or a non-standard request that can be handled by a class dissector (we used to do both at the same time, this makes the output difficult to read) Change-Id: Ia46239b2b9e121c9ca165cc56d0b271345d7962e Reviewed-on: https://code.wireshark.org/review/7005 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit a097659 Author: Martin Kaiser Date: Sun Feb 1 18:08:15 2015 +0100 change try_dissect_next_protocol() such that its parameter is the top-most tree on which it operates this gives callers more control over where things are displayed Change-Id: I8cdc07b4f3569bca728781fb709e2a2bb37c433b Reviewed-on: https://code.wireshark.org/review/7004 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 1648d6e Author: Martin Kaiser Date: Sun Feb 1 16:37:47 2015 +0100 new function is_usb_standard_setup_request() to check if a request is a standard setup request it's not sufficient to look at the type bits in the request type field use the new function where we checked the type bits before Change-Id: I65b901dca91607a4dad4e4296b3f3a877aebf346 Reviewed-on: https://code.wireshark.org/review/7003 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 13f6bce Author: Michal Labedzki Date: Tue Jan 6 10:47:33 2015 +0100 Bluetooth: ATT: Use proto_tree_add_new_bytes for UUID128 Change-Id: I018b3e125bcbb6908276dd2b3b9f66def9aa745b Reviewed-on: https://code.wireshark.org/review/6907 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Tested-by: Michal Labedzki Reviewed-by: Michal Labedzki commit 617c733 Author: Michal Labedzki Date: Tue Jan 6 10:46:17 2015 +0100 Add proto_tree_add_new_bytes() Version to add as generated field, without tvb offset, length. Change-Id: If4c7aebcbf1b47faa483bcbd40995eff3ccb99f0 Reviewed-on: https://code.wireshark.org/review/6906 Tested-by: Michal Labedzki Reviewed-by: Michal Labedzki commit 722ce56 Author: Bill Meier Date: Fri Feb 6 15:44:05 2015 -0500 btatt: fix bug ("Labeled code is unreachable"); Introduced in gca3fe28; Found by MSVC2013 Code Analysis Change-Id: I4c754dfacca492b53debdaf82557e4fe91698460 Reviewed-on: https://code.wireshark.org/review/6991 Reviewed-by: Bill Meier Reviewed-by: Michal Labedzki commit fb00452 Author: Michal Labedzki Date: Thu Jan 22 12:27:23 2015 +0100 Bluetooth/GUI: ATT: Add Server Attribute Table It is a GUI+QT feature that introduce Bluetooth menu and "ATT Server Attributes" that present all handle+UUID pairs as table. User may copy cell value, row, selected rows or whole table within header. On activate user will go to packet that introduce UUID for specified handle. Change-Id: If17e53aff5feb89ededc740a595ba5882b90be5e Reviewed-on: https://code.wireshark.org/review/6911 Reviewed-by: Michal Labedzki commit 2ff79dd Author: Michal Labedzki Date: Thu Feb 5 09:18:53 2015 +0100 Bluetooth: ATT: Fix Running Walking Sensor field name Change-Id: I595c169e476cf86aa77ca926f4ce0d5d0e4aecd1 Reviewed-on: https://code.wireshark.org/review/7002 Reviewed-by: Michal Labedzki commit 7610a69 Author: Michal Labedzki Date: Sat Feb 7 17:24:48 2015 +0100 Bluetooth: ATT: Fix not missing break "Break" is not missing, "error opcode" is part of opcode "Error Response" that is needed to fetch request data. Change-Id: I35432b22fae492a93332a8787213dd8fcf796e3b Reviewed-on: https://code.wireshark.org/review/7001 Reviewed-by: Michal Labedzki commit 1eec034 Author: Alexis La Goutte Date: Fri Feb 6 17:25:18 2015 +0100 Bluetooth: ATT: Missing break in switch (CID 1268199) Change-Id: I562f1b8c1d39586c2a3f25363e89e81587176c58 Reviewed-on: https://code.wireshark.org/review/6987 Reviewed-by: Anders Broman commit 1ecd0ad Author: Alexis La Goutte Date: Fri Feb 6 17:08:26 2015 +0100 Bluetooth: ATT: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: Id323b783e2931ad9b4e08727df91c8e0138d35c1 Reviewed-on: https://code.wireshark.org/review/6986 Reviewed-by: Anders Broman commit 2c65b33 Author: Peter Wu Date: Sat Feb 7 00:49:31 2015 +0100 Fix RTP crash on RTP analysis attempt The tap listener was handling rtpstream_tapinfo_t* types while other users was expecting a GList* instead. Fix this and avoid future confusion by replacing void* pointers. Ping-Bug: 10714 Change-Id: I66f62eaaed4a529714264bbf4e7ad1e72b46ce5a Reviewed-on: https://code.wireshark.org/review/6997 Reviewed-by: Gerald Combs commit 6f22eb6 Author: Gerald Combs Date: Fri Feb 6 16:42:16 2015 -0800 Qt: Fix coloring rules reordering. Change-Id: I8bf36fffb3e3fc19c10c5f07db951cc5a4253556 Reviewed-on: https://code.wireshark.org/review/6998 Reviewed-by: Gerald Combs commit c8cad99 Author: Gerald Combs Date: Wed Feb 4 16:36:19 2015 -0800 Qt: Add the Coloring Rules dialog. Merge in the old ColorDialog which was a placeholder for color_filter_add_cb. Change-Id: I48d188509f480b8514122b4011ac9d8790fcca10 Reviewed-on: https://code.wireshark.org/review/6996 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit b3f3dd8 Author: Gerald Combs Date: Fri Feb 6 10:36:27 2015 -0800 Qt: Fix preference change behavior. Main window: Keep track of our current layout and only change it if the preferences change. This keeps the panes from resizing. Re-select the current packet if the layout changes so that the proto tree and byte view aren't left in an invalid state. This fixes a crash similar to bug 10896. Search frame: Get rid of an invalid error message. Update coding style. I don't think any of these fix bug 10921 since Xiaochuan seems to get a crash immediately upon opening the dialog. Change-Id: I0e880a50d3c9ac1c6ae6a01034b05fd2249444f4 Reviewed-on: https://code.wireshark.org/review/6989 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 3b3ce87 Author: Bill Meier Date: Fri Feb 6 16:46:19 2015 -0500 qnet6: Fix a bug found by MSVC2013 Code Analysis. wrongo: 2 * 2 + 4 * 5 + (khdr.msgtype & QNET_KIF_CRED) ? (4 * 4 + 4 * 7) : 0 Change-Id: I79117a34528642a81d0c80427a8e41d733bef10d Reviewed-on: https://code.wireshark.org/review/6995 Reviewed-by: Bill Meier commit ff6d503 Author: Bill Meier Date: Fri Feb 6 14:04:01 2015 -0500 qnet6: Cleanup - Remove some boilerplate comments; - Use a consistent indent style (gnu); - Use a consistent format for hf[] entries; - Whitespace; - Long lines; - Rename a generic macro; Change-Id: Ic2edcf8a8c0151d63a0d0ad901ddea9d7443ad19 Reviewed-on: https://code.wireshark.org/review/6994 Reviewed-by: Bill Meier commit 49c27d3 Author: Bill Meier Date: Fri Feb 6 16:18:30 2015 -0500 cfdp: Fix bug ("Labeled code is unreachable") Found by MSVC2013 Code Analysis Change-Id: If8138ff3eab7daa1da728781314f8024e36545be Reviewed-on: https://code.wireshark.org/review/6992 Reviewed-by: Bill Meier commit 501d996 Author: Jeff Morriss Date: Wed Feb 4 10:13:50 2015 -0500 Further simplify the LSA-Update processing: the always-present forwarding block can be considered TOS 0. Use similar logic in LSA-Summary processing. Ping-Bug: 6302 Change-Id: I0a74b95f6c4413ebce240e6e1b46c7e88311713a Reviewed-on: https://code.wireshark.org/review/6951 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 8b095bc Author: Alexis La Goutte Date: Fri Feb 6 17:04:02 2015 +0100 Multicast Stream (GTK): fix crash when try to select a stream Change-Id: Iaaa9445ae99b37cfb1865251d50f38375f3eb272 Reviewed-on: https://code.wireshark.org/review/6985 Reviewed-by: Evan Huus Reviewed-by: Michael Mann commit 55eb35a Author: Petr Gotthard Date: Fri Feb 6 09:50:40 2015 +0100 AMQP: Fix one warning from Clang Code Analysis Since 'values' is always 'length/4', we can have it as 'gint' and avoid the Clang warning concerning the while cycle. >> cannot optimize loop, the loop counter may overflow [-Wunsafe-loop-optimizations] Change-Id: I4342f9e3fcd5df7779f41414ab6f789fe402e3af Reviewed-on: https://code.wireshark.org/review/6979 Petri-Dish: Alexis La Goutte Reviewed-by: Pascal Quantin commit eb85555 Author: Petr Gotthard Date: Thu Feb 5 18:01:54 2015 +0100 AMQP: Add more COL_INFO description for some packets/frames. Change-Id: If70dc3972d99d34d8e37dd26045076e515fd4d2c Reviewed-on: https://code.wireshark.org/review/6968 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Reviewed-by: Pascal Quantin commit 0b0f7fa Author: Jeff Morriss Date: Wed Feb 4 10:32:02 2015 -0500 More emem removal. Remove emem's 8-byte-memory-alignment configure check as well as references to all the environment variables emem used. Change-Id: I897aec9e9c68e064454561e7a9f066b18892ec66 Reviewed-on: https://code.wireshark.org/review/6950 Petri-Dish: Alexis La Goutte Reviewed-by: Anders Broman commit 881ff5d Author: Gerald Combs Date: Wed Feb 4 12:18:37 2015 -0800 Remove gethostbyaddr and gethostbyaddr2. They've been deprecated for a very long time. Replace them with getaddrinfo. Note that we might not want to do synchronous name resolution at all. Add HAVE_GETADDRINFO to the KfW win-mac.h collision list. Change-Id: If59ce8a038776eadd6cd1794ed0e2dad8bf8a22c Reviewed-on: https://code.wireshark.org/review/6958 Reviewed-by: Gerald Combs Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit d6ebb82 Author: Jeff Morriss Date: Thu Feb 5 21:31:06 2015 -0500 (Trivial) Reformat some. Change-Id: I1bed28c33d1942b9d8ee8ef341d7017d2df21f37 Reviewed-on: https://code.wireshark.org/review/6977 Reviewed-by: Jeff Morriss commit 61e3bdc Author: Gerald Combs Date: Thu Feb 5 16:58:57 2015 -0800 WSDG: Wrap a line. Change-Id: I21e573c3800a245cbdae4fcb4d4cfaf36f3a0abd Reviewed-on: https://code.wireshark.org/review/6976 Reviewed-by: Gerald Combs commit 3badc30 Author: Pascal Quantin Date: Thu Feb 5 23:20:54 2015 +0100 QNET6: do not use col_set_str with non constant strings Change-Id: I63e965d819413299bf3e9a400b80ded23225598a Reviewed-on: https://code.wireshark.org/review/6975 Reviewed-by: Pascal Quantin commit b3e8269 Author: cbontje Date: Thu Feb 5 12:51:51 2015 -0700 SEL Protocol Maintenance (2/2) - Complete internal cleanup of 'fastser' -> 'fastmsg' syntax - Includes all variables, comments and filter values Change-Id: Ib58e470c9552387cb8c1d8c68fa1574cf7aa1691 Reviewed-on: https://code.wireshark.org/review/6974 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Reviewed-by: Alexis La Goutte commit 1fdc6f4 Author: Pascal Quantin Date: Thu Feb 5 12:45:50 2015 +0100 QNX6: avoid deferencing a null pointer Bug: 10920 Change-Id: Ibf3539c188431d2514c523c094d1e2d86b77f0b5 Reviewed-on: https://code.wireshark.org/review/6967 Reviewed-by: Evan Huus Petri-Dish: Pascal Quantin Reviewed-by: Pascal Quantin commit 3f480c6 Author: cbontje Date: Thu Feb 5 12:49:58 2015 -0700 The 'mbrtu' dissector should be registered with RTAC Serial, not the 'modbus' one. (This error was missed by me when confirming recent changes to the RTAC serial dissector and fixes decoding of RTAC serial Modbus captures.) Change-Id: I2df609f88263e90ae4815722ff76b6a0b988a01e Reviewed-on: https://code.wireshark.org/review/6973 Reviewed-by: Michael Mann commit 99761aa Author: Guy Harris Date: Thu Feb 5 11:03:11 2015 -0800 Remove endif() left over from previous change. Change-Id: Ia5781bcb55b2cf2e5ab2bc8c6587348ffe62a5c2 Reviewed-on: https://code.wireshark.org/review/6972 Reviewed-by: Guy Harris commit 572b30a Author: Guy Harris Date: Thu Feb 5 10:22:52 2015 -0800 Get rid of the temporary OS X-specific hack. Hopefully Gerald's change will fix this annoyance once and for all. Change-Id: I547b221a670f1435fa86cb96b084cfa5b788c57f Reviewed-on: https://code.wireshark.org/review/6971 Reviewed-by: Guy Harris commit d138011 Author: Gerald Combs Date: Thu Feb 5 09:48:39 2015 -0800 WSDG: Fixup admonition block formatting. We tend to clobber the reader with admon blocks. Make the preceding and succeeding ones normal paragraphs. Change-Id: I0c70af93feb586d2e8f6120e2842fab52379b76f Reviewed-on: https://code.wireshark.org/review/6970 Reviewed-by: Gerald Combs commit 410a8d1 Author: Gerald Combs Date: Thu Feb 5 09:22:37 2015 -0800 CMake: Make copy_data_files depend on html_docs. Semi-blind attempt to fix what appears to be a race condition on the OS X x86 buildbot. Change-Id: I379c7dec26c2bca092d0c9a49465ee56a01d15ec Reviewed-on: https://code.wireshark.org/review/6969 Reviewed-by: Gerald Combs commit dff82e6 Author: Richard Sharpe Date: Sun Feb 1 11:50:10 2015 -0800 Update the Windows build documentation with some common traps that stop people from building as well as a hint about downloading the vcredist_xYY.exe file. Change-Id: I6ae9a045939a77ba2c9584f05124fdc8f355f11c Signed-off-by: Richard Sharpe Reviewed-on: https://code.wireshark.org/review/6916 Reviewed-by: Graham Bloice commit 48aa669 Author: AndersBroman Date: Thu Feb 5 10:18:36 2015 +0100 CAPWAP: Fix a typo. Change-Id: I19031eac4d26a5620dc05f2632c403d82d7a4ab2 Reviewed-on: https://code.wireshark.org/review/6966 Reviewed-by: Anders Broman commit fb9dc13 Author: Alexis La Goutte Date: Thu Feb 5 09:33:45 2015 +0100 MySQL: fix assert when the Connect Attrs capability is set, but no attributes From (emphasis mine): Starting with MySQL 5.6.6 the client **may** send attributes if CLIENT_CONNECT_ATTRS is set: Does this mean that the capability *may* be set, but the list of attributes can be empty? Issue reported by Peter Wu Ping-Bug:10351 Change-Id: Ib83c27f4a15341f791c443471d7a3bdbd942aef4 Reviewed-on: https://code.wireshark.org/review/6965 Reviewed-by: Anders Broman commit 2bcd38f Author: Evan Huus Date: Wed Feb 4 22:30:20 2015 -0500 ethercat: add default case in FoeFormatter Should probably fix an unintialized memory access caught by valgrind, although I can't reproduce it because out-of-tree plugins are still broken. Bug: 10919 Change-Id: Ib8c46e13922f25260ca0e8886368f5ce24e3d0b0 Reviewed-on: https://code.wireshark.org/review/6962 Reviewed-by: Guy Harris Reviewed-by: Anders Broman commit 8bad9ed Author: Alexis La Goutte Date: Thu Feb 5 07:52:48 2015 +0100 CAPWAP : fix warning about wrong type after proto_tree_add_bitmask(_with_flags) change Warn Dissector bug, protocol CAPWAP-CONTROL, in packet 1: proto.c:7802: field capwap.control.message_element.wtp_frame_tunnel_mode is not of an FT_{U}INTn type Warn Dissector bug, protocol CAPWAP-CONTROL, in packet 2: proto.c:7802: field capwap.control.message_element.ac_descriptor.security is not of an FT_{U}INTn type ... Change-Id: I03f70ca664d99771ad27457052e6df11f9d5ad9e Reviewed-on: https://code.wireshark.org/review/6964 Reviewed-by: Anders Broman commit 8ffaec9 Author: Alexis La Goutte Date: Thu Feb 5 07:48:28 2015 +0100 CAPWAP: Don't try to dissect fragment packet (Only display are "Data") Issue reported by Massimo Vellucci Bug:10918 Change-Id: I7f3b15536f66496d975696b3ff29fbc5b77ee5a8 Reviewed-on: https://code.wireshark.org/review/6963 Reviewed-by: Anders Broman commit 5b62526 Author: Guy Harris Date: Wed Feb 4 16:46:24 2015 -0800 OK, try cmake -E copy. It didn't fail with cp, so maybe that's just random luck, or maybe the built-in copy functions have an issue, or maybe just copy_if_different has an issue (64-bit inode number issues?). Try just copy, and see what happens. Change-Id: I84abf3846af9305c19ad4a78d5c9df31b1e1e61e Reviewed-on: https://code.wireshark.org/review/6961 Reviewed-by: Guy Harris commit a2e48c6 Author: Guy Harris Date: Wed Feb 4 15:56:15 2015 -0800 On OS X, temporarily use cp to install some files. The 32-bit OS X build is failing rather often due to cmake -E copy_if_different failing to copy wireshark.html, and to call cmake's copy functions completely crappy at reporting errors is to insult software that's merely completely crappy at reporting errors. Try using cp in the hopes that it'll actually tell us *WHY* the copy is failing and see if we can fix it. Change-Id: I723150c52c2ec0fe704d54191ef27fb6caf47fba Reviewed-on: https://code.wireshark.org/review/6960 Reviewed-by: Guy Harris commit 86d24b0 Author: Pascal Quantin Date: Wed Feb 4 22:35:24 2015 +0100 LPP: upgrade dissector to v12.3.0 Change-Id: Ibc2aa3127efcfbae33e6f3729d0e1e427db1c0fe Reviewed-on: https://code.wireshark.org/review/6959 Reviewed-by: Pascal Quantin commit 40d06bd Author: Gerald Combs Date: Wed Feb 4 13:07:50 2015 -0800 Don't clobber PROJECT_VERSION_EXTENSION. PROJECT_VERSION_EXTENSION was updated to match g528a857 config.nmake. Try to preserve it if it's set. Change-Id: I48edfcd149ef5adafff7ece68e0d43a9cdec0b59 Reviewed-on: https://code.wireshark.org/review/6957 Reviewed-by: Gerald Combs commit 52b4059 Author: Gerald Combs Date: Wed Feb 4 13:00:52 2015 -0800 1.99.2 → 1.99.3. Change-Id: Id03d0243f20b33873a92be7444b61952d0b18638 Reviewed-on: https://code.wireshark.org/review/6956 Reviewed-by: Gerald Combs