commit 3d703ff Author: Gerald Combs Date: Thu May 28 11:47:31 2015 -0700 Build 1.99.6. Change-Id: I8db40aea6c208d0badfc7d178b642328264e6c10 commit c532bdc Author: Gerald Combs Date: Thu May 28 09:49:47 2015 -0700 Set a capture buffer size only when we have a valid handle. Fixes the current Windows unit test crash. Clean up a warning message. Change-Id: I696e70c7656352d9576c1ad29703298cc7109621 Reviewed-on: https://code.wireshark.org/review/8674 Reviewed-by: Gerald Combs commit 222de83 Author: Mike Frysinger Date: Sat May 16 05:08:53 2015 -0400 switch to AC_PATH_TOOL The TOOL variant will automatically search for host prefixed scripts (e.g. armv7a-unknown-linux-gnueabi-pcap-config) before falling back to the default (i.e. pcap-config). This makes cross-compiling a bit simpler. Change-Id: Ia450839693b5550f798634a7e8b82c2a661b088c Reviewed-on: https://code.wireshark.org/review/8481 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit abfd445 Author: Alexis La Goutte Date: Fri May 22 17:35:20 2015 +0200 Androiddump: fix Null pointer passed as an argument to a 'nonnull' parameter Change-Id: I8fbcac112d0b60e0129ce0fc17a5e0ffab02710f Reviewed-on: https://code.wireshark.org/review/8589 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki Reviewed-by: Alexis La Goutte commit 187e8f6 Author: Jeff Morriss Date: Wed May 20 11:28:04 2015 -0400 Windows: don't attempt to set the capture buffer size on remote (rpcap) devices. Also move the code for setting the buffer size on Windows near the code for setting it when we have pcap_create(): into open_capture_device(). Bug: 9067 Change-Id: Ica45f74b98094958d8bb0a38de23248aaa251d4b Reviewed-on: https://code.wireshark.org/review/8551 Petri-Dish: Jeff Morriss Tested-by: Petri Dish Buildbot Reviewed-by: Jeff Morriss commit 2772a11 Author: Jeff Morriss Date: Wed May 27 11:08:26 2015 -0400 Document the services file in the man pages. Bug: 11227 Change-Id: Id9cc64820b238bd8c82a758a553e1352398ad885 Reviewed-on: https://code.wireshark.org/review/8664 Reviewed-by: Anders Broman commit d9c13fa Author: Jeff Morriss Date: Wed May 27 10:40:38 2015 -0400 Document the subnets file in the man pages. Text adapted from that in the WSUG documentation of the same. Ping-Bug: 1445 Ping-Bug: 11227 Change-Id: I4d07cba437e70324d19c5ae23e44b86c47b749a8 Reviewed-on: https://code.wireshark.org/review/8662 Reviewed-by: Anders Broman commit e08bc0d Author: Gerald Combs Date: Wed May 27 16:15:03 2015 -0700 Don't warn about overwriting filename preferences. When specifying a filename preference (e.g. the SSL pre-master secret log filename) don't warn about overwriting the file. Most of the time we're reading the file and when we're not (e.g. for the SSL debug log) overwriting it is kind of the point. Preference descriptions are plain text. We display them in tooltips as rich text. Convert them accordingly. Fixup some of the SSL preference descriptions. Bug: 11010 Change-Id: I4f1b1f3dd270c01648d9dd52ae20381c3c0d2e37 Reviewed-on: https://code.wireshark.org/review/8665 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 6d5fa70 Author: Jeff Morriss Date: Wed May 27 21:15:50 2015 -0400 is_linux_bonding_device() is only used if we HAVE_PCAP_CREATE so only define it if we HAVE_PCAP_CREATE. Change-Id: Ic4eb6e69bde7d244b68a9fd97f66682eda6bdf91 Reviewed-on: https://code.wireshark.org/review/8667 Reviewed-by: Jeff Morriss commit 8250325 Author: Pascal Quantin Date: Wed May 27 16:51:18 2015 +0200 ANSI IS-637 A: dump bytes when SMS encoding format is set to octet Change-Id: I3d8a72a9549d170e0b1d54ad930da8c9dd510134 Reviewed-on: https://code.wireshark.org/review/8663 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 4963c77 Author: Michael Mann Date: Thu May 21 22:20:29 2015 -0400 Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Final part. While there change deprecated tvb_length-xxx() calls Change-Id: I8b0cf823c2d37a92c58fcb653f7fe1e8fdad5a79 Reviewed-on: https://code.wireshark.org/review/8642 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit a25c46b Author: Michael Mann Date: Mon May 25 14:58:05 2015 -0400 Remove proto_tree_add_text from some dissectors. Change-Id: Id7ef95a56d9d8cc01f9a1a4556ad056b8bb7f8bc Reviewed-on: https://code.wireshark.org/review/8654 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit c6b0a61 Author: Michael Mann Date: Mon May 25 13:10:59 2015 -0400 Remove proto_tree_add_text from packet-ssl-utils.c Change-Id: I64998e93e8d72faa76e0e7809abfd9ccae10ab36 Reviewed-on: https://code.wireshark.org/review/8653 Reviewed-by: Anders Broman commit 27f16ad Author: Peter Lemenkov Date: Fri May 22 16:20:10 2015 +0300 [RTPproxy] Remove non-existent reply This reply message was never implemented anywhere. Current protocol spec doesn't mention this type of a reply either: * https://github.com/sippy/rtpproxy/wiki/RTPP-%28RTPproxy-protocol%29-technical-specification#information So we should remove this. Change-Id: I4e5efef24c6859d5a4a0ba08e3e4cca6d7b217f2 Signed-off-by: Peter Lemenkov Reviewed-on: https://code.wireshark.org/review/8656 Reviewed-by: Anders Broman commit 3d3c854 Author: Alexis La Goutte Date: Tue May 26 10:48:18 2015 +0200 Doc (packet-PROTOABBREV): fix quote for config include Following https://code.wireshark.org/review/#/c/8204/ Change-Id: I7850c10d9d3ca9ad63a85c9c6ef98d70bf4201b8 Reviewed-on: https://code.wireshark.org/review/8647 Reviewed-by: Graham Bloice commit a713b13 Author: Michael Mann Date: Sun May 24 21:10:29 2015 -0400 Duplicate the presence of the "ignored" field in order to remove proto_tree_add_text. Change-Id: I0906c28656a104210f6fd1f95c9cee7899308538 Reviewed-on: https://code.wireshark.org/review/8619 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit da93752 Author: Alexis La Goutte Date: Tue May 26 12:14:06 2015 +0200 ATM: Add reserved field Always display reserved field Change-Id: Ic9d7ea269bd31fc25bc9ef0430a49f37fa66a937 Reviewed-on: https://code.wireshark.org/review/8652 Reviewed-by: Anders Broman commit 4d15e49 Author: Alexis La Goutte Date: Tue May 26 11:39:52 2015 +0200 ATM: fix indent (use spaces) Change-Id: I6d8bae2124a5472448e2f2629340a20f5a899076 Reviewed-on: https://code.wireshark.org/review/8651 Reviewed-by: Anders Broman commit dd22928 Author: Alexis La Goutte Date: Tue May 26 11:17:36 2015 +0200 AIM: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang remove also orig_offset (no longer needed) Change-Id: Idc65b45fb67bae6acdca33962f3352a50296a6e5 Reviewed-on: https://code.wireshark.org/review/8650 Reviewed-by: Anders Broman commit f91f7d4 Author: Michael Mann Date: Sun May 24 22:12:42 2015 -0400 Remove proto_tree_add_text from file-elf.c Change-Id: Ib7df1e2c40ad86866f5a3d6902a7a92144028be7 Reviewed-on: https://code.wireshark.org/review/8620 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit ebcc36d Author: Alexis La Goutte Date: Tue May 26 10:47:22 2015 +0200 nghttp2: fix quote for config.h include following https://code.wireshark.org/review/#/c/8204/ Change-Id: I5ffad2bcbed217893243b8a01451b282030d0108 Reviewed-on: https://code.wireshark.org/review/8646 Reviewed-by: Anders Broman commit 7519896 Author: Anish Bhatt Date: Mon May 25 21:23:39 2015 -0700 Replace deprecated tvb_length* apis Change-Id: Ia23a6cbc61dfaf65002ce63160e87877963a3cca Reviewed-on: https://code.wireshark.org/review/8643 Reviewed-by: Anders Broman Reviewed-by: Alexis La Goutte commit 8817fd0 Author: Alexis La Goutte Date: Tue Apr 28 07:44:57 2015 +0200 CAPWAP: Add Vendor Specific from Cisco Based on work of actube https://github.com/7u83/actube Change-Id: I4f9b3bfa263446fb380127640ba99ecb0043eef2 Reviewed-on: https://code.wireshark.org/review/8307 Reviewed-by: Alexis La Goutte commit 00041a4 Author: Michael Mann Date: Mon May 25 08:05:21 2015 -0400 Revert "[AIM] Fix string length" It's a FT_UINT_STRING field type This reverts commit dc14e3ce0df78da52da95e7356c6e15390b191ec. Change-Id: I1185efbad459887fb9c16fb01e670bc43e6f2d84 Reviewed-on: https://code.wireshark.org/review/8623 Reviewed-by: Michael Mann Reviewed-by: Pascal Quantin commit 2638402 Author: Guy Harris Date: Tue May 26 01:53:38 2015 -0700 Fix variable that needs to survive a longjmp(). Pointed out by a warning in a compilation for ARM. Change-Id: Iab2748adbdc88c9e6749da1c3835896683a1a091 Reviewed-on: https://code.wireshark.org/review/8648 Reviewed-by: Guy Harris commit ecdaa11 Author: Martin Kaiser Date: Mon May 25 18:24:27 2015 +0200 jpeg: remove some more unnecessary initialisations Change-Id: If66a3951037d01c1aa502c0695ea11c62cc4d208 Reviewed-on: https://code.wireshark.org/review/8633 Reviewed-by: Martin Kaiser commit 1e5ca4f Author: Martin Kaiser Date: Mon May 25 18:21:48 2015 +0200 jpeg: replace an empty switch-case with a todo comment Change-Id: I656fa2f69453916dd5466265220e2b4590d3631c Reviewed-on: https://code.wireshark.org/review/8632 Reviewed-by: Martin Kaiser commit 73ef7b0 Author: Martin Kaiser Date: Mon May 25 17:50:53 2015 +0200 jpeg: some more code cleanup delete unnecessary initialisations declare variables at the start of a function Change-Id: Ib427790c51c1fc7433d0f3c17dc9fa4748585180 Reviewed-on: https://code.wireshark.org/review/8631 Reviewed-by: Martin Kaiser commit 630be08 Author: Martin Kaiser Date: Mon May 25 17:21:02 2015 +0200 DVB-CI: clean up the expert info definitions sort them by layer wrap long lines make the filter strings consistent Change-Id: Ibbeb405c6356abe61dd9a0194af1c072d2c1c971 Reviewed-on: https://code.wireshark.org/review/8630 Reviewed-by: Martin Kaiser commit 02640a0 Author: Anders Date: Mon May 25 17:30:54 2015 +0200 [GTP] Dissect eNodeB ID IE Change-Id: I7b6800ca71c9a0d2be4f30be55b49eec237ac908 Reviewed-on: https://code.wireshark.org/review/8629 Reviewed-by: Anders Broman commit 5dd4400 Author: Martin Kaiser Date: Mon May 25 16:32:54 2015 +0200 DVB-CI: kill the last two proto_tree_add_text() calls Change-Id: I53f9df7bf193551e786ad4ece368f3de702ce8de Reviewed-on: https://code.wireshark.org/review/8628 Reviewed-by: Martin Kaiser commit 886b25e Author: Martin Kaiser Date: Mon May 25 16:11:03 2015 +0200 iso7816: remove one proto_tree_add_text() call Change-Id: I3905fb83f5f70ee80e54fba479c0e8caca5baa6c Reviewed-on: https://code.wireshark.org/review/8627 Reviewed-by: Martin Kaiser commit 16715e0 Author: Martin Kaiser Date: Mon May 25 15:57:02 2015 +0200 DVB-CI: remove NULL-checks for proto_item_append_text()'s first argument Change-Id: I6648c20a003392a7435ca0461d2b004a1d415d51 Reviewed-on: https://code.wireshark.org/review/8626 Reviewed-by: Martin Kaiser commit e37a805 Author: Martin Kaiser Date: Mon May 25 15:53:56 2015 +0200 jpeg: clean up the sos header dissection Change-Id: Id3e6258036112a64e4111d0483c572697681eb89 Reviewed-on: https://code.wireshark.org/review/8625 Reviewed-by: Martin Kaiser commit 2fde6ff Author: Graham Bloice Date: Sun Apr 26 18:21:09 2015 +0100 Fix out of tree builds Stop out of tree builds picking up the in-tree version and config.h Change-Id: Icadc46cab66db72af2d475eac31b28d0ca10df90 Reviewed-on: https://code.wireshark.org/review/8204 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit dc14e3c Author: Anders Date: Mon May 25 09:38:11 2015 +0200 [AIM] Fix string length Change-Id: I64f73bd5cb131ad6efc64eea6a7eb66af9cee5c4 Reviewed-on: https://code.wireshark.org/review/8622 Reviewed-by: Anders Broman commit 7410afb Author: Stephane Bryant Date: Tue May 12 17:13:31 2015 +0200 reload-framing: add range checks before bit-shifts Change-Id: I1422b581157ffa389f121306de4dc9241ffb4061 Reviewed-on: https://code.wireshark.org/review/7595 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte Reviewed-by: Anders Broman commit cc3a96c Author: Andreas Gruenbacher Date: Tue May 19 23:18:13 2015 +0200 NFS: Remove the hidden acl, dacl, and sacl items These attributes are already represented by hf_nfs4_reco_attr items. Change-Id: Ib3804e2d30921764913f483863c003ffb55118ca Reviewed-on: https://code.wireshark.org/review/8586 Reviewed-by: Evan Huus Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit df38a2d Author: Michael Mann Date: Sun May 24 11:31:14 2015 -0400 Remove proto_tree_add_text from AIM dissectors. Change-Id: Ic7385d0555d72aa8ea2b9beb284ca1f6a115b174 Reviewed-on: https://code.wireshark.org/review/8616 Reviewed-by: Michael Mann commit f3ce5d2 Author: Michael Mann Date: Sun May 24 15:11:26 2015 -0400 Remove proto_tree_add_text from packet-osi-options.c and packet-esis.c Change-Id: Ifb404f5bab58d06d7e1f0106f284c7ae9858a502 Reviewed-on: https://code.wireshark.org/review/8617 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 82bd00a Author: Evan Huus Date: Sun May 24 18:38:16 2015 -0400 ceph: remove an unnecessary DISSECTOR_ASSERT coverity picked up on this being effectively dead code, and it's trivial to prove it will never trigger Change-Id: I5a2893671a764914f483d4ff6bcc835c9b0d3b28 Reviewed-on: https://code.wireshark.org/review/8615 Reviewed-by: Michael Mann commit 80346da Author: Michael Mann Date: Sun May 24 22:53:54 2015 -0400 Remove proto_tree_add_text from packet-ehs.c Change-Id: Ia56d41d3591f759619f13d6df679579f9d9888f7 Reviewed-on: https://code.wireshark.org/review/8621 Reviewed-by: Michael Mann commit 9d67d9f Author: Michael Mann Date: Sun May 24 20:46:49 2015 -0400 Make protocol name/key combo string filterable. Change-Id: I1ff863d0a4e114223b8fe283b1dc894e39fcefd7 Reviewed-on: https://code.wireshark.org/review/8618 Reviewed-by: Michael Mann commit 0c8390b Author: Luke Mewburn Date: Sun May 24 19:27:21 2015 +1000 proto.h: fix clang++ 3.6 warning Add spaces around literals to avoid warnings when compiling ui/qt with clang++ 3.6 -Wreserved-user-defined-literal (on Mac OS X). Change-Id: Ia2703dd8c914e8ffb299c4a6c44bba3aa674acb8 Reviewed-on: https://code.wireshark.org/review/8607 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 776ba4c Author: Michael Mann Date: Fri May 22 22:43:53 2015 -0400 Create a PTP/IP preference for "vendors" to break up the duplicate values in the ptp_opcode_names and ptp_respcode_names value_strings. Bug: 8573 Change-Id: I65a71a2c12cda61ed4c4b52a8ea0441261782942 Reviewed-on: https://code.wireshark.org/review/8597 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit b18309c Author: Gerald Combs Date: Fri May 22 15:33:38 2015 -0700 Qt: Update the status bar when saving. Plumb in more capture file callbacks. Add common functions for setting the status bar file information. Add and update code to match the GTK+ status bar behavior. Make sure we update the capture file length when rescanning. Bug: 10943 Change-Id: Ie84c7a57ee421d57ba3477f8dde3847aaafa1cd1 Reviewed-on: https://code.wireshark.org/review/8594 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit b25faac Author: Gerald Combs Date: Fri May 22 14:01:31 2015 -0700 Qt: Add a "[closed]" hint to the packet dialog. Try to make it more obvious that the file has closed. Ping-Bug: 11044 Change-Id: I76ae5724316c6fd9e7efdd817c39ac268b7d4dd0 Reviewed-on: https://code.wireshark.org/review/8593 Reviewed-by: Gerald Combs commit e9d8769 Author: Gerald Combs Date: Fri May 22 12:57:44 2015 -0700 Qt: Don't crash after "Save As". Rename "stay_closed" to "dont_reopen" to match cf_save_records and its GTK+ equivalent. Set "dont_reopen" to FALSE when we "Save As", otherwise we crash on Windows. Bug: 10904 Change-Id: I4bb10abc230439e10cc55ffbd5595bfbc0a34b6f Reviewed-on: https://code.wireshark.org/review/8592 Reviewed-by: Gerald Combs commit a34d696 Author: Stig Bjørlykke Date: Fri May 22 14:18:19 2015 +0200 p1: Fixed do_address for extension attributes This is not an optimal solution, but fixes the reported problem. The do_address functionality should probably be rewritten to only use pinfo for storing data. Bug: 11210 Ping-Bug: 8515 Change-Id: I2625cc4044ab93b6e943a3c2d2ffd1b26149da29 Reviewed-on: https://code.wireshark.org/review/8585 Reviewed-by: Alexis La Goutte Reviewed-by: Anders Broman commit 3bc42db Author: anilkumar911 Date: Fri May 22 15:21:40 2015 +0530 Netscaler: Add support to read MTCP record. Change-Id: I73aadb10e44aa64c6f4c9cc2145a63f5bd9c74e5 Reviewed-on: https://code.wireshark.org/review/8580 Reviewed-by: Anders Broman commit 1942039 Author: Anders Date: Fri May 22 18:06:48 2015 +0200 [Diameter] Show Visited-PLMN-Id Change-Id: If528f459535fde03bd936445113a3b12f34d42e5 Reviewed-on: https://code.wireshark.org/review/8590 Reviewed-by: Anders Broman commit 1f994e8 Author: Martin Mathieson Date: Fri May 22 15:33:12 2015 +0100 ISAKMP: Add recent notify message types to range_string, and show names in notification root node Change-Id: I3849868f6fbc8c5243757f6a39806365ca7a3609 Reviewed-on: https://code.wireshark.org/review/8587 Reviewed-by: Martin Mathieson commit 8d36cda3 Author: Joerg Mayer Date: Fri May 22 16:28:03 2015 +0200 Fix packet-ieee80211-radiotap-iter.c:159:36: runtime error: left shift of 1 by 31 places cannot be represented in type 'int' Change-Id: I0135b73c14bab05153a9ba2f5477f8651388037d Reviewed-on: https://code.wireshark.org/review/8588 Reviewed-by: Jörg Mayer commit 78593c2 Author: Andreas Gruenbacher Date: Tue May 19 11:43:06 2015 +0200 NFS: Fix NFSv4 attribute offsets and lengths NFSv4 attributes are transferred as a bitmask, followed by each of the attributes in the bitmask. The offset and length of the dissected attribute values should point at where the attribute values are; instead, they were pointing at the bitmap. Fix that. Change-Id: I4f93b7fffd7497306ae828a2fbd3c0e9b0accd1c Reviewed-on: https://code.wireshark.org/review/8536 Reviewed-by: Alexis La Goutte commit 03577f6 Author: Andreas Gruenbacher Date: Mon May 18 16:39:59 2015 +0200 NFS: Dissect NFSv4.1 dacl and sacl attributes The NFSv4.1 dacl and sacl attributes consist of a 32-bit acl flags field, followed by an access control list in the same format as the acl attribute. Bug: 11208 Change-Id: I5fb08f9764c21cd6abb4ee02265e4e6b4ed54f01 Reviewed-on: https://code.wireshark.org/review/8526 Reviewed-by: Alexis La Goutte commit e6b5ae7 Author: Alexis La Goutte Date: Fri May 22 14:09:10 2015 +0200 Diameter: fix indent (Use 4 spaces) Change-Id: Ie82f243af15f6851021d297018005c672a3fb28b Reviewed-on: https://code.wireshark.org/review/8584 Reviewed-by: Alexis La Goutte commit a0fcd0b Author: Anders Date: Fri May 22 13:05:06 2015 +0200 [Diameter] Added feature list dissection for 3GPP Sh interface Bug: 11218 Change-Id: I83838cc4af1d3eeaed04032c3127f2d4707d0fd3 Reviewed-on: https://code.wireshark.org/review/8583 Reviewed-by: Anders Broman commit 99e43f9 Author: Anders Date: Fri May 22 12:29:53 2015 +0200 [Diamater] Sub dissect Suported-Vendor-Id Change-Id: I5c0014449ef9886ba74abdf8f609860ef37a7831 Reviewed-on: https://code.wireshark.org/review/8582 Reviewed-by: Anders Broman commit 6b72a52 Author: Anders Date: Fri May 22 12:13:45 2015 +0200 [SIP] Add hf for header Session-Id Change-Id: I9b1dc7822fd1753d9b5af9c00a7eda928f423a67 Reviewed-on: https://code.wireshark.org/review/8581 Reviewed-by: Anders Broman commit 4fc571c Author: Peter Lemenkov Date: Thu May 21 16:39:43 2015 +0300 Cosmetic - adjust comments according to the proto Change-Id: I75b422d3181e93e12d6758d891538fa9fea7d1f7 Signed-off-by: Peter Lemenkov Reviewed-on: https://code.wireshark.org/review/8574 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit b738857 Author: Peter Lemenkov Date: Thu May 21 14:53:50 2015 +0300 Typo Change-Id: Ib50768ccca6e0354d287793ce639e28bee2c9865 Signed-off-by: Peter Lemenkov Reviewed-on: https://code.wireshark.org/review/8573 Reviewed-by: Anders Broman commit 3ddbda5 Author: Peter Lemenkov Date: Thu May 21 14:50:50 2015 +0300 Don't treat packets w/o line feed differently Change-Id: I7ddd0ecf5e4f02f66b9fea528725a5e29c1062ea Signed-off-by: Peter Lemenkov Reviewed-on: https://code.wireshark.org/review/8572 Reviewed-by: Anders Broman commit 5addf12 Author: Peter Lemenkov Date: Tue May 5 13:17:03 2015 +0300 Change unofficial extension parameter A character "v" was mapped to a different command parameter. So we should replace it. Change-Id: Ia668b0b0bead7bb4c4ba0a60f51f53daf2095a36 Signed-off-by: Peter Lemenkov Reviewed-on: https://code.wireshark.org/review/8571 Reviewed-by: Anders Broman commit 4dfc5a7 Author: Jeff Morriss Date: Thu May 21 14:14:28 2015 -0400 MSRP has a registered port now, register the dissector for it. Presumably it got the port when it became an RFC. Change-Id: I0afb815bcfe4b36b896fa6f7e62f93047a36b05b Reviewed-on: https://code.wireshark.org/review/8576 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 8f462b0 Author: Andreas Stieger Date: Wed Dec 3 00:09:42 2014 +0000 allow use of deprecated gdk-pixbuf functions gdk-pixbuf 2.31.2 marked GdkPixdata including as deprecated, including gdk_pixbuf_new_from_inline. Wireshark builds with deprecated functions turned off by default, in this case GDK_PIXBUF_DISABLE_DEPRECATED. Patch to configure.ac to allow use of deprecated function until upstream has ported the code, or a replacement patch is available. Bug: 10750 gdk-pixbuf change: https://git.gnome.org/browse/gdk-pixbuf/commit/?id=48d76fb7f2d059013f5781b199245274998f05c9 Initial warning: ui_utils.c: In function 'window_icon_realize_cb': ui_utils.c:115:5: warning: implicit declaration of function 'gdk_pixbuf_new_from_inline' [-Wimplicit-function-declaration] icon = gdk_pixbuf_new_from_inline(-1, wsicon_16_pb_data, FALSE, NULL); ^ Causes these warnings due to the implicit declaration: gui_utils.c:115:10: warning: assignment makes pointer from integer without a cast [enabled by default] icon = gdk_pixbuf_new_from_inline(-1, wsicon_16_pb_data, FALSE, NULL); ^ Fails the package checks in these lines: E: wireshark 64bit-portability-issue gui_utils.c:115, 117, 119, 121, 512 E: wireshark 64bit-portability-issue main.c:1513, 1519, 1525, 1531 E: wireshark 64bit-portability-issue prefs_layout.c:346, 347, 348, 349, 350, 351 E: wireshark 64bit-portability-issue stock_icons.c:413, 425 Change-Id: I85092753058cd2e5cda527e4321a7d92ac38facd Reviewed-on: https://code.wireshark.org/review/8578 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Reviewed-by: Balint Reczey commit 2aea664 Author: Guy Harris Date: Thu May 21 20:13:22 2015 -0700 Expand a comment. As either Grace Hopper or Andrew Tanenbaum, depending on which claim you read, said, "The {wonderful,good} thing about standards is that there are so many to choose from." Which standard for Lawful Intercept headers do you want? Change-Id: I8633e3d3e3d9a205f643d63980a80986e59d43f4 Reviewed-on: https://code.wireshark.org/review/8579 Reviewed-by: Guy Harris commit fe7c5ea Author: Gerald Combs Date: Thu May 21 12:12:40 2015 -0700 Fixup capture filter completion logic. Don't add the current word to the completion list. Change-Id: Ia475520092f461c9e7b03f82cc3427585e095162 Reviewed-on: https://code.wireshark.org/review/8577 Reviewed-by: Gerald Combs commit 0289d5c Author: Anders Date: Thu May 21 17:27:12 2015 +0200 [NSIP GPRS-NS] Fix a crash due to not NULL terminated hf arrays for proto_tree_add_bitmask(). Change-Id: I65adad6a33b3d6b199d54160bce85759a35607d6 Reviewed-on: https://code.wireshark.org/review/8575 Reviewed-by: Anders Broman commit 8999634 Author: Anders Date: Thu May 21 15:31:29 2015 +0200 [GTP] Add a couple of new IEs as "Not dissected yet" Change-Id: If7a083ab3a56801168853a43dff85e1066d6bec5 Reviewed-on: https://code.wireshark.org/review/8570 Reviewed-by: Anders Broman commit 3e8c9a4 Author: Tatsuhiro Tsujikawa Date: Thu May 21 10:36:47 2015 +0200 Include stdint.h instead of inttypes.h when compiled with MSVC < 2013 Backport by Alexis La Goutte from upstream Bug:11216 Change-Id: Ia269adce607ebc5a31ac9ef119dc2d4248173d62 Reviewed-on: https://code.wireshark.org/review/8568 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 353e4a3 Author: Guy Harris Date: Thu May 21 01:42:15 2015 -0700 Include to get MAXPATHLEN. Change-Id: Ibf40b75eb224262c4d5a571e56e2575bca787b91 Reviewed-on: https://code.wireshark.org/review/8565 Reviewed-by: Guy Harris (cherry picked from commit eb93c661c5c5f368ee0288193cdf3a7ce7102bd7) Reviewed-on: https://code.wireshark.org/review/8567 commit 29aeea7 Author: Guy Harris Date: Thu May 21 00:28:34 2015 -0700 Remove trailing whitespace. Change-Id: Ibc6620f489ae5d956b03ee61dc6f08dfc0a93371 Reviewed-on: https://code.wireshark.org/review/8562 Reviewed-by: Guy Harris commit 5a54d69 Author: Guy Harris Date: Thu May 21 00:25:55 2015 -0700 Don't just blindly tell application X11 to do anything. Determine what type of X11 (bundled from Apple, unbundled XQuartz) we should have and what type we do have. If we don't have any installed, don't tell X11 to do anything, as that just pops up a "where is X11?" dialog; that's information the user shouldn't need to tell the system if it is installed, and it's information for which the user shouldn't be asked if it's not installed - and if they're asked, they might answer incorrectly, leaving a system that doesn't properly launch X11 for Wireshark. (See various ask.wireshark.org questions about this, for example.) Pick up some changes from newer versions of Inkscape, such as using unsigned char *, not using FSSpecs, and adding some comments, while we're at it. Change-Id: Ic9a2b25938c4eec5628d1c16c7db28aa0714203e Reviewed-on: https://code.wireshark.org/review/8559 Reviewed-by: Guy Harris Reviewed-on: https://code.wireshark.org/review/8561 commit 90a1303 Author: Alexis La Goutte Date: Wed May 20 13:49:48 2015 +0200 802.11: Remove duplicate RIC Descriptor display Change-Id: I0fa523dd0e62f94e478ad35b216fc3dc5651718c Reviewed-on: https://code.wireshark.org/review/8547 Reviewed-by: Anders Broman commit 22aa241 Author: Pascal Quantin Date: Wed May 20 22:36:25 2015 +0200 MBIM: fix GSM SMS transmitted PDU length Change-Id: I5568d6048f620f5332577e2cf0d36ffa20200ebf Reviewed-on: https://code.wireshark.org/review/8556 Reviewed-by: Pascal Quantin commit 9ac0337 Author: Guy Harris Date: Wed May 20 13:34:04 2015 -0700 Get rid of XML step for adding menubar items. And don't create extra action groups; just add them to the main menubar's action group. Rename add_menu_item() to add_menu_item_to_main_menubar() to make that clearer. Change-Id: I6b564620decd8d0c9c4a2cb79b1a03df5ff27a4b Reviewed-on: https://code.wireshark.org/review/8555 Reviewed-by: Guy Harris commit af3cb5e Author: Pascal Quantin Date: Wed May 20 22:16:10 2015 +0200 PCEP: reorder pcep_class_vals extended value string Change-Id: Iaa270bc085cbee41be9881eab2749c0ed26ef359 Reviewed-on: https://code.wireshark.org/review/8554 Reviewed-by: Pascal Quantin commit 734032a Author: Oscar Gonzalez de Dios Date: Tue May 19 00:46:40 2015 +0200 Added support to RFC 6006, in particular, SERO and SSRO Objects and P2MP Endpoints Object. Trailing whitespaces, indent and typo fixed, used value_string. Fixed EOF Problem (Ubuntu Petri Dish failed) Bug:11213 Change-Id: I4ecc11b17c34dd993a72903ad4314c51ada64e02 Reviewed-on: https://code.wireshark.org/review/8532 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 2acb57d Author: Pascal Quantin Date: Wed May 20 15:45:20 2015 +0200 GSM SMS: update some (value|range)_string tables for MTC Device Trigger feature Change-Id: Iffc62744310688d2f5f4d6689ff2f9d96fd4f6f1 Reviewed-on: https://code.wireshark.org/review/8552 Reviewed-by: Pascal Quantin commit a30000a Author: Gerald Combs Date: Wed May 20 09:17:38 2015 -0700 Autocompleting "and" and "or" probably isn't useful. Change-Id: Ia16a02a616fd052eeaa9eceff76bc1b20ee8d82e Reviewed-on: https://code.wireshark.org/review/8553 Reviewed-by: Gerald Combs commit 344c990 Author: Michael Mann Date: Wed May 20 07:51:00 2015 -0400 Improve VN-Tag dissector. Bug: 7496 Change-Id: Ic1648f1c111913b7370b2eaf5557c4d8ea078033 Reviewed-on: https://code.wireshark.org/review/8546 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 67159be Author: Alexis La Goutte Date: Fri May 15 18:17:39 2015 +0200 RADIUS: Sync with FreeRADIUS Master commit 917d8af3bbb3d9f4bea4aa437d244a655cc69291 Author: Alan T. DeKok Date: Wed May 13 12:38:42 2015 -0400 formatting commit 0b0c515fa8facbca66f31fbb18dd4ad632e2c200 Author: skids Date: Wed May 13 12:25:14 2015 -0400 Add new port bounce attribute from Aruba This attribute was added in ArubaOS 7.4.0.3 for the Aruba Mobility Access Switch commit 17547a39413af58a7e4622d9d74af87ce2f52630 Author: Jorge Pereira Date: Thu May 7 19:51:24 2015 -0300 Updating the Alcatel 7750 dictionary based on "9304720101_V1_7750 SR-OSRADIUS ATTRIBUTE.pdf" document. commit ba4682aee27bd0aa87f67dbd8af4242c86e33015 Author: Arran Cudbard-Bell Date: Wed Apr 22 22:06:01 2015 +0100 Update ericsson.ab dictionary to include new accounting VSAs commit a1c76e847ad0058fcd924ed7f3974ac65e06695d Author: Arran Cudbard-Bell Date: Sat Apr 18 09:50:41 2015 +0100 If it's binary in radiator, it should be octets in FreeRADIUS From me: Add also some missing VSA on ericson.ab dicto Change-Id: I440c9006dc72388a45ba9a13225ecddf4773ae97 Reviewed-on: https://code.wireshark.org/review/8471 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte Reviewed-by: Anders Broman commit 390299c Author: Alexis La Goutte Date: Wed May 20 14:01:25 2015 +0200 Aruba ERM: fix typo Double space between Signal Strength and [percent] Change-Id: Ibf645a9e44d2e642df8fd53afd0a6ccbbb2adde0 Reviewed-on: https://code.wireshark.org/review/8549 Reviewed-by: Anders Broman commit feb47cf Author: Michael Mann Date: Thu May 14 22:53:16 2015 -0400 Start exposing the filter field of a tap listener to the RTP GUI APIs. A tap listener has the ability to apply a filter (typically the display filter). Add a parameter to RTP GUI API functions to allow them to pass in a filter. Bug: 996 Change-Id: Ib184dfb023be5d1d24a0d842b4039311426b5293 Reviewed-on: https://code.wireshark.org/review/8468 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 713ed3f Author: cbontje Date: Tue May 19 08:09:29 2015 -0600 Fixed Modbus RTU Serial message direction detection. ("And that, children, is why we always test different message types before submitting"). Change-Id: I29c730c01db4596a2326dcadfcffa3a20758569a Reviewed-on: https://code.wireshark.org/review/8539 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit efe3486 Author: Benjamin Roch Date: Tue Feb 24 18:42:07 2015 +0100 Enhanced info output of packet-tte dissector. Change-Id: I2df393e9913d3a52db632778410d7b8932f78f8b Reviewed-on: https://code.wireshark.org/review/7637 Petri-Dish: Alexis La Goutte Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit b687f71 Author: Martin Kaiser Date: Tue May 19 23:29:29 2015 +0200 DVB-CI: change two proto_tree_add_text() calls into expert info Change-Id: Ic5f87480273e0a097900ace6a7538c34b2a89444 Reviewed-on: https://code.wireshark.org/review/8545 Reviewed-by: Martin Kaiser commit af05459 Author: Gerald Combs Date: Tue May 19 10:18:54 2015 -0700 Add capture filter autocompletion. Autocomplete on recent and saved capture filters along with the primitives in gencode.l in the libpcap sources. Move common autocomplete code to SyntaxLineEdit. Change-Id: I0931a6775bacf9c917c294befbbdaade51d19b93 Reviewed-on: https://code.wireshark.org/review/8542 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit fd98519 Author: Guy Harris Date: Tue May 19 19:55:00 2015 -0700 Have an add_menu_item() to add items to the menu bar, and use it. Have it contain all the code to add an item to the menu bar; we may be able to get rid of the "construct the XML"/"have GTK+ parse the UI" code in favor of code that directly does the actions to add the item to the menu without the intermediate XML. Use it for both the items registered with register_menu_bar_menu_items() and for the items registered with the new external menu mechanism. Change-Id: Ibcac03173580bb83ae46cde1d1435f71767d8355 Reviewed-on: https://code.wireshark.org/review/8544 Reviewed-by: Guy Harris commit 2b68570 Author: Martin Kaiser Date: Tue May 19 23:00:27 2015 +0200 DVB-CI: remove some more proto_tree_add_text() calls Change-Id: I02349c2e7aa00c1b105ab069a9fe9b66d130bc7d Reviewed-on: https://code.wireshark.org/review/8543 Reviewed-by: Martin Kaiser commit 1f34e04 Author: Anders Date: Tue May 19 21:37:04 2015 +0200 [GTP]Target identification can have a length of 0. Change-Id: Ica74dc4ce891f226c05d031c29465d386957edf4 Reviewed-on: https://code.wireshark.org/review/8541 Reviewed-by: Anders Broman commit ea3537f Author: Gerald Combs Date: Mon May 18 16:56:57 2015 -0700 Autocomplete saved display filters. Add saved display filters to the completion list. Fix a complex filter completion bug. Change-Id: I035923882fd8d6232d0b69e464bb1517f261dbd9 Reviewed-on: https://code.wireshark.org/review/8533 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit c19b8eb Author: Guy Harris Date: Tue May 19 12:05:49 2015 -0700 Apparently "H" stands for "HOSC", not "HSC", at least these days. Change-Id: I90807b5b40afa53fbfd31b48a322918ef4a7cc27 Reviewed-on: https://code.wireshark.org/review/8540 Reviewed-by: Guy Harris commit adc05f4 Author: Alexis La Goutte Date: Fri May 15 19:03:34 2015 +0200 HTTP2: Update to libnghttp2 1.0.0 Change-Id: I77ae40b4c5643e3cb71242e27a00de151db0d83c Reviewed-on: https://code.wireshark.org/review/8477 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte Reviewed-by: Anders Broman commit f1ea2fa Author: Stig Bjørlykke Date: Tue May 19 12:57:55 2015 +0200 p1: Handle OrganizationalUnitName Added back code removed in commit for bug 8515. Bug: 11210 Change-Id: I23bf56f88d8a1320da8404a82a8d9d3aacc3dace Reviewed-on: https://code.wireshark.org/review/8537 Petri-Dish: Michael Mann Reviewed-by: Michael Mann commit cff7bcd Author: Alexis La Goutte Date: Sat May 16 18:19:52 2015 +0200 BGP: Remove proto_tree_add_text call Part 2 Update VPLS-BGP and BGP-AD Change-Id: I6a311bfc69d9666be6f83e38042745162701aaac Reviewed-on: https://code.wireshark.org/review/8485 Reviewed-by: Michael Mann commit 75be35d Author: Andreas Gruenbacher Date: Mon May 18 16:46:31 2015 +0200 NFS: Move attribute definitions higher up in the nfs dissector The next commit will use some of these definitions before their (previous) point of definition. Change-Id: Ic7c96bc48d338bb7b44bf295af3fadc3e7bec370 Reviewed-on: https://code.wireshark.org/review/8525 Reviewed-by: Michael Mann commit d64d87f Author: Graham Bloice Date: Mon May 18 15:31:24 2015 +0100 Fix CMake warnings Rename a local CMake variable to prevent CMP0054 warnings in CheckTypeSize and CheckStructHasMember modules. Change-Id: Ida0df954c81333ad37455db90e0d72ca9df8c6f1 Reviewed-on: https://code.wireshark.org/review/8522 Reviewed-by: Graham Bloice commit a80c88a Author: Michael Mann Date: Sat May 16 23:08:34 2015 -0400 Improve Firebird/Interbase dissector. Inspired by the patch in bug 3749, added better dissection of opcodes and better (but not complete) support of multiple messages in a frame. Provided links to firebird source. Bug: 3749 Change-Id: I403728d32d634c23e1af7ce842f9aaca4014ed78 Reviewed-on: https://code.wireshark.org/review/8494 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Reviewed-by: Michael Mann commit 47cc023 Author: Guy Harris Date: Mon May 18 18:43:14 2015 -0700 Fix typo. Change-Id: Idde2f4771b42714561f65f712e680f9609aeaa57 Reviewed-on: https://code.wireshark.org/review/8535 Reviewed-by: Guy Harris commit a273d9d Author: Guy Harris Date: Mon May 18 18:40:13 2015 -0700 Pass the executable path to CreateProcess(), and end it with ".exe". On Windows, 1) pass the path of the executable as the first argument to CreateProcess(), which requires that we 2) have that path end with ".exe. Maybe it'll fix the searching-for-dumpcap that showed up in bug 11196. Change-Id: I9d06c07c3513fd42b98d3f8d9a1d2d545f651fe2 Reviewed-on: https://code.wireshark.org/review/8534 Reviewed-by: Guy Harris commit 376ba91 Author: Martin Kaiser Date: Sun May 17 17:20:32 2015 +0200 DVB-CI: remove proto_tree_add_text() calls from the appmmi resource Change-Id: I422e8644445d7bb8a8ae43f426183db6b8974839 Reviewed-on: https://code.wireshark.org/review/8530 Reviewed-by: Martin Kaiser commit b4f895c Author: Martin Kaiser Date: Sun May 17 16:26:45 2015 +0200 DVB-CI: remove proto_tree_add_text() calls from the operator profile resource rename some variables and remove obsolete comments while we're at it Change-Id: Ib400c371ea52c3681fbc1d25ef42791e4aeff9e4 Reviewed-on: https://code.wireshark.org/review/8529 Reviewed-by: Martin Kaiser commit fcb284d Author: Martin Kaiser Date: Sun May 17 14:44:13 2015 +0200 DVB-CI: remove proto_tree_add_text() calls from the transport layer Change-Id: I593527fafa38312d5d4e8f778e9af0d6294bb3f8 Reviewed-on: https://code.wireshark.org/review/8528 Reviewed-by: Martin Kaiser commit f33aa0c Author: Martin Kaiser Date: Sun May 17 15:58:17 2015 +0200 DVB-CI: fix a TPDU parsing error if the response TPDU starts with 0x80 (T_SB), this is not an unknown tag, it simply indicates that the optional header and body are absent this bug was introduced in e597acdc4827ef62bc9597fdd248366411533a36 Change-Id: I076a0c9f0ea124e11edbb7a0bc0e41d1ab6f374a Reviewed-on: https://code.wireshark.org/review/8527 Reviewed-by: Martin Kaiser commit 9d5a9fb Author: Guy Harris Date: Mon May 18 10:17:19 2015 -0700 Don't put the NTLMv2 ChallengeFromClient into the protocol tree twice. It's already put there by dissect_ntlmv2_response(); no need to do it again. Also, rename "NTLM Client Challenge" to "LMv2 Client Challenge", as that's what it is (ChallengeFromClient from 2.2.2.4 LMv2_RESPONSE), and rename "Client Challenge" to "NTLMv2 Client Challenge", as that's what *it* is (ChallengeFromClient from 2.2.2.7 NTLM v2: NTLMv2_CLIENT_CHALLENGE). Change-Id: If95e2c77323cb597df7e400bf9ffc045d94c60e2 Reviewed-on: https://code.wireshark.org/review/8524 Reviewed-by: Guy Harris commit 65b17d4 Author: Guy Harris Date: Mon May 18 10:00:58 2015 -0700 Reorganize the NTLMSSP blob and AUTHENTICATE message parsing. The "result" argument to dissect_ntlmssp_blob() is never null, so don't check for it being null. Have separate clauses for LmChallengeResponse and NtChallengeResponse, and do the checks for NTLMv1 vs. NTLMv2 inside those clauses. Do the copy to client_challenge within the AUTHENTICATE message parsing only if we've already determined that it's an NTLMv2 message. Add some comments to better explain what's being done and to ask some questions. Change-Id: I52345eaeac4252d928b2e477751817084bf4e363 Reviewed-on: https://code.wireshark.org/review/8523 Reviewed-by: Guy Harris commit 930f5b5 Author: Michal Labedzki Date: Mon May 18 12:15:43 2015 +0200 Bluetooth: OBEX: Fix crash when there is no Type/Name header in request Not all requests have them, so check for them to avoid crash. Change-Id: I265fb8ad9f63132bee6eeb1aa521cae8b8df82b9 Reviewed-on: https://code.wireshark.org/review/8521 Reviewed-by: Michal Orynicz Petri-Dish: Michael Mann Reviewed-by: Michael Mann commit 9b99bdb Author: Alexis La Goutte Date: Mon May 18 11:08:51 2015 +0200 IPDR: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: Icf1686e9f1530a602ec5b03572be53d4f245d70c Reviewed-on: https://code.wireshark.org/review/8520 Petri-Dish: Alexis La Goutte Reviewed-by: Michael Mann commit 89b2e08 Author: Alexis La Goutte Date: Mon May 18 11:03:08 2015 +0200 IPDR: fix comma at end of enumerator list [-Wpedantic] Change-Id: I4f78a3a15aa04c52042f7461d11b31c95f7e9590 Reviewed-on: https://code.wireshark.org/review/8519 Reviewed-by: Michael Mann commit 0215ad2 Author: Alexis La Goutte Date: Mon May 18 10:15:45 2015 +0200 fix make distcheck (add packet-bthci_sco.h to list of distributed file) Don't forget to add *.h files to distributed file Change-Id: I37459a4836e495f66185fd4d07306bb8963667f6 Reviewed-on: https://code.wireshark.org/review/8518 Reviewed-by: Alexis La Goutte commit 408de59 Author: Guy Harris Date: Mon May 18 00:31:02 2015 -0700 Fix a comment. Change-Id: I0f777121a4897983a48794fcdfb13efc26266bdc Reviewed-on: https://code.wireshark.org/review/8517 Reviewed-by: Guy Harris commit 26980bc Author: Michal Labedzki Date: Sun May 3 17:24:10 2015 +0200 androiddump: Case-insensitive for option and add verbose mode If verbose mode is off, then androiddump is quite. Change-Id: Ib0b2d10acf05487a971e2bf7cbc27fd2666ec262 Reviewed-on: https://code.wireshark.org/review/8516 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki commit 66e849e Author: Michal Labedzki Date: Sun May 3 18:34:31 2015 +0200 Ubertooth: Add WriteRegister command Change-Id: Ie1cea754bcf732bf3985b777245e8b08606757f0 Reviewed-on: https://code.wireshark.org/review/8515 Reviewed-by: Michal Labedzki commit f837dab Author: Michal Labedzki Date: Sun May 3 13:50:42 2015 +0200 Bluetooth: HCI: Add command-event tracking HCI Commands in most cases generate response in Event queue, so try to map event to command and give user response time information. Change-Id: Ib4956829b7d0064ab528aa3202f8f959d8d371b7 Reviewed-on: https://code.wireshark.org/review/8514 Reviewed-by: Michal Labedzki commit 21b41e8 Author: Michal Labedzki Date: Sun May 10 19:07:19 2015 +0200 Bluetooth: HCI: Add new LE Event numbers New event will be added later, for now all number are useful. Change-Id: I83b77627dfb0c511710c3080aaac0f6857f76137 Reviewed-on: https://code.wireshark.org/review/8513 Reviewed-by: Michal Labedzki commit ac747a3 Author: Michal Labedzki Date: Fri May 8 09:10:35 2015 +0200 Bluetooth: BTLE: Fix data handling from previous dissector Check previous dissector before cast data parameter. That also causes Head overflow too. Change-Id: I8f6ce2ec183e4c757613fd7e1959d9d0e4cfc89e Reviewed-on: https://code.wireshark.org/review/8512 Reviewed-by: Michal Labedzki commit a0569ac Author: Michal Labedzki Date: Mon May 4 11:46:19 2015 +0200 Bluetooth: Remove duplicates by default for ATT Server Attributes dialog Change-Id: Ic833c800f599eed465eddc3d17ca07bdf3e83aba Reviewed-on: https://code.wireshark.org/review/8511 Reviewed-by: Michal Labedzki commit 72ea3b1 Author: Michal Labedzki Date: Mon May 4 12:54:29 2015 +0200 Bluetooth: SCO: Add Stream Number generated field It is used to distinguish SCO streams. Stream Number increase any time when new SCO connection is created. Change-Id: I6cf68914112980cdbad345e52469bf2baf214551 Reviewed-on: https://code.wireshark.org/review/8510 Reviewed-by: Michal Labedzki commit f169900 Author: Michal Labedzki Date: Fri May 1 15:13:13 2015 +0200 Bluetooth: SCO: Add Connect/Disconnect tracking Change-Id: I4db44628d60ec8ae22b625649e971b344f450ed9 Reviewed-on: https://code.wireshark.org/review/8509 Reviewed-by: Michal Labedzki commit 586ce7c Author: Michal Labedzki Date: Thu Apr 30 15:44:42 2015 +0200 Bluetooth: SCO: Add Missing fields Missing fields are: Reserved, Packet Status. Change-Id: Ia9edb23e3fc8c45d12931200dd02f0d3eef87c48 Reviewed-on: https://code.wireshark.org/review/8508 Reviewed-by: Michal Labedzki commit 187dede Author: Michal Labedzki Date: Mon Apr 20 13:46:01 2015 +0200 Bluetooth: ATT: Enable UUID128 field API used by this field is implemented, so field can be enabled now. Change-Id: Ifc8de81157c9b125ba769d14ec57a498d9810c5f Reviewed-on: https://code.wireshark.org/review/8507 Reviewed-by: Michal Labedzki commit b936c23 Author: Michal Labedzki Date: Sun Apr 19 19:08:13 2015 +0200 Bluetooth: OBEX: Add DecodeAs by Type aka MIME Type Also map some Types to Dissector Table dissectors. Change-Id: I1a1924924ac569368b3a4fafdc05c98e4a8d4841 Reviewed-on: https://code.wireshark.org/review/8506 Reviewed-by: Michal Labedzki commit 381a8c3 Author: Michal Labedzki Date: Sun Apr 5 13:57:53 2015 +0200 Bluetooth: OBEX: Add Current Path tracking info It will be useful for analysis. Also support partialy known path, unknown part is shown as "?". Change-Id: I0299e64d233022d1941b364afc4a6be0c9f4d23e Reviewed-on: https://code.wireshark.org/review/8505 Reviewed-by: Michal Labedzki commit 515032e Author: Jeff Morriss Date: Sun May 17 20:33:12 2015 -0400 Add IP Detail Record dissector to the Release Notes. Change-Id: I6c5405beef4e8d880d73d9706e61e953431cce4f Reviewed-on: https://code.wireshark.org/review/8504 Reviewed-by: Michael Mann commit 4a4871a Author: Evan Huus Date: Sun May 17 10:31:38 2015 -0400 ntlmssp: swap bounds check and length for memcpy The values make more sense swapped (and the code is super-old) so I'm assuming this was just a long-uncaught typo. Fixes a valgrind error at any rate. Also replace a malloc+memcpy with a memdup for simplicity. Bug: 11203 Change-Id: I74c0aff548b844cf90610db56a143f3eac172658 Reviewed-on: https://code.wireshark.org/review/8493 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit d934d40 Author: Guy Harris Date: Sun May 17 14:35:50 2015 -0700 Update some comments. There's all sorts of interesting stuff out there on the Intertubes if you happen to be searching for the right thing. Change-Id: Ib5e18ece5dfaa284ece8cfda23887a9408c8318e Reviewed-on: https://code.wireshark.org/review/8503 Reviewed-by: Guy Harris commit ba3f9f5 Author: Michael Mann Date: Sun May 17 16:33:21 2015 -0400 Add IPDR dissector Bug: 2771 Change-Id: Ic2904c981a182be5859c3840025e7ffa9ea387ed Reviewed-on: https://code.wireshark.org/review/8501 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 1c45528 Author: Joerg Mayer Date: Sun May 17 22:59:12 2015 +0200 Fix some files to pass the pre-commit hook script. Change-Id: I105bf4e03fcf95cf7541f6377215809759fd933e Reviewed-on: https://code.wireshark.org/review/8502 Reviewed-by: Jörg Mayer commit 36af2c6 Author: Guy Harris Date: Sun May 17 12:38:04 2015 -0700 Improve comments, fix capitalization of "Aruba". Give better comments describing the 5 different formats Aruba equipment can use. It's "Aruba Networks", not "ARUBA" anything. Change-Id: I300d77375e8182b60e830cb545d8802c1a49569c Reviewed-on: https://code.wireshark.org/review/8500 Reviewed-by: Guy Harris commit 83787bb Author: Guy Harris Date: Sun May 17 12:19:47 2015 -0700 Make the human-readable names the same in the preferences and the packets. Change-Id: Ie00c81e9893412cc322cfb08e8b5b5f4e5ce47e4 Reviewed-on: https://code.wireshark.org/review/8499 Reviewed-by: Guy Harris commit e16d37b Author: Guy Harris Date: Sun May 17 11:17:30 2015 -0700 Update a URL. Change-Id: I51e884815a83bd44b528d5dd86f98d0ea51719f9 Reviewed-on: https://code.wireshark.org/review/8498 Reviewed-by: Guy Harris commit ab1743e Author: Gerald Combs Date: Sun May 17 08:07:52 2015 -0700 [Automatic update for 2015-05-17] Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ic345ff4e7b46ee43af35ebbdda32ffc25e793c65 Reviewed-on: https://code.wireshark.org/review/8495 Reviewed-by: Gerald Combs commit 7b2453a Author: Alexis La Goutte Date: Fri May 15 19:07:38 2015 +0200 HTTP2: Update to final RFC Change-Id: I0b19d4576b652dc9dd94346c75945e0bdc554a0e RFC7540: Hypertext Transfer Protocol Version 2 (HTTP/2) RFC7541: HPACK: Header Compression for HTTP/2 Reviewed-on: https://code.wireshark.org/review/8478 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit bcc3912 Author: Alexis La Goutte Date: Fri May 15 18:54:49 2015 +0200 nghttp2: use <> for include glib.h Change-Id: I6fdb72322dca514a774ab074c26128f70992a8f7 Reviewed-on: https://code.wireshark.org/review/8476 Reviewed-by: Michael Mann commit 53b7a05 Author: Joerg Mayer Date: Sun May 17 09:12:07 2015 +0200 packet-skinny.c is a generated file nowadays. Apply commit 0970872a4cfdba0d9de913da036717ac2167297a to the source file as well. Change-Id: I9cc69bf5de3318b9a930bde3455a320880976af7 Reviewed-on: https://code.wireshark.org/review/8492 Reviewed-by: Jörg Mayer commit d8b70a8 Author: Guy Harris Date: Sat May 16 15:52:31 2015 -0700 struct timeval not used, so no need for . Change-Id: I5f635f354db68f1cff0874f3cd0ba09c87edad1d Reviewed-on: https://code.wireshark.org/review/8491 Reviewed-by: Guy Harris commit 08ccac8 Author: Guy Harris Date: Sat May 16 15:49:38 2015 -0700 Do all floating-point work in double-precision. That squelches some double -> float warnings. Change-Id: I19b8049698c7931e8c146d9532fc65ee091e4c24 Reviewed-on: https://code.wireshark.org/review/8490 Reviewed-by: Guy Harris commit 1715be2 Author: Guy Harris Date: Sat May 16 13:48:04 2015 -0700 Use nstime_t for time stamps. Don't roll our own time stamp handling, use nstime_t. That also gives us nanosecond resolution, for what that's worth. Change-Id: Ib9945bdef5a70e1656b96995f510507da36b4b59 Reviewed-on: https://code.wireshark.org/review/8489 Petri-Dish: Guy Harris Reviewed-by: Guy Harris commit b4a68bc Author: Alexis La Goutte Date: Sat May 16 18:02:12 2015 +0200 SIP: Fix typo lenght => length Change-Id: Ib533bd2526c27cf5f1161616fcf52136e40c827a Reviewed-on: https://code.wireshark.org/review/8484 Reviewed-by: Michael Mann commit 185697a Author: Evan Huus Date: Sat May 16 10:48:40 2015 -0400 megaco: handle missing tokens Fix an infinite loop when no transaction end offset is present and `megaco_tvb_find_token` returns -1. Bug: 11193 Change-Id: I82c7b795e522efca674787e504427f64b8c28fc4 Reviewed-on: https://code.wireshark.org/review/8483 Reviewed-by: Evan Huus Petri-Dish: Evan Huus Petri-Dish: Alexis La Goutte Reviewed-by: Michael Mann commit cfc5a2e Author: Guy Harris Date: Sat May 16 11:37:28 2015 -0700 Have per-queued-packet flags, including "is a packet in error". The contents of the packet_info structure change during the dissection process, so you can't rely on its contents when running tap listeners. Bug: 11184 Change-Id: I52fc45774add56ee2bcb5faef2af7c731b4304fd Reviewed-on: https://code.wireshark.org/review/8486 Reviewed-by: Guy Harris commit 63295df Author: Graham Bloice Date: Sat May 16 15:10:53 2015 +0100 Remove odd characters Change-Id: Ie861badb555e235199549ee27ca374feb6356be6 Reviewed-on: https://code.wireshark.org/review/8482 Reviewed-by: Graham Bloice commit 85f38f9 Author: Evan Huus Date: Tue May 12 21:53:32 2015 -0400 tap: Add ability to reject/ignore "error" packets in tap ICMP (and a few other protocols) can carry "error packets" as payloads in certain cases. In the same way that we don't (by default) call TCP reassembly code on TCP packets we know are out-of-order, we also shouldn't call tap code on frames carried in ICMP error packets. Bug: 11184 Change-Id: Ie83dbb505c8fdc15c5554705488c16fa0274a06a Reviewed-on: https://code.wireshark.org/review/8446 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit aa6466a Author: Alexis La Goutte Date: Fri May 15 18:43:09 2015 +0200 Main (menubar): fix C++ style comments are not allowed in ISO C90 Change-Id: Ia8ae6780027a63c4a88ea8d2a10ba1e0f8931f25 Reviewed-on: https://code.wireshark.org/review/8472 Reviewed-by: Michael Mann commit a04a894 Author: Gerald Combs Date: Fri May 15 13:36:04 2015 -0700 Qt: Stop tapping when the I/O Graph dialog closes. Add a setCaptureStopFlag function to ProgressBar. Add a stopTapping function and setCaptureStopFlag signal to CaptureFile. Use the new plubming to stop tapping when the IO Graph dialog closes. Bug: 10116 Change-Id: Ic46814eed18933f511d9d1ff37e2e7918741f353 Reviewed-on: https://code.wireshark.org/review/8480 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit a1eb0aa Author: Gerald Combs Date: Fri May 15 11:08:18 2015 -0700 Qt: Make sure we can fetch ExportDissectionDialog's layout. Make sure ExportDissectionDialog is a non-native, funny-looking file dialog so that we can fetch its layout. Fix and add some URLs while we're here. Bug: 11122 Change-Id: Icf62f7a436c7ba27ec20f84e7c1af1a5d7c9b949 Reviewed-on: https://code.wireshark.org/review/8479 Reviewed-by: Gerald Combs commit 3acebb4 Author: Pascal Quantin Date: Fri May 15 18:13:49 2015 +0200 MBIM: add checks on the maximum string or PDU size allowed Change-Id: I10912bbe5a4ee38732a200b595b8d34dfa40c698 Reviewed-on: https://code.wireshark.org/review/8475 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 0ae9496 Author: Gerald Combs Date: Fri May 15 09:43:18 2015 -0700 Qt: Fixup sequence dialog buttons. Switch from "Save As" + Cancel + OK to "Save As" + Close. Change-Id: I6f1093965f90fe9cbbfbf053779c05388c897641 Reviewed-on: https://code.wireshark.org/review/8474 Reviewed-by: Gerald Combs commit 76a5465 Author: Gerald Combs Date: Fri May 15 09:04:02 2015 -0700 Qt: Fix packet deselection. When no packets are selected, clear the related item delegate, packet detail, and byte view. Also, don't crash. Bug: 10529 Change-Id: I1f46d0d60d060d517f1ee2f8b5a9124bc1fad00e Reviewed-on: https://code.wireshark.org/review/8470 Reviewed-by: Gerald Combs commit f1a747e Author: Edwin Groothuis Date: Thu May 14 20:15:44 2015 -0400 ui/mcast_stream.c: Add dependency on sys/time.h for struct timeval Needed to compile on FreeBSD. Bug: 11199 Change-Id: I6b10a0954020d58dcec93364ebecc8a7069ac8f3 Reviewed-on: https://code.wireshark.org/review/8467 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 4c601c8 Author: Edwin Groothuis Date: Fri May 15 13:30:02 2015 +0200 androiddump: fix compilation under FreeBSD Bug: 11200 Change-Id: Ic46b235c84488bb8537ec3c2605e6770eb843795 Reviewed-on: https://code.wireshark.org/review/8469 Petri-Dish: Pascal Quantin Reviewed-by: Pascal Quantin commit 57716e1 Author: Roland Knall Date: Mon Mar 9 08:11:13 2015 +0100 Qt: Implement "Apply as Column" for packet context Implement the same functionality for "Apply as Column" as it exists in the GTK version of Wireshark. Especially for the context menu in the packet view panel. Change-Id: Id25b7797616ff3b3acf7aa920395516c8a4e9bf9 Reviewed-on: https://code.wireshark.org/review/7604 Reviewed-by: Roland Knall Petri-Dish: Alexis La Goutte Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki Tested-by: Michal Labedzki commit 7f424b5 Author: Gerald Combs Date: Thu May 14 15:37:55 2015 -0700 Pop the display filter status when it loses focus. Change-Id: I7878fd99f8b773f8c550a6d2416e9e2d44abd321 Reviewed-on: https://code.wireshark.org/review/8466 Reviewed-by: Gerald Combs commit 4ba370e Author: Gerald Combs Date: Thu May 14 15:12:12 2015 -0700 Don't complete the current field. Change-Id: If2b16783d08d23df427ac9b9c86984245db56d53 Reviewed-on: https://code.wireshark.org/review/8465 Reviewed-by: Gerald Combs commit 63e94c5 Author: Gerald Combs Date: Thu May 14 15:00:07 2015 -0700 Fix display filter completion behavior. Allow completion for mismatched protocol and filter names. Change-Id: I1d1e6b8f16d4d2d331b915c199f857835dcc1c53 Ping-bug: 11187 Reviewed-on: https://code.wireshark.org/review/8464 Reviewed-by: Gerald Combs commit 294706a Author: Gerald Combs Date: Thu May 14 10:25:56 2015 -0700 Fix packet list font zooming. Change-Id: I376fc3b41e9ebbe1353527d8d3bbf8d4b86cc29a Reviewed-on: https://code.wireshark.org/review/8463 Reviewed-by: Gerald Combs commit 97f1fd3 Author: Pascal Quantin Date: Thu May 14 17:31:30 2015 +0200 USB COM: add dissection of Ethernet Networking Functional Descriptor Change-Id: Id5023090b5b80ca12695fc9e012a59f53b30479c Reviewed-on: https://code.wireshark.org/review/8461 Petri-Dish: Pascal Quantin Reviewed-by: Pascal Quantin commit 2e75240 Author: Gerald Combs Date: Thu May 14 09:28:29 2015 -0700 Qt: Apply protocol preferences. Make sure we call prefs_apply_all when saving preferences. Bug: 11119 Change-Id: Iacf1e28e69c2aebcbbd7dceaa210c8219663665f Reviewed-on: https://code.wireshark.org/review/8462 Reviewed-by: Gerald Combs commit 2156413 Author: Gerald Combs Date: Wed May 13 15:46:51 2015 -0700 Qt: Column preference fixes. Don't call redrawVisiblePackets in PacketList::sectionResized. Otherwise we trigger the crash in bug 11179. Call recent_set_column_width instead. Clean up the slots called when column preferences change and when recent column widths change. Update our column visibility in redrawVisiblePackets. Use recent_get_column_width when writing the recent file. columnWidth doesn't return a valid value when we're not visible. Bug: 11179. Change-Id: I34ab93d944b341e42129a1c8ff94ba8f7ad4f5fc Reviewed-on: https://code.wireshark.org/review/8457 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki Reviewed-by: Gerald Combs commit 2793069 Author: Gerald Combs Date: Thu May 14 08:28:08 2015 -0700 Add a comment explaining completion misbehavior. Note that field name completion won't work correctly if a field's abbrev doesn't match its protocol filter name. Fixing this is left as an exercise for the reader. Change-Id: Ia9b55f20bf58b8252e27506bcce4a0dd71cc199c Reviewed-on: https://code.wireshark.org/review/8460 Reviewed-by: Gerald Combs commit f11def9 Author: cff339 Date: Thu May 14 11:16:17 2015 +0800 GSM A RR: fix 'packet channel description' dissection It should support decoding 'MA_NUMBER_IND' and 'CHANGE_MARK_1'. Signed-off-by: cff339 Change-Id: I634f326b4741b8853a631e6da2e9c056f60781ef Reviewed-on: https://code.wireshark.org/review/8458 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 0db5490 Author: Guy Harris Date: Thu May 14 00:46:26 2015 -0700 Register the IPv4 and IPv6 dissectors directly with WTAP_ENCAP_RAW_IP{4,6}. No need to run them through the "raw IP" dissector. Change-Id: I63639651873f00326a20b88a08ecb4ab3b9a83b3 Reviewed-on: https://code.wireshark.org/review/8459 Reviewed-by: Guy Harris commit 2ddf0e6 Author: Jeff Morriss Date: Wed May 13 14:04:45 2015 -0400 Don't put an expert info on every single raw frame (even if it was just a Note). It's completely normal that there's no link information when you're dissecting raw packets. This does leave the Raw protocol tree without any children (which looks a little funny) but I don't want to take it out and I don't see anything useful to put under it. Also change the Raw protocol item to cover all the bytes of the TVB (like the frame item). Change-Id: I44c1ac954c9989273d0c461ba366caba0a480ea6 Reviewed-on: https://code.wireshark.org/review/8454 Reviewed-by: Anders Broman Reviewed-by: Michael Mann commit 4a37dfc5 Author: Gerald Combs Date: Wed May 13 12:34:25 2015 -0700 Qt: Add the correct column width padding. When applying recent column widths, add the correct padding in the right place. Bug: 11175 Change-Id: I5a6fe7975764ddc5d9024d8839a837579b2bf799 Ping-Bug: 11179 Reviewed-on: https://code.wireshark.org/review/8456 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 703b5dc Author: Gerald Combs Date: Tue May 12 16:28:39 2015 -0700 Qt: Don't set ProtoTree::uniformRowHeights. Some packet detail items contain multiple lines. Show them, which duplicates the GTK+ UI behavior. Add a note about adding a custom item delegate if this affects performance. Make item labels QStrings while we're here. Bug: 10225 Change-Id: Ia39320028ecff5fe7fa3e4c09ff37405986b7f6e Reviewed-on: https://code.wireshark.org/review/8445 Tested-by: Jeff Morriss Petri-Dish: Gerald Combs Reviewed-by: Gerald Combs commit 84db6a6 Author: Gerald Combs Date: Wed May 13 12:04:05 2015 -0700 Fix an error found by Valgrind. Change-Id: I9f0adac70129c90b4bf1e678bece6c6b8b8b4b75 Reviewed-on: https://code.wireshark.org/review/8455 Reviewed-by: Gerald Combs commit a3666e5 Author: Alexis La Goutte Date: Wed May 13 08:02:58 2015 +0200 QCustomPlot: fix division(or modulo) by zero found by Clang and Coverity (CID 1159170 & 1159171) Try 2 Change-Id: I10c439ccd4b8e5ac24275332e35fb35ad95b8d1b Reviewed-on: https://code.wireshark.org/review/8447 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 4c4328e Author: Gerald Combs Date: Wed May 13 09:25:41 2015 -0700 Try to avoid duplicate display filter completions. When adding recent filters to the completion list, skip over items that look like fields and assume they'll be added further down the line. Change-Id: Ief1e7aeebf91504becc2e07ba9cad66a90d8c7f3 Reviewed-on: https://code.wireshark.org/review/8453 Reviewed-by: Gerald Combs commit cf82e68 Author: AndersBroman Date: Wed May 13 17:54:19 2015 +0200 [Thrift] Strengthen the heuristic. Change-Id: I9e0676f36f8c5cb7fb344640333c8d32990e0a1e Reviewed-on: https://code.wireshark.org/review/8452 Reviewed-by: Anders Broman commit 46d89bd Author: Francesco Fondelli Date: Wed May 13 16:41:45 2015 +0200 PCEP: fix SID parsing, label is the first 20 bits Change-Id: I13d2ff79b171b232dd4e1e1082beeae2e36dec51 Signed-off-by: Francesco Fondelli Reviewed-on: https://code.wireshark.org/review/8451 Reviewed-by: Anders Broman commit 232f260 Author: Alexis La Goutte Date: Wed May 13 08:12:13 2015 +0200 MEGACO: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: Iee615c46fcb5dd0ced55d971c5f70bc7c970f9a6 Reviewed-on: https://code.wireshark.org/review/8448 Reviewed-by: Anders Broman commit 51c3fc6 Author: AndersBroman Date: Wed May 13 14:20:49 2015 +0200 [GCP] Add a command string when there's no context tracking. Change-Id: I26235f172d97e5c4f6e52d3816675deb1849d988 Reviewed-on: https://code.wireshark.org/review/8450 Reviewed-by: Anders Broman commit 6d1b6f4 Author: AndersBroman Date: Wed May 13 13:26:06 2015 +0200 [VoIP] There has to be two separate routines for MEGACO and H248 as tap_id_offset is used to access tapinfo. Fixes a crash rported in Bug: 11132 Change-Id: I32ada3e0eb16d0e128ff67c5aec499890602eab0 Reviewed-on: https://code.wireshark.org/review/8449 Reviewed-by: Anders Broman commit 0bf4299 Author: Michael Mann Date: Mon May 11 19:43:38 2015 -0400 Change the formatting strings used to create the Conversation Filter submenu Bug: 11178 Change-Id: I4a5ae1399da8206efb29c059437d56da06a539a9 Reviewed-on: https://code.wireshark.org/review/8417 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit 1e4aa6c Author: Guy Harris Date: Tue May 12 15:23:27 2015 -0700 Remove trailing whitespace. Change-Id: I7be78c8759255f14efd1b794bfefad9a18428670 Reviewed-on: https://code.wireshark.org/review/8444 Reviewed-by: Guy Harris commit 613d4f3 Author: Guy Harris Date: Tue May 12 15:21:44 2015 -0700 More cleanly handle 3-byte IPv4 addresses. Make a union of the 4 bytes of the address and the address as a 32-bit integer, and fill in the bytes differently based on whether it's an interior or exterior route. Rather than just casting a pointer to a byte to a pointer to a 4-byte integer - which may not be safe, as the byte array might not be properly aligned - just use the integer member of the union. Change-Id: Ic0e78a832cedb9a5a8d435a6c911409b17e41685 Reviewed-on: https://code.wireshark.org/review/8443 Reviewed-by: Guy Harris commit 384141b Author: Gerald Combs Date: Tue May 12 15:09:16 2015 -0700 Add casts to fix clang warnings. Change-Id: I0059536cb68fb3ef313f3166bf18444a89b4eea3 Reviewed-on: https://code.wireshark.org/review/8442 Reviewed-by: Gerald Combs commit e16500e Author: Guy Harris Date: Tue May 12 15:09:41 2015 -0700 Fix check for NUL at the end of a string. *seq[slength - 1] means *(seq[slength - 1]), where seq points to a "const gchar *", so it fetches the pointer at an offset of slength - 1 from the pointer to which seq points, and dereferences that pointer. What's wanted is (*seq)[slength - 1], i.e. fetch the pointer to which seq points, and fetch the byte at an offset of slength - 1 from the byte to which said pointer points. Change-Id: I7246f5e6093d035bad59be530893f3fc54dad97e Reviewed-on: https://code.wireshark.org/review/8441 Reviewed-by: Guy Harris commit 99ca421 Author: Gerald Combs Date: Tue May 12 12:35:54 2015 -0700 Qt: Display filter completion fixes. Fixup the logic for adding field names to the list. Connect our completer activation signal to its slot once, not twice. Bug: 11187 Change-Id: Ife1879fe05c870094ee31e59dd62e3004f588bfc Reviewed-on: https://code.wireshark.org/review/8440 Reviewed-by: Gerald Combs commit 79ba6e6 Author: Pascal Quantin Date: Tue May 12 22:56:15 2015 +0200 OSPF: fix dissection of Router Address TLV Bug: 11190 Change-Id: Ic6585e44767c1c80a7090dc94205eb33cf15c083 Reviewed-on: https://code.wireshark.org/review/8437 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit a7fcfea Author: Gerald Combs Date: Tue May 12 11:26:59 2015 -0700 Qt: Add packet list navigation checks. Add sanity checks to go{First,Last,Next,Previous}Packet. Bug: 11085 Change-Id: I6c33ea314720935aa1881257e9f32732134eec31 Reviewed-on: https://code.wireshark.org/review/8433 Reviewed-by: Gerald Combs commit 2e7ec36 Author: Pascal Quantin Date: Tue May 12 18:43:30 2015 +0200 USB: allow to call sub dissectors for setup response packets without transaction available This is useful when people export displayed packets of a USB sub dissector (like MBIM) without keeping the USB setup requests and still expect to have "Decode As" functionality working Change-Id: Iad32ddc7b87544ff568a091f03e393a106f38554 Reviewed-on: https://code.wireshark.org/review/8430 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 8de774a Author: Alexis La Goutte Date: Tue May 12 15:54:30 2015 +0200 PIM: Add PIM IP version field for PIMv1 too Change-Id: I455a4f81798c7a99a48551ae362dabf2b697cf88 Reviewed-on: https://code.wireshark.org/review/8427 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit e110664 Author: Michael Mann Date: Fri May 8 11:47:05 2015 -0400 Overhaul the MEGACO dissector. 1. Have megaco dissector display fields as their are "interpreted", not as raw data with "interpretation" as a subtree 2. Replace/remove proto_tree_add_text 3. Convert some "numeric string fields" into numeric values. 4. Add some more dissection discovered while looking for sample captures. Bug: 6732 Ping-Bug: 10909 Change-Id: Ie051a8a16ef2355681a24be8789bae0971632cd1 Reviewed-on: https://code.wireshark.org/review/8382 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 8f962a7 Author: Alexis La Goutte Date: Mon May 11 12:32:33 2015 +0200 PIM: Remove trailing whitespace before comma Change-Id: I7798ddd6db4a98cfe9cc96275f56837ef3bf0b1e Reviewed-on: https://code.wireshark.org/review/8399 Reviewed-by: Anders Broman commit 2943acd Author: Alexis La Goutte Date: Mon May 11 12:30:19 2015 +0200 PIM: Enhance code Use proto_tree_add_item when it is possible Add display of reserved field... Change-Id: Id47c237f06e28e7d5dfbd92848dc26a7496cf799 Reviewed-on: https://code.wireshark.org/review/8398 Reviewed-by: Anders Broman commit 1aad9e0 Author: Alexis La Goutte Date: Mon May 11 10:20:45 2015 +0200 PIM: Remove proto_tree_add_text rewrite display of PIM(v1) Address and remove last proto_tree_add_text call :) Change-Id: I020970e80338d15dbe68e32713b8ada31fd0a4e2 Reviewed-on: https://code.wireshark.org/review/8397 Reviewed-by: Anders Broman commit 92694a4 Author: Alexis La Goutte Date: Sun May 10 21:16:00 2015 +0200 PIM: Remove proto_tree_add_text only 2 proto_tree_add_text calls, (it will be remove on another patch) Change-Id: I670e37bbbe1cc3ae740a94cd620fa14f20cb9feb Reviewed-on: https://code.wireshark.org/review/8396 Reviewed-by: Michael Mann commit d1f7823 Author: Jeff Morriss Date: Mon May 11 15:45:04 2015 -0400 Fix Diameter reassembly when the captured tvb length is less than 5 bytes. Since Diameter does heuristic checks before calling tcp_dissect_pdus() we have to "manually" ask for more data if the tvb is too short for our heuristics. Bug: 11183 Change-Id: I14c36042306b532b53df80cc3971866b76094084 Reviewed-on: https://code.wireshark.org/review/8405 Reviewed-by: Evan Huus Petri-Dish: Jeff Morriss Tested-by: Petri Dish Buildbot Reviewed-by: Jeff Morriss commit b708c4a Author: Marius Date: Tue May 12 13:35:34 2015 +0200 Diameter: Add support for Sd interface Bug: 11186 Change-Id: I3aed8818dd021c72b2cb1fb51adc717613c501ea Reviewed-on: https://code.wireshark.org/review/8425 Reviewed-by: Jeff Morriss commit cc3a66a Author: Pascal Quantin Date: Mon May 11 23:46:17 2015 +0200 MBIM: fix dissection of captures taken on a Linux host - ensure that MBIM tree is not below URB setup one - do not try to dissect an empty tvb Change-Id: I8c6655727eec7df84882fd861d5581848340e0f3 Reviewed-on: https://code.wireshark.org/review/8410 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit d3dbb2b Author: Pascal Quantin Date: Mon May 11 23:24:05 2015 +0200 USB COM: add dissection of ECM Management Element Notifications Change-Id: I9395c5e7974526d9be5cceca479e840dca5ff71e Reviewed-on: https://code.wireshark.org/review/8409 Reviewed-by: Pascal Quantin Reviewed-by: Michael Mann commit 2693e1d Author: Guy Harris Date: Mon May 11 19:40:59 2015 -0700 In the name of God and all that is holy, don't do that. http://www.bitterfilms.com/rejected.html 1) There is *NO* guarantee that you can safely dereference a misaligned pointer. 2) There is *NO* guarantee that you are running on a little-endian machine, so that an attempt to fetch a 32-bit integer through such a pointer will fetch it in little-endian form. Instead, fetch it using tvb_get_letohl(), which 1) doesn't care about alignment and 2) always fetches in little-endian order. Change-Id: I44721cbf3c4456797990cc741836c9dd8c6c3696 Reviewed-on: https://code.wireshark.org/review/8423 Reviewed-by: Guy Harris commit 5862c94 Author: Guy Harris Date: Mon May 11 17:22:30 2015 -0700 In the name of God and all that is holy, don't do that. http://www.bitterfilms.com/rejected.html 1) There is *NO* guarantee that you can safely dereference a misaligned pointer. 2) There is *NO* guarantee that you are running on a little-endian machine, so that an attempt to fetch a 32-bit integer through such a pointer will fetch it in little-endian form. Instead, fetch it using tvb_letohl(), which 1) doesn't care about alignment and 2) always fetches in little-endian order. Change-Id: I30ad6607b7c6d5047245bfcfdcbe757b02d02172 Reviewed-on: https://code.wireshark.org/review/8422 Reviewed-by: Guy Harris commit a0046c3 Author: Gerald Combs Date: Mon May 11 17:14:38 2015 -0700 Qt: Expert info → Expert information. Change-Id: I6cf87a1c63a4b34678667396d836d15766155b1a Reviewed-on: https://code.wireshark.org/review/8420 Reviewed-by: Gerald Combs commit 0970872 Author: Guy Harris Date: Mon May 11 17:14:54 2015 -0700 Don't cast pointers when they're assigned to the data field of an address. That field is just a void *, so there's no need to cast them, and at least one of those casts generates alignment warnings with -Wcast-align. Change-Id: I88e22a794a8c990b01e7ed8f45951a2665febbc1 Reviewed-on: https://code.wireshark.org/review/8421 Reviewed-by: Guy Harris commit b55d801 Author: Gerald Combs Date: Mon May 11 16:42:52 2015 -0700 Speed up display filter completion. Don't loop over non-matching fields. This improves completion performance considerably on Windows (where it was noticeable). Change-Id: I7f526fe960c5c41da5ae847b04be25d65ca42bb1 Reviewed-on: https://code.wireshark.org/review/8418 Reviewed-by: Gerald Combs commit 61749e5 Author: Guy Harris Date: Mon May 11 15:45:38 2015 -0700 Get rid of now-empty and unneeded structure. Change-Id: I4c557c49a6d6013dff129515cdfadb496529ff35 Reviewed-on: https://code.wireshark.org/review/8414 Reviewed-by: Guy Harris commit 1daf6e9 Author: Gerald Combs Date: Mon May 11 15:21:38 2015 -0700 Qt: Provide a hint about the current display filter field. If the field under the DisplayFilterEdit cursor is valid, push its description. In the main window this shows up in the status bar. Change-Id: I7ba1255694941c64aa8cce896283a426b9a69f2c Reviewed-on: https://code.wireshark.org/review/8413 Reviewed-by: Gerald Combs commit 8045cd6 Author: Guy Harris Date: Mon May 11 15:10:54 2015 -0700 Do not assume the data field of an address structure is an aligned pointer. There is *no* guarantee that it's aligned on a 4-byte boundary, and there is *no* guarantee that you can safely dereference an unaligned pointer. See bug 11172 for a crash on Solaris/SPARC caused by those assumptions both being false. Change-Id: I30d97aebd42283545f5b8f6d50fa09c5b476ec47 Reviewed-on: https://code.wireshark.org/review/8412 Reviewed-by: Guy Harris commit e3e5d30 Author: Guy Harris Date: Mon May 11 14:58:16 2015 -0700 Pull the MIMO control code into the beamforming report code. Hopefully, that'll convince Microsoft's static analyzer that nr will always be >= 1, so you can safely subtract 1 from it and use it as an array index. Get rid of the vht_mimo_control_t structure in favor of a few variables for the bitfields we actually use. Make some tables static - no need to initialize them every time we enter the routine. Change-Id: Icde05a768ea1a9c897b69003afcab1dddeffaaf5 Reviewed-on: https://code.wireshark.org/review/8411 Reviewed-by: Guy Harris commit 9fd6c45 Author: Evan Huus Date: Sun May 10 16:57:26 2015 -0400 proto: use correct mask when checking display Otherwise numeric fields with BASE_EXT_STRING don't match anything and cause an assertion failure. Also fix indentation. Change-Id: I2708be50a6c5aff5400ec44e6a141db39d2d94e7 Reviewed-on: https://code.wireshark.org/review/8391 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit a5c4e0c Author: Gerald Combs Date: Mon May 11 14:00:41 2015 -0700 Update the release notes. Change-Id: I7733ff823303f8e3a0dcef296e627540bf93fa1e Reviewed-on: https://code.wireshark.org/review/8408 Reviewed-by: Gerald Combs commit 7ebe97a Author: Gerald Combs Date: Mon May 11 13:53:15 2015 -0700 Qt: Fix the main welcome banner. Leave the text empty, otherwise it overwrites "Development Version" at inopportune times. Remove a QDebug include. Change-Id: I94060ef69cc3b42dda39adfe34d2c0bfbe564ec2 Reviewed-on: https://code.wireshark.org/review/8407 Reviewed-by: Gerald Combs commit f1c375d Author: Guy Harris Date: Mon May 11 13:29:08 2015 -0700 Try to handle the executable being a libtool wrapper. Change-Id: I8fd2b4445707029ea24ad3c02804c0bf8fcedd15 Reviewed-on: https://code.wireshark.org/review/8406 Reviewed-by: Guy Harris commit 1fa0e72 Author: Alexis La Goutte Date: Mon Apr 13 20:47:31 2015 +0200 Wireshark (Qt): The lower left status bar reports "Ready to load or capture" when a live capture is active 10947 Qt Wireshark - The lower left status bar reports "Ready to load or capture" when a live capture is active Reported by Jim Young Bug: 10947 Change-Id: I7dcd5081194bbeab43fef4d994220ac3ea23f536 Reviewed-on: https://code.wireshark.org/review/8067 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus Reviewed-by: Alexis La Goutte commit e580b91 Author: Alexis La Goutte Date: Wed May 6 23:11:19 2015 +0200 Transifex: Add also debian po file to translate Change-Id: Ibacd7775e5e71dc30f1cfaaf022c22fc0b594fd0 Reviewed-on: https://code.wireshark.org/review/8321 Reviewed-by: Michal Labedzki Reviewed-by: Evan Huus Reviewed-by: Alexis La Goutte commit f4c2d3b Author: Guy Harris Date: Mon May 11 12:23:47 2015 -0700 Remove trailing whitespace. Change-Id: Ibdb899ddcaa88579aa2dc3c842d016a1ac164e2a Reviewed-on: https://code.wireshark.org/review/8404 Reviewed-by: Guy Harris commit 341f2ce Author: Gerald Combs Date: Mon May 11 12:10:25 2015 -0700 Qt: Packet list fixes. When updating the monospace font, don't apply it to PacketList itself. On Windows and Linux here it sets the header font as well. Add the item delegate width to the column size hint. This correctly resizes column 0 on Windows. It seems to add extra space on OS X and Linux, unfortunately. Change-Id: I294cd9868fe00144b896636be65896e8557ab208 Reviewed-on: https://code.wireshark.org/review/8402 Reviewed-by: Gerald Combs commit 5a9d065 Author: Guy Harris Date: Mon May 11 12:22:23 2015 -0700 Skip past env and its environment-variable arguments. Change-Id: Ic0bec27e5884a1e5db8e98e6d84b677ae8b2d377 Reviewed-on: https://code.wireshark.org/review/8403 Reviewed-by: Guy Harris commit e37ae10 Author: Gerald Combs Date: Mon May 11 10:25:27 2015 -0700 Use setPlaceholderText in CaptureFilterEdit. Matches a recent change in DisplayFilterEdit. Change-Id: I22d0f4a327ecae0e2065302a003037d19162b74d Reviewed-on: https://code.wireshark.org/review/8401 Reviewed-by: Gerald Combs commit c9ec0be Author: Guy Harris Date: Mon May 11 10:18:30 2015 -0700 Try to get a stack trace from core dumps. Change-Id: I66d853391f29acfb026d3c246adba9bdf6a4dc36 Reviewed-on: https://code.wireshark.org/review/8400 Reviewed-by: Guy Harris commit 60803f3 Author: Gerald Combs Date: Tue Mar 3 12:27:10 2015 -0800 Qt: Add display filter completion. Add completion to DisplayFilterEdit. Disable autocompletion in DisplayFilterCombo. New behavior: If we're at the beginning of the entry "recent" display filters appear at the top of the list. Start using QLineEdit::placeholderText while we're here. Bug: 10923 Ping-Bug: 9254 Change-Id: Ic8dd37768abb83d50d4e6c849bb51095fc3742d2 Reviewed-on: https://code.wireshark.org/review/8360 Reviewed-by: Gerald Combs commit 2c96aac Author: Francesco Fondelli Date: Mon May 11 11:55:03 2015 +0200 MPLS PM: add timestamp2 field decoding Bug: 11180 Change-Id: I28e8d72d80047a08f754593327bdd5900633574a Signed-off-by: Francesco Fondelli Reviewed-on: https://code.wireshark.org/review/8395 Reviewed-by: Alexis La Goutte commit 87bfae7 Author: Alexis La Goutte Date: Tue May 5 14:42:31 2015 +0200 BGP: Remove proto_tree_add_text call Part 1 Change-Id: Icbc73690370eba07e77b35d2815346f1d5a44347 Reviewed-on: https://code.wireshark.org/review/8386 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit f1e7367 Author: Evan Huus Date: Sun May 10 16:45:29 2015 -0400 giop: ignore NULL-terminator in CDR strings CDR strings appear to be both counted *and* NULL-terminated in many cases, which is rather weird, so if we see a NULL-terminator, ignore it in the count; otherwise we print a trailing '\000' on all the strings we put in the tree. Bug: 11126 Change-Id: I45b6b414683a6f646d37c2e2001b7319d5c80be5 Reviewed-on: https://code.wireshark.org/review/8390 Reviewed-by: Anders Broman commit e997aaa Author: cjdunlop Date: Thu May 7 07:49:10 2015 -0500 packet-cipmotion.c: Modified CIP motion parser Modified CIP Motion parser to include newly-defined Axis Safety related fields in the status data set section. Change-Id: I70c6dd345ae9353b87e6f7c1300b60687f41a1f6 Reviewed-on: https://code.wireshark.org/review/8342 Reviewed-by: Anders Broman commit 9e86026 Author: Alexis La Goutte Date: Sun May 10 17:23:49 2015 +0200 HTTP2: Update to libnghttp2 0.7.14 Change-Id: Ib4cbe5cd876956bffeea81011a94296333ff1e9c Reviewed-on: https://code.wireshark.org/review/8379 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 6b158da Author: Alexis La Goutte Date: Sun May 10 19:07:34 2015 +0200 Dicto (3gpp2): fix indent (use tabs) Change-Id: I0f1d6a8501329857b1c38646e18b72cdae84a7c5 Reviewed-on: https://code.wireshark.org/review/8385 Reviewed-by: Anders Broman commit 0617b1a Author: Guy Harris Date: Sun May 10 17:00:15 2015 -0700 When piping tshark to something else, run it with run_and_catch_crashes. That got the crash information in the WPA EAPOL Rekey test; use it for all other tests where, otherwise, the crash information would be lost. Change-Id: I230b7952b6d79ebf6dc003747dc05328616ef7c2 Reviewed-on: https://code.wireshark.org/review/8394 Reviewed-by: Guy Harris commit c8394b8 Author: Guy Harris Date: Sun May 10 14:43:32 2015 -0700 Fix pathname used to run run_and_catch_crashes. Change-Id: Ib8bbee1906c89decd16f3ea0ea5f78c9337e5f43 Reviewed-on: https://code.wireshark.org/review/8393 Reviewed-by: Guy Harris commit 42611db Author: Guy Harris Date: Sun May 10 14:16:14 2015 -0700 Try wrapping some tshark invocations in a script to catch crashes. Add a script that takes a command as an argument and runs it in a subshell, so that said subshell will catch any signals from it and report it. This would be done for commands that aren't the last command in the pipeline, as, given that the exit status of a pipeline is the exit status of the last command in the pipeline, there's no guarantee that the shell will bother to pick up the exit status of earlier commands in the pipeline. Use that for the tshark in the WPA EAPOL Rekey test, so it at least can report the signal (on Solaris, SIGSEGV means, among other things, "dereferenced a pointer pointing out of the address space" and SIGBUS means, among other things, "dereferenced a misaligned pointer on SPARC"). Maybe we can make the script also fire up a debugger if it finds a core dump (and a debugger) and get a stack trace. Change-Id: I4188190a1f1a4d3afc4719d886161ee56bd89d8b Reviewed-on: https://code.wireshark.org/review/8392 Reviewed-by: Guy Harris commit 040641d Author: Pascal Quantin Date: Sun May 10 21:16:47 2015 +0200 Copy PTK key in its dedicated array, and not at the address of the array While we are at it, put back some debug logs that were removed in g1439eb6 (otherwise msgbuf is no more initialized) Change-Id: Ie34c4f2e638bc3ee77a0565446de37a15385dc0d Reviewed-on: https://code.wireshark.org/review/8389 Reviewed-by: Pascal Quantin commit 19aaa18 Author: Guy Harris Date: Sun May 10 11:03:35 2015 -0700 Don't initialize a variable that's unused before we later set it. Change-Id: I944cac044a8b091cbe5d85cd63a8c698a82b8559 Reviewed-on: https://code.wireshark.org/review/8388 Reviewed-by: Guy Harris commit 7d4e0c7 Author: Guy Harris Date: Sun May 10 11:00:25 2015 -0700 Pick array sizes based on what they're supposed to hold. In AirPDcapRsnaPwd2PskStep(), digest[] holds an SSID plus 4 bytes of count, so the size is MAX_SSID_LENGTH plus 4, and digest1[] holds an SHA-1 digest, so the size is SHA1_DIGEST_LEN. That makes it a bit clearer why those are the sizes. Change-Id: I58ed6643f57675375f7f369470d600382323315f Reviewed-on: https://code.wireshark.org/review/8387 Reviewed-by: Guy Harris commit c01f369 Author: Evan Huus Date: Sun May 10 07:11:04 2015 -0400 qt: minor string change in capture options Replace "Capture in" with "Enable" for promiscuous mode; the checkbox doesn't actually affect which interfaces get captured on, which is the way I wanted to read the old text. Change-Id: I35dd2c8f9523311cb267515804b1421e50e60e06 Reviewed-on: https://code.wireshark.org/review/8374 Reviewed-by: Evan Huus Reviewed-by: Alexis La Goutte Reviewed-by: Gerald Combs commit 4263c13 Author: Pascal Quantin Date: Mon May 4 23:13:04 2015 +0200 mergecap: fix merge of files with different encapsulation types Issue reported on https://ask.wireshark.org/questions/42061/merging-captures-on-1995 Change-Id: I0697a03221972f2d1616da52aecc6257f0bc5b88 Reviewed-on: https://code.wireshark.org/review/8293 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit b230a03 Author: Martin Kaiser Date: Fri Apr 17 17:34:14 2015 +0200 ZVT: show positive, negative completion in the info column Change-Id: I2488a505e6634da5cbcaf2e86505414d34823b8e Reviewed-on: https://code.wireshark.org/review/8381 Reviewed-by: Martin Kaiser commit b105ce2 Author: Martin Kaiser Date: Sun May 10 16:45:33 2015 +0200 DVB-CI: remove some more proto_tree_add_text() calls Change-Id: If2f5ee4629b48fe0ffbe76c49952de8fb14fb64e Reviewed-on: https://code.wireshark.org/review/8380 Reviewed-by: Martin Kaiser commit af7bdfc Author: Gerald Combs Date: Sun May 10 08:07:28 2015 -0700 [Automatic update for 2015-05-10] Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I9ee8a6cb84ceb23340af3562cfa9927357319ee6 Reviewed-on: https://code.wireshark.org/review/8376 Reviewed-by: Gerald Combs commit c1567a0 Author: Mikhail Koreshkov Date: Mon Apr 13 21:59:12 2015 +0300 Q931: separate ett for each information element Add separate ett for all possible information elements. It's better to expand only necessary subtree but not all Change-Id: If84359e28547ce5dcf753dc1bee691ece7f29ace Reviewed-on: https://code.wireshark.org/review/8054 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte Reviewed-by: Evan Huus commit be8f9c4 Author: Guy Harris Date: Sat May 9 23:53:20 2015 -0700 Add some bounds checks. Change-Id: I5b0405f814d439c1d5ce329a817475102be483af Reviewed-on: https://code.wireshark.org/review/8373 Reviewed-by: Guy Harris commit dac8015 Author: Guy Harris Date: Sat May 9 19:30:15 2015 -0700 new_key is used only for TKIP keys; set it only in that part of the code. Change-Id: I64424731e4d5f94c7b69436b5318b67a14471171 Reviewed-on: https://code.wireshark.org/review/8372 Reviewed-by: Guy Harris commit 1507b4a Author: Guy Harris Date: Sat May 9 19:17:57 2015 -0700 Allocate the unwrapped key in AES_unwrap(). Have it allocate the buffer for the unwrapped key and return a pointer to it, rather than having it be handed a buffer for that key. That makes it a bit easier to validate, in AES_unwrap, that we don't write past the end of the buffer. Change-Id: Id02852c23054b3ed33eeeb383e7aa6cf12d02ed9 Reviewed-on: https://code.wireshark.org/review/8371 Reviewed-by: Guy Harris commit acf7985 Author: Guy Harris Date: Sat May 9 16:35:45 2015 -0700 Define the SHA-1 digest length in wsutil/sha1.h and use it. Hopefully that'll make it a little easier to make sure that we're not overflowing arrays. Change-Id: I770df045ef9a45fd486c1271ea424b3334bb39d2 Reviewed-on: https://code.wireshark.org/review/8370 Reviewed-by: Guy Harris commit bb89e77 Author: Guy Harris Date: Sat May 9 12:35:38 2015 -0700 Make option_content a guint8 *. It points to an array of bytes, not a character string. Add some casts to squelch other Sun/Oracle C warnings. Clean up some comments while we're at it. Change-Id: Id0908178cb00d537e95569b9ce6f745c8fd6d716 Reviewed-on: https://code.wireshark.org/review/8369 Reviewed-by: Guy Harris commit 89f0c5e Author: Alexis La Goutte Date: Sat May 9 18:55:29 2015 +0200 ICMP: Fix Logically dead code (CID 1295678) Mistake when remove proto_tree_add_text calls Change-Id: I820264b7a90a2563f846b6e6472416cd3e3278a4 Reviewed-on: https://code.wireshark.org/review/8368 Reviewed-by: Michael Mann commit 652f5ad Author: Francesco Fondelli Date: Fri May 8 09:52:40 2015 +0200 PCEP: Update to last draft - fix PLSP-ID parsing, is a 20 bits field - fix SID parsing, is in network order on the wire - fix PATH-SETUP-TYPE and SR-PCE-CAPABILITY code points Change-Id: If26035181462a9cad77a4a594aab3c007b4d00a2 Signed-off-by: Francesco Fondelli Reviewed-on: https://code.wireshark.org/review/8351 Reviewed-by: Alexis La Goutte commit 4607290 Author: Guy Harris Date: Sat May 9 05:16:05 2015 -0700 Rename a variable to avoid a collision with the C++ keyword "template". Change-Id: I27c5efc5586e97d19ef905921919e1385809eb9b Reviewed-on: https://code.wireshark.org/review/8367 Reviewed-by: Guy Harris commit 6cf626e Author: Jamil Nimeh Date: Fri May 8 20:28:20 2015 +0200 SSL: fix dissection of CertificateStatus message with OCSP_MULTI Bug: 11181 Change-Id: I05769e254f2e276e1594d7ed5cb50496e16cfc2f Reviewed-on: https://code.wireshark.org/review/8356 Petri-Dish: Pascal Quantin Reviewed-by: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 2ad4bfe Author: Jeff Morriss Date: Fri May 8 14:05:58 2015 -0400 Eliminate a couple of empty Diameter grouped AVP lists. Use Session-ID as a place holder for grouped AVPs that can hold any AVP and look up the contents of a couple grouped AVPs whose contents wasn't specified. Also, update the DTD to allow vendors to not add any AVPs. Change-Id: Id2852e31cecbcfaf64efb46918101b3a81ed5bdb Reviewed-on: https://code.wireshark.org/review/8355 Reviewed-by: Anders Broman commit 9f613e3 Author: Martin Mathieson Date: Fri May 8 17:16:53 2015 +0100 RRC: add domain and release cause information to the INFO column. Change-Id: If0bee7f283d6c4dd44618221d528fb55e30f510a Reviewed-on: https://code.wireshark.org/review/8353 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 2d63e58 Author: Guy Harris Date: Fri May 8 23:55:42 2015 -0700 Fix some more constants to be unsigned. Change-Id: I714078683cff517c79a15abf29e1ae4a9a60271d Reviewed-on: https://code.wireshark.org/review/8365 Reviewed-by: Guy Harris commit 795211b Author: Guy Harris Date: Fri May 8 18:33:56 2015 -0700 Fix definition of tnef_open(). Change-Id: I8d030ab48fc47e4948c9f6dcad08f0bd08ca5ff8 Reviewed-on: https://code.wireshark.org/review/8364 Reviewed-by: Guy Harris commit 17ea21f Author: Guy Harris Date: Fri May 8 18:30:35 2015 -0700 Make everything unsigned. The LHS of the & operation is unsigned; make the RHS unsigned as well. That squelches a Sun/Oracle C warning. Change-Id: I6983cc89603a512020b8e8b560c00632de6b2fb3 Reviewed-on: https://code.wireshark.org/review/8363 Reviewed-by: Guy Harris commit 5302544 Author: Guy Harris Date: Fri May 8 18:26:49 2015 -0700 Keep everything unsigned there. This squelches a warning from Sun/Oracle C, and it's the right thing to do in any case, as the LHS of the & operator is unsigned. Change-Id: I824a82d945f8f2535282bbf466dcd65806c6f695 Reviewed-on: https://code.wireshark.org/review/8362 Reviewed-by: Guy Harris commit a50eefb Author: Guy Harris Date: Fri May 8 16:26:02 2015 -0700 Add some more warnings when building with Sun^WOracle's C compiler. Change-Id: I696b0757ba7fece61f50ebcee79b576a4f15660f Reviewed-on: https://code.wireshark.org/review/8361 Reviewed-by: Guy Harris commit 27f276f Author: Guy Harris Date: Fri May 8 14:36:20 2015 -0700 Fix indentation. Change-Id: I90bddd1dd879706b95ab28539411e26fc29e61d8 Reviewed-on: https://code.wireshark.org/review/8359 Reviewed-by: Guy Harris commit db34120 Author: Pascal Quantin Date: Fri May 8 21:14:10 2015 +0200 airpdcap: ensure that buffer put on stack is big enough to hold the result of AirPDcapRsnaPwd2PskStep() g1439eb6 changed AIRPDCAP_WPA_PSK_LEN from 64 bytes to 32 bytes, leading to a stack corruption in AirPDcapRsnaPwd2Psk() function Change-Id: Ibf51f6749715055cd84906a144214ed44c85256b Reviewed-on: https://code.wireshark.org/review/8358 Reviewed-by: Pascal Quantin commit dce4cc6 Author: Pascal Quantin Date: Fri May 8 18:46:47 2015 +0200 GTPv2: fix unused parameter 'pinfo' warning Change-Id: I41e9d429685752c10562e5255036c2b84390373c Reviewed-on: https://code.wireshark.org/review/8354 Reviewed-by: Pascal Quantin commit 92853e8 Author: AndersBroman Date: Fri May 8 15:33:42 2015 +0200 [GTPv2] Add dissection of Throttling IE. Change-Id: I9c71a9d6e276213eb43e4265578e57f87f1619fd Reviewed-on: https://code.wireshark.org/review/8352 Reviewed-by: Anders Broman commit e7eaca4 Author: Guy Harris Date: Fri May 8 00:15:17 2015 -0700 epan/nghttp2/nghttp2_net.h no longer exists, so don't list it. Change-Id: I4a2f289a49edf10a62208dad186a9b6426b5af2b Reviewed-on: https://code.wireshark.org/review/8344 Reviewed-by: Guy Harris commit 3859e55 Author: Guy Harris Date: Fri May 8 00:10:30 2015 -0700 A NULL is needed at the end of the argument list for g_object_set(). Change-Id: I086403275d596f19ef44374f956654cf94ac9a11 Reviewed-on: https://code.wireshark.org/review/8343 Reviewed-by: Guy Harris commit 7d0049c Author: Jiří Engelthaler Date: Thu May 7 07:54:00 2015 +0200 Recent files: Disable mnemonic accelerator key for menu item If recent file name contains underscore, menu item parses it as mnemonic accelerator. So disabled using underline for recent file menu item. Change-Id: I1253a0103e750a14a69f0d064587e0eb56581b82 Reviewed-on: https://code.wireshark.org/review/8325 Reviewed-by: Anders Broman commit f77e02c Author: Gerald Combs Date: Wed Mar 11 15:22:20 2015 -0700 Expert Info dialog. Show all expert messages in a combined view. Group top-level items by a (severity, group, protocol) tuple. Let the user enable and disable messages via a check menu. Add ProtoTree::goToField and expert_info_t.hf_index. Use them to jump to what we hope is the afflicted item. Enable the context menu only if the user has selected a packet item. Add a free-form search field that matches expert summaries. This differs from the GTK+ version but hopefully provides a smoother workflow. Bug: 10931 Change-Id: Ia12cb7c27cdea1634fa2798fb7e4c1b23bd16ad2 Reviewed-on: https://code.wireshark.org/review/8294 Reviewed-by: Gerald Combs Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 3d7ff97 Author: Alexis La Goutte Date: Thu May 7 14:04:05 2015 +0200 nghttp2: use g_ntoh[ls], g_hton[ls] from glib Change-Id: I9e4278d469579022dd82bed4e40ff582fff266b6 Reviewed-on: https://code.wireshark.org/review/8328 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 1439eb6 Author: deagol Date: Fri May 1 22:56:50 2015 +0200 IEEE 802.11: 802.1X (WPA-EAP) rekeying support This patch extends the existing decryption support for WPA to also handle rekeys by checking each decrypted packet for a 4-way-handshake. Rekeys can be used for WPA-PSK, but are more common with WPA-Enterprise (WPA-EAP). For decrypting WPA-EAP secured packets the user must provide all used PMK's of the connection (aka PSK's) as WPA-PSK 32 byte hex values to wireshark via the existing interface. (The capture must have all 4-way-handshakes included also, starting with the first unencrypted one.) Every decrypted unicast packet will habe the used PMK and TK shown in the CCMP/TKIP section below the key index in the GUI. Group packets will display the GTK instead. Additionally this fixes a small issue with group rekey handling, so every packet can be selected in the GUI in random order, removing the need to manually find the correct group keying packets prior to that. It was tested primary with WPA-CCMP, but TKIP is also working. One section in the code touch bluetooth 802.1X support. It should do exactly the same, but will now also examine all decypted packets for rekeys. Ping-Bug: 11172 Change-Id: I19d055581fce6268df888da63485a48326046748 Reviewed-on: https://code.wireshark.org/review/8268 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit b644698 Author: Jeff Morriss Date: Thu May 7 22:06:11 2015 -0400 Use the correct AVP type in a couple of places: IPAddress instead of Address. (For whatever reason the Diameter dictionary calls it IPAddress rather than Address--the latter is what's in the RFCs.) Change-Id: I5efcffc2a9bced6ba841b09fd83cb3dcd128d440 Reviewed-on: https://code.wireshark.org/review/8341 Reviewed-by: Anders Broman commit 1244ee0 Author: Jeff Morriss Date: Thu May 7 17:41:17 2015 -0400 Fix several Starent enums that didn't have codes. The codes were there but the strings got messed up somewhere along the way. Change-Id: I41cc581dba0c00936737ea77e789cac1aecadf0f Reviewed-on: https://code.wireshark.org/review/8340 Reviewed-by: Anders Broman commit bc2605e Author: Jeff Morriss Date: Thu May 7 17:31:03 2015 -0400 Add Float32 and Float64 types to the Diameter dictionary. Change-Id: I74f7c37fc9b62ae0b9f29e4da0b1b3d5037b8192 Reviewed-on: https://code.wireshark.org/review/8339 Reviewed-by: Anders Broman commit 5b64a69 Author: Jeff Morriss Date: Thu May 7 17:26:54 2015 -0400 Update the Diameter DTD to reflect the fact that vendors are no longer defined in base or applications. (IOW update the DTD to reflect I5119f0dc7f8e3bbf59e2207046a8bb0f42ab0ca1.) Change-Id: I459b3aac50ce4dabb552e674145d9097920e0a5d Reviewed-on: https://code.wireshark.org/review/8338 Reviewed-by: Anders Broman commit f5c4dc7 Author: Jeff Morriss Date: Thu May 7 17:21:33 2015 -0400 Fix Starent vendor definition: it's not an empty element. Change-Id: Ib61b9be817bcfd2fbdc0ec57f69edda9052b588c Reviewed-on: https://code.wireshark.org/review/8337 Reviewed-by: Anders Broman commit 0b4e883 Author: Jeff Morriss Date: Thu May 7 16:14:53 2015 -0400 Allow empty-element Diameter Applications and use that format. This also fixes a couple of applications that weren't properly terminated (as a result of some of my recent changes). Change-Id: I9662017a81c63aceeb950d3b29cb17dde16d4f0c Reviewed-on: https://code.wireshark.org/review/8335 Reviewed-by: Anders Broman commit 301f5ff Author: Pascal Quantin Date: Thu May 7 22:39:34 2015 +0200 ftypes: display 64 bits BASE_HEX fields as hexadecimal Change-Id: Ie9bedf6c17c0a941ebaabd5144460a42eb4ca1ed Reviewed-on: https://code.wireshark.org/review/8336 Reviewed-by: Pascal Quantin commit e55ac64 Author: Gerald Combs Date: Fri Mar 27 18:49:39 2015 -0500 Qt: Fix packet list column resizing. The size hint changes in g5ab8490 broke packet list column resizing. Add back a way to force the hinting necessary for sizeHintForColumn to work properly. Bug: 11067 Ping-Bug: 10924 Change-Id: Icd525200f7a88f2b6d22a3039cda98ad0527239e Reviewed-on: https://code.wireshark.org/review/8334 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 141c923 Author: Moeller, Thies Date: Thu May 7 16:13:54 2015 +0200 fix FT_INT64 fields output in tshark Bug: 11170 Change-Id: Ife7f565d17b92cd5f84e92ce109f530e68d98cfa Reviewed-on: https://code.wireshark.org/review/8333 Reviewed-by: Pascal Quantin commit 1362a0b Author: Alexis La Goutte Date: Thu May 7 14:11:06 2015 +0200 SIGCOMP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I66e4e4735a16de5e50f86e29c34202e6668cd44e Reviewed-on: https://code.wireshark.org/review/8329 Reviewed-by: Michael Mann commit 0310c72 Author: Alexis La Goutte Date: Thu May 7 14:12:43 2015 +0200 Revert "QCustomPlot: fix division(or modulo) by zero found by Clang and Coverity (CID 1159170 & 1159171)" This reverts commit b394aa5f1e4ad030ab23d18b439e8f5c9eca9792. The patch don't fix this issue... Change-Id: I654933ec4ebebdef840f24ba20162f1f1a5321cc Reviewed-on: https://code.wireshark.org/review/8332 Reviewed-by: Alexis La Goutte commit d8ccd27 Author: Jiří Engelthaler Date: Wed May 6 17:34:54 2015 +0200 packet-iec104: make object number filterable if SQ flag is set Make object number filterable again if SQ flag is set which breaks my commit 785fab7f Sample capture https://wiki.wireshark.org/SampleCaptures?action=AttachFile&do=get&target=IEC104_SQ.pcapng Change-Id: I450b86452876fab26e1a9f1bfc2f729573c52124 Reviewed-on: https://code.wireshark.org/review/8313 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 7771ed2 Author: cbontje Date: Tue May 5 14:26:21 2015 -0600 Fix detection of 'Write Multiple Registers' and 'Write Multiple Coils' function message 'direction' Also did some refactoring of existing code to make it more readable for the various existing function code types. ** Commit amendment to not use depreciated tvb_length() function. Change-Id: Ia4c9f3514968c2a7bebc404ca9185cf8d814dfca Reviewed-on: https://code.wireshark.org/review/8301 Reviewed-by: Anders Broman commit c3c4d42 Author: Michael Mann Date: Mon May 4 09:20:33 2015 -0400 Reduce proto_tree_add_text calls in packet-sigcomp.c Some other minor cleanup. Change-Id: I267fe1512e57ce15f9e6be83ac1b55e6e897e7a1 Reviewed-on: https://code.wireshark.org/review/8322 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 924093c Author: Moeller, Thies Date: Mon May 4 13:52:48 2015 +0200 fix FT_UINT64 fields output in tshark Bug: 11170 Change-Id: Ica259867e2c8e0b4b680bca94970e13962a8dbb1 Reviewed-on: https://code.wireshark.org/review/8290 Reviewed-by: Alexis La Goutte commit f735d4b Author: Michael Mann Date: Wed May 6 22:47:12 2015 -0400 Need to generate hf_ variable for aliases in structs. Change-Id: I6bd995d42cf54aaf2ad90d0322056c7ff0830ea9 Ping-Bug: 11156 Reviewed-on: https://code.wireshark.org/review/8324 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 718e900 Author: Michael Mann Date: Wed May 6 22:32:29 2015 -0400 Remove proto_tree_add_text from idl2wrs generation. Change-Id: Iab9df3e68d2a3878c3081c6352c45f7c329b983e Reviewed-on: https://code.wireshark.org/review/8323 Reviewed-by: Anders Broman commit 12e0f0f Author: Jeff Morriss Date: Wed May 6 16:49:33 2015 -0400 Update the 3GPP list of Experimental-Result-Code values. Change-Id: I7223eaeb40f6590814cc1748f6aa457bbd92eddc Reviewed-on: https://code.wireshark.org/review/8320 Reviewed-by: Anders Broman commit 8035807 Author: Jeff Morriss Date: Wed May 6 16:03:15 2015 -0400 Add/clarify some comments about how the Experimental-Result-Code AVP is handled. Specifically we put Experimental-Result-Codes specified by 3GPP in the XML file and let other vendors' codes be handled through a dissector table. Change-Id: I2c3977fb959ad84faa5cb90aeb3d191c8b465ede Reviewed-on: https://code.wireshark.org/review/8319 Reviewed-by: Jeff Morriss commit 0f55a0f Author: Guy Harris Date: Wed May 6 12:53:24 2015 -0700 Have global_capture_opts if we either have pcap or extcap. The extcap code uses it; if the intent is not to support extcap if you don't have pcap, then don't enable it in the configure scripts/CMake. Change-Id: I4af80a2e6f557134fa8c542ad3143f3e8ca555d4 Reviewed-on: https://code.wireshark.org/review/8318 Reviewed-by: Guy Harris commit 8886fbd Author: Guy Harris Date: Wed May 6 12:50:09 2015 -0700 Fix some --without-pcap build problems. Change-Id: Ic80de2bf2e2e047667784b8d19207f7f097b3d5c Reviewed-on: https://code.wireshark.org/review/8317 Reviewed-by: Guy Harris commit abdfd88 Author: Alexis La Goutte Date: Sun May 3 21:11:04 2015 +0200 PIM: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: Ia8eca42bae42fb139bfc63232c6d9bf05811ad39 Reviewed-on: https://code.wireshark.org/review/8280 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 1e3be59 Author: Gerald Combs Date: Tue May 5 15:18:38 2015 -0700 WildPackets → Savvius. Change-Id: I2494c2b1dcc9e324535b3f659b51b44059c478bd Reviewed-on: https://code.wireshark.org/review/8304 Reviewed-by: Gerald Combs commit 0e3d53a Author: AndersBroman Date: Wed May 6 15:52:21 2015 +0200 [Thrift] Fix a copy-paste-o and add dissecton of T_BYTE Change-Id: I2623d273a39393533c10568ef2f7642c05ac636c Reviewed-on: https://code.wireshark.org/review/8311 Reviewed-by: Anders Broman commit 67da8ae Author: Alexis La Goutte Date: Wed May 6 14:47:59 2015 +0200 GTPv2 : fix unused parameter 'tree' [-Werror=unused-parameter] Change-Id: I01097889dd4a1c29135f50dcfb737ff50b0de2b7 Reviewed-on: https://code.wireshark.org/review/8310 Reviewed-by: Alexis La Goutte commit 7fcd7b0 Author: AndersBroman Date: Wed May 6 13:23:52 2015 +0200 [GTPv2] Add dissetion of IE Overload Control Information and Metric. Change-Id: I8bd423ea41929bfd20cecf9d80a686f1b286082f Reviewed-on: https://code.wireshark.org/review/8309 Reviewed-by: Anders Broman commit 8e3c1e7 Author: Alexis La Goutte Date: Wed May 6 12:55:53 2015 +0200 THRIFT: Fix Mac Buildbot packet-thrift.c:99: warning: declaration of 'tvb_captured_length' shadows a global declaration packet-thrift.c:114: warning: declaration of 'tvb_captured_length' shadows a global declaration packet-thrift.c:138: warning: declaration of 'tvb_captured_length' shadows a global declaration packet-thrift.c:166: warning: declaration of 'tvb_captured_length' shadows a global declaration Change-Id: I0ce4fc0bf6470f1b3a89de599346c1efe8bb93cf Reviewed-on: https://code.wireshark.org/review/8308 Reviewed-by: Alexis La Goutte commit b5a44d2 Author: AndersBroman Date: Tue May 5 18:12:45 2015 +0200 Add a THRIFT dissector. Change-Id: I69f2a99bde5a9f8c4c969cdd9145838ac776521b Reviewed-on: https://code.wireshark.org/review/8298 Petri-Dish: Anders Broman Reviewed-by: Anders Broman commit 050de6a Author: Michael Mann Date: Tue May 5 07:54:25 2015 -0400 Set tap filter when WLAN "Limit to display filter" option is checked. Bug: 11160 Change-Id: Ic2f1475a3b51eb8919435f1064fc0faf3c4da3eb Reviewed-on: https://code.wireshark.org/review/8296 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 64c2bf7 Author: Michael Mann Date: Thu Apr 30 22:38:20 2015 -0400 Fix the need to manually adjust packet-gias.c (take 2) Need to have packet-gias.c in the DIRTY_CORBA_IDL_DISSECTOR_SRC grouping to work around the warnings still generated. Change-Id: I08ea1f7d90577cc112b85e7fc00171827f58d6d2 Reviewed-on: https://code.wireshark.org/review/8266 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann Reviewed-by: Anders Broman commit 2cf2f36 Author: Guy Harris Date: Tue May 5 22:37:25 2015 -0700 Fix configuration with --without-qt and with no --with-gtk[23]. If building with Wireshark wasn't explicitly disabled - i.e., if we are building Wireshark, which means we are building an application with a GUI - and Qt was explicitly disabled, and neither GTK+ 2 nor GTK+ 3 were explicitly enabled, look for GTK+ 3. Change-Id: Ib913355f7b483d065e766605aa88a71fa9984f36 Reviewed-on: https://code.wireshark.org/review/8306 Reviewed-by: Guy Harris commit b5ef92e Author: David Creswick Date: Sun Apr 5 19:13:57 2015 -0500 GTK UI: remove eo_saveable_pathname in favor of eo_massage_str The function had several deficiencies: - When "" is passed as the filename, the function returns a null pointer (due to the quirky behavior of g_strsplit_set), which causes a segfault when it's dereferenced later. I'm not sure what the correct return should be, but it shouldn't be NULL. - It leaks memory. (The array of strings returned by g_strsplit_set are never freed.) - It only strips out backslashes. That is not the only character that is disallowed in filenames, even on windows. - The functionality is already provided by eo_massage_str and it does a more complete job of it. Change-Id: I4d9eab7506048c5d04de8f163b8af1e3f67c163d Reviewed-on: https://code.wireshark.org/review/7996 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte Reviewed-by: Gerald Combs commit fa04dfd Author: Peter Wu Date: Mon May 4 00:47:11 2015 +0200 wsdg: clarify gerrit account requirement A IRC user was asking about the meaning of `my.username` and noted that information is scattered over places. This patch tries to make the documentation more friendly for newcomers which are unfamiliar with Gerrit (and maybe OpenID?). The login page already recommends Launchpad, so no need to write it here. Change-Id: Ic55c9a2073d0045c6367f3efc8c842e53215f2dd Reviewed-on: https://code.wireshark.org/review/8288 Reviewed-by: Mark Reviewed-by: Alexis La Goutte Reviewed-by: Gerald Combs commit 5d20b58 Author: Mark Cunningham Date: Sun May 3 20:01:04 2015 +0100 kerberos encryption types (etype) additions + cleanup source http://www.iana.org/assignments/kerberos-parameters/kerberos-parameters.xhtml and referenced RFCs Change-Id: I898218c3ef75da21130f3f6c83848c0fca095acf Reviewed-on: https://code.wireshark.org/review/8300 Reviewed-by: Peter Wu commit cc02069 Author: Gerald Combs Date: Tue May 5 09:56:55 2015 -0700 CMake: Try to fix version.h dependencies. Make the gitversion target depend on version.h instead of running make-version.pl separately. Make wsutil and qtui depend on gitversion. Change-Id: I32f25347c12c7f86b2439ed4bf517cc8f5fb106f Reviewed-on: https://code.wireshark.org/review/8299 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 3a7c788 Author: Gerald Combs Date: Tue May 5 16:01:20 2015 +0000 Revert "Try to please both GCC (the compiler, not me) and clang." Unfortunately it prevents compilation with GCC. I'll just use "cmake -DDISABLE_WERROR=ON" on the affected machine for now. This reverts commit cdaad860720a17d889e759d9e263c5fcadaf36a2. Change-Id: I54c0e7882e42dd39b81c90c761e4aaec6d757bd1 Reviewed-on: https://code.wireshark.org/review/8297 Reviewed-by: Gerald Combs commit 95cde35 Author: Richard Stearn Date: Mon Apr 27 16:08:09 2015 +0100 Updated to add the G8BPQ MKISS additional commands and "Checksum" mode. Change-Id: I40b1ff8ffca3c0e1cafb79af4ed5df26eda7182b Reviewed-on: https://code.wireshark.org/review/8212 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 5727ebe Author: Roland Knall Date: Tue Apr 28 10:26:46 2015 +0200 extcap: Implement QT extcap options Implementing a button in the interface list, to bring up the extcap options dialog, as well as a dialog, which will be generated depending on the selected extcap options. Change-Id: I1733dc6a8c1a121089a9c353aff10bc4a53e86de Reviewed-on: https://code.wireshark.org/review/8224 Petri-Dish: Michal Labedzki Reviewed-by: Roland Knall Reviewed-by: Pascal Quantin commit cdaad86 Author: Gerald Combs Date: Mon May 4 18:07:09 2015 -0700 Try to please both GCC (the compiler, not me) and clang. The fix for GCC 5's -Wlogical-not-parentheses d7b2327 triggers -Wparentheses-equality in clang. Try to work around the issue with diagnostic suppression. Change-Id: I5eea1d3e76f6d2aa14a2595cd4455dcd2818f6a1 Reviewed-on: https://code.wireshark.org/review/8295 Reviewed-by: Gerald Combs commit 9b9b994 Author: Martin Kaiser Date: Mon May 4 22:40:07 2015 +0200 DVB-CI: make some more items filterable wrap long lines, remove a trailing space Change-Id: Ie9cd268ffbc6d021a3f90f3644dc8665daa8e5ca Reviewed-on: https://code.wireshark.org/review/8292 Reviewed-by: Martin Kaiser commit c14022e Author: Ray Gomez Date: Tue May 5 00:24:30 2015 +0800 added features in Feature-List-ID 2 used in S6a/S6d Change-Id: I4e1be924ffa7cb09c4c73d494f5d97c9cc0bf626 Reviewed-on: https://code.wireshark.org/review/8291 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 222597b Author: Roland Knall Date: Sun May 3 23:39:23 2015 +0200 androiddump: Change expected boolean result Change boolean options to accept lower- and uppercase TRUE as positive result Change-Id: I858918f7591bb7daf94444fb6c82f9aa37168d01 Reviewed-on: https://code.wireshark.org/review/8283 Reviewed-by: Roland Knall Reviewed-by: Michal Labedzki Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit ae949aa Author: Marius Date: Mon May 4 11:00:27 2015 +0200 Add support for decoding all Feature-List Gx flags Bug: 11167 Change-Id: I1c9af7c942cbc5e6abb2ea1520a8937968d52107 Reviewed-on: https://code.wireshark.org/review/8289 Petri-Dish: Alexis La Goutte Reviewed-by: Anders Broman commit 800fd17 Author: YFdyh000 Date: Mon May 4 00:08:44 2015 +0800 Add accesskey to Bluetooth menu Change-Id: I81e0edf8622579ec711d15077f62c31048837bf8 Reviewed-on: https://code.wireshark.org/review/8282 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki commit 70be586 Author: Alexis La Goutte Date: Sun May 3 21:12:52 2015 +0200 nettrace 3GPP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: Ie94165a45d9af23eee6e4d6406ad6fba4de785c0 Reviewed-on: https://code.wireshark.org/review/8281 Reviewed-by: Anders Broman commit 58ec8df Author: Guy Harris Date: Sun May 3 15:15:30 2015 -0700 Fix inconsistent indentation. Change-Id: If757fb60023f2bf733ed3f51b6d6a18756283b42 Reviewed-on: https://code.wireshark.org/review/8285 Reviewed-by: Guy Harris commit 85d3b61 Author: Guy Harris Date: Sun May 3 15:09:11 2015 -0700 Don't dissect otherwise-undissected data twice. Also, set decoded to TRUE after we return from a dissector; that makes it a bit clearer when we're setting it. Change-Id: Ief3e999c72954e08d4608b15b49921da294807c1 Reviewed-on: https://code.wireshark.org/review/8284 Reviewed-by: Guy Harris commit 0d6581c Author: Gerald Combs Date: Sun May 3 11:15:06 2015 -0700 Add a note about slot naming. Note that QMetaObject::connectSlotsByName looks for slots which follow a specific naming convetion, and that manually connected slots should not use that convention. This isn't obvious and seems to trip people up from time to time. Change-Id: I81f05519fcba672dcca8ccd82bbafa4d1559cebf Reviewed-on: https://code.wireshark.org/review/8279 Reviewed-by: Gerald Combs commit 26a3573 Author: Jesse Gross Date: Sat Apr 25 20:29:30 2015 -0700 Add support for IPv6 heuristic dissectors. This adds limited support for heuristic subdissectors with IPv6. The initial motivation is STT but it should transparently work for other protocols using IP heuristic dissectors in a manner similar to the non-heuristic dissectors. The limitation is in regards to IPv6 extension headers. IPv6 has multiple checks against the next protocol table when determining when the protocol is an unknown extension header or not. This assumes that the check is cheap and has no side effects, neither of which is true for heuristic dissectors. As a compromise, this assumes that the next protocol is registered as protocol, even if is not the one that is ultimately dissected. Although not strictly correct, in practice this is true for existing protocols and likely future ones because the heuristic dissectors are overriding non-heuristic ones. Change-Id: Iff8cfc148ced5ca16191cc2b1879ad87e38d23cd Reviewed-on: https://code.wireshark.org/review/8197 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 812d311 Author: Roland Knall Date: Sun May 3 18:01:29 2015 +0200 ext_menubar: Change action name to remove warning on_actionExternalMenu_triggered() triggered a warning, as no menu exists on the automatic UI configuration. Change-Id: Ic3dc4c2c9e4c95ec4bbea01bd53af9a8c831e0d7 Reviewed-on: https://code.wireshark.org/review/8276 Reviewed-by: Roland Knall Petri-Dish: Pascal Quantin Reviewed-by: Pascal Quantin commit 5c14aec Author: Martin Kaiser Date: Sun May 3 18:00:45 2015 +0200 DVB-CI: remove some proto_tree_add_text() calls Change-Id: I727132effdb17138c35b0f3282f2f7b3dddb05b4 Reviewed-on: https://code.wireshark.org/review/8278 Reviewed-by: Martin Kaiser commit b07ffb0 Author: Pascal Quantin Date: Sun May 3 18:50:08 2015 +0200 Qt: remove a debug log showing the plugins path at startup Change-Id: I357a7d0b32a6cb4e80711feee49046b13317ea14 Reviewed-on: https://code.wireshark.org/review/8277 Reviewed-by: Pascal Quantin commit 3d4646e Author: Gerald Combs Date: Sun May 3 08:07:17 2015 -0700 [Automatic update for 2015-05-03] Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I4d5f34d1b803d478101ba4a1388ac3d71c641918 Reviewed-on: https://code.wireshark.org/review/8273 Reviewed-by: Gerald Combs commit cd204b5 Author: Gerald Combs Date: Thu Mar 19 10:48:34 2015 -0700 Try to keep capinfos+ASan from failing. Set ASAN_OPTIONS=detect_leaks=0, otherwise all captures show up as invalid in capinfos. Change-Id: I4c2c1e52e9cd8b253cd4c01d0f8770294b66102e Reviewed-on: https://code.wireshark.org/review/7757 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte Reviewed-by: Evan Huus commit 44d1601 Author: Guy Harris Date: Sat May 2 02:56:31 2015 -0700 Don't try checksumming if we didn't capture all the data to be checksummed. Check the captured length as well as the reported length, as is done in other checksumming code paths. Change-Id: I55371d99a28ffd1325e7266037cced580077d80b Reviewed-on: https://code.wireshark.org/review/8272 Reviewed-by: Guy Harris commit 27e480c Author: Guy Harris Date: Sat May 2 02:47:58 2015 -0700 Handle PIMvN, for N > 2, by just adding the checksum and subtree and bailing. Don't bother doing the checksum, as we don't know how much to checksum; don't assume setting pim_length to 0 will force it not to be checksummed, as it doesn't; and don't test twice for a version != 2. Change-Id: I1c2ed3ecf1572aef6c5af140c410f9cdd0e9c3a6 Reviewed-on: https://code.wireshark.org/review/8271 Reviewed-by: Guy Harris commit 6e66cda Author: Guy Harris Date: Sat May 2 02:30:44 2015 -0700 No need to call tvb_reported_length() twice. Just reuse the result we got from an earlier call. Change-Id: Icb4617d731d9e3f152ce762f56a1c32567cbde4a Reviewed-on: https://code.wireshark.org/review/8270 Reviewed-by: Guy Harris commit 4f95ff8 Author: Guy Harris Date: Sat May 2 02:21:52 2015 -0700 Expand comments. Update a URL, and tell The Story About PIM, or, at least, about various drafts floating around. I guess it took a while for the protocol to settle down, and a number of things changed significantly between early drafts and RFC 2117, including whether the protocol runs atop IGMP or directly atop IP. There doesn't appear to be *any* draft that corresponds to what dissect_pimv1() dissects; all have significant differences. Change-Id: Ia9c80cc384546b0a822a59fef01c1476f95ad8a6 Reviewed-on: https://code.wireshark.org/review/8269 Reviewed-by: Guy Harris commit ecd16b4 Author: Joerg Mayer Date: Fri May 1 19:21:59 2015 +0200 Fix checkAPI: Warning: i4b_trace.h has an SVN Id tag. Please remove it! Change-Id: Ia82801866edb2783f896e624da4553717370c36b Reviewed-on: https://code.wireshark.org/review/8267 Reviewed-by: Jörg Mayer commit 0d7087c Author: Alexis La Goutte Date: Fri May 1 11:36:14 2015 +0200 Revert "Fix the need to manually adjust packet-gias.c" This reverts commit 3ca9318d8215738b8d4edcde0598226cfc6cf031. Mac OS X buildbot are not happy packet-gias.c:356: warning: 'hf_UCO_InvalidInputParameter_details' defined but not used packet-gias.c:359: warning: 'hf_UCO_ProcessingFault_details' defined but not used packet-gias.c:360: warning: 'hf_UCO_SystemFault_details' defined but not used packet-gias.c:5275: warning: 'decode_UCO_Ratio_st' defined but not used packet-gias.c:5303: warning: 'decode_UCO_DirectAccessLocation_st' defined but not used packet-gias.c:5588: warning: 'decode_UCO_Coordinate3d_st' defined but not used packet-gias.c:5612: warning: 'decode_UCO_Circle_st' defined but not used packet-gias.c:5625: warning: 'decode_UCO_Ellipse_st' defined but not used packet-gias.c:5656: warning: 'decode_UCO_SimpleGSImage_st' defined but not used packet-gias.c:5671: warning: 'decode_UCO_SimpleCImage_st' defined but not used packet-gias.c:5694: warning: 'decode_UCO_CompressedImage_st' defined but not used packet-gias.c:5836: warning: 'decode_GIAS_ImageSpec_st' defined but not used Change-Id: Iee076c00eb4e48571a99f6b854b7e3e52983c2f8 Reviewed-on: https://code.wireshark.org/review/8265 Reviewed-by: Alexis La Goutte commit 3ca9318 Author: Michael Mann Date: Thu Apr 30 22:38:20 2015 -0400 Fix the need to manually adjust packet-gias.c Change-Id: I11beada78d2f2b4359d3638cdbcb6f43623fd10c Reviewed-on: https://code.wireshark.org/review/8262 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit aa3870f Author: Pascal Quantin Date: Thu Apr 30 19:19:35 2015 +0200 C12.22: check c1222_baseoid_len before doing a memcpy Should fix the following runtime error reported by Joerg: ../../asn1/c1222/packet-c1222-template.c:1427:3: runtime error: null pointer passed as argument 1, which is declared to never be null ../../asn1/c1222/packet-c1222-template.c:1427:3: runtime error: null pointer passed as argument 2, which is declared to never be null Change-Id: I2f952815ed81e47b504e6479835a357b7656828e Reviewed-on: https://code.wireshark.org/review/8251 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Jörg Mayer Reviewed-by: Pascal Quantin commit b849726 Author: Guy Harris Date: Thu Apr 30 20:03:39 2015 -0700 Fix some cases where we're shifting a signed 1 left. Shift 1U instead, to make sure it's unsigned; the result of, for example, the result of shifting a signed value left is undefined if the value times 2^{shift count} doesn't fit in the *signed* type of the shifted value. That means, in particular, that the result of shifting 1 left by {number of bits in an int - 1} is undefined. (In *practice*, it'll probably be -2^32, with the bit you want set, but that's not guaranteed, and GCC 5.1 seems not to like it.) Make some other left-hand operands of <<, and some variables holding results from shifts of that sort, unsigned, while we're at it. Change-Id: Ie72a9d0d518f59b35948267d10c80735d162e8bb Reviewed-on: https://code.wireshark.org/review/8264 Reviewed-by: Guy Harris commit 91515a0 Author: Michael Mann Date: Mon Apr 27 22:24:58 2015 -0400 Add tshark -z "ncp,srt" Change-Id: Iab2559c2bac5550987c108c6e917506fcec525e9 Reviewed-on: https://code.wireshark.org/review/8221 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 8b5a50e Author: Guy Harris Date: Thu Apr 30 19:55:01 2015 -0700 Fix some cases where we're shifting a signed 1 left. Shift 1U instead, to make sure it's unsigned; the result of, for example, the result of shifting a signed value left is undefined if the value times 2^{shift count} doesn't fit in the *signed* type of the shifted value. That means, in particular, that the result of shifting 1 left by {number of bits in an int - 1} is undefined. (In *practice*, it'll probably be -2^32, with the bit you want set, but that's not guaranteed, and GCC 5.1 seems not to like it.) This fixes the *other* generator for the X11 header files; we manually fix the file in question, because life's too short to spend very much of it trying to debug Perl issues that cause a Can't use string ("1") as a HASH ref while "strict refs" in use at ../../tools/process-x11-xcb.pl line 675. at ../../tools/process-x11-xcb.pl line 1859 at ../../tools/process-x11-xcb.pl line 1859 failure. Change-Id: I3dd46025b2ae461e63034b36ab11cdbc9380b696 Reviewed-on: https://code.wireshark.org/review/8263 Reviewed-by: Guy Harris commit 510777c Author: Guy Harris Date: Thu Apr 30 17:52:52 2015 -0700 Fix some cases where we're shifting a signed 1 left. Shift 1U instead, to make sure it's unsigned; the result of, for example, the result of shifting a signed value left is undefined if the value times 2^{shift count} doesn't fit in the *signed* type of the shifted value. That means, in particular, that the result of shifting 1 left by {number of bits in an int - 1} is undefined. (In *practice*, it'll probably be -2^32, with the bit you want set, but that's not guaranteed, and GCC 5.1 seems not to like it.) This fixes the generator for the X11 header files; we manually fix the header file in question, because life's too short to spend very much of it trying to debug Perl issues that cause a Can't use string ("1") as a HASH ref while "strict refs" in use at ../../tools/process-x11-xcb.pl line 675. at ../../tools/process-x11-xcb.pl line 1859 at ../../tools/process-x11-xcb.pl line 1859 failure. Change-Id: Ia903e9dacad49021bc0dfe129b9393ad426de9eb Reviewed-on: https://code.wireshark.org/review/8261 Reviewed-by: Guy Harris commit f708c5c Author: Joerg Mayer Date: Fri May 1 02:49:04 2015 +0200 rv is only used in an assert. The assert only evaluates to code if NDEBUG is undefined. Protect rv and its use accordingly. Change-Id: Iadbc55f74ccb797d7e812090140e636713658aa7 Reviewed-on: https://code.wireshark.org/review/8260 Reviewed-by: Jörg Mayer commit cbeaf03 Author: Joerg Mayer Date: Fri May 1 02:40:17 2015 +0200 Revert "Fix warning:" This reverts commit 39a31c3205ed1f0691f5e55174abe84653bcf7b0. rv is used in an assert, thus breaking debug builds. Change-Id: Ide9c287a9b6bfe07554a9429d3d216266d63c017 Reviewed-on: https://code.wireshark.org/review/8259 Reviewed-by: Jörg Mayer commit 6fa0a4c Author: Joerg Mayer Date: Fri May 1 02:13:30 2015 +0200 Replace deprecated function by not deprecated function. Change-Id: I8c33409796a4047e9b928902916bba434adc6262 Reviewed-on: https://code.wireshark.org/review/8258 Reviewed-by: Jörg Mayer commit 39a31c3 Author: Joerg Mayer Date: Fri May 1 02:07:56 2015 +0200 Fix warning: /home/jmayer/work/wireshark/git/epan/nghttp2/nghttp2_hd.c: In function ‘hd_inflate_remove_bufs_with_name’: /home/jmayer/work/wireshark/git/epan/nghttp2/nghttp2_hd.c:1736:10: error: variable ‘rv’ set but not used [-Werror=unused-but-set-variable] size_t rv; ^ turning error. Change-Id: Ibd46013ddbdbdf634e7df1eb7dd50c60a1f62e26 Reviewed-on: https://code.wireshark.org/review/8257 Reviewed-by: Jörg Mayer commit 7a308e7 Author: Guy Harris Date: Thu Apr 30 15:39:16 2015 -0700 Fix some cases where we're shifting a signed 1 left. Shift 1U instead, to make sure it's unsigned; the result of, for example, the result of shifting a signed value left is undefined if the value times 2^{shift count} doesn't fit in the *signed* type of the shifted value. That means, in particular, that the result of shifting 1 left by {number of bits in an int - 1} is undefined. (In *practice*, it'll probably be -2^32, with the bit you want set, but that's not guaranteed, and GCC 5.1 seems not to like it.) Change-Id: I96114047d402d1bae537cdfeb28a8564b1c94712 Reviewed-on: https://code.wireshark.org/review/8256 Reviewed-by: Guy Harris commit 9fba5f0 Author: Guy Harris Date: Thu Apr 30 15:21:00 2015 -0700 Fix some cases where we're shifting a signed 1 left. Shift 1U instead, to make sure it's unsigned; the result of, for example, the result of shifting a signed value left is undefined if the value times 2^{shift count} doesn't fit in the *signed* type of the shifted value. That means, in particular, that the result of shifting 1 left by {number of bits in an int - 1} is undefined. (In *practice*, it'll probably be -2^32, with the bit you want set, but that's not guaranteed, and GCC 5.1 seems not to like it.) Change-Id: I0d27565c382a04ceda9eec65f45a430ceb74cf53 Reviewed-on: https://code.wireshark.org/review/8255 Reviewed-by: Guy Harris commit d2b02ea Author: Guy Harris Date: Thu Apr 30 13:39:39 2015 -0700 Don't shift signed values left. That's not valid in C99, at least, if the value is negative or if the shift count is the number of bits in the value - 1, and we might get compile-time or run-time complaints about that. Also, make bit masks unsigned; to quote a run-time error reported in https://www.wireshark.org/lists/wireshark-dev/201504/msg00084.html "left shift of 1 by 31 places cannot be represented in type 'int'", so use type "unsigned int" instead, by shifting 1U rather than 1 left. Change-Id: I62220808058cb93f83329c1916b888a2067d524c Reviewed-on: https://code.wireshark.org/review/8254 Reviewed-by: Guy Harris commit fac1107 Author: Gerald Combs Date: Thu Apr 30 11:35:57 2015 -0700 CMake: Always set PROCESSOR_ARCHITECTURE on Windows. An undefined or invalid PROCESSOR_ARCHITECTURE will produce an invalid wireshark.exe.manifest. Make sure it's always set. Change-Id: I1b33f7bd5e964f05344919d1f11d88c14104c0ce Reviewed-on: https://code.wireshark.org/review/8253 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit d0e3431 Author: Alexis La Goutte Date: Wed Apr 29 23:12:12 2015 +0200 HTTP2: Update to libnghttp2 0.7.13 Change-Id: I69589a90077a9b009f2e1a45531059ebd61a0450 Reviewed-on: https://code.wireshark.org/review/8242 Petri-Dish: Alexis La Goutte Reviewed-by: Pascal Quantin Reviewed-by: Alexis La Goutte commit 12ec6c4 Author: Peter Lemenkov Date: Thu Apr 30 16:53:27 2015 +0300 Add correct decoding of a Il command That's another one protocol shortcoming - the same parameter used twice: * https://github.com/sippy/rtpproxy/wiki/RTPP-%28RTPproxy-protocol%29-technical-specification#createupdatelookup-session * https://github.com/sippy/rtpproxy/wiki/RTPP-%28RTPproxy-protocol%29-technical-specification#get-information Change-Id: I9ccc05579b0a1c28b8180eb56a2eb51fc803c063 Signed-off-by: Peter Lemenkov Reviewed-on: https://code.wireshark.org/review/8250 Reviewed-by: Pascal Quantin commit 6d17456 Author: Peter Lemenkov Date: Thu Apr 30 16:42:25 2015 +0300 Clarify command parameters meanings See these links for a "single file" parameter: * https://github.com/sippy/rtpproxy/wiki/RTPP-%28RTPproxy-protocol%29-technical-specification#record-stream * https://github.com/sippy/rtpproxy/wiki/RTPP-%28RTPproxy-protocol%29-technical-specification#copy-stream Change-Id: I23275898f98121215294c3c1a7a0ee727097d250 Signed-off-by: Peter Lemenkov Reviewed-on: https://code.wireshark.org/review/8249 Reviewed-by: Pascal Quantin commit ca921fd Author: Peter Lemenkov Date: Thu Apr 30 16:10:50 2015 +0300 Parse another one missing command modifier Parse another one missing command modifier - "request New port". See protocol description for the details: https://github.com/sippy/rtpproxy/wiki/RTPP-%28RTPproxy-protocol%29-technical-specification#createupdatelookup-session Change-Id: I4a49b0715022dca250ef0def75fb2e7983aaca1b Signed-off-by: Peter Lemenkov Reviewed-on: https://code.wireshark.org/review/8248 Reviewed-by: Pascal Quantin commit f80205e Author: Guy Harris Date: Thu Apr 30 11:13:50 2015 -0700 Make bit masks unsigned. To quote a run-time error reported in https://www.wireshark.org/lists/wireshark-dev/201504/msg00084.html "left shift of 1 by 31 places cannot be represented in type 'int'", so use type "unsigned int" instead, by shifting 1U rather than 1 left. Change-Id: I95cf5ce53aa3b94ccb9f246d31863715bb682409 Reviewed-on: https://code.wireshark.org/review/8252 Reviewed-by: Guy Harris commit e003123 Author: Graham Bloice Date: Thu Apr 30 15:00:29 2015 +0100 CMake for Windows improvements Allow the wireshark libs directory to be defined by WIRESHARK_LIB_DIR. Ensure either WIRESHARK_LIB_DIR or WIRESHARK_BASE_DIR is defined. Ensure the compiler is a supported version (VS2010, 12 or 13). Change-Id: I0abd371c5773c08ca255abe308d1a59e2e290a02 Reviewed-on: https://code.wireshark.org/review/8247 Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice commit 6af14c2 Author: Pavel Strnad Date: Thu Apr 30 13:53:59 2015 +0200 Add reordercap to the wireshark-common package Change-Id: I63b1a34458912f5cffe2770522e9d2c3737dbc08 Reviewed-on: https://code.wireshark.org/review/8246 Reviewed-by: Balint Reczey Tested-by: Balint Reczey commit 45a5a1a Author: AndersBroman Date: Thu Apr 30 14:18:01 2015 +0200 [nettrace_3gpp_32_423] Fix nettrace_3gpp_32_423.c:292: warning: declaration of 'random' shadows a global declaration. Change-Id: I2dde89a3f0e5abb3b8acc3c7d09e1a0d53a6c0f7 Reviewed-on: https://code.wireshark.org/review/8245 Reviewed-by: Anders Broman commit 2d8b4a2 Author: AndersBroman Date: Wed Apr 29 09:19:08 2015 +0200 Add the abillity to read 3GPP trace records with format accoding to TS 32 423(XML) Change-Id: I37895ec35797089a32c7d1695e735046d6aa979e Reviewed-on: https://code.wireshark.org/review/8237 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 58c890d Author: Joerg Mayer Date: Thu Apr 30 10:27:46 2015 +0200 Fix a small typo Change-Id: I1c5464a0344d46d01eee140723d179a7adacd0f6 Reviewed-on: https://code.wireshark.org/review/8243 Reviewed-by: Jörg Mayer commit 0d37980 Author: Graham Bloice Date: Wed Apr 29 21:57:32 2015 +0100 CMake Windows fixes Set the minimum version for Windows to 3.1.3 Set the policy for CMP0054 to squelch a few warnings. Change-Id: I7647a0e5dce83db2cd87d7b8048c808e10863c7e Reviewed-on: https://code.wireshark.org/review/8241 Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice commit cce79f9 Author: Graham Bloice Date: Wed Apr 29 20:15:16 2015 +0100 Update CMake docs for Windows Change-Id: Ib08935d09d5e1b4db76bd56effd17097faca4468 Reviewed-on: https://code.wireshark.org/review/8239 Reviewed-by: Graham Bloice commit 56c56d2 Author: Jeff Morriss Date: Wed Apr 29 09:12:13 2015 -0400 Finish removing VerizonWireless.xml and ChinaTelecom.xml Change-Id: I7e64ed4a588ecc7ef72288e0fd3bf91f8b31e5e7 Reviewed-on: https://code.wireshark.org/review/8238 Reviewed-by: Jeff Morriss commit afe07a9 Author: Micha Reiser Date: Tue Apr 28 14:06:06 2015 +0200 - Mark some DCE/RPC functions as public do allow calls from plugins - DCOM: * Mark some DCOM functions as public do allow calls from plugins * Add Support for Additional Variant Types Money, I8, UI8 * Fix an uint32 overflow when dissecting nwstringz0 where the length is 0 * Use WS_DLL_PUBLIC instead of WS_DLL_PUBLIC_DEF Change-Id: I02861a09203c6b42326f5a7b7e652e0f7c26d369 Reviewed-on: https://code.wireshark.org/review/8222 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 4120530 Author: Pascal Quantin Date: Wed Apr 29 12:18:11 2015 +0200 GSM CBS: fix a typo While we are at it, let's use pinfo memory pool instead of making a copy of the string to be freed afterwards Change-Id: Ic92b3a09b053e8394f194b595272c7b228bd6b2b Reviewed-on: https://code.wireshark.org/review/8236 Petri-Dish: Pascal Quantin Reviewed-by: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 7f6fe7a Author: Jeff Morriss Date: Tue Apr 28 20:29:28 2015 -0400 Reorganize some of the Diameter XML files, taking advantage of the fact that AVPs can be grouped by Vendor now (not just by Application). Move a bunch of vendor-specific Application IDs to the vendor's XML file. Delete the (basically empty) SKT.xml, ChinaTelecom.xml, and VerizonWireless.xml files. Fix a typo: 16777224 is 3GPP Gx, not 3GPP Cx. Use (derived) type Enumerated (rather than Unsigned32 or Integer32) when the AVP is of type Enumerated. Change-Id: I7a9702c0c48dc3fe751ad74413d8ecc040984f1f Reviewed-on: https://code.wireshark.org/review/8235 Petri-Dish: Jeff Morriss Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit fbec73d Author: Alexis La Goutte Date: Tue Apr 28 22:11:48 2015 +0200 cli_service_response_time_table.h: fix api reference The following parameters of draw_srt_table_data(srt_stat_table *rst, gboolean draw_header, gboolean draw_footer) are not documented: parameter 'draw_header', 'draw_footer' Change-Id: Idda62f1195f08eb2272c731db663c1eca886906d Reviewed-on: https://code.wireshark.org/review/8231 Reviewed-by: Anders Broman commit bac77ff Author: Alexis La Goutte Date: Tue Apr 28 22:03:08 2015 +0200 proto.h: fix api reference argument 'expression' of command @param is not found in the argument list of __DISSECTOR_ASSERT_STRINGIFY(s) The following parameters of __DISSECTOR_ASSERT_STRINGIFY(s) are not documented: parameter 's' The following parameters of __DISSECTOR_ASSERT_CMPINT(a, op, b, type, fmt) are not documented: parameter 'type', fmt The following parameters of proto_tree_add_bitmask_list(proto_tree *tree, tvbuff_t *tvb, const guint offset, const int len, const int **fields, const guint encoding) are not documented: parameter 'len' Change-Id: I6adc34e66f45cdba63c34e87db762b39a281d127 Reviewed-on: https://code.wireshark.org/review/8230 Reviewed-by: Anders Broman commit de563fa Author: Alexis La Goutte Date: Tue Apr 28 21:52:39 2015 +0200 to_str.h: fix api reference The following parameters of tvb_address_var_to_str(wmem_allocator_t *scope, tvbuff_t *tvb, address_type type, const gint offset, int length) are not documented: parameter 'length' Change-Id: I0b93a2b47601bbb5ef424b6d0c2651952241ce32 Reviewed-on: https://code.wireshark.org/review/8229 Reviewed-by: Anders Broman commit bcdc0c6 Author: Alexis La Goutte Date: Tue Apr 28 21:38:15 2015 +0200 follow.h: fix api reference warning The following parameters of follow_index(stream_type stream, guint32 addr) are not documented: parameter 'stream' Change-Id: I983a82e297d2e794c225ce1c3986f9752cad81e6 Reviewed-on: https://code.wireshark.org/review/8228 Reviewed-by: Anders Broman commit 5545152 Author: Alexis La Goutte Date: Tue Apr 28 21:35:45 2015 +0200 Address.h : fix api reference warning The following parameters of WMEM_COPY_ADDRESS(scope, to, from) are not documented: parameter 'scope' Change-Id: Ice1bddb55839f7aa839bdf6dec74211cf7e4d9dc Reviewed-on: https://code.wireshark.org/review/8227 Reviewed-by: Anders Broman commit c93e437 Author: Alexis La Goutte Date: Tue Apr 28 07:49:40 2015 +0200 CAPWAP: fix wrong offset length for header length hf Change-Id: I336509ab2ddb6c3c9890fdcbd838f0235738b3cf Reviewed-on: https://code.wireshark.org/review/8225 Reviewed-by: Anders Broman commit b5e19fc Author: Jeff Morriss Date: Tue Apr 28 20:49:32 2015 -0400 Fix typo: we already checked for rcc and rcc-qt5, now it's time to check for rcc-qt4 (not rcc again). Fix up indentation: consistently use tabs. Change-Id: I8e6d5a601f2a28fef5eb705d8bfac0e02a0e02f3 Reviewed-on: https://code.wireshark.org/review/8233 Reviewed-by: Jeff Morriss commit 9e91ca2 Author: Jeff Morriss Date: Tue Apr 28 20:43:46 2015 -0400 When configuring with Wireshark disabled, don't complain if uic, moc, and rcc aren't found. This would work before but only if you explicitly disabled Qt. Bug: 11157 Change-Id: I1e4c2c18277e28c38b1ed2ffcaf45e49926e7a1f Reviewed-on: https://code.wireshark.org/review/8232 Reviewed-by: Jeff Morriss commit e15513b Author: Graham Bloice Date: Sun Apr 26 19:11:44 2015 +0100 Fix Windows asciidoc build Replace some unixisms with CMake equivalents Change-Id: I8dc125e830cdf7c31b13539c0a86df736097afef Reviewed-on: https://code.wireshark.org/review/8208 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs Reviewed-by: Graham Bloice commit aeab984 Author: Michael Mann Date: Mon Apr 27 22:24:19 2015 -0400 Bugfix string compare length Change-Id: Iddaad1ae5b80d5d10b482790c5c7a017fc94328b Reviewed-on: https://code.wireshark.org/review/8220 Reviewed-by: Michael Mann commit addf8f6 Author: Josef Baumgartner Date: Wed Apr 22 09:21:46 2015 +0200 epl: Add support for AMNI frame The "EPSG Draft Standard 302-A: High Availability" introduces the new frame "AMNI". This change adds support to correctly dissect POWERLINK AMNI frames. Change-Id: I9e402423296c4e82a25e897de964629bb695d566 Reviewed-on: https://code.wireshark.org/review/8215 Reviewed-by: Roland Knall Petri-Dish: Pascal Quantin Reviewed-by: Pascal Quantin commit 360d49d Author: AndersBroman Date: Tue Apr 28 11:00:43 2015 +0200 [GTPv2] Mark a parameter as unused. Change-Id: Ia007c4956d3ec422dca7f320a83ef7f84173d47b Reviewed-on: https://code.wireshark.org/review/8219 Reviewed-by: Anders Broman commit aaa6d2a Author: Cathy Yang Y Date: Tue Apr 28 10:35:57 2015 +0200 [GTPv2] Add dissection of IE User CSG Information (UCI) Change-Id: Ie06122ceb59db66c5ecd05b2fa4a9b9acc16f5dd Reviewed-on: https://code.wireshark.org/review/8217 Reviewed-by: Anders Broman commit 35f966c Author: AndersBroman Date: Tue Apr 28 10:02:12 2015 +0200 [Diameter] Update Rx interface AVPs Change-Id: I8f046fc75093501104b916da88a928c8a934a8ce Reviewed-on: https://code.wireshark.org/review/8216 Reviewed-by: Anders Broman commit 0b368ea Author: Michael Mann Date: Sun Apr 26 12:26:05 2015 -0400 Add service_response_time_table for TShark srt stats. This is a "refactoring part 1" of the srt stats. This first step is using the service_response_time_table for all (possible) TShark srt stats. Next step will be combining the GTK and TShark service_response_time_table, so there is more code reuse and the "shared structure names" between GTK and TShark service_response_time_table won't seem as bad. Maybe it can even go one step farther and handle a dynamic number of columns so this refactoring can apply to all srt stats. Change-Id: Ief28e7e55f7dbbf4f2d9bb6f1a1592b87b866137 Reviewed-on: https://code.wireshark.org/review/8210 Reviewed-by: Michael Mann Reviewed-by: Anders Broman commit 8c996a2 Author: Michael Mann Date: Mon Apr 27 08:53:00 2015 -0400 Add tshark -z "smb2,srt" Change-Id: I66247132f00c83f35cf78cb63ea00a5ce923fddb Reviewed-on: https://code.wireshark.org/review/8211 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 0b97f0d Author: Michael Mann Date: Sat Apr 25 20:28:18 2015 -0400 Add tshark -z "ldap,srt" Bug: 9363 Change-Id: Ic64716ef0156607ca40773cef8e76fc4a0825b3c Reviewed-on: https://code.wireshark.org/review/8196 Reviewed-by: Michael Mann commit c1a7f05 Author: Ray Gomez Date: Tue Apr 28 01:54:29 2015 +0800 Implement additional flags for IDR-Flags,DSR-Flags, ULR-Flags and NOR-Flags. Change-Id: I47cfabf07e4ccadb043085d2ab47e56c13fc378b Reviewed-on: https://code.wireshark.org/review/8214 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 3059f4f Author: Martin Mathieson Date: Mon Apr 27 16:47:25 2015 +0100 S1AP: Add missing protocol IE declaration for E-UTRAN-Trace-ID Change-Id: I03caf29a5a1889884837fccf366cb35d0ccd6281 Reviewed-on: https://code.wireshark.org/review/8213 Reviewed-by: Martin Mathieson Reviewed-by: Anders Broman commit e3785f7 Author: Christoph Schlosser Date: Fri Apr 17 11:25:26 2015 +0200 win-setup.ps1 Make setup script aware of proxies This will allow the powershell setup script to utilize the system proxy configuration, allowing for a download behind a company firewall Change-Id: Id0bfaf4ded219374be6e60a08d620a519f5e4820 Reviewed-on: https://code.wireshark.org/review/8182 Reviewed-by: Roland Knall Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Christoph Schlosser Reviewed-by: Gerald Combs commit f9e7fd5 Author: Graham Bloice Date: Sun Apr 26 14:38:32 2015 +0100 Fix x64 compilation warning The build warning: C:/buildbot/wireshark/wireshark-master-64/win7x64/build/cmbuild/epan/uat_load.c(1348): warning C4267: '+=' : conversion from 'size_t' to 'guint', possible loss of data is caused by parse_str_pos being a guint and adding a size_t value. Fix by declaring parse_str_pos as size_t. Change-Id: I0e33ea710abeb0ea23d816f35bc3eda8d9b13e60 Reviewed-on: https://code.wireshark.org/review/8198 Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice commit af11fde Author: AndersBroman Date: Mon Apr 27 13:24:49 2015 +0200 [RANAP] Heuristics does not work with lenght detremant of 2 bytes. Change-Id: Ib26b9d66e690770a27d63f75f4c9a935fc93b2b0 Reviewed-on: https://code.wireshark.org/review/8209 Reviewed-by: Anders Broman commit 5b1d62c Author: Roland Knall Date: Thu Apr 16 10:20:05 2015 +0200 ext_menubar: Add pointer to GUI main structure Add a pointer to the callback, which will provide an enum value, for each calling GUI entity, as well as a pointer to the main structure for that entity. For Qt this can be used for instance, to connect to slots of the main instance, to update a calling dialog. Change-Id: Ifa6b04f868512574de53b6bce507e343f6e219d4 Reviewed-on: https://code.wireshark.org/review/8085 Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall Reviewed-by: Anders Broman commit c3c8316 Author: Alexis La Goutte Date: Sun Apr 26 19:17:34 2015 +0200 SSL/TLS: Add support of TLS Fallback Signaling Cipher Suite Value (SCSV) for Preventing Protocol Downgrade Attacks (RFC 7507) Update comment about TLS_FALLBACK_SCSV Add new alert Inappropriate Fallback (86) Change-Id: I17385b0a9ad71f3623ff4fdb4a9c588e46ba8d58 Reviewed-on: https://code.wireshark.org/review/8203 Reviewed-by: Anders Broman commit de1b3c6 Author: Matthieu Texier Date: Wed Apr 1 00:22:38 2015 +0200 ISIS: Add TLV 149 support (SID/Label Binding) Also fixing indentation problem Bug: 10304 Change-Id: I560db0e8cce9fdf796a47e387f2d681abe54a653 Reviewed-on: https://code.wireshark.org/review/8192 Reviewed-by: Alexis La Goutte Tested-by: Alexis La Goutte Reviewed-by: Anders Broman commit 01c2a06 Author: Alexis La Goutte Date: Sun Apr 26 16:57:30 2015 +0200 CAPWAP: Add CAPWAP MAC Profile (RFC7494) Add 2 Message Element * IEEE 802.11 Supported MAC Profiles (1060) * IEEE 802.11 MAC Profile (1061) Change-Id: I53686a0ecc6b59c5049c44068f339c5265c13f58 Reviewed-on: https://code.wireshark.org/review/8200 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 1e2867c Author: Jesse Gross Date: Wed Apr 15 19:07:12 2015 -0700 Clean up STT plugin This adds some essential features for STT dissection including using a heuristic IP dissector to ensure we get the right traffic, segment reassembly, and additional field decoding. Based on work original done by Andrew Evans. Change-Id: Ic89d6b16803185c7f58b73935c2646d532d0ae14 Reviewed-on: https://code.wireshark.org/review/8187 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit a2fb4d1 Author: Alexis La Goutte Date: Sun Apr 26 20:03:30 2015 +0200 Bluetooth: OBEX: Missing break in switch (CID 1295685) Change-Id: Ib6f910642deeb6829fa1bb3d4f8a932947870bd2 Reviewed-on: https://code.wireshark.org/review/8206 Reviewed-by: Anders Broman commit 25fd18a Author: Guy Harris Date: Sun Apr 26 11:25:47 2015 -0700 Include "config.h" first, even before , as is done in other files. Also move system and GLib includes before Wireshark includes. Change-Id: I6636c9fdafb69b6dcf297d4c2632f5e8448e1d93 Reviewed-on: https://code.wireshark.org/review/8207 Petri-Dish: Guy Harris Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris commit 3813ae6 Author: Graham Bloice Date: Sun Apr 26 19:00:26 2015 +0100 Fix asciidoc warnings Removed some errant asciidoc processing instructions Change-Id: I6b76a4b75d016852a5a9ff3896c9e076fe46002c Reviewed-on: https://code.wireshark.org/review/8205 Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice commit 9b5a09a Author: Gerald Combs Date: Sun Apr 26 08:07:42 2015 -0700 [Automatic update for 2015-04-26] Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I431063783434a6f7a9a4f4b8186316ed3f98005b Reviewed-on: https://code.wireshark.org/review/8199 Reviewed-by: Gerald Combs commit 0437280 Author: Alexis La Goutte Date: Sat Apr 25 14:41:05 2015 +0200 C15ch: fix o previous prototype for function [-Wmissing-prototypes] Change-Id: Iaa3c12ca435bf628343216d2d951f50cc0ff2231 Reviewed-on: https://code.wireshark.org/review/8194 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit d5e932f Author: Alexis La Goutte Date: Sat Apr 25 14:39:00 2015 +0200 C15CH: fix unused (const) variable found by Clang packet-c15ch.c:1523:22: warning: unused variable 'MIN_PM_VAL' [-Wunused-const-variable] packet-c15ch.c:1611:22: warning: unused variable 'MIN_DIG_CKT_TEST_TRKPM_VAL' [-Wunused-const-variable] packet-c15ch.c:3006:21: warning: unused variable 'FIRST_TASK_TYPE_INDEX' [-Wunused-const-variable] Change-Id: I09ba83acc4515fe9818cd43f9ac2ec7fe7196bae Reviewed-on: https://code.wireshark.org/review/8193 Reviewed-by: Anders Broman commit e3ee681 Author: Evan Huus Date: Sat Apr 25 17:30:36 2015 -0400 c15ch: check packet sanity before allocating The 'num_digits' parameter to add_digits_string_info_col can come straight from the packet. Verify it is sane (e.g. the number of bytes required are actually present) as otherwise we can try and allocate enourmous quantities of memory for no reason. Also clean up the routine; fix indenting, and simplify the loop variables. Bug: 11148 Change-Id: I11052652f8d42fa2bb31f37e3c74523842bb3096 Reviewed-on: https://code.wireshark.org/review/8195 Reviewed-by: Evan Huus Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit fa16e70 Author: Jesse Gross Date: Fri Apr 24 18:49:31 2015 -0700 Fix filtering on IP heuristic subdissectors. The IP dissector passes 'tree' to its heuristic dissectors instead of the 'parent_tree' passed to the normally registered dissectors. These two are generally the same except that 'tree' is set to NULL in cases where IP is not referenced - a local optimization that should not be passed down to the lower layers. The result is that the filter: ip && PROTO matches but: PROTO does not match. This changes the two types of dissectors to behave the same by getting 'parent_tree'. Change-Id: I78690d4767d2e3a763fd4388792c49aa5df0a962 Reviewed-on: https://code.wireshark.org/review/8190 Reviewed-by: Guy Harris commit ad36856 Author: jorge power Date: Fri Apr 24 11:22:16 2015 -0400 add register_dissector call for name batadv Change-Id: Idf92449e510a347ad44225f79e36a274123cd0da Reviewed-on: https://code.wireshark.org/review/8186 Reviewed-by: Anders Broman commit 9c64fdb Author: Peter Lemenkov Date: Wed Apr 15 16:54:51 2015 +0300 Update list of errors Update list of errors according to the formal protocol description: https://github.com/sippy/rtpproxy/wiki/RTPP-%28RTPproxy-protocol%29-technical-specification#negative-reply Change-Id: I879521ee2bd69969491fb6e6493b7d1c6adc0c3d Signed-off-by: Peter Lemenkov Reviewed-on: https://code.wireshark.org/review/8185 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit edce10b Author: Peter Lemenkov Date: Wed Apr 15 16:19:10 2015 +0300 Update version strings Change-Id: I0e83e42ee6080aab2a9a9d4dc0d195f0849137ee Signed-off-by: Peter Lemenkov Reviewed-on: https://code.wireshark.org/review/8184 Reviewed-by: Alexis La Goutte commit 91a3a07 Author: Peter Lemenkov Date: Wed Apr 15 16:11:17 2015 +0300 Use alloc0 to simplify further initialisation Change-Id: Ib333c2827a13927acd3cfcf28c200909d9d38685 Signed-off-by: Peter Lemenkov Reviewed-on: https://code.wireshark.org/review/8183 Reviewed-by: Alexis La Goutte commit 49fbb78 Author: Guy Harris Date: Thu Apr 23 11:56:27 2015 -0700 Use BASE_EXT_STRING for *all* value_string_exts. Change-Id: Id78735d3b6205a143dd6af0926483f04429a4cd4 Reviewed-on: https://code.wireshark.org/review/8180 Reviewed-by: Guy Harris commit 741cfe7 Author: Jeff Morriss Date: Thu Apr 23 10:35:08 2015 -0400 Move some checks so they're executed after the comments are removed. We shouldn't complain if someone says "don't use __func__, it's not portable" in a comment. Change-Id: Ib712a00a68c14048eb5d97413a5d5bc0e0812e24 Reviewed-on: https://code.wireshark.org/review/8179 Petri-Dish: Jeff Morriss Tested-by: Petri Dish Buildbot Reviewed-by: Jeff Morriss commit cc6c6db Author: Alexis La Goutte Date: Thu Apr 23 14:35:40 2015 +0200 C15ch: try to make buildbot Happy packet-c15ch.c:5798: warning: comparison of unsigned expression >= 0 is always true packet-c15ch.c:5809: warning: comparison of unsigned expression < 0 is always false packet-c15ch.c:5841: warning: comparison of unsigned expression < 0 is always false packet-c15ch.c:5859: warning: comparison of unsigned expression < 0 is always false packet-c15ch.c:5917: warning: comparison is always false due to limited range of data type Change-Id: Ia12f83c070bc1b794581cd37e330c38b0bad0516 Reviewed-on: https://code.wireshark.org/review/8174 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 6290887 Author: Jeff Morriss Date: Thu Apr 23 09:10:38 2015 -0400 Use VALS_EXT_PTR to satisfy checkAPIs. Change-Id: Ic7a7cfb97be5c3fbca5944328d04d505b54242ad Reviewed-on: https://code.wireshark.org/review/8176 Reviewed-by: Jeff Morriss commit 2318bd9 Author: Pascal Quantin Date: Thu Apr 23 14:58:21 2015 +0200 LPP: fix a typo in the protocol abbreviation Bug: 11141 Change-Id: I2bd00a84dd59bbcfc67bf6b8286cb49fd9ff01f9 Reviewed-on: https://code.wireshark.org/review/8175 Reviewed-by: Pascal Quantin commit 7d6a1e7 Author: Graham Bloice Date: Thu Apr 23 12:15:02 2015 +0100 CMake fix windows setup Standardise the args to win-setup.ps1 Change-Id: Ibd9d7bb338edb1cef444abc37a7b103eec38fb09 Reviewed-on: https://code.wireshark.org/review/8173 Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice commit 2665578 Author: Michael Mann Date: Wed Apr 8 21:27:10 2015 -0400 Add C15 Call History Protocol dissection (C15ch) dissector Bug: 11063 Change-Id: I3daa9e6a75e52df1587678bd78f42e4e46fe4509 Reviewed-on: https://code.wireshark.org/review/7557 Reviewed-by: Alexis La Goutte Tested-by: Alexis La Goutte Reviewed-by: Michael Mann commit 0e572cb Author: Michal Labedzki Date: Thu Apr 23 08:58:21 2015 +0200 androiddump: Fix warning about unneeded value Value from strtol is not needed in this case, but compiler complains about it, so check if value range is valid and other possible error that can be detected. Change-Id: I6a8eeb6d2cb62c155772201000eca4c16bc8a555 Reviewed-on: https://code.wireshark.org/review/8172 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki commit 4ea4ddb Author: Thomas Wiens Date: Wed Apr 22 23:11:38 2015 +0200 Added syntax id 0x82 for NCK data access Change-Id: Iaff4551f87fa8d74a09a99c3c772c8abbdf60198 Reviewed-on: https://code.wireshark.org/review/8168 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 3a42b55 Author: Jeff Morriss Date: Tue Apr 21 14:12:59 2015 -0400 idl2wrs: don't use -1 for the protocol-item length. It doesn't work any more for empty (length==0) PDUs. Similar to bug 10646/Ifb96768969a43c59367b73e7bb940ceeb02cf6b0 (for RPC). Untested as I'm not set up to build IDL dissectors now. Bug: 11134 Change-Id: I77aacc2590acbacbe02edb1768e754f92f87bc23 Reviewed-on: https://code.wireshark.org/review/8163 Reviewed-by: Michael Mann Reviewed-by: Evan Huus commit 7ccab8a Author: Thomas Wiens Date: Wed Apr 22 23:35:47 2015 +0200 Added decoding of BSEND/BRECV communication Change-Id: Ie02f809e69cf9e7980d90ab02a2d4f34a465e0cd Reviewed-on: https://code.wireshark.org/review/8170 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit c958e84 Author: Thomas Wiens Date: Wed Apr 22 23:26:34 2015 +0200 Added display and filteroptions for byte- and bitaddress Change-Id: I48f39c148006e25fa98b75656cbb11496bce9d25 Reviewed-on: https://code.wireshark.org/review/8169 Reviewed-by: Michael Mann commit 54bed8b Author: Thomas Wiens Date: Wed Apr 22 22:57:44 2015 +0200 Added transport size double-integer Change-Id: I3b5452ef8cfd4fac414b2c5bdd7926ea679b8029 Reviewed-on: https://code.wireshark.org/review/8167 Reviewed-by: Michael Mann commit 8d6324f Author: Michael Mann Date: Wed Apr 22 07:57:37 2015 -0400 Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 2 of a few Change-Id: Ic1f1aafe2ed02dce95b15c03a91cbd68807a5cf4 Reviewed-on: https://code.wireshark.org/review/8165 Petri-Dish: Alexis La Goutte Reviewed-by: Michael Mann commit 825aa50 Author: Tobias Brunner Date: Wed Apr 22 16:49:16 2015 +0200 Fix length calculation of IKEv2 REDIRECT notify with nonce data Change-Id: Ia20569e89c3ae1d9ccdec73cc25c622e64117536 Reviewed-on: https://code.wireshark.org/review/8166 Reviewed-by: Anders Broman commit 5e6acdd Author: Michal Labedzki Date: Mon Apr 20 08:26:42 2015 +0200 Add androiddump to debian package Also add extcap manpage. Change-Id: I3de0d7957de6a22da69953ca29ad676d42a163fa Reviewed-on: https://code.wireshark.org/review/8130 Reviewed-by: Balint Reczey commit 97499c1 Author: Jeff Morriss Date: Tue Apr 21 10:17:27 2015 -0400 Add VALS_EXT_PTR to decorate pointers to value_string_ext's in hfinfo. This allows checkAPIs to continue checking the 'convert' field for correctness when dissectors use value_string_ext_new() to build their value_string_ext's (without resorting to tricks like getting the address of the dereferenced pointer). This will be used to resolve the checkAPIs failure in patch set 3 of Ia5c96b1f6f1fe3a9521b3d70142889e3881fae5e . Change-Id: I700d86b9076f077706d34000f5a6aa5c96351f69 Reviewed-on: https://code.wireshark.org/review/8162 Petri-Dish: Jeff Morriss Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 4461f72 Author: Jeff Morriss Date: Mon Apr 20 18:14:35 2015 -0400 Add special handling of the (derived) AppId AVP type so that we can maintain one (and only one) Application ID list. This means we don't have to list all the Application IDs several times in the XML file. Collapse those lists into one (much more complete, now) list while also fixing URIs for several of the specifications (and making it clear for others that we don't have access to the specification--by declaring their URI to be "none"). Add a bunch more entries to the list of application IDs. Change-Id: Ia5c96b1f6f1fe3a9521b3d70142889e3881fae5e Reviewed-on: https://code.wireshark.org/review/8147 Petri-Dish: Jeff Morriss Reviewed-by: Anders Broman commit ecc3369 Author: Jeff Morriss Date: Tue Apr 21 21:20:59 2015 -0400 Misc. Diameter XML cleanups. Consistently used (derived) type Enumerated (rather than Unsigned32 or Integer32) when the AVP is of type Enumerated. Use a uri of "none" when we don't have access to the specification. Update the URI of an Application or two. Clean up white space and formatting. Change-Id: Iad677db186469b7d8c4a23b7a7fca6c357dbc012 Reviewed-on: https://code.wireshark.org/review/8164 Reviewed-by: Jeff Morriss commit 448e122 Author: michal.orynicz Date: Tue Apr 21 11:08:19 2015 +0200 [Androiddump] Fix CMake install path for androiddump Changed path from "share" to one based on plugns path For example /usr/local/lib/wireshark/extcap Change-Id: I8f4a9f274b1cec897ed45de9e05679ac3f230301 Reviewed-on: https://code.wireshark.org/review/8161 Reviewed-by: Michal Labedzki Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Balint Reczey Tested-by: Balint Reczey commit 847e517 Author: Jeff Morriss Date: Mon Apr 20 13:17:01 2015 -0400 Allow the definition of AVPs within vendor IDs. This allows for a more natural organization of AVP definitions: they can now be grouped by application (including the base application) or vendor ID. This means we can stop using the "workaround" (for those vendors who define AVPs but don't have their own application ID) of finding some random application ID to put in a vendor-specific xml file just to satisfy the parser. Rework a couple of Vendor-specific xml files as an example. Note: this does mean that vendor IDs can no longer be defined inside of the base or other application. If that's a problem the parser could be made (through some duplication of code) to understand the old format too. Change-Id: I5119f0dc7f8e3bbf59e2207046a8bb0f42ab0ca1 Reviewed-on: https://code.wireshark.org/review/8141 Petri-Dish: Jeff Morriss Tested-by: Petri Dish Buildbot Reviewed-by: Jeff Morriss commit 8b72091 Author: Guy Harris Date: Mon Apr 20 18:27:41 2015 -0700 Calculate *Peek tagged timestamps in fixed-point. Add a variant of filetime_to_nstime() that takes a value that's like a FILETIME but in units of nanoseconds rather than tenths of a microsecond, and use that. (It looks as if they might just get FILETIME values from the OS and multiply them by 100, as the nanosecond-FILETIME values appear to be multiples of 100 in the captures I've seen, but they might have chosen nanosecond resolution in case they need to support a higher-resolution time stamp source, so we don't assume that the values will always be a multiple of 100.) Change-Id: If6a1cb2cb673688b042eb113b79cfd267f5454a5 Reviewed-on: https://code.wireshark.org/review/8150 Reviewed-by: Guy Harris commit c35f2cc Author: Evan Huus Date: Sun Apr 19 20:19:54 2015 -0400 reassembly: address a 15-year old XXX comment Question: "what if we didn't capture the entire fragment due to a too-short snapshot length?" Answer: An assertion fails and we leak a bunch of memory. Don't do that. Bug: 11129 Change-Id: I0adfb217f0e66ae8f5f6255a4caf7ff940826b59 Reviewed-on: https://code.wireshark.org/review/8128 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit 63e294b Author: Guy Harris Date: Mon Apr 20 14:37:32 2015 -0700 Don't use FT_STRINGZ for something that's not a string. Change-Id: Idd2f0ab5237ab2596557214fe9853e7b2259a34d Reviewed-on: https://code.wireshark.org/review/8146 Reviewed-by: Guy Harris commit 57d332d Author: Guy Harris Date: Mon Apr 20 13:53:21 2015 -0700 Get rid of trailing white space. Change-Id: I83ba78a9f153f4a193550c5069182b9203b28edb Reviewed-on: https://code.wireshark.org/review/8144 Reviewed-by: Guy Harris commit 94dc9cd Author: Guy Harris Date: Mon Apr 20 13:41:07 2015 -0700 Have a common routine to convert FILETIME to nstime_t. We had several copies of that code; put it into a filetime_to_nstime() routine in wsutil, and call that common routine instead. Change-Id: I1eb5579c36c129ff8d23f9212285ab3f63be0f43 Reviewed-on: https://code.wireshark.org/review/8142 Reviewed-by: Guy Harris commit 4e9ff47 Author: Graham Bloice Date: Mon Apr 20 16:36:06 2015 +0100 CMake minor updates Fix up generation messages for Windows build Remove some superfluous Lua messages Change-Id: I405e7edfcb043fc842fe4f0cca8d23d5755527f9 Reviewed-on: https://code.wireshark.org/review/8138 Reviewed-by: Graham Bloice commit 262625b Author: Alexis La Goutte Date: Mon Apr 20 13:34:22 2015 +0200 OpenSafety: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: Iccd80450835946abbe68d66fb4ccbc1c799e6065 Reviewed-on: https://code.wireshark.org/review/8137 Reviewed-by: Roland Knall Reviewed-by: Anders Broman commit 263564f Author: Evan Huus Date: Sun Apr 19 15:32:42 2015 -0400 sv: remove #if0'd code we can always get it back from git if we want Change-Id: I61911628541cf4ed4be20e736e41fbaa58978d75 Reviewed-on: https://code.wireshark.org/review/8124 Reviewed-by: Evan Huus Reviewed-by: Alexis La Goutte commit 1c6c397 Author: anilkumar911 Date: Tue Apr 14 11:43:54 2015 +0530 Make offset unsigned int. Change-Id: Ieb7f8a7735b8dd73f180a385294c3b8ca7ceaefb Reviewed-on: https://code.wireshark.org/review/8060 Reviewed-by: Anders Broman commit 3695abd Author: Guy Harris Date: Mon Apr 20 00:48:02 2015 -0700 Make various structure members the right size for time-in-seconds. I.e., make them time_t's. Change-Id: I102e9f585ae2798927757fe7f0f7a5a3fa251ec2 Reviewed-on: https://code.wireshark.org/review/8134 Reviewed-by: Guy Harris commit 7fa7422 Author: Guy Harris Date: Mon Apr 20 00:20:12 2015 -0700 Visual Networks captures have only millisecond resolution. Change-Id: I59d7a6b5e29a068fd820075c913ac3c546593b9e Reviewed-on: https://code.wireshark.org/review/8133 Reviewed-by: Guy Harris commit ff4ca0a Author: Guy Harris Date: Mon Apr 20 00:13:55 2015 -0700 Simplify the calculation of the time stamp. The time is calculated based on a 32-bit "seconds since the Epoch" value for the start time and a 32-bit delta from that time, in milliseconds. We can just split that delta into seconds and milliseconds, add the seconds to the start time to get the seconds part of the time stamp, and multiply the milliseconds by 1,000,000 to get the nanoseconds part of the time stamp. The only 64-bit arithmetic needed is adding the seconds to a 64-bit version of the start time (just in case seconds+start time goes past Y2.038K). Change-Id: Id7c4c6255870627f81fc99dae919abaf47efc710 Reviewed-on: https://code.wireshark.org/review/8132 Reviewed-by: Guy Harris commit bba29dd Author: Guy Harris Date: Mon Apr 20 00:05:13 2015 -0700 The previous change doesn't work; do it right. The correct bit has to be set in the value passed in; create a proto_tree_add_boolean64() that takes a 64-bit argument and use that. Change-Id: I28eaab38308baa908bdc1b043b2f0b87a17afe0d Reviewed-on: https://code.wireshark.org/review/8131 Reviewed-by: Guy Harris commit 9abd4a2 Author: Jeff Morriss Date: Fri Apr 17 14:19:00 2015 -0400 Add Tekelec (now Oracle) AVPs. Untested; taken from the document 910-6828-001 Revision A (found on the web). Change-Id: Ibf312a0a15c5c64ec16e636814febb0e996fe5f2 Reviewed-on: https://code.wireshark.org/review/8110 Reviewed-by: Anders Broman commit b3caf89 Author: Evan Huus Date: Sun Apr 19 15:28:23 2015 -0400 wimax: replace deprecated tvb_length calls Change-Id: I9db1051e065762b826973ecbc2dba460a7f89013 Reviewed-on: https://code.wireshark.org/review/8123 Reviewed-by: Evan Huus Reviewed-by: Anders Broman commit 8844fbc Author: Evan Huus Date: Sun Apr 19 15:39:40 2015 -0400 replace some deprecated tvb_length calls Change-Id: I18152e75aec2eedccad4d393c1b4b493cd7b406d Reviewed-on: https://code.wireshark.org/review/8125 Reviewed-by: Evan Huus Petri-Dish: Evan Huus Reviewed-by: Anders Broman commit d47373f Author: Guy Harris Date: Sun Apr 19 18:51:39 2015 -0700 Make sure we handle Booleans even with the upper 32 bits set. Just pass 1 or 0 to proto_tree_add_boolean() depending on whether the 64-bit value is non-zero or zero. Change-Id: I5b55c9aff4e559fb8e62bd96ae2b0b34e45189fa Reviewed-on: https://code.wireshark.org/review/8129 Reviewed-by: Guy Harris commit 1edbd5a Author: Guy Harris Date: Sun Apr 19 14:26:54 2015 -0700 Don't use proto_tree_add_uint() to add FT_BOOLEAN values. In proto_item_add_bitmask_tree(), if use_value is true, base the routine we use to add the item to the tree on the type of the field being added. Also, use DISSECTOR_ASSERT_NOT_REACHED(), not g_assert_not_reached(), to catch types that aren't integral or Boolean. Change-Id: I6ff9867bddcae16ddf8b689b48fdc93c6f949105 Reviewed-on: https://code.wireshark.org/review/8127 Reviewed-by: Guy Harris commit 9194aab Author: Guy Harris Date: Sun Apr 19 14:06:02 2015 -0700 Use 64-bit fixed point to calculate time stamps. Change-Id: I77c470937366dbaf50adbf174569ef0676ae3658 Reviewed-on: https://code.wireshark.org/review/8126 Reviewed-by: Guy Harris commit 76a0edc Author: Julien STAUB Date: Sun Apr 12 18:15:39 2015 +0200 zbee: add support to ZigBee power configuration cluster Implemented full power configuration cluster according to 07-5123-04 ZigBee cluster library Change-Id: Ic9cb9894c2153ce53e2a2762967dbdc6a4a060c2 Reviewed-on: https://code.wireshark.org/review/8032 Petri-Dish: Pascal Quantin Reviewed-by: Julien STAUB Reviewed-by: Pascal Quantin commit 2bc5b3a Author: Peng Li Date: Sun Apr 19 17:15:11 2015 +0800 rtcp.psfb.fmt DissectorTable does not work in Lua plugin Change-Id: I4e26ee5e4d9c1556d62ce01720e40848047c23e0 Reviewed-on: https://code.wireshark.org/review/8119 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit daafb9d Author: Gerald Combs Date: Sun Apr 19 08:07:55 2015 -0700 [Automatic update for 2015-04-19] Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Id9886f878c4d7422b779f1361fd9f7fcfb315982 Reviewed-on: https://code.wireshark.org/review/8120 Reviewed-by: Gerald Combs commit 2392e8a Author: Martin Mathieson Date: Sun Apr 19 08:58:43 2015 +0100 Ixiatrailer: Requires at least 15 bytes so change test in heuristic. Change-Id: I00415fc77d2493eccdb3f0511f0a49d670e26d9d Reviewed-on: https://code.wireshark.org/review/8118 Reviewed-by: Alexis La Goutte commit b394aa5 Author: Alexis La Goutte Date: Sat Apr 18 16:04:19 2015 +0200 QCustomPlot: fix division(or modulo) by zero found by Clang and Coverity (CID 1159170 & 1159171) Change-Id: Iba9317436983bb4b3730be8b80e7b9c107ffc3a9 Reviewed-on: https://code.wireshark.org/review/8112 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit fbe39ce Author: Roland Knall Date: Fri Feb 20 15:16:30 2015 +0100 openSAFETY: Implementing a tap interface Implementing a tap interface as well as a packet structure which contains all necessary information from a single openSAFETY frame. This structure is located in a separate packet-opensafety.h so that plugins and other programs, which want to utilize the tap interface, may benefit from the same defines The 40bit calculation was implemented in a wrong fashion, so that it never calculated the correct UDID Change-Id: I62895f91d0a255a5489b9bf397a40d824a27383f Reviewed-on: https://code.wireshark.org/review/7275 Reviewed-by: Roland Knall Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 2ce0418 Author: Michal Labedzki Date: Fri Mar 20 15:37:59 2015 +0100 Bluetooth: OBEX: Dissect HeaderID HeaderID is bitfield in real. There is information about length-information in value part. Change-Id: Ib861f658c7b56e16df8a6514de69215138a1740d Reviewed-on: https://code.wireshark.org/review/8039 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki commit aeb9827 Author: Michael Mann Date: Thu Apr 16 22:40:34 2015 -0400 Convert proto_tree_add_boolean to proto_tree_add_bitmask_[value|value_with_flags|list] Part 1 of a few Change-Id: I413f23dfa92da5488ca8a7f62ca0738b25004635 Reviewed-on: https://code.wireshark.org/review/8117 Reviewed-by: Michael Mann commit 8f9aa33 Author: Michal Labedzki Date: Mon Aug 25 15:46:54 2014 +0200 Bluetooth: OBEX: Add DecodeAs for profile-based Application Parameters Application Parameters are defined in profile specification. If there is not enough infgormation to recognize profile user must have ability to do that manually. Also add expert info that packet is manually "Decoded As". Change-Id: I8a735d46d365d712995cd8cc00b2f46849c8afb4 Reviewed-on: https://code.wireshark.org/review/8044 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki commit 39968ac Author: Michal Labedzki Date: Tue Oct 21 11:57:11 2014 +0200 MIME: Allow to dissect big files Increase file size limit for mime files that can be loaded by Wireshark to AddressSpace/2. On 32bit machines the limit can be 2 GiB. Change-Id: I5b38b3ebe401077f4e1e873cff4b37da560d592f Reviewed-on: https://code.wireshark.org/review/4907 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki Tested-by: Michal Labedzki Reviewed-by: Peter Wu Reviewed-by: Alexis La Goutte commit e9926ff Author: Alexis La Goutte Date: Thu Apr 16 20:21:59 2015 +0200 ZigBee: commissioning dissection Miscellaneous corrections in ZigBee Green Power commissioning cluster dissection. Change-Id: I6aaf5f2c1ad5c70d1961709c0e94ab5c5af81ec7 Reviewed-on: https://code.wireshark.org/review/8094 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Reviewed-by: Anders Broman commit 735f08a Author: Alexis La Goutte Date: Sat Apr 18 15:56:58 2015 +0200 GIOP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I5cd8fe72e6288578d4fa316096dfa606bf3e7aea Reviewed-on: https://code.wireshark.org/review/8116 Petri-Dish: Alexis La Goutte Reviewed-by: Anders Broman commit 4b65a8d Author: Alexis La Goutte Date: Sat Apr 18 15:56:14 2015 +0200 GIAS: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I430e044d838b0d81bda15d3f8012b81f7247080e Reviewed-on: https://code.wireshark.org/review/8115 Reviewed-by: Anders Broman commit 0d368da Author: Alexis La Goutte Date: Sat Apr 18 15:55:42 2015 +0200 Bluetooth: OBEX: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I5c260b6af14786119a324c3fed98178ddad01c6d Reviewed-on: https://code.wireshark.org/review/8114 Reviewed-by: Anders Broman commit 1c86217 Author: Alexis La Goutte Date: Sat Apr 18 15:54:07 2015 +0200 Bluetooth: HFP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I1509a9ee9b136c15b5da8ff88fa6eadab3dd7f99 Reviewed-on: https://code.wireshark.org/review/8113 Reviewed-by: Anders Broman commit 3d25167 Author: Alexis La Goutte Date: Thu Apr 16 08:09:51 2015 +0200 802.11 fix unchecked return value (CID 1293628) following ge243b0041 check the last add_tagged_field for avoid a Coverity warning (Yes the code is already safe..) Ping-Bug: 11110 Change-Id: Iaceb8cf9c91de426bc5e5408b4271091cab57862 Reviewed-on: https://code.wireshark.org/review/8084 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit adf0d67 Author: Alexis La Goutte Date: Fri Apr 17 15:33:08 2015 +0200 proto(.h): fix '@return' command used in a comment that is attached to a function returning void [-Wdocumentation] Change-Id: Ice88ddf2d35293f23be2d5a61a6ae77ed540f886 Reviewed-on: https://code.wireshark.org/review/8107 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 3d7b728 Author: Gerald Combs Date: Thu Apr 16 11:38:04 2015 -0700 Make androiddump loadable on OS X. Make sure the target location for extcap executables and extcap_dir match on OS X. Set the extcap directory to Contents/MacOS/extcap. The Mac Developer Library documentation doesn't explicitly define "Resources", but examples include data files and not executables. It does state that executables shouldn't go into PlugIns. Make sure we rpathify androiddump. Change-Id: If36c762e2a1991c26e5c01a870deaf191bcf9f94 Reviewed-on: https://code.wireshark.org/review/8093 Reviewed-by: Gerald Combs commit f2070bd Author: Jeff Morriss Date: Fri Apr 17 13:45:43 2015 -0400 Consistently used (derived) type Enumerated (rather than Unsigned32 or Integer32) when the AVP is of type Enumerated. Just for correctness. Change-Id: Ia485d6e06ca16d6da82aa5d1b60025120e45242f Reviewed-on: https://code.wireshark.org/review/8109 Reviewed-by: Jeff Morriss commit e5e2465 Author: Jeff Morriss Date: Fri Apr 17 13:32:51 2015 -0400 Fix up some indentation/white space issues. Change-Id: I73a1a1dd567970f99df769d5976cc82a7e5b9a60 Reviewed-on: https://code.wireshark.org/review/8108 Reviewed-by: Jeff Morriss commit 3ac9921 Author: Gerald Combs Date: Thu Apr 16 19:41:51 2015 -0700 Retire git_version.xml. Remove check_git_version.sh and its associated targets. We haven't used git_version.xml since the AsciiDoc conversion. Change-Id: I480f0094c4355d71201f2dd285198581bbbfc415 Reviewed-on: https://code.wireshark.org/review/8104 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit e280df6 Author: Graham Bloice Date: Tue Apr 7 21:41:34 2015 +0100 Fix CMake warnings Newer versions of CMake generate warnings about the use of @variable@ references, replace @CPACK_PACKAGE_NAME@ with ${CPACK_PACKAGE_NAME} Set the policy for CMP0026 to be old to squelch warnings about the use of target LOCATION Change-Id: I424083260c51875dde80f98a23d6528c31ff0aec Reviewed-on: https://code.wireshark.org/review/7977 Petri-Dish: Graham Bloice Reviewed-by: Jörg Mayer Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice commit 1948d02 Author: Michal Labedzki Date: Thu Apr 16 08:04:58 2015 +0200 androiddump: Fix build on onther than Win platforms androiddump should be put in extcat directory. Change-Id: I360eef2d5a68178c73181949b0fe3346585f5190 Reviewed-on: https://code.wireshark.org/review/8083 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki commit bd58617 Author: Jeff Morriss Date: Thu Apr 16 10:47:31 2015 -0400 Add a few items to the Release Notes. - GIAS dissector - Netscaler 3.5 support - GUI menu API for plugins Change-Id: I88f52a73e1149de6fe0588c1316b27fac9af59ce Reviewed-on: https://code.wireshark.org/review/8090 Reviewed-by: Michael Mann Reviewed-by: Alexis La Goutte Reviewed-by: Anders Broman commit 76d355d Author: Gerald Combs Date: Thu Apr 16 09:39:51 2015 -0700 CMake: Set WIN32 for GUI executables. Pass WIN32 to add_executable where needed. Require CMake 2.8.11 on Windows. Change-Id: I6a119bbb0f16f9e21f2e7378bae7ed52b8abb2dc Reviewed-on: https://code.wireshark.org/review/8091 Reviewed-by: Gerald Combs Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice commit a8efae3 Author: Pascal Quantin Date: Fri Apr 17 10:32:26 2015 +0200 Do not package debug files when building PortableApps.com installer with (the soon to be dead) nmake Change-Id: Ifd6fc71cebe6db06923e2d764cb415bf5b2ed025 Reviewed-on: https://code.wireshark.org/review/8106 Reviewed-by: Pascal Quantin commit 9992063 Author: Guy Harris Date: Thu Apr 16 23:18:57 2015 -0700 Download the Qt dmg and just do a binary installation. That's a *lot* faster than building from source. That means we should suggest adding the Qt pkg-config directory to PKG_CONFIG_PATH; do so. Change-Id: I9a70ea73fbace1f736cad8a4da11b62df8e5818e Reviewed-on: https://code.wireshark.org/review/8105 Reviewed-by: Guy Harris commit a0254ff Author: Guy Harris Date: Thu Apr 16 18:58:14 2015 -0700 Mount the CMake dmg we downloaded, don't download it again. Amazingly, "hdiutil attach" can take a URL as an argument; it will attempt to download the file in question and mount it. We've already downloaded the file, so there's no point in downloading it again (especially not with a URL with "v2.8" coded in). Change-Id: I106fc0c32a378aeead66ed32bceb454d23efa297 Reviewed-on: https://code.wireshark.org/review/8103 Reviewed-by: Guy Harris commit 59060e1 Author: Guy Harris Date: Thu Apr 16 16:16:32 2015 -0700 Fix spelling error. Also clean up alignment. Change-Id: Ib1efb5f642489ea2ddfe2d129c083eda72551bad Reviewed-on: https://code.wireshark.org/review/8100 Reviewed-by: Guy Harris commit 8e03c6e Author: Alexis La Goutte Date: Thu Apr 16 21:01:15 2015 +0200 ZigBee: dissection of commissioning frame Fix miscelleanous errors in ZigBee Green Power Change-Id: Ie5d379228a755ea09821148dc508108c6293da81 Reviewed-on: https://code.wireshark.org/review/8095 Reviewed-by: Evan Huus commit 5829f5d Author: Evan Huus Date: Thu Apr 16 07:45:39 2015 -0400 giop: replace glib with wmem One structure and one hash table with very simple uses. Fixes a memory leak. Change-Id: I727b7d5b0b17c2fcfaaad57797d11090e392253b Ping-Bug: 11123 Reviewed-on: https://code.wireshark.org/review/8088 Reviewed-by: Michael Mann Reviewed-by: Evan Huus commit 8825b55 Author: Evan Huus Date: Thu Apr 16 07:36:46 2015 -0400 giop: fix uninitialized use of request id Move the req_id field to the "message-dependent data" section of the header struct, since in the spec I found it is not specified in the common GIOP header (even though it appears to be present in all message types). Regardless, this better reflects the fact that it is not initialized by the primary tvb_memcpy, only the independent fields are. Initialize it and use it rather than creating a local for no reason; fixes the possibility of using it uninitialized. Bug: 11123 Change-Id: I3bae1df5123fbb1f2b86f7c42cee392b5b045c4f Reviewed-on: https://code.wireshark.org/review/8087 Reviewed-by: Evan Huus commit 32bbe0a Author: Alexis La Goutte Date: Thu Apr 16 21:27:40 2015 +0200 Extcap: fix logically dead code (CID 1232344) Change-Id: Ia6c178a9a5ec413004107f63c8dcaa38c19690b9 Reviewed-on: https://code.wireshark.org/review/8096 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit 51d4d0a Author: Gerald Combs Date: Thu Apr 16 14:31:58 2015 -0700 Minor Win32 console fix. Fix a no-op in set_has_console. Mark it and set_console_wait GTK+ only. Change-Id: Ifc6540b30edc0296c4a47c004a397cc309e71d2b Reviewed-on: https://code.wireshark.org/review/8099 Reviewed-by: Gerald Combs commit c455049 Author: Guy Harris Date: Thu Apr 16 14:21:00 2015 -0700 Fix copy-and-pasteo. "Recursion(n). See "recursion"." Change-Id: Ic0acab13a6da8e0e00ead32653498d13edf212ac Reviewed-on: https://code.wireshark.org/review/8098 Reviewed-by: Guy Harris commit 7c1243c Author: Gerald Combs Date: Thu Apr 16 12:42:57 2015 -0700 Update README.cmake. Change-Id: I2aaae7936639dc2775a8f7fdb1d4276893c8a6dc Reviewed-on: https://code.wireshark.org/review/8097 Reviewed-by: Gerald Combs commit 2100415 Author: Alexis La Goutte Date: Thu Apr 16 19:59:32 2015 +0200 RADIUS: fix test suite by comment new rfc dicto tshark: radius: Vendor: 'integer', does not exist in /home/wireshark/builders/wireshark-master/ubuntu-14.04-x64/build/radius/dictionary.rfc7499:10 Vendor: 'integer', does not exist in /home/wireshark/builders/wireshark-master/ubuntu-14.04-x64/build/radius/dictionary.rfc7499:11 Change-Id: I2852658235b7025e429e891401088de91c542424 Reviewed-on: https://code.wireshark.org/review/8092 Reviewed-by: Alexis La Goutte commit 338f3a5 Author: AndersBroman Date: Thu Apr 16 15:58:53 2015 +0200 Remove deprecated tvb_lengt APIs Change-Id: Ic3c364384dcc1d87089d646665f5900081de13df Reviewed-on: https://code.wireshark.org/review/8089 Reviewed-by: Anders Broman commit 4171f55 Author: Alexis La Goutte Date: Tue Apr 7 18:01:28 2015 +0200 RADIUS: Sync with FreeRADIUS Master commit dec7ff66f34d773d25dee412fe218b4e108d7680 Author: Alan T. DeKok Date: Wed Apr 1 13:49:22 2015 -0400 added VALUEs commit 634bdb7b29089ed9fd9548a4ed033bfca82832d2 Author: Alan T. DeKok Date: Wed Apr 1 13:34:19 2015 -0400 Added from RFC which has numbers assigned commit 005437d9f260c233f165e5f1a8a0e00ab48d6456 Author: Arran Cudbard-Bell Date: Thu Mar 26 09:09:13 2015 -0400 Hyphens commit 88332d8e5dc6bae25270500902cdcb511e0e08a6 Author: Nikolai Kondrashov Date: Thu Mar 26 12:13:39 2015 +0200 Update dictionary.mikrotik Update dictionary.mikrotik to have new attributes and values mentioned in Mikrotik wiki: http://wiki.mikrotik.com/index.php?title=Manual:RADIUS_Client/vendor_dictionary commit 849336c73dda97ac2a1185f19e21fd2d4d086180 Author: Alan T. DeKok Date: Wed Mar 25 15:40:02 2015 -0500 Motorola error message Change-Id: I03ab7666dd64cef75e8ebf088766b6b28497817c Reviewed-on: https://code.wireshark.org/review/7974 Reviewed-by: Anders Broman commit 95f138e Author: AndersBroman Date: Thu Apr 16 13:31:57 2015 +0200 Replace deprecated tvb_length APIs Change-Id: Idfd3bed012e823de544fe4de483c8f095fc7c65d Reviewed-on: https://code.wireshark.org/review/8086 Reviewed-by: Anders Broman commit 2d79f56 Author: Balint Reczey Date: Fri Apr 10 01:58:42 2015 +0200 Fix wireshark.pc when CMAKE_INSTALL_LIBDIR is absolute Change-Id: I9667660329c0888f35e1ac332537eda995509a85 Reviewed-on: https://code.wireshark.org/review/8010 Reviewed-by: Balint Reczey commit ec83c79 Author: Arnd Hannemann Date: Fri Apr 10 01:24:35 2015 +0200 Fix misspellings in German debconf translation Change-Id: I6cd3ce90dd3ffe5ebdf5f39f14cb3dabb38c62e9 Reviewed-on: https://code.wireshark.org/review/8009 Reviewed-by: Martin Kaiser Reviewed-by: Alexis La Goutte commit 8e7d904 Author: Pascal Quantin Date: Tue Apr 14 18:47:36 2015 +0200 androiddump: stop recompiling systematically androiddump.c with nmake Our default rules are confused because source file is in a subfolder of the nmake makefile Change-Id: If3dee4cd5b3be493abfe8c696383fb170952260b Reviewed-on: https://code.wireshark.org/review/8068 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin Reviewed-by: Michal Labedzki Reviewed-by: Alexis La Goutte commit b845785 Author: Gerald Combs Date: Wed Apr 15 16:23:56 2015 -0700 CMake: Try not to clobber our gspawn exes. Try not to overwrite gspawn*.exe between signing them and packaging them. (Second try.) Change-Id: I717f5fca6dc6afbc146927d06e6f74ae6a0a87c8 Reviewed-on: https://code.wireshark.org/review/8082 Reviewed-by: Gerald Combs commit 973b288 Author: Gerald Combs Date: Wed Apr 15 23:22:26 2015 +0000 Revert "CMake: Try not to clobber our gspawn exes." This accidentally reverted code from g40ce324. Will try again shortly. This reverts commit 8d9fdda9913a4773ebaf4fc34401ae8a24b729d7. Change-Id: I0bf7f351b926f1ce4b0c9e19fe0367add1dfee1e Reviewed-on: https://code.wireshark.org/review/8081 Reviewed-by: Gerald Combs commit 8d9fdda Author: Gerald Combs Date: Wed Apr 15 14:34:58 2015 -0700 CMake: Try not to clobber our gspawn exes. Try not to overwrite gspawn*.exe between signing them and packaging them. Change-Id: I9f224b64537c3b0dd6f7f8b94a8837bd427ad2ca Reviewed-on: https://code.wireshark.org/review/8080 Reviewed-by: Gerald Combs commit f026088 Author: Anton Thomasson Date: Wed Apr 15 15:50:34 2015 +0200 Fix gsmtap signal and snr. -Correct parsrsing to get correct value (corect position in header). -Rename hf_gsmtap_noise_dbm to hf_gsmtap_snr_db to reflect use and name in struct. -Change order of decalaration/use of signal and snr to reflect position in struct. -Change registered types to signed to reflect possible values and definition in struct. Change-Id: I748bd19757c0dd87fe4ad0969dfcc8427b908aa2 Reviewed-on: https://code.wireshark.org/review/8077 Reviewed-by: Sylvain Munaut <246tnt@gmail.com> Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 3c110d7 Author: Alexis La Goutte Date: Wed Apr 15 12:55:09 2015 +0200 Androiddump: Fix Memory - corruptions (OVERRUN) (CID 1293632) Change-Id: Ifd0d5026d207f763e1726963049acfb5a77f4b39 Reviewed-on: https://code.wireshark.org/review/8075 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki commit 40ce324 Author: Gerald Combs Date: Mon Apr 13 17:11:15 2015 -0700 Set the extcap working directory on Windows. On Windows, prepend the main program directory to %Path% when spawning extcap processes. This lets us place androiddump in extcap while allowing it to locate its DLLs. Change-Id: I406c47ce71323266d5f14fb596931398464e452d Reviewed-on: https://code.wireshark.org/review/8057 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 05c0152 Author: AndersBroman Date: Wed Apr 15 17:20:35 2015 +0200 Replcae deprecated API tvb_length with tvb_reported_length or tvb_captured length. Change-Id: Id42f3409a32e202528d350f7afde7376e411fc51 Reviewed-on: https://code.wireshark.org/review/8076 Reviewed-by: Anders Broman commit d2e880e Author: AndersBroman Date: Wed Apr 15 12:07:28 2015 +0200 Replcae deprecated API tvb_length with tvb_reported_length or tvb_captured length. Change-Id: Ia1235c49b28320b5651e284115639820f81cb747 Reviewed-on: https://code.wireshark.org/review/8074 Reviewed-by: Anders Broman commit 9237174 Author: Julien STAUB Date: Tue Apr 14 19:30:18 2015 +0200 ZigBee: fix IS_ANALOG_SUBTYPE macro Modify IS_ANALOG_SUBTYPE macro according to 07-5123-04 zigbee cluster library specification. It wasn't filtering out the 8-bit enums ans 16 bit enum (digital types). Bug: 11120 Change-Id: I74f1c0e6671b33fa69e5045cfc283ada3a39d380 Reviewed-on: https://code.wireshark.org/review/8069 Reviewed-by: Pascal Quantin commit 6a41349 Author: Gerald Combs Date: Tue Apr 14 14:34:00 2015 -0700 CMake: Fix an NSIS dependency. Change-Id: I514243727da1fed52c78a4cbd8c82c68bf724c8a Reviewed-on: https://code.wireshark.org/review/8070 Reviewed-by: Gerald Combs commit 495740f Author: Gerald Combs Date: Tue Apr 7 12:55:42 2015 -0700 CMake: Initial PortableApps targets. Add portableapps_app_dir and portableapps_package targets. Change-Id: Ifea3d952eef0e267de6364999d45807236d99102 Reviewed-on: https://code.wireshark.org/review/8025 Reviewed-by: Gerald Combs commit 1404605 Author: Gerald Combs Date: Tue Apr 7 14:05:52 2015 -0700 Start moving win-setup to PowerShell. Add win-setup.ps1, which duplicates the following tasks performed by config.nmake + Makefile.nmake + win-setup.sh: - Create the windows library directory. - Download files. - Download and unpack zip files. - Check and set current-tag.txt Don't verify applications or libraries. CMakeLists.txt does that. Update the Developer's Guide. Have POWERSHELL_COMMAND use dot sourcing instead of "-File", which appears to be a synonym for "-IgnoreTheExitStatusReturnedByThisScript". This removes our dependencies on unzip and wget and reduces our dependency on bash. Change-Id: Ia9def24acbe183d81b9d477fa42e655e4a3a6614 Reviewed-on: https://code.wireshark.org/review/7990 Reviewed-by: Graham Bloice Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 311758a Author: Roland Knall Date: Tue Apr 14 09:32:17 2015 +0200 openSAFETY: Replace deprecated API Replace deprecated API functions tvb_length and tvb_length_remaining Change-Id: Ibf4c7b12a1a6ea3b1a750dce7faf2f4933b4c470 Reviewed-on: https://code.wireshark.org/review/8063 Reviewed-by: Roland Knall Reviewed-by: Pascal Quantin commit b9ce255 Author: Michal Labedzki Date: Tue Mar 24 19:37:05 2015 +0100 Bluetooth: OBEX: Update to PBAP 1.2, GOEP 2.1, CTN 1.0 and GPP 1.0 Add a lot of fields. Change-Id: If12a30b1840c0dbe934bc6af264a068935912832 Reviewed-on: https://code.wireshark.org/review/8043 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki commit b7fd51e Author: Guy Harris Date: Tue Apr 14 01:02:35 2015 -0700 Oops, have to actually comment out the definition, not just the declaration. Change-Id: Iea588a07f4c559f4455d85d6bf99f9a3b631caed Reviewed-on: https://code.wireshark.org/review/8066 Reviewed-by: Guy Harris commit 75f9ecb Author: Guy Harris Date: Tue Apr 14 00:52:01 2015 -0700 Cast away a (non-relevant) warning. Change-Id: Iee5029dc685561491660a8f711e58a652893bc90 Reviewed-on: https://code.wireshark.org/review/8065 Reviewed-by: Guy Harris commit 8b13e41 Author: Guy Harris Date: Tue Apr 14 00:37:29 2015 -0700 That made some *other* routines unused; "#if 0" them out. Change-Id: I932765f724b6f38afafa8cba7bea6ee210c6b2e5 Reviewed-on: https://code.wireshark.org/review/8064 Reviewed-by: Guy Harris commit f99ef8c Author: Guy Harris Date: Tue Apr 14 00:26:00 2015 -0700 "#if 0" out some unused variables and functions. This should be checked - why are they being generated by idl2wrs? Change-Id: I35956f95b3679fc06e2c63ddc1313733813e5f3f Reviewed-on: https://code.wireshark.org/review/8062 Reviewed-by: Guy Harris commit 34e5a1f Author: Guy Harris Date: Tue Apr 14 00:14:07 2015 -0700 Get rid of extra variable. That assigns all string members with a g_strdup-family function, making the assignment of the name similar to the other assignments. Change-Id: I5f2a4afbad5173b8428ba1bbe435f851e8cc1a19 Reviewed-on: https://code.wireshark.org/review/8061 Reviewed-by: Guy Harris commit 870d223 Author: AndersBroman Date: Tue Apr 14 08:55:47 2015 +0200 Change deprecated API tvb_length -> tvb_reported_length Change-Id: I14577dccaed5aa5ed85e94b6810a94b4c8b2e437 Reviewed-on: https://code.wireshark.org/review/8059 Reviewed-by: Anders Broman commit 62c0e03 Author: gal Date: Thu Apr 2 20:31:15 2015 +0100 GIOP: Reassembly of fragments Support for the reassembly of GIOP Fragment message types. A new bool preference (giop.reassemble) is introduced to control reassembly and it is enabled by default. Change-Id: I10ca51f745710dca3b57a03cc89126f7b1dc06b4 Reviewed-on: https://code.wireshark.org/review/7966 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 085e95a Author: gal Date: Tue Apr 7 09:35:16 2015 +0100 Geospatial and Imagery Access Service (GIAS) Dissector A Corba (GIOP) based protocol for the exchange of Intelligence, Surveillance and Reconnaissance (ISR) products. Defined in STANAG 4559/AEDP-5 "NATO Standard ISR Library Interface (NSILI)" See http://www.nato.int/structur/ac/224/standard/4559/4559.htm for more information. The dissector is generated using idl2wrs using the gias.idl, with some manual corrections, as noted in README.gias. Patch Set 4: Initialise uninitialised variables and no longer mark them as unused. Change-Id: Ieae93a135b30078f2d34e66f8c7b2e476438224e Reviewed-on: https://code.wireshark.org/review/7965 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 4c52738 Author: Michal Labedzki Date: Mon Mar 23 19:03:21 2015 +0100 Bluetooth: SDP: Update to MAP 1.2 and PBAP 1.2 There are some new attributes comparing MAP 1.1 to 1.2 and PBAP 1.1 to 1.2. Change-Id: I4be2691e99d176c22676a00549aa550ea07e77e3 Reviewed-on: https://code.wireshark.org/review/8042 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki commit 7123438 Author: Michal Labedzki Date: Sun Mar 22 18:36:35 2015 +0100 Bluetooth: OBEX: Fix reassemble at transport layer Transport layer is RFCOMM. OBEX packet may be fragmented over RFCOMM. If so then (Opcode + Final flag + ) Packet Length determines packet length, but whole OBEX packet will be framented over parts/packet that first packet has Packet Length and next packets are sequential parts of whole packet (no header, etc.) Reassemble on this level is simple concatenation of all packet up to Packet Length. Let threat packet shorted than 3 bytes as bad packet. There is still no reasssemble on OBEX level (aka Final flag), so content send over OBEX (vCards, files, XMLs) is still not reassembled. Change-Id: I11882eb07480b34d274a4ca6e504e609dcf982c0 Reviewed-on: https://code.wireshark.org/review/8041 Reviewed-by: Michal Labedzki commit 21757ae Author: Michal Labedzki Date: Sat Mar 21 19:01:07 2015 +0100 Bluetooth: OBEX: Add request/response tracking Change-Id: I691d8a89c222208afb3b1bcd924a2331ea58af5b Reviewed-on: https://code.wireshark.org/review/8040 Reviewed-by: Michal Labedzki commit 6aba675 Author: Michal Labedzki Date: Sat Mar 28 12:58:17 2015 +0100 Bluetooth: GATT/L2CAP: Add support for 6LoWPAN 6LoWPAN is used by GATT level profile called IPSP. Change-Id: Iff2e1a8d531072d9bba03e7d84b56db59110cb35 Reviewed-on: https://code.wireshark.org/review/8045 Reviewed-by: Michal Labedzki commit 5791116 Author: Michal Labedzki Date: Tue Mar 24 08:56:54 2015 +0100 Bluetooth: HFP: Update to HFP 1.7 Update to latest Bluetooth specification: 1.7 (previously 1.6) Add +BIND and +BIEV commands, also update +BRSF to support new features. There is still some things to implement, but need more work to do it, like request-response tracking. Change-Id: I195380b9588f3a3e5b07628fbe9d5c66ed46fbfd Reviewed-on: https://code.wireshark.org/review/8046 Reviewed-by: Michal Labedzki commit d074ed1 Author: Guy Harris Date: Mon Apr 13 22:04:40 2015 -0700 Just use g_strdup_printf() to create a g_mallocated formatted string. And, as it's g_mallocated, we don't need to g_mallocate it again with g_strdup(). The same is true of strings allocated with g_strconcat(). Don't make an extra copy, and don't free up the original. Change-Id: Iea470a4424a811934f7fb8b0ba8dd110d337e420 Reviewed-on: https://code.wireshark.org/review/8058 Reviewed-by: Guy Harris commit eeed4d1 Author: Roland Knall Date: Mon Mar 30 16:10:01 2015 +0200 UI: Implementing menus for plugins Plugins may utilize the tap interface to provide special tools or analysis options, not otherwise available in Wireshark, or perhaps not allowed to be distributed freely. Up until now, those tools either had to start automatically, or could not be started at all, or had to be started separately. It should be possible, that those tools may be started using a menu entry directly from Wireshark. This interface tries to achieve exactly that. This interface uses a clean interface, which can be implemented in any plugin or dissector. Documentation for this has been added to README.plugins. Separators are only supported for now in the Qt interface, but URLs can now be added as a simple item, and the UI will use the same methods used for other URL calls to open them. Change-Id: I170107dafb66f6badaa864d05a9091e5cbbf52c2 Reviewed-on: https://code.wireshark.org/review/7865 Reviewed-by: Roland Knall Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 035d741 Author: Gerald Combs Date: Mon Apr 13 13:44:23 2015 -0700 Fix zlib DLL copy. Switch to "if exist ... xcopy". Change-Id: I255fd3e719645b247024583590b748104c5e15b9 Reviewed-on: https://code.wireshark.org/review/8056 Reviewed-by: Gerald Combs commit 936f76f Author: Guy Harris Date: Mon Apr 13 12:35:14 2015 -0700 More casts. Change-Id: I0c8969bcb986350fa58f65d8e67394766b734286 Reviewed-on: https://code.wireshark.org/review/8055 Reviewed-by: Guy Harris commit 5fa914c Author: Guy Harris Date: Mon Apr 13 11:05:08 2015 -0700 Add a major version number argument to --with-qt. Without a major version number, it behaves as before, picking whatever version it finds, and preferring Qt 5 to Qt 4. With a major version number, it looks only for the version in question. Bug: 10793 Change-Id: Idf6c2c61e84bb87f7b601d8f09c33f31b67bf46d Reviewed-on: https://code.wireshark.org/review/8052 Petri-Dish: Guy Harris Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris commit 8d9441d Author: Guy Harris Date: Mon Apr 13 12:06:11 2015 -0700 Cast away some warnings. offsetof() doesn't necessarily return an int-sized value; cast it to guint. Change-Id: Ie0072d62de0178f87bc3168e3f8f1a03d9ec69d5 Reviewed-on: https://code.wireshark.org/review/8053 Reviewed-by: Guy Harris commit f333e7e Author: Gerald Combs Date: Mon Apr 13 10:31:00 2015 -0700 Add the OpenSUSE zlib1.dll when needed. The Visual Studio solution files created by CMake list "Debug" as the first configuration, which means that we end up with zlibd1.dll by default. Many of the OpenSUSE DLLs depend on zlib1.dll. Add the OBS version in that case. Change-Id: Ia98490f1a192802d1482e0749bbd2b550e916bc5 Reviewed-on: https://code.wireshark.org/review/8051 Reviewed-by: Gerald Combs commit 3a220ed Author: Pascal Quantin Date: Sat Apr 11 21:49:48 2015 +0200 Fix extcap interface capture with tshark Extcap parameters must be saved when doing the interface number/name matching, otherwise extcap program is not launched and pipe is not created Change-Id: Iaa0c9ad145049ee6e7a285dfca904ceb0baf417f Reviewed-on: https://code.wireshark.org/review/8017 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 2e8d8e1 Author: Pascal Quantin Date: Fri Apr 10 19:04:22 2015 +0200 dumpcap: fix opening of pipes on Windows broken since gbed29af Previous code was assuming that all local pipes were of extcap type. Let's explicitly check for extcap prefix now. Bug: 10803 Change-Id: If955e77a9ee2af11b553740269964c40273d5177 Reviewed-on: https://code.wireshark.org/review/8013 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 9ea5215 Author: Michal Labedzki Date: Mon Mar 23 12:04:36 2015 +0100 Qt: Add option to copy all visible item or selected tree items in Packet Details pane The idea is allow to copy data from GUI by user, what is currently case only for tshark. The first option copy every item from Packet Details that are expanded (visibled). The second option do the same but start on currently selected item/tree. (let think about protocols like BT SDP where there is a lot of recursive subtrees) Change-Id: I19c925d21293ceb8af2167c7d2c1b1b36507124e Reviewed-on: https://code.wireshark.org/review/8047 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki Tested-by: Michal Labedzki commit 62a70e8 Author: anilkumar911 Date: Thu Mar 19 10:55:10 2015 +0530 Support for new netscaler 3.5 trace format. Change-Id: Ica74f3f9239a96486967cf248feb4313bc390734 Reviewed-on: https://code.wireshark.org/review/7751 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 6ab6136 Author: Michael Mann Date: Sun Apr 12 19:12:35 2015 -0400 Add more "bitmask grouping" APIs. Add proto_tree_add_bitmask_value, proto_tree_add_bitmask_value_with_flags and proto_tree_add_bitmask_list to aid in the removal of proto_tree_add_boolean "groupings" as well as "groups" of fields that use proto_tree_add_item with the same offset/len. This may be able to be optimized later, but the first step will be converting dissectors to use it. A sample conversion of each API is also included. Change-Id: I53febc7450ad632482f82615a7fa62174f8472c9 Reviewed-on: https://code.wireshark.org/review/8038 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 89cd92d Author: Pascal Quantin Date: Mon Apr 13 14:50:56 2015 +0200 GSM A: force display of the bits sequence corresponding to "Degrees of longitude" field It makes the display more consistent with other fields of Location Estimate IE Bug: 11114 Change-Id: Ib31c61a34f419cf97601a660f3b807454b1becd9 Reviewed-on: https://code.wireshark.org/review/8049 Reviewed-by: Anders Broman commit aaf347c Author: AndersBroman Date: Mon Apr 13 12:13:05 2015 +0200 Remove deprecated API tvb_lengtRemove deprecated API tvb_length Change-Id: Iea7dd7d13ce1a2ee375a2c4a75f897ba2c936921 Reviewed-on: https://code.wireshark.org/review/8048 Reviewed-by: Anders Broman commit 502eef9 Author: Guy Harris Date: Sun Apr 12 14:55:53 2015 -0700 Fix the path for androiddump. The androiddump binary ends up in the top-level source directory, not the extcap subdirectory. Change-Id: Ia306b35211b885b817802a6a22ed9dbbe07f2532 Reviewed-on: https://code.wireshark.org/review/8037 Reviewed-by: Guy Harris commit 0c700d8 Author: Pascal Quantin Date: Sun Apr 12 22:33:35 2015 +0200 Windows: fix generation of PortableApps.com installer Change-Id: I249268ce21ddfbdc7f149609a950736b4fe2ae07 Reviewed-on: https://code.wireshark.org/review/8036 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit c0d94c2 Author: Michal Labedzki Date: Sun Apr 12 18:44:07 2015 +0200 androiddump: Disable automatic starting adb It does not work as expected. Change-Id: Ibbfce9fdbb3e1aae747101a576fbe32c979b42c9 Reviewed-on: https://code.wireshark.org/review/8033 Reviewed-by: Pascal Quantin Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki commit afff424 Author: Pascal Quantin Date: Sun Apr 12 19:25:31 2015 +0200 androiddump: add more compatibility with MSVC connect API Change-Id: I11d84d3904e11a085381b30cca7fc678c18797e6 Reviewed-on: https://code.wireshark.org/review/8034 Petri-Dish: Pascal Quantin Reviewed-by: Pascal Quantin commit 4ef6e24 Author: Pascal Quantin Date: Sun Apr 12 19:41:39 2015 +0200 Windows: do not install androiddump by default It adds a delay on startup and is verbose on command line when Android SDK is not installed Change-Id: I165358ff14ef458712ebaa12bd3c7256f657e238 Reviewed-on: https://code.wireshark.org/review/8035 Reviewed-by: Pascal Quantin commit 56470cc Author: Michal Labedzki Date: Wed Apr 8 16:09:03 2015 +0200 Add missing androiddump stuff Add missing androiddump stuff like: - release notes - documentation - Windows nmake support - running androiddump as a windows application instead of console on Windows - addition of androiddump to the Windows installer Change-Id: I3bc6cc70e4dc96c0cd776f3d965dd2aa0309995d Reviewed-on: https://code.wireshark.org/review/7981 Petri-Dish: Pascal Quantin Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki commit 5b80ccb Author: Gerald Combs Date: Sun Apr 12 08:07:18 2015 -0700 [Automatic update for 2015-04-12] Update manuf, services enterprise-numbers, translations, and other items. Change-Id: Ide45514d6fd320962b642ed7c86bca959f2c58f7 Reviewed-on: https://code.wireshark.org/review/8029 Reviewed-by: Gerald Combs commit 5f933e8 Author: Guy Harris Date: Sat Apr 11 21:07:24 2015 -0700 Only add flags to CFLAGS_FOR_BUILD if $CC and $CC_FOR_BUILD are the same. Otherwise, just because a flag is appropriate for $CC, that doesn't necessarily mean it's appropriate for $CFLAGS_FOR_BUILD. (We don't use CFLAGS_FOR_BUILD for many things, so it's probably not worth making a lot of effort to throw all the warning flags into it if we're cross-compiling; we *do* throw them in for native compilation, which is what most developers use and test with, so that should be sufficient to let the warnings catch problems with the build tools we're building.) Change-Id: Iad9d611b4687e9e154f9871f741f3c8f3b307c88 Reviewed-on: https://code.wireshark.org/review/8026 Reviewed-by: Guy Harris commit 6c34e9a Author: Guy Harris Date: Sat Apr 11 14:37:56 2015 -0700 Ignore androiddump - it's another build target. Change-Id: If0d4ca167fba528726537a7b65f0fbdba5aaa59d Reviewed-on: https://code.wireshark.org/review/8024 Reviewed-by: Guy Harris commit 6c56fdb Author: Guy Harris Date: Sat Apr 11 14:36:21 2015 -0700 Use HAVE_ARPA_INET_H to control whether to include . That's how we do it elsewhere. Change-Id: Icd44d8bdec2425b58a4479cd60f08788c85c4d71 Reviewed-on: https://code.wireshark.org/review/8023 Reviewed-by: Guy Harris commit 4bcdfee Author: Pascal Quantin Date: Sat Apr 11 22:53:12 2015 +0200 Add removal of zlib 1.2.8 folder Change-Id: I064cdfb46db49208b271806d7f697e3128e040a9 Reviewed-on: https://code.wireshark.org/review/8022 Reviewed-by: Pascal Quantin commit afec93c Author: Guy Harris Date: Sat Apr 11 13:40:40 2015 -0700 More type cleanup to squelch warnings. Make exported_pdu_headers_size a size_t to make it big enough. Make used_buffer_length a size_t as it doesn't go negative and gets compared with unsigned values. Cast length to size_t when comparing it with used_buffer_length - by that time, we've ensured that it's not negative. Change-Id: Ie192eee55914ebe548865d46575768964353ea2d Reviewed-on: https://code.wireshark.org/review/8021 Reviewed-by: Guy Harris commit 08c083a Author: Pascal Quantin Date: Sat Apr 11 22:39:40 2015 +0200 androiddump: fix a typo Change-Id: I4adaace10aefb441e9aee76f9aba6101e805efa9 Reviewed-on: https://code.wireshark.org/review/8020 Reviewed-by: Pascal Quantin commit ffe99c0 Author: Guy Harris Date: Sat Apr 11 13:17:11 2015 -0700 Use G_GUINT64_CONSTANT() to make a guint64_t (or uint64_t) constant. Don't assume "UL" is good enough; long is 32 bits on ILP32 platforms. Change-Id: If235e2e49afcbfff7d5289cafe24cf5cc01358e4 Reviewed-on: https://code.wireshark.org/review/8019 Reviewed-by: Guy Harris commit 3195a20 Author: Guy Harris Date: Sat Apr 11 13:13:09 2015 -0700 Squelch 64-bit-to-32-bit shortening errors. Cast some sizeofs, make a variable size_t. Change-Id: I439a9f2a584535597e6ac92ccdf243ae07e870b3 Reviewed-on: https://code.wireshark.org/review/8018 Reviewed-by: Guy Harris commit ee30955 Author: Guy Harris Date: Sat Apr 11 12:53:35 2015 -0700 It's not "Windows vs. (Linux or OS X or Cygwin)", it's "Windows vs. UN*X". Either it's Windows and not Cygwin (__WIN32 suffices for both 32-bit and 64-bit Windows, and this code is unlikely to work on 16-bit Windows, not that much of anybody cares about it any more), or it's UN*X or Windows- pretending-to-be-UN*X-with-Cygwin. That way we don't have to pile on new defined(XXX)'s for every UN*X out there. Change-Id: Ia1df3378a88f2cf8bd1cc8f1a74b51adfe668370 Reviewed-on: https://code.wireshark.org/review/8016 Reviewed-by: Guy Harris commit 9fecad7 Author: Guy Harris Date: Sat Apr 11 12:45:40 2015 -0700 A temporary variable squelches some warnings. GINT32_FROM_BE() and GINT32_TO_BE() both declare local variables, and they collide, so warnings are issued if you use them both in the same statement. Change-Id: I87df6cf7f180316692ab5164e25263ff28d5d760 Reviewed-on: https://code.wireshark.org/review/8015 Reviewed-by: Guy Harris commit 0394b01 Author: Gerald Combs Date: Fri Apr 10 15:08:21 2015 -0700 Retire ws-manifest.pl. We haven't used it in a while and we won't use in the CMake environment. Change-Id: Iecfb8c418bddf1ed1fcd38b189babf082101662e Reviewed-on: https://code.wireshark.org/review/8014 Reviewed-by: Gerald Combs commit fd72024 Author: Gerald Combs Date: Fri Apr 10 08:00:17 2015 -0700 Move the PortabaleApps packaging up one level. Update the PA section of the Developer's Guide. Change-Id: I383d2a2405e742eb353390f5a43fd6d6d32cb25b Reviewed-on: https://code.wireshark.org/review/8012 Reviewed-by: Gerald Combs commit 1785d42 Author: AndersBroman Date: Fri Apr 10 14:57:55 2015 +0200 Remove depricated API tvb_length -> tvb_reported_length Change-Id: I78b1d2accf4fd0b37eaa16cb8bf515422565e98a Reviewed-on: https://code.wireshark.org/review/8011 Reviewed-by: Anders Broman commit 38d3e06 Author: Gerald Combs Date: Wed Apr 8 17:36:35 2015 -0700 CMake: Add a build environment == generator check. If we're building on Windows and %Platform% is "x64" or undefined, check it against our generator's target platform. Update the "${CMAKE_GENERATOR} MATCHES" regexes to match what CMake uses internally. Change-Id: I33996344978855cbdf7c1ee9e55b7340efea5b5c Reviewed-on: https://code.wireshark.org/review/7994 Reviewed-by: Gerald Combs Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice commit 8c0f09e Author: Alexis La Goutte Date: Wed Apr 1 14:11:28 2015 +0200 MIP6: Remove proto_tree_add_text Based on packet-ip.c Change-Id: Ibc561b58d5f4b3e3469e1c578e83b3abe3c206f8 Reviewed-on: https://code.wireshark.org/review/8008 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 806ba8c Author: Alexis La Goutte Date: Wed Apr 8 21:55:46 2015 +0200 Androiddump: fix Null pointer passed as an argument to a 'nonnull' parameter By remove duplicate code... Change-Id: I247c64864c112b08e912d4738478a22e65470eb4 Reviewed-on: https://code.wireshark.org/review/7988 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Reviewed-by: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 10e2053 Author: Alexis La Goutte Date: Thu Apr 9 22:36:13 2015 +0200 Androiddump: fix Potential leak of memory pointed to by 'serial_number' Change-Id: Ib244ec9a94d99a3589d411a4e3bcb1b03212b82e Reviewed-on: https://code.wireshark.org/review/7987 Reviewed-by: Michal Labedzki Reviewed-by: Michael Mann commit dc4345b Author: Alexis La Goutte Date: Thu Apr 9 22:38:58 2015 +0200 Androiddump: Fix Result of 'malloc' is converted to a pointer of type 'unsigned short', which is incompatible with sizeof operand type 'unsigned short *' Remove malloc Change-Id: I12a7f76026336853a50bc5277404c44aa715b8d2 Reviewed-on: https://code.wireshark.org/review/7986 Reviewed-by: Michal Labedzki Reviewed-by: Michael Mann commit 93169cb Author: Alexis La Goutte Date: Thu Apr 9 22:20:53 2015 +0200 OCFS2: fix some GCC / Clang warnings packet-ocfs2.c:249: comma at end of enumerator list [-Wpedantic] packet-ocfs2.c:1171: no previous prototype for 'proto_register_ocfs2' [-Wmissing-prototypes] packet-ocfs2.c:1651: no previous prototype for 'proto_reg_handoff_ocfs2' [-Wmissing-prototypes] packet-ocfs2.c:1678:4: no newline at end of file [-Wnewline-eof] Remove also unneed glib.h include Change-Id: I47a03dbc9f175a0e2453dd90a733144ac9f95fc4 Reviewed-on: https://code.wireshark.org/review/8007 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Reviewed-by: Anders Broman commit 7b60d2b Author: Gerald Combs Date: Thu Apr 9 08:36:33 2015 -0700 Pass HTTP URLs to wget. Not all wgets are equal. Revert part of 7787c1b so that wget fetches over HTTP instead of HTTPS. Change-Id: Iced263380429795975cf239cba7dac54bd729d38 Reviewed-on: https://code.wireshark.org/review/8005 Reviewed-by: Graham Bloice Petri-Dish: Graham Bloice Reviewed-by: Martin Mathieson Reviewed-by: Gerald Combs commit 1f45a37 Author: Michael Mann Date: Thu Apr 9 12:28:27 2015 -0400 Replace PROTO_TREE_ADD_XXX_ITEM macro use with real code. PROTO_TREE_ADD_XXX_ITEM had a bug in it for int values. This was fixed by adding proto_tree_set_ ## ctype ## to the macro, but not all compilers support macros at the end of a function, so just remove the macro entirely and just have the duplicate code. Change-Id: Icf92a6786daa0e84305ba174ce155833f90b6463 Reviewed-on: https://code.wireshark.org/review/8006 Reviewed-by: Roland Knall Reviewed-by: Michael Mann commit eb0489b Author: Michael Mann Date: Thu Apr 9 08:30:24 2015 -0400 Correct macro expansion in PROTO_TREE_ADD_XXX_ITEM for integer fields. Change-Id: I57e5dcfabc1c1b4c024b9e1cbfd8b9a34c79c330 Reviewed-on: https://code.wireshark.org/review/8003 Reviewed-by: Michael Mann Reviewed-by: Anders Broman commit c2a1d8f Author: AndersBroman Date: Thu Apr 9 14:36:26 2015 +0200 Replace deprecated API tvb_length -> tvb_reported_length Change-Id: I9c8bf6beec47afb901e492723b335a28a24f455e Reviewed-on: https://code.wireshark.org/review/8004 Reviewed-by: Anders Broman commit 5fa267e Author: AndersBroman Date: Thu Apr 9 14:01:25 2015 +0200 REplace deprecated API tvb_length -> tvb_reported_length Change-Id: I6090055a9c31f6787626b810de655d1cc71b99de Reviewed-on: https://code.wireshark.org/review/8002 Reviewed-by: Anders Broman commit db92f39 Author: Alexis La Goutte Date: Thu Apr 9 11:59:40 2015 +0200 802.11: use switch for Aruba type Change-Id: I7f0f10ca695fedab613156811fac60e5fa015bee Reviewed-on: https://code.wireshark.org/review/8000 Reviewed-by: Anders Broman commit bc457cb Author: Alexis La Goutte Date: Thu Apr 9 11:30:48 2015 +0200 802.11: don't return when Wrong Tag Length Change-Id: I8de390e273e06620a8cdf62acae076ed6dd10a54 Reviewed-on: https://code.wireshark.org/review/7999 Reviewed-by: Anders Broman commit 99e7395 Author: AndersBroman Date: Thu Apr 9 13:27:18 2015 +0200 Replace deprecated API tvb_length... with tvb_reported_length... Change-Id: I44732d2743ba461d1791bb3795b0aef5a314bc1f Reviewed-on: https://code.wireshark.org/review/8001 Reviewed-by: Anders Broman commit 08c223a Author: Graham Bloice Date: Wed Apr 8 23:19:31 2015 +0100 Cleanup CMake VS solution Move the zlib artefacts into Libs\zlib "folder" Change-Id: Iddf0121fad3885553d908a51e9e07a7f676403fe Reviewed-on: https://code.wireshark.org/review/7993 Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs Reviewed-by: Graham Bloice commit 054a1aa Author: Marian Ďurkovič Date: Thu Apr 9 09:07:36 2015 +0200 TRILL: Fix incorrect header length Change-Id: I508ee3d4143235157f223e5b9cd16d70cdf1fa72 Reviewed-on: https://code.wireshark.org/review/7997 Reviewed-by: Alexis La Goutte commit d65f896 Author: Alexis La Goutte Date: Wed Apr 8 21:08:54 2015 +0200 Androiddump: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I245ebb47dfc3d202cba5f63c33fca9c0e30da0ad Reviewed-on: https://code.wireshark.org/review/7984 Reviewed-by: Michal Labedzki commit 66f7f6e Author: Michael Mann Date: Wed Apr 8 21:08:55 2015 -0400 Improve ATH dissector. Address comments made after initial dissector was submitted. Change-Id: Ic42431d8af1d281dbe6f67a8f3f4d5e0aeea4156 Reviewed-on: https://code.wireshark.org/review/7995 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 327ec9c Author: Julien STAUB Date: Wed Apr 8 18:57:22 2015 +0200 zigbee: correct zcl meas sensing corrected the relative humidity measurement 0.00 to 100.00 values. Previous version had bug for example 0.01% -> display 0.1% Change-Id: I3955d36d1f2a1334ef7baab4fd854f13950d1951 Reviewed-on: https://code.wireshark.org/review/7983 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit e243b00 Author: Martin Kaiser Date: Wed Apr 8 22:46:30 2015 +0200 [IEEE 802.11] fix two potential endless loops add_tagged_field() may return 0 if the tag length is not what is expected for this particular tag Bug: 11110 Change-Id: Ia2fd6635613fb6d8e1264147d2ddd44162484887 Reviewed-on: https://code.wireshark.org/review/7989 Reviewed-by: Martin Kaiser commit e1b566c Author: Eugene Adell Date: Tue Mar 24 21:35:50 2015 +0100 ATH dissector Change-Id: Idb51bb15e0e0764bd686cb4e822c313779245a4f Reviewed-on: https://code.wireshark.org/review/7807 Reviewed-by: Alexis La Goutte commit 5b0d5ca Author: Graham Bloice Date: Wed Apr 8 16:25:30 2015 +0100 Fix CMake build for Windows The change to zlib 1.28 requires the variable BUILD_SHARED_LIBS to be set and true to build the correct zlib dll on Windows. Change-Id: I0f46b832726834a4e99d7d7d0637112da9c0c531 Reviewed-on: https://code.wireshark.org/review/7982 Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice commit 356e9c4 Author: Roland Knall Date: Wed Apr 8 12:44:50 2015 +0200 androiddump: Fix missing headers for Mac OSX Add sys/socket.h as well as arpa/inet.h and the definition of closesocket. Change-Id: I3986a1cd019c40e7c27cecb3752fd8b7374de6da Reviewed-on: https://code.wireshark.org/review/7980 Reviewed-by: Michal Labedzki Tested-by: Michal Labedzki commit b99cf21 Author: Michal Labedzki Date: Sat Feb 14 19:10:21 2015 +0100 extcap: Add support for Android - androiddump androiddump is extcap program that can be used with Android devices (need Android SDK in system PATH). Supported is Logcat/Logger logs and Bluetooth interfaces for all Android to this day (Lollipop). Please note that it will work also for FirefoxOS. Interfaces: 1. Logcat Main (binary or text) 2. Logcat System (binary or text) 3. Logcat Events (binary or text) 4. Logcat Radio (binary or text) 5. Logcat Crash (text; Lollipop) 6. Bluetooth Hcidump ( Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte Reviewed-by: Michal Labedzki Tested-by: Michal Labedzki commit f3d2cb5 Author: Alexis La Goutte Date: Tue Apr 7 15:37:40 2015 +0200 802.11: Not showing all 11k subelement fields Add support of Reported Frame Body (subelement of Beacon Report) Bug:11101 Change-Id: I44f313ef081fcba7aaf6208baed81a46152fddb6 Reviewed-on: https://code.wireshark.org/review/7970 Reviewed-by: Anders Broman commit c2f6dda Author: Alexis La Goutte Date: Sat Apr 4 20:25:10 2015 +0200 WiFi P2P: Update to Peer-to-Peer (P2P) Technical Specification Version 1.5 Add new IE 19 Out-of-Band Group Owner Negotiation Channel 21 Service Hash 22 Session Information Data Info 23 Connection Capability Info 24 Advertisement_ID Info 25 Advertised Service Info 26 Session ID Info 27 Feature Capability 28 Persistent Group Info Bug:11074 Change-Id: I627ca5906c1e3235aa7d4abb4ebfa757825b7fbf Reviewed-on: https://code.wireshark.org/review/7914 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit f6a183d Author: AndersBroman Date: Wed Apr 8 10:03:08 2015 +0200 Replace deprecated tvb_length with tvb_reported_length. Change-Id: I45d2ae41da823c50ba383a8e2aaec570ee3ad842 Reviewed-on: https://code.wireshark.org/review/7979 Reviewed-by: Anders Broman commit 9721a2a Author: Michael Mann Date: Sun Apr 5 12:45:21 2015 -0400 Add section to README.dissector about dissector tables Bug: 8985 Change-Id: I9245fb556a55da681fe53dd5c12bb549c83c89c6 Reviewed-on: https://code.wireshark.org/review/7926 Reviewed-by: Michael Mann Reviewed-by: Anders Broman commit 1858b81 Author: Michael Mann Date: Fri Apr 3 11:09:17 2015 -0400 Remove RTAC Serial preference that doubled for Decode As. Just use Decode As directly. Change-Id: Iab03a6ff8a70c3c6b0406f426e622eb52bb34ba7 Reviewed-on: https://code.wireshark.org/review/7902 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 7ca0472 Author: Michael Mann Date: Fri Apr 3 08:43:19 2015 -0400 Remove MPLS preference that doubled for Decode As. Just use Decode As directly. Also replace "registered" dissectors which just the creation of a handle since the dissectors really don't need to be "found" outside of themselves. Change-Id: I1e0c3ae784b71c0145b1f1730a97feae8e9f488f Reviewed-on: https://code.wireshark.org/review/7899 Reviewed-by: Michael Mann commit 3ab3158 Author: Michael Mann Date: Thu Apr 2 19:33:39 2015 -0400 Add proper "Decode As" mechanism for FLIP payload instead of (many) preferences. Other cleanup with FLIP dissector while in the neighborhood. Change-Id: I0ecdea447979b0ba508a8bb84bd67e4eb4b32a70 Reviewed-on: https://code.wireshark.org/review/7896 Reviewed-by: Michael Mann commit cec99ab Author: Gerald Combs Date: Tue Apr 7 11:56:36 2015 -0700 Win32: Restore the versioned plugin installation path. Revert parts of g2ef72cb and g7710da4 so that the NSIS installer once again places plugins in $INSTDIR\plugins\$VERSION. This matches the behavior of Autotools and previous Windows installers, and reduces the chances of a version mismatch if the user happens to install a custom plugin. Leave the development plugin path unversioned. Leave the extcap path unversioned for now. Change-Id: I861d4ee12975fba4b642e391871c5e852d92a2fe Reviewed-on: https://code.wireshark.org/review/7976 Reviewed-by: Pascal Quantin Reviewed-by: Graham Bloice Petri-Dish: Graham Bloice Reviewed-by: Gerald Combs commit 461666b Author: Pascal Quantin Date: Tue Apr 7 22:51:13 2015 +0200 Qt: fix maximized state apply Preferences are not loaded yet when we call MainWindow::loadWindowGeometry() Anyway, prefs.gui_geometry_save_maximized should only be checked when saving preferences (MainWindow::saveWindowGeometry() method) like what we do in GTK UI Change-Id: I8eb01a5f4f7672fbf5846bc576584e28f72d5e31 Reviewed-on: https://code.wireshark.org/review/7978 Reviewed-by: Pascal Quantin Reviewed-by: Gerald Combs commit 69a435b Author: Graham Bloice Date: Mon Mar 30 14:03:22 2015 +0100 Add zlib compilation to CMake on Windows Modify CMake to compile zlib, removing need for an nmake compilation of zlib before running CMake. Change-Id: I63cead55b14d6a2e22b1b6a8536eaf9260e21231 Reviewed-on: https://code.wireshark.org/review/7864 Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs Reviewed-by: Graham Bloice commit 77f87b7 Author: Alexis La Goutte Date: Mon Mar 2 16:01:57 2015 +0100 Byte view tab (Qt): Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Remove unused bmask variable Change-Id: I44613f1d949dbaf8e559b3bfb2196609d821c4f3 Reviewed-on: https://code.wireshark.org/review/7496 Reviewed-by: Gerald Combs Reviewed-by: Alexis La Goutte commit f467009 Author: Pascal Quantin Date: Tue Apr 7 17:25:42 2015 +0200 ATM: add a cast to pacify the OSX 10.5 x86 buildbot Change-Id: I2bff621b46b4811cf60ebaff8fca7429bed3a91e Reviewed-on: https://code.wireshark.org/review/7973 Reviewed-by: Pascal Quantin commit 1df34d9 Author: Herwin Weststrate Date: Tue Apr 7 16:59:26 2015 +0200 Typo fix in manpage of editcap Positve => Positive Change-Id: I09190b44783d8b7f4e8e90208d8a82d192a6a189 Reviewed-on: https://code.wireshark.org/review/7971 Reviewed-by: Alexis La Goutte commit d3f2d8c Author: Bill Meier Date: Sun Apr 5 22:11:36 2015 -0400 ieee80211.c: "IEEE 802.11 plus Network Monitor radio header" encap: Fix dissection Specifically: Management/Control frames saved by Microsoft Netmon (3.4?) with "IEEE 802.11 plus Network Monitor radio header" encapsulation may or may not be saved with an FCS. See Bug 11105. Fix: Use "check fcs" preference to specify whether Management & Control frames have an fcs for this encapsulation. Change-Id: Ibd0be7b4765c2df2b959cb2234aeed027266246b Reviewed-on: https://code.wireshark.org/review/7939 Reviewed-by: Alexis La Goutte commit 9e724f7 Author: Alexis La Goutte Date: Tue Apr 7 12:11:26 2015 +0200 802.11: don't not showing all 11k subelement fields Missing break for Measurement Report tag Ping-Bug:11101 Change-Id: I570088f1eed756d541be74539774295eb67c2d47 Reviewed-on: https://code.wireshark.org/review/7969 Reviewed-by: Alexis La Goutte commit 862b16b Author: Alexis La Goutte Date: Tue Apr 7 14:31:32 2015 +0200 SGSAP: fix indent (use 4 spaces) Change-Id: I0c649d0a799817dea66ad297d47f9f22fdaa32c9 Reviewed-on: https://code.wireshark.org/review/7968 Reviewed-by: Alexis La Goutte commit f762de0 Author: AndersBroman Date: Tue Apr 7 14:12:19 2015 +0200 [SGSAP] Use the subtree for MCC MNC. Change-Id: I9913fb0d92193723e8e83a58e0d76782b3d20204 Reviewed-on: https://code.wireshark.org/review/7967 Reviewed-by: Anders Broman commit f8838c3 Author: AndersBroman Date: Tue Apr 7 13:13:45 2015 +0200 [SGSAP] Add dissection of TMSI based NRI container and Selected CS domain operator. Change-Id: I7c9c089588848a44e1454803b767ac79c07d197f Reviewed-on: https://code.wireshark.org/review/7964 Reviewed-by: Anders Broman commit 8d59ead Author: Sunil Mushran Date: Sat Apr 4 22:10:26 2015 -0400 Add OCFS2 dissector. Bug: 5553 Change-Id: If297036b6d7a7afe163d97b05bc4a319d6cf2e97 Reviewed-on: https://code.wireshark.org/review/7949 Petri-Dish: Michael Mann Reviewed-by: Michael Mann commit a49e552 Author: Stig Bjørlykke Date: Tue Apr 7 08:52:38 2015 +0200 DMP: Handle encoded 7bit string as binary. This bug was introduced when rewriting tvb_get_string() to handle encoding (and thus handling ASCII string different). Change-Id: Ia37a9d075fb58c8d6c26af811e96f7ca1e82af3d Reviewed-on: https://code.wireshark.org/review/7962 Reviewed-by: Stig Bjørlykke commit 0a729d8 Author: Michael Mann Date: Tue Apr 7 03:09:14 2015 +0000 Revert "Don't rescan packets when a display filter is added if we are capturing without "Updating list of packets in real time". There are no displayed packets to filter!" This reverts commit a11f7a75486abe3b2fdb7e8ba61e41b40b738dee. Change-Id: If3ae617c8e35439d0a77d2a2ded50288e2e6f5d7 Reviewed-on: https://code.wireshark.org/review/7961 Reviewed-by: Michael Mann commit 0eb4dfe Author: Michael Mann Date: Thu Apr 2 13:38:30 2015 -0400 Add proper "Decode As" mechanism for AAL2 instead of preference. Also create dissector table for AAL5 subdissectors. This isn't identified as a "Decode As" need, but now the conversion should be easier if that becomes needed. Change-Id: Ie70318991874de9ef8d95a2853dfceb3c0b94a00 Reviewed-on: https://code.wireshark.org/review/7894 Reviewed-by: Evan Huus Reviewed-by: Michael Mann commit a11f7a7 Author: Michael Mann Date: Sat Apr 4 19:24:22 2015 -0400 Don't rescan packets when a display filter is added if we are capturing without "Updating list of packets in real time". There are no displayed packets to filter! Bug: 6217 Change-Id: Ie4a90ff8a738d6c970d51598bf14b4b51ea069ce Reviewed-on: https://code.wireshark.org/review/7918 Reviewed-by: Michael Mann commit 3a87a32 Author: Guy Harris Date: Mon Apr 6 15:45:24 2015 -0700 See if this squelches warnings when compiling without libpcap. Change-Id: I29441ff47365e302b0ef6dfd54e94f4bf1def08a Reviewed-on: https://code.wireshark.org/review/7958 Reviewed-by: Guy Harris commit ba0b348 Author: Guy Harris Date: Mon Apr 6 14:56:17 2015 -0700 Show a count in the status bar for all captures. (I'd have said "for non-update-list-of-packets-in-real-time captures", but that's too long for the holy Git "first line of the commit message is a summary" rule.) For non-update-list-of-packets-in-real-time captures, show a packet count in the status bar. Change-Id: I31670770e3772e9f772f0c9a6438fc6d053560aa Reviewed-on: https://code.wireshark.org/review/7957 Reviewed-by: Guy Harris commit ec8ed15 Author: Gerald Combs Date: Mon Apr 6 10:31:51 2015 -0700 Use zlib 1.2.8 on Windows. Change-Id: I3df88b1e891f43cd6b6ed089f6c3d20a942e68bc Reviewed-on: https://code.wireshark.org/review/7952 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 0ef2fd5 Author: Guy Harris Date: Mon Apr 6 14:06:17 2015 -0700 Reset the captured-packet count when we start or restart a capture. Bug: 6217 Change-Id: I916e9a6fdb0e114d5f8f123153c213af9273bbc3 Reviewed-on: https://code.wireshark.org/review/7954 Reviewed-by: Guy Harris commit 8fec18a Author: Julien STAUB Date: Mon Apr 6 15:16:26 2015 +0200 zigbee: enhance zigbee illuminance cluster dissection value displayed wasn't in lux Change-Id: Id0c48c9a7968639e47d81e128c22c6cdcb3df929 Reviewed-on: https://code.wireshark.org/review/7945 Reviewed-by: Pascal Quantin commit 9147961 Author: Gerald Combs Date: Mon Apr 6 11:30:33 2015 -0700 Add a warning about Chocolatey's Wget package. Its CA certificate configuration appears to be incomplete. Recommend Cygwin's instead. Change-Id: I0e7ddbfbb2a37f2872a820442e2d185f20ef551e Reviewed-on: https://code.wireshark.org/review/7948 Reviewed-by: Gerald Combs commit 1871fb2 Author: Guy Harris Date: Mon Apr 6 12:14:25 2015 -0700 Keep a captured-packet count in a capture_session and use that. Have the count in a cfile_t structure always reflect the actual number of packets that have been read from the file, rather than, when doing a non-update-list-of-packets-in-real-time capture, falsely increasing the count in the cfile_t to reflect the number of packets captured but not yet read. Have the status bar base its captured-packet count on the count in the capture_session structure, and base the "sorry, no packets were captured" message on the count in the capture_session structure, as we're no longer using the count in the cfile_t structure to count anything in the process of a non-update-list-of-packets-in-real-time capture. That way, we preserve the invariant that the "frames" member of a cfile_t will be non-null if the "count" member is non-zero, fixing bug 6217. It also means we can get rid of cf_set_packet_count(), as we only set the count in the capture-file-reading code. Bug: 6217 Change-Id: I72c0e2c07c30782bad777995370b7c19e1460cc2 Reviewed-on: https://code.wireshark.org/review/7950 Reviewed-by: Guy Harris commit b23ab90 Author: Evan Huus Date: Sun Apr 5 21:24:40 2015 -0400 unistim: remove tvb_length deprecated API Change-Id: Ic2bdc6ec69dcdd856987ec74cc401cd8585727ac Reviewed-on: https://code.wireshark.org/review/7937 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit 6efa0b6 Author: Evan Huus Date: Sun Apr 5 21:21:51 2015 -0400 profinet: remove tvb_length deprecated API Change-Id: Ie6f607d86235c0e2d4fc95f77a7500c1636da934 Reviewed-on: https://code.wireshark.org/review/7936 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit c1e6a19 Author: Evan Huus Date: Sun Apr 5 21:28:10 2015 -0400 ethercat: remove deprecated tvb_length API Change-Id: I76916948fc06c5a4df5a1188fde164d516b4105d Reviewed-on: https://code.wireshark.org/review/7938 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit 686d3ef Author: Robert P Date: Mon Apr 6 09:45:33 2015 +0200 PKCS1: fix a typo for OID 1.3.132.0.35 Bug: 11106 Change-Id: Ied414b8e0bae8f34445f4d36bc6dfcc96b4a7456 Reviewed-on: https://code.wireshark.org/review/7941 Reviewed-by: Pascal Quantin commit bfd3d26 Author: Guy Harris Date: Mon Apr 6 01:01:03 2015 -0700 Show a list of interfaces on the welcome screen when capturing. In a non-update-list-of-packets-in-real-time capture, once the capture starts, put up a message on the welcome screen indicating on what interfaces we're capturing, rather than leaving the "waiting for stuff to arrive from dumpcap" message up. Make some routines not used outside main_welcome.c static while we're at it. Change-Id: I461dd1333d3fa2b64f20310f7b77b45578f9b40d Reviewed-on: https://code.wireshark.org/review/7942 Reviewed-by: Guy Harris commit d4bfa9c Author: Guy Harris Date: Sun Apr 5 16:42:35 2015 -0700 Have a common routine for constructing strings listing interfaces. We have a bunch of duplicated code to make those lists; make a common routine for that. (dumpcap currently doesn't use it, as the routine in question uses a routine in libui, which dumpcap doesn't use. We should probably fix that.) Change-Id: I9058bf3320d420b8713e90743618972da1d1c6ed Reviewed-on: https://code.wireshark.org/review/7934 Reviewed-by: Guy Harris commit 24af6ee Author: Guy Harris Date: Sun Apr 5 15:13:17 2015 -0700 Pop the welcome screen message when we close a file. That fixes a bug where the welcome screen gets stuck at "Waiting for capture input data..." if you do a non-update-list-of-packets-in-real- time capture, stop the capture, and close the capture. Change-Id: Ia77900707c6287e091a1acd2a6640462e0e4fb37 Reviewed-on: https://code.wireshark.org/review/7931 Reviewed-by: Guy Harris commit fd510be Author: Guy Harris Date: Sun Apr 5 13:01:45 2015 -0700 Give the welcome screen its own set of callbacks. Don't have the status bar code know about the welcome screen; instead, give the welcome screen its own callbacks, so that it can modify the welcome screen as appropriate. Change-Id: Id38d66edeaea085f114b47d6361312450435b58a Reviewed-on: https://code.wireshark.org/review/7927 Reviewed-by: Guy Harris commit afe9b9b Author: Martin Kaiser Date: Sun Apr 5 18:28:52 2015 +0200 fibre channel: remove some unnecessary if(tree) checks Change-Id: Id55fcaa49d5ae46af2c26c7c641f6440335ca225 Reviewed-on: https://code.wireshark.org/review/7925 Reviewed-by: Martin Kaiser commit d4c8dca Author: Gerald Combs Date: Sun Apr 5 09:13:46 2015 -0700 [Automatic update for 2015-04-05] Update manuf, services enterprise-numbers, translations, and other items. Change-Id: If98edeab7a413c33e54fbd579e975da26993a380 Reviewed-on: https://code.wireshark.org/review/7922 Reviewed-by: Gerald Combs commit 837948d Author: Pascal Quantin Date: Sun Apr 5 16:37:06 2015 +0200 NAS EPS: remove proto_tree_add_text calls Change-Id: Ib66a37c31df5da5c93dc7087528bb92d0ffec67e Reviewed-on: https://code.wireshark.org/review/7920 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit f90699c Author: Gerald Combs Date: Sun Apr 5 08:54:16 2015 -0700 Don't commit translation updates for now. Doing so conflicts with the weekly update script. Change-Id: I3ffbe9cbae9b8efdc8369de2054d9f8b8a8d5c5e Reviewed-on: https://code.wireshark.org/review/7921 Reviewed-by: Gerald Combs commit 4c5b53f Author: Evan Huus Date: Sat Apr 4 13:46:01 2015 -0400 docsis: remove tvb_length calls Change-Id: Ib35c6436876aa7f933dcec0a97a70ccbbc823905 Reviewed-on: https://code.wireshark.org/review/7913 Reviewed-by: Evan Huus commit 32d0fc0 Author: Evan Huus Date: Sat Apr 4 13:41:30 2015 -0400 irda: remove tvb_length calls Change-Id: I5ea9ed7226217ab272d957ae3240a286c6a26de9 Reviewed-on: https://code.wireshark.org/review/7912 Reviewed-by: Evan Huus commit 8699bc2 Author: Michael Mann Date: Sat Apr 4 16:23:02 2015 -0400 Remove epan member from PacketWinData and just use cfile.epan when redissecting a packet window. A pointer to cfile.epan was saved by the window when it's created, but any redissection will remove the epan_session used by cfile.epan underneath the window, so let's just use cfile.epan directly. Bug: 11043 Change-Id: Ie6b85708025f8ab7d5e5dc48ad99fee0931af472 Reviewed-on: https://code.wireshark.org/review/7915 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris commit 8327921 Author: Guy Harris Date: Sat Apr 4 14:43:22 2015 -0700 Fix another capture_dev_user_pmode_find() call. Missed by the previous commit. Change-Id: I0882e2cf7a734f93e59dbfd1aab564a2fd65d316 Reviewed-on: https://code.wireshark.org/review/7917 Reviewed-by: Guy Harris commit c67bc03 Author: Guy Harris Date: Sat Apr 4 14:01:56 2015 -0700 Let capture_dev_user_pmode_find() say "not found". "Not found" is different from "found, and false". Have it return a boolean "did I find the property" indication and, if it did, supply the property value through a pointer. Change-Id: Iaa942ea346410b35e512ff1a3821cbf60c88dfd6 Reviewed-on: https://code.wireshark.org/review/7916 Reviewed-by: Guy Harris commit 666f9bc Author: Alexis La Goutte Date: Sat Apr 4 16:18:06 2015 +0200 dumpcap: fix no previous prototype for ‘is_linux_bonding_device’ [-Wmissing-prototypes] Change-Id: If0c07232f92fab03f5312a932b925156d53bda4e Reviewed-on: https://code.wireshark.org/review/7909 Reviewed-by: Evan Huus commit 2b7f875 Author: Martin Kaiser Date: Sat Apr 4 19:15:50 2015 +0200 change several (mutually exclusive) if statements into one big if-else Change-Id: Ib3614431c3ff8f6e53fa0993e296ffea70926d03 Reviewed-on: https://code.wireshark.org/review/7911 Reviewed-by: Martin Kaiser commit e4da62f Author: Martin Kaiser Date: Sat Apr 4 13:26:21 2015 +0200 Coverity 1158848, 1158849 (logically dead code) the option parameter of output_fields_set_option() is always a 0-terminated string therefore, option_value can't possibly be NULL, remove the NULL checks if someone runs 'tshark ... -E header=', option_value is an empty string, bail out in this case, don't parse *option_value and *(option_value++) in the switch statements Change-Id: I734b04aff653e8dbe990f546220595546e7503b0 Reviewed-on: https://code.wireshark.org/review/7904 Reviewed-by: Martin Kaiser commit f1803db Author: Alexis La Goutte Date: Sun Feb 22 20:13:36 2015 +0100 Add update-tx tools (Resync translation between repo and Transifex) Change-Id: Ica2902fbc8a089b3b877b00c1fd72397f2c08146 Reviewed-on: https://code.wireshark.org/review/7314 Reviewed-by: Gerald Combs Reviewed-by: Alexis La Goutte commit 71eda00 Author: Alexis La Goutte Date: Sat Apr 4 16:17:37 2015 +0200 GSM: fix no previous prototype for 'de_sm_re_attempt_ind' [-Wmissing-prototypes] Change-Id: Iaf4c01f659f9c0eed8615e77d0eab81724b44385 Reviewed-on: https://code.wireshark.org/review/7908 Reviewed-by: Pascal Quantin commit 38a5fce Author: Alexis La Goutte Date: Sat Apr 4 16:19:28 2015 +0200 GSM: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: If10a9902c231b87995562fd0c687a25dcab3e250 Reviewed-on: https://code.wireshark.org/review/7910 Reviewed-by: Pascal Quantin commit 9d10be5 Author: Michael Mann Date: Thu Apr 2 07:54:24 2015 -0400 Some CANopen frame types can have zero size, so use tvb_reported_length instead of -1. Bug: 11083 Change-Id: Ib17649fbbc4f79705e3ad18903b5c8847cb09054 Reviewed-on: https://code.wireshark.org/review/7881 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus Reviewed-by: Michael Mann commit 267e169 Author: Martin Kaiser Date: Sat Apr 4 13:53:03 2015 +0200 try to silence the OS X builbots by renaming index to idx mp2t.c: In function 'mp2t_find_next_pcr': mp2t.c:160: warning: declaration of 'index' shadows a global declaration /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk/usr/include/string.h:125: warning: shadowed declaration is here mp2t.c: In function 'mp2t_bits_per_second': mp2t.c:208: warning: declaration of 'index' shadows a global declaration /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk/usr/include/string.h:125: warning: shadowed declaration is here Change-Id: Ia8591990409a0730d913c50d80b6950425a22052 Reviewed-on: https://code.wireshark.org/review/7905 Reviewed-by: Martin Kaiser commit 66c4c14 Author: Martin Kaiser Date: Sat Apr 4 13:34:11 2015 +0200 we may see an empty option string in output_fields_set_option() Change-Id: I45a4cbef7cb38a851c207fbe26ff412ffc502240 Reviewed-on: https://code.wireshark.org/review/7903 Reviewed-by: Martin Kaiser commit 37c41d7 Author: Michael Mann Date: Thu Apr 2 20:16:54 2015 -0400 Add proper "Decode As" mechanism for I2C messages instead of preference. Change-Id: Ifcf1193f97df6911ca9a0cf5613c9450b8fce1e4 Reviewed-on: https://code.wireshark.org/review/7897 Reviewed-by: Martin Kaiser commit 7253ee7 Author: Weston Schmidt Date: Wed Mar 18 21:51:03 2015 -0700 Add PCR based stream times for MPEG ts files. Change-Id: Ie1308829c3ad44d842bf12c7ebc5c200c942d8cc Reviewed-on: https://code.wireshark.org/review/7750 Reviewed-by: Martin Kaiser commit f031faf Author: Michael Mann Date: Thu Apr 2 17:15:08 2015 -0400 Add proper "Decode As" mechanism for EtherNet/IP I/O instead of preference. Change-Id: I9d7c0f296176679b61d7ee0c4358ce409dfc4f4f Reviewed-on: https://code.wireshark.org/review/7895 Reviewed-by: Evan Huus Reviewed-by: Michael Mann commit a655c9a Author: Gerald Combs Date: Fri Apr 3 12:21:40 2015 -0700 Nmake preprocessor string comparisons are case-sensitive. In related news, VC/bin/amd64/vcvars64.bat calls "set Platform=X64" while VC/bin/x86_amd64/vcvarsx86_amd64.bat calls "set Platform=x64". Change-Id: I4bc97eee6170c11e43ed2b46b7599f5021843d6a Reviewed-on: https://code.wireshark.org/review/7893 Reviewed-by: Gerald Combs commit 8c31988 Author: Pascal Quantin Date: Fri Apr 3 16:57:42 2015 +0200 NAS EPS: upgrade dissector to v12.8.0 Change-Id: I8b7f7380c32c38fa5483a2966b56a6c2ee687c1c Reviewed-on: https://code.wireshark.org/review/7892 Petri-Dish: Pascal Quantin Reviewed-by: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit b9cf389 Author: AndersBroman Date: Thu Apr 2 15:07:49 2015 +0200 [S1AP] Display the decimal value for TAC. Change-Id: I12127b5f7e53e2d47a42ad54d4e952f6a184d7b6 Reviewed-on: https://code.wireshark.org/review/7883 Reviewed-by: Anders Broman commit a5b51d5 Author: Alexis La Goutte Date: Fri Apr 3 12:36:33 2015 +0200 TX: Update translations (Manual sync 2015-04-03) Change-Id: I8f7860707fea0bfb6b2ff36fb445cf4e91917e06 Reviewed-on: https://code.wireshark.org/review/7890 Reviewed-by: Alexis La Goutte commit 1377dff Author: Alexis La Goutte Date: Wed Apr 1 15:00:16 2015 +0200 802.11: don't not showing all 11k subelement fields Add Request Channel Load and Noise Histogram Bug:11101 Change-Id: I276eb4711169555a2df6a72c78d0ad743398b954 Reviewed-on: https://code.wireshark.org/review/7877 Petri-Dish: Alexis La Goutte Reviewed-by: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit fdcc9e5 Author: Alexis La Goutte Date: Wed Apr 1 14:16:45 2015 +0200 802.11: don't not showing all 11k subelement fields Add expert info when there is some undecoded Measure Request/Report type (and subtype) Change-Id: Iece7487680d3211f28365d6596db31f408edb96b Ping-Bug:11101 Reviewed-on: https://code.wireshark.org/review/7876 Tested-by: Alexis La Goutte Reviewed-by: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 23f0e16 Author: Graham Bloice Date: Thu Apr 2 14:30:40 2015 +0100 Fix IMF Dissector The IMF dissector doesn't properly handle the extra CRLF between the headers and the body, leaving it as part of the last header, and then fails to obtain the body contents due to incorrectly specifying the length of the remaining data. Change-Id: I8a1dfebd90e4cd5249f2244e9374a8e9ed3a25da Reviewed-on: https://code.wireshark.org/review/7884 Reviewed-by: Graham Bloice Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit a6459ca Author: Pascal Quantin Date: Fri Apr 3 07:20:05 2015 +0200 3GPP NAS: upgrade dissector to v12.9.0 Change-Id: I6bffe7b5b95d72031df5aecac66129d2ceff517e Reviewed-on: https://code.wireshark.org/review/7889 Reviewed-by: Pascal Quantin commit e4e59eb Author: Pascal Quantin Date: Thu Apr 2 15:30:33 2015 +0200 3GPP NAS: display Short Element Identifier as it was done prior to ge74cb41 Change-Id: Ie001b420eb1fd29c8f5c941e69f4e2929250d887 Reviewed-on: https://code.wireshark.org/review/7885 Reviewed-by: Pascal Quantin commit 4e68f01 Author: Joerg Mayer Date: Fri Apr 3 02:15:39 2015 +0200 Fix: packet-bitcoin.c:1735:6: error: 'hfi_msg_getheaders_version' undeclared (first use in this function) &hfi_msg_getheaders_version, caused by previous commit. Weird that the compiler on my system didn't catch that. Change-Id: I73cb06553bdf3a37f7c3d61d85f425d7c92d5b99 Reviewed-on: https://code.wireshark.org/review/7888 Reviewed-by: Jörg Mayer commit f505d38 Author: Joerg Mayer Date: Fri Apr 3 01:50:59 2015 +0200 Fix: git/epan/dissectors/packet-bitcoin.c:270:26: error: ‘hfi_msg_getheaders_version’ defined but not used [-Werror=unused-variable] Change-Id: Ifcbc8be775e5f435497f5391755356caee48a7d9 Reviewed-on: https://code.wireshark.org/review/7887 Reviewed-by: Jörg Mayer commit 7787c1b Author: Gerald Combs Date: Thu Apr 2 12:10:36 2015 -0700 Fixup our anonsvn URLs. Change-Id: Id18d392bf7ff948fc78b684d8222c5c3725d302a Reviewed-on: https://code.wireshark.org/review/7886 Reviewed-by: Gerald Combs commit c3bc159 Author: Alexis La Goutte Date: Tue Mar 31 16:45:34 2015 +0200 802.11: EAPOL 4-way handshake information wrong the EAPOL Key Exchange descriptions show key packets 2 and 4 as "Key (Message 4 of 4)" Reason of issue : In the IEEE 802.11 specification the value for the counter is defined as following: Message #2 - counter = n Message #4 - counter = n+1 So the only way to distinguish between message #2 and message #4 using the counter value would be for Wireshark to "look ahead" and compare the counter values (e.g., if counter1 < counter2, then message 2, else message 4). Fix : However, there is a much easier way to distinguish between message #2 and message #4. Instead of using the counter field, Wireshark could parse the "WPA Key Nonce" field (display filter = wlan_rsna_eapol.keydes.nonce). According to the IEEE specification, sections 11.6.6.3 and 11.6.6.5 define the value for the WPA Key Nonce as following: Message #2, Key Nonce = SNonce (Supplicant Nonce) Message #4, Key Nonce = 0 So, the logic would be: 1. Use the Wireshark parser to determine the WPA Key Nonce value. The Key nonce field is 32 octets. 2. If !(keynonce), then message #2 Else message #4 (Only check the first 4 octets of nonce if equal to zero) Issue reported by Murray Pickard Reason of issue (and proposed fix) by Amato Carbonara Bug: 10557 Change-Id: I66086ac27a4d7d3ac0356be295d23001e2af71c8 Reviewed-on: https://code.wireshark.org/review/7868 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 33abb91 Author: Alexis La Goutte Date: Wed Apr 1 16:54:20 2015 +0200 dumpcap: fix Resource leak (CID: 129558) Change-Id: Ia5d91889ad636412f9ed8104818bfbbd311bf99b Reviewed-on: https://code.wireshark.org/review/7879 Petri-Dish: Alexis La Goutte Reviewed-by: Guy Harris commit 7e87ddd Author: Balint Reczey Date: Wed Apr 1 16:32:28 2015 +0200 Update command used for generating .debs in WSDG Change-Id: I50e224087a3bdd92d166c6767ea5ef959d1d5aa2 Reviewed-on: https://code.wireshark.org/review/7878 Reviewed-by: Balint Reczey Tested-by: Balint Reczey commit 6254896 Author: Alexis La Goutte Date: Wed Apr 1 12:40:40 2015 +0200 AFP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: Ib1c2bb355c7757b1aca4b59953ca6ab94aa30593 Reviewed-on: https://code.wireshark.org/review/7873 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 822dd3d Author: Alexis La Goutte Date: Wed Apr 1 13:05:07 2015 +0200 USB Audio : fix fix Found soft-deprecated APIs (tvb_length) Change-Id: I727f0b0853920967b88a95e1708b535e8b1e4d9e Reviewed-on: https://code.wireshark.org/review/7875 Reviewed-by: Anders Broman commit ce2b1ca Author: Pascal Quantin Date: Wed Apr 1 12:21:33 2015 +0200 2G/3G NAS: follow-up of ge74cb41 Change-Id: Id095bfb4a39b205517a8545e8a1c66927b4f4515 Reviewed-on: https://code.wireshark.org/review/7872 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit edf62d1 Author: Pascal Quantin Date: Wed Apr 1 12:40:51 2015 +0200 LTE RRC: fix a typo introduced in g9aa624d Change-Id: Ia1bb68c64ca4cb820790dc84abee9cc222a1d0e4 Reviewed-on: https://code.wireshark.org/review/7874 Reviewed-by: Pascal Quantin commit c164534 Author: Michal Labedzki Date: Wed Mar 18 17:02:54 2015 +0100 Qt: Add Capture Restart feature Change-Id: Ied33dd43bb16660aec7063ddf81982ee48226e9e Reviewed-on: https://code.wireshark.org/review/7737 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki commit 7cfc7d1 Author: Alexis La Goutte Date: Tue Mar 31 16:26:09 2015 +0200 Bluetooth: fix Uninitialized scalar variable (CID 1268203) Change-Id: Ic9e47a32dc935e3e121cd49d4b378021c122aecd Reviewed-on: https://code.wireshark.org/review/7866 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki commit e74cb41 Author: Michael Mann Date: Sun Mar 29 10:45:16 2015 -0400 Remove proto_tree_add_text from GSM dissectors. Change-Id: I72a7c1a44bda7755d8b1376dd5e57c46f137ff31 Reviewed-on: https://code.wireshark.org/review/7870 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 752f5de Author: Richard Sharpe Date: Sat Mar 28 08:34:12 2015 -0700 Fix bug #10858. There were several cases where uint32 fields were mistaken for two uint16 fields and three fields were merged into one as an unknown. There was also an unnecessary unknown field on the end that caused a malformed packet exception to occur. Tested with a capture of a rename. Bug: 10858 Change-Id: Ibcf22270d2c34605bb47e3a9804b53746597572d Signed-off-by: Richard Sharpe Reviewed-on: https://code.wireshark.org/review/7837 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit c5b35c2 Author: Evan Huus Date: Tue Mar 31 20:31:18 2015 -0400 afp: 64-bit values require 64-bit value strings Bug: 11099 Change-Id: Id3b465f1835552d25b9877242d4c69a3c03281a6 Reviewed-on: https://code.wireshark.org/review/7871 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit 9aa624d Author: Pascal Quantin Date: Tue Mar 31 22:05:43 2015 +0200 LTE RRC: upgrade dissector to v12.5.0 Change-Id: I9e3dfb17b4b7f96be999ccea88fec754a936d312 Reviewed-on: https://code.wireshark.org/review/7869 Petri-Dish: Pascal Quantin Reviewed-by: Pascal Quantin commit b1f1c1f Author: Alexis La Goutte Date: Tue Mar 31 16:31:34 2015 +0200 USB Audio: fix Logically dead code (CID: 1247681) Change-Id: I8a32b1aff45376246ea092459594fcae2f423755 Reviewed-on: https://code.wireshark.org/review/7867 Reviewed-by: Pascal Quantin Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit fa192dc Author: Richard Sharpe Date: Tue Mar 24 21:05:31 2015 -0700 Correctly handle the CREATE_APP_INSTANCE_ID Create Tag as well as another that is based around a GUID. Also add some more FileFs Info strings and one more FSCTL code. Change-Id: Ib9e5d5a4ee64cd9b94eb9a54ec7a04a82e4ad00f Signed-off-by: Richard Sharpe Reviewed-on: https://code.wireshark.org/review/7817 Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 17cbd50 Author: Roland Knall Date: Tue Mar 31 12:56:19 2015 +0200 wsutil: Fix comment Comment was, although accurate on the subject, not very well formulated Change-Id: I4e6a4bdbc40f75b6bca72de4e71451c441d70d08 Reviewed-on: https://code.wireshark.org/review/7863 Reviewed-by: Roland Knall Reviewed-by: Michal Labedzki Reviewed-by: Anders Broman commit 4db7c2d Author: Mikhail Koreshkov Date: Mon Mar 30 22:16:35 2015 +0300 GSM_A: dissector table for User-To-User signalling Add User-To-User (UUS) dissector table to be able further data processing. Change-Id: I44cc32441072c643d19af53849cf5b53909b4889 Reviewed-on: https://code.wireshark.org/review/7857 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit c3c8552 Author: Guy Harris Date: Mon Mar 30 15:55:15 2015 -0700 Add the new #defines to cmakeconfig.h.in. Unlike autoconf, which can generate config.h.in based on the contents of the configure script, CMake requires that cmakeconfig.h.in be updated separately. Change-Id: I78ead3bae41667bd7c452329485a819ac34bce5e Reviewed-on: https://code.wireshark.org/review/7859 Reviewed-by: Guy Harris commit 9670f05 Author: Gerald Combs Date: Tue Mar 24 20:33:08 2015 -0500 Add ftsanity.py to the unit tests. Change-Id: Ib480d8be5f66c70a4213af27acee94016fbf974b Reviewed-on: https://code.wireshark.org/review/7855 Reviewed-by: Gerald Combs commit 7181ae4 Author: Guy Harris Date: Mon Mar 30 11:21:17 2015 -0700 Work around a Linux bonding driver bug (and the lack of a libpcap workaround). The bonding driver does not properly handle unknown ioctls; it returns ENODEV rather than ENOTSUP, EOPNOTSUPP, ENOTTY, or a "not supported" error of that type. This causes problems detailed in bug 11058. On Linux, check for bonding devices before checking for monitor-mode support. While we're at it, get rid of a commented-out include of CheckCSourceCompiles (it's presumably already been implicitly included by other functions that use it). Bug: 11058 Change-Id: I13035de0650634c51a52f262829b2b6fb86b39e9 Reviewed-on: https://code.wireshark.org/review/7856 Petri-Dish: Guy Harris Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris commit f341fd9 Author: Alexis La Goutte Date: Mon Mar 30 15:02:26 2015 +0200 WSP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: I1e046988ed0e21e4824a3021e43fb429ed5211b4 Reviewed-on: https://code.wireshark.org/review/7854 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 3443e1e Author: Michael Mann Date: Sat Mar 28 17:59:11 2015 -0400 Remove proto_tree_add_text from packet-afp.c Also do a bunch of proto_tree_add_bitmask conversions and other small cleanup. Change-Id: I0b42098e1db1457f80b839edbc260c0a72e177d6 Reviewed-on: https://code.wireshark.org/review/7853 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit b428477 Author: Alexis La Goutte Date: Mon Mar 30 12:01:57 2015 +0200 BTHFP: fix missing Break in switch (CID: 1287325) Change-Id: I26156e928b5fc07cff8a7c83cfed2f1cccff1994 Reviewed-on: https://code.wireshark.org/review/7851 Reviewed-by: Michal Labedzki commit 8cc297c Author: Pascal Quantin Date: Mon Mar 30 12:27:40 2015 +0200 LPP: upgrade dissector to v12.4.0 Change-Id: Ie09ab1002ccc3f275828615755b3130bfbb14fdc Reviewed-on: https://code.wireshark.org/review/7852 Petri-Dish: Pascal Quantin Reviewed-by: Pascal Quantin commit 3b9cf24 Author: Pascal Quantin Date: Sun Mar 29 00:18:43 2015 +0100 ANSI IS-637 A: add dissection of Multiple Encoding User Data and Service Category Program Data Bug: 11086 Change-Id: I36096d35038bc71191040514a38dcdf9e1373f31 Reviewed-on: https://code.wireshark.org/review/7840 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit d892c32 Author: Michael Mann Date: Fri Mar 27 19:23:08 2015 -0400 Eliminate proto_tree_add_text from packet-nfs.c Various other cleanup while in the neighborhood. Change-Id: I9d8322fd8fb867ad5569db9f781a33825ca34d1b Reviewed-on: https://code.wireshark.org/review/7834 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 8874653 Author: Vincent Helfre Date: Sun Mar 29 20:47:50 2015 +0200 RRC: add a missing mask forgotten in gf3d1e3c Change-Id: Ib62e15d17ea576f2180ac92d217869768225905d Reviewed-on: https://code.wireshark.org/review/7850 Reviewed-by: Pascal Quantin commit 606fa96 Author: Pascal Quantin Date: Sun Mar 29 19:35:47 2015 +0200 Extcap: fix USBPcap capture broken by g8204578 g8204578 was not the right way to do things: if_type is used to identify an extcap interface Change-Id: Iead6c5e63f6874012c27ed7c1bf7152a5891ad65 Reviewed-on: https://code.wireshark.org/review/7849 Reviewed-by: Pascal Quantin commit 4e4de74 Author: Martin Kaiser Date: Sat Mar 21 12:05:46 2015 +0100 DVB-CI Card Information Structure (CIS): start dissecting the device tuples Change-Id: I20a098eb1fdcfd34eb03b685d6936a6cf5868c0d Reviewed-on: https://code.wireshark.org/review/7848 Reviewed-by: Martin Kaiser commit e91d070 Author: Martin Kaiser Date: Sat Mar 21 09:00:51 2015 +0100 smart card dev class descriptor: use a bit field for the supported protocols Change-Id: Icf1d71f0aa90ed418264cd4f349e2a514f1ae2f9 Reviewed-on: https://code.wireshark.org/review/7847 Reviewed-by: Martin Kaiser commit 7861fb3 Author: Martin Kaiser Date: Sat Mar 21 08:41:32 2015 +0100 dissect two more features in the smart card device class descriptor Change-Id: Ia442cbf7a30c1f1054a3fa8e814d595867e2c034 Reviewed-on: https://code.wireshark.org/review/7846 Reviewed-by: Martin Kaiser commit f3d1e3c Author: Vincent Helfre Date: Sun Mar 29 14:44:52 2015 +0200 RRC: add dissection of ims-Information IE Bug: 11096 Change-Id: I348726dcd3b62f75db67e63c07bcdc79e86657a7 Reviewed-on: https://code.wireshark.org/review/7842 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit beb7628 Author: Gerald Combs Date: Sun Mar 29 08:05:50 2015 -0700 [Automatic manuf, services and enterprise-numbers update for 2015-03-29] Change-Id: Ied01fe7ddb1734f1f8974c725b802075220bbd0f Reviewed-on: https://code.wireshark.org/review/7843 Reviewed-by: Gerald Combs commit 1091f65 Author: Laurenz Kamp Date: Fri Mar 27 15:32:39 2015 +0100 bitcoin: Updated dissector to support the latest protocol version (70002). Changes made: Updated dissectors: -> ping: ping packets now have a nonce. -> version: If version >= 70002, version messages have a relay flag. -> Messages with no payload: Added mempool and filterclear messages. Added dissectors: -> pong message -> notfound message -> reject message -> filterload message -> filteradd message -> merkleblock message -> headers message Change-Id: I9eb0dba971b2f612f95211847a7f283a037341e6 Reviewed-on: https://code.wireshark.org/review/7831 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit d3517fd Author: Evan Huus Date: Sat Mar 28 08:48:38 2015 -0400 wsp: fix format string I76f7515889727dc7fad27ac90ca96750384a46f3 made the format strings static using macros, but missed the fact that sprintf("%s foo", bar) should become (bar " foo") and not ("%s foo" bar). This caused a malformed value string fallback. Bug: 11092 Change-Id: Idba3c87a32a6b3c852e661a62e8cd9be6cad0904 Reviewed-on: https://code.wireshark.org/review/7836 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit b8ccc2a Author: Evan Huus Date: Sat Mar 28 08:38:25 2015 -0400 x11: destroy two more hash tables in convo data Fixes a memory leak. Bug: 11088 Change-Id: Ie5532507c6e2963af8056d41abf1c7a398e08cfd Reviewed-on: https://code.wireshark.org/review/7835 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit 16280d9 Author: Michael Mann Date: Thu Mar 26 16:07:40 2015 -0400 Remove proto_tree_add_text from packet-sml.c Change-Id: I811933345a5c62624af08db39ee79c1431c89aa5 Reviewed-on: https://code.wireshark.org/review/7833 Reviewed-by: Michael Mann commit 8204578 Author: Pascal Quantin Date: Fri Mar 27 07:50:42 2015 +0100 Extcap: display a USB icon when adding a USBPcap interface Change-Id: Ibe78b115eb6e7e737a5dc9c8a7937b82d8cf76a8 Reviewed-on: https://code.wireshark.org/review/7830 Reviewed-by: Pascal Quantin commit 55de704 Author: Pascal Quantin Date: Sat Mar 21 16:42:08 2015 +0100 USB: use URB/IRP ID for request/response tracking Bug: 11072 Change-Id: I5f1824d602e4b88c9c5c8520b0aac9945206f093 Reviewed-on: https://code.wireshark.org/review/7781 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 91addef Author: AndersBroman Date: Thu Mar 26 19:25:18 2015 +0100 [Diameter] Pretify a couple of AVPs that might be text eventhough they are specified as octet strings. Change-Id: Ib3dd1fe18b64c9defdcd6e0434dd9937fbd4dfea Reviewed-on: https://code.wireshark.org/review/7828 Reviewed-by: Anders Broman commit 01947ac Author: Graham Bloice Date: Thu Mar 26 14:11:21 2015 +0000 CMake updates for Windows build Removed the redundant setpath batch file and associated macro and updated docs. Change-Id: I5ddab6bad2d14ed3443194d7269f1890e4aa608e Reviewed-on: https://code.wireshark.org/review/7826 Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice commit a596361 Author: Andreas Schultz Date: Thu Mar 26 10:23:58 2015 +0100 DTLS: use addresses_ports_reassembly_table_functions When capturing two consecutive DTLS session to the same server, fragments for the second session report a error: > [Reassembly error, protocol DTLS: New fragment overlaps old data (retransmission?)] It turns out that the DTLS dissector uses the addresses_reassembly_table_functions which takes only the IP addresses into account and not the ports. Changing that to the addresses_ports_reassembly_table_functions fixes the bogus error message. Change-Id: If317314dca4b1d46e802bac54c07c89c7a73e24e Reviewed-on: https://code.wireshark.org/review/7824 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 680dfc1 Author: Graham Bloice Date: Thu Mar 19 16:51:02 2015 +0000 CMake cleanup for VS solution Add FOLDER properties to targets to tidy up the VS solution Change-Id: Ia42e0e89fb490cd3dcd33b7c5f59eb0a27b74c7a Reviewed-on: https://code.wireshark.org/review/7822 Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice commit 13c486c Author: Peter Wu Date: Wed Mar 25 20:51:01 2015 +0100 html2text.py: Python 2.5 compatibility, improve Unicode support Add support for Python 2.5 (remove unicode_literals import which does not seem to be necessary), check before using break_on_hyphens (without this option in Python 2.5, the output is uglier though) and avoid the 'with' keyword. While at it, fix reading Unicode text from file in Python 2 (tested with: echo € | tools/html2text.py) and support reading from stdin using the '-' filename. Tested against Python 2.5.6, 2.6.6, 2.7.9, 3.2.6, 3.4.3 with the commands from the previous html2text.py commit message, and additionally with the Unicode character € as input (instead of the faq.py output). Change-Id: I3de3f7a4e7cf7d702463c3a59758803843338a54 Reviewed-on: https://code.wireshark.org/review/7823 Reviewed-by: Peter Wu Tested-by: Peter Wu Petri-Dish: Peter Wu Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 785fab7 Author: Jiří Engelthaler Date: Wed Mar 25 16:57:16 2015 +0100 packet-iec104: fix showing information objects if SQ flag is set IOA of information object is shown only for first object in sequence, corrected byte count for information object. Change-Id: Id428ce3b9d98da0be0315f2a880e5c025e076183 Reviewed-on: https://code.wireshark.org/review/7821 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit ffecd08 Author: Peter Wu Date: Mon Mar 2 11:32:51 2015 +0100 FindPOD: fix link to CSS docbook/Makefile.am uses --stylesheet=ws.css too, without this change the generated HTML will point to the source directory... Change-Id: I351cb658c404a08655201933158f91765f8d9c35 Reviewed-on: https://code.wireshark.org/review/7503 Reviewed-by: Peter Wu Reviewed-by: Gerald Combs commit dbef80f Author: Peter Wu Date: Sun Mar 22 15:46:33 2015 +0100 dfilter-test.py: add OOT support and Python 3 compat Support WS_BIN_PATH and SOURCE_DIR (modelled after test/config.sh) to support out-of-tree builds (including cmake). Add Python 3 support and mention this in the documentation. Tested with Python 2.7.9, 3.2.6, 3.4.3: WS_BIN_PATH=/tmp/wsbuild/run SOURCE_DIR=/tmp/wireshark \ tools/dfilter-test.py testBytesIPv6 (2.7.9 and 3.4.3 were also tested fully, but some cases seem to fail even before this patch. 2.5.6 and 2.6.6 do not work because the unittest module is outdated.) Change-Id: I13074579f6f74206edb5cd7be8e7a8406de49c56 Reviewed-on: https://code.wireshark.org/review/7793 Reviewed-by: Anders Broman commit 1ba4191 Author: Peter Wu Date: Sun Mar 22 15:10:34 2015 +0100 indexcap.py: fix tmpdir handling, python 3 compat Add Python 3 compatibility to indexcap.py and only create a tmpdir for actions that need it. Only remove tmpdir for the compare action and try to remove the temp dir even if an exception occurs. In list_protos_in_cap.sh, rename BIN_DIR to WS_BIN_PATH (matching test/config.sh) and allow it to be overridden from the environment. Tested with Python 2.6.6, 2.7.9, 3.2.6, 3.4.3 as follows (with tshark built using cmake and '-b /tmp/wsbuild/run'): tools/indexcap.py out pop-ssl.pcapng; tools/indexcap.py out pop-ssl.pcapng --list-all-proto; tools/indexcap.py out pop-ssl.pcapng --list-all-files; tools/indexcap.py out pop-ssl.pcapng --list-all-proto-files=ssl; rm out; Python 2.5.6 does not work (there is no multiprocessing module). The dict output in Python 3.4.3 is different (has the hash function changed?) Change-Id: I592d8c4458a20d5088d815c6dd1cf90c9d3df9d3 Reviewed-on: https://code.wireshark.org/review/7792 Reviewed-by: Jeff Morriss Reviewed-by: Anders Broman commit 68698db Author: Peter Wu Date: Sat Mar 21 11:57:01 2015 +0100 Always use html2text.py for FAQ, improve output A recent commit broke compilation with Python 3. The original author of html2text.py is deceased and the fork has increased the number of files for this "simple" helper. The html2text.py script in this patch was rewritten and its output matches with lynx (except for a few newlines around lists). This means that indentation has been added for headings, paragraphs and lists. Also, since it was written from scratch, a new license could be chosen that matches Wireshark. Since now the in-tree html2text.py script provides nicer output, remove detection of the alternative programs (elinks, links). lynx/w3m is somehow still necessary for asciidoc though. (I also looked into reusing html2text.py for the release notes to replace asciidoc, but the --format=html output produces different output (HTML adds a ToC and section numbers). For now still require lynx for release notes) Tested with Python 2.6.6, 2.7.9, 3.2.6 and 3.4.3 under LC_ALL=C and LC_ALL=en_US.UTF-8 on Linux. Tested reading from stdin and file, writing to file, pipe and tty. Tested with cmake (Ninja) and autotools on Arch Linux x86_64. Test: # For each $PATH per python version, execute (with varying LC_ALL) help/faq.py -b | tools/html2text.py /dev/stdin | md5sum help/faq.py -b | tools/html2text.py | md5sum help/faq.py -b | tools/html2text.py help/faq.py -b | tools/html2text.py >/dev/null Change-Id: I6409450a3e6c8b010ca082251f9db7358b0cc2fd Reviewed-on: https://code.wireshark.org/review/7779 Petri-Dish: Peter Wu Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 83b6338 Author: Peter Wu Date: Wed Mar 18 23:54:52 2015 +0100 faq: fix formatting, fix links, use HTML5 The "a:hover" styling on https://www.wireshark.org/faq.html is ugly as it is not a real link. This patch turns questions into clickable links (focusing at the anchor) and converts from XHTML syntax to HTML5. Dead links have been updated and other links have been converted to https if available. The result passes the HTML5 validation at https://validator.nu. Change-Id: I32b7c18baeabe7ab7fce2dadd4c1d4e6de5c593f Reviewed-on: https://code.wireshark.org/review/7778 Reviewed-by: Anders Broman commit c94cfad Author: Pascal Quantin Date: Tue Mar 24 22:44:13 2015 +0100 Small fixes to Windows installer - re-add option to install SNMP MIBs - remove Qt specific folders during uninstall Change-Id: Idb5889cf164e90f4403435d24ae10e3dfe37fe44 Reviewed-on: https://code.wireshark.org/review/7808 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 786a7ea Author: Pascal Quantin Date: Tue Mar 24 23:04:57 2015 +0100 Add support for WIRESHARK_EXTCAP_DIR environment variable on Windows This can be useful when a user cannot modify the Wireshark installation folder (due to UAC restriction for example) This is already supported on Linux / OSX Change-Id: Icfcb43908de1fd8cd415cd31a98219eab1c757c8 Reviewed-on: https://code.wireshark.org/review/7809 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 9a9413f Author: Michael Mann Date: Tue Mar 24 21:27:31 2015 -0400 Generate the filter using _ws.expert.message instead of expert.message Bug: 11073 Change-Id: Ie98d52561b7aebe6875392cf3efeb22adb2ac499 Reviewed-on: https://code.wireshark.org/review/7813 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 083f6b6 Author: Guy Harris Date: Tue Mar 24 20:22:00 2015 -0700 Have a #define for whether the capture buffer size can be set. It can be set if either 1) this is Windows (where we're assumed to be using WinPcap, which includes calls to set the buffer size) or 2) we have pcap_create() (in which case we also have pcap_set_buffer_size(), at least in a normal libpcap release). Use that rather than testing "defined(_WIN32) || defined(HAVE_PCAP_CREATE)"; that makes it a bit more obvious what's being tested. Change-Id: Id9f8455019d19206b04dd6820a748cb97ae5ad12 Reviewed-on: https://code.wireshark.org/review/7816 Reviewed-by: Guy Harris commit 493ddd5 Author: Guy Harris Date: Tue Mar 24 19:41:05 2015 -0700 OK, this appears to be what's intended. Include a column to describe what's intended. If that's *not* what's intended, fix the comment and the twisty little maze of #defines. Change-Id: Ic5d120c401d8aba23a19e9d042b1460621b80e0b Reviewed-on: https://code.wireshark.org/review/7815 Reviewed-by: Guy Harris commit 77bc38e Author: Guy Harris Date: Tue Mar 24 18:30:01 2015 -0700 Clean up handling of buffer size. Instead of a twisty little maze of #if, #ifdefs, and #elifs, all different, define HAVE_BUFFER_SIZE upfront iff we can set the buffer size - i.e., if this is Win32, and thus we're using WinPcap, or if we have pcap_create() and thus pcap_set_buffer_size() - and use that to govern whether to have a buffer size setting or not. Always put the buffer size setting in the right vertical box. If that doesn't work well for some configurations of available interface knobs, feel free to change the checks, but please make it less opaque what's going on (include a comment if necessary). Change-Id: I384c601982b470ae08de271431eac06d6c925332 Reviewed-on: https://code.wireshark.org/review/7814 Reviewed-by: Guy Harris commit 162f266 Author: Guy Harris Date: Tue Mar 24 18:10:51 2015 -0700 Generate format strings at compile time. This squelches some compiler warnings, with the addition of G_GNUC_PRINTF() calls. Change-Id: I76f7515889727dc7fad27ac90ca96750384a46f3 Reviewed-on: https://code.wireshark.org/review/7812 Reviewed-by: Guy Harris commit 004cafd Author: Michael Mann Date: Tue Mar 24 19:52:29 2015 -0400 Replace HF_EMPTY and ETT_EMPTY with -1 Change-Id: If3e89f8e46edd4eef82037b6b348fd70a9a3033d Reviewed-on: https://code.wireshark.org/review/7811 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit b8b172c Author: Michael Mann Date: Tue Mar 24 19:45:34 2015 -0400 convert proto_tree_add_uint -> proto_tree_add_item The calls were just passing in a tvb_get function anyway. Change-Id: If69b2d41997f748dc5d12650e2553d5bc69930ce Reviewed-on: https://code.wireshark.org/review/7810 Reviewed-by: Michael Mann commit 8a3bd9e Author: Roland Knall Date: Tue Mar 24 13:10:57 2015 +0100 Win32: Compilation error if winpcap remote capturing disabled If HAVE_PCAP_REMOTE is not set, this code is not defined and therefore will not be compiled correctly. Change-Id: Ie08a6f99598d46cfa38e2448ea979a8a9aa7c7fc Reviewed-on: https://code.wireshark.org/review/7803 Reviewed-by: Roland Knall Petri-Dish: Alexis La Goutte Reviewed-by: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 7710da4 Author: Pascal Quantin Date: Tue Mar 24 18:37:35 2015 +0100 Since g2ef72cb, plugins are no more stored in plugins/$VERSION folder Also update the custom samples to reflect the latest changes done Change-Id: I2ac865fad1acdef5a5c4d68a155cbdf970c306f5 Reviewed-on: https://code.wireshark.org/review/7805 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 6545d19 Author: Mikhail Koreshkov Date: Tue Mar 24 22:17:30 2015 +0300 Q931: Dissect IEC/ISO cause coding standard as ITU-T Add preference to enable dissect IEC/ISO cause coding as ITU-T (Q.850) Change-Id: Id61f0785b8355f1aed03c4dea70657d661af3f11 Reviewed-on: https://code.wireshark.org/review/7806 Reviewed-by: Alexis La Goutte commit cc4bce5 Author: Peter Wu Date: Sun Mar 22 13:10:30 2015 +0100 ftsanity.py: make it work with modern tshark Broken since 4ac2441d7c7371249a3422fc2e67b8ad98aa6631 ("Coalesce "-G fields2" and "-G fields3" into "-G fields"). This patch fixes Python3 compatibility, fixes handling of the changed output and option and prints the faulting line on assertion error. It also updates two dissectors which had tabs in their description, breaking the output. Tested with Python 2.5.6, 2.6.6, 2.7.9, 3.2.6, 3.4.3. Change-Id: Ifcd0d0eb092b357eca357cd53f2e1348ebf8885c Reviewed-on: https://code.wireshark.org/review/7791 Reviewed-by: Gilbert Ramirez Reviewed-by: Anders Broman commit 693304b Author: Peter Wu Date: Sun Mar 22 11:29:04 2015 +0100 checklicenses.py: add python3 compatibility Tested with Python 2.5.6, 2.6.6, 2.7.9, 3.2.6, 3.4.3. Change-Id: I5893bb32d339118ec968edc7de0e185e39ab4f81 Reviewed-on: https://code.wireshark.org/review/7789 Petri-Dish: Evan Huus Reviewed-by: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 570bc36 Author: Edward Dao Date: Sat Mar 21 09:33:50 2015 -0700 http2: fix dissection over TLS Previously, the http2 heuristics dissector sets a conversation dissector which overrides the SSL dissector, breaking SSL decryption before http2. This patch fixes that by checking for an active http2 session in the http2 heuristics dissector. Change-Id: Ibacbcde3e29bbb746ad2e394f1c10ca571b07bf5 Reviewed-on: https://code.wireshark.org/review/7782 Reviewed-by: Peter Wu Petri-Dish: Peter Wu Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit ae20651 Author: Michael Mann Date: Mon Mar 23 10:31:21 2015 -0400 Overhaul WSP dissector. 1. Remove proto_tree_add_text (the reason I started the update) 2. Add expert info (mostly related to proto_tree_add_text, but since I was in the neighborhood...) 3. Replace "big functions macros" with "small macro" + real function (for big .o size savings) 4. Remove DebugLog macro (intent seems to duplicate basic functionality of a step-through debugger) 5. Replace HF_EMPTY (and comparible macros) with -1 6. Move header handler array to remove need for many forward declarations. Change-Id: Ic5467289aae7d54e78c1fd65f93358387d6139aa Reviewed-on: https://code.wireshark.org/review/7799 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit a6fc6aa Author: Evan Huus Date: Sat Mar 21 13:19:25 2015 -0400 wcp: add validations to decompressed_entry Ensure that a reference to past bytes refers to bytes that actually exist. Bug: 10978 Change-Id: If95d785ee15243c88edcd7115b5ff25fbaa08e6c Reviewed-on: https://code.wireshark.org/review/7783 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit a4a5adb Author: Pascal Quantin Date: Fri Mar 20 19:14:12 2015 +0100 GSM RLC/MAC: fix an out of bounds access When GRNTI does not exist in Packet Measurement Report R5 additions, too many lines are skipped Fixes an ASAN failure reported by Alexis Change-Id: I400bc4d9732f1d8e3c6fb8b72bf08a70a636d78c Reviewed-on: https://code.wireshark.org/review/7772 Reviewed-by: Alexis La Goutte Reviewed-by: Pascal Quantin commit 1b41208 Author: Guy Harris Date: Sun Mar 22 16:58:42 2015 -0700 Centralize the code to set the active_dlt value for a device. We were doing it similarly, but not the same, in several places; make a common routine for it. Have that code check to make sure the DLT_ value in question is actually supported by the device; if not, pick the first supported DLT_ value, if any; this keeps it from, for example, picking a bad DLT_ value if your defaults were set based on monitor mode being on but monitor mode actually being off, or vice versa. Change-Id: I1722bfeaf60429bc5c6f665fdea3d466052b13bd Reviewed-on: https://code.wireshark.org/review/7795 Reviewed-by: Guy Harris commit c474bb8 Author: Pascal Quantin Date: Sun Mar 22 19:50:59 2015 +0100 Update libwireshark0.symbols file Change-Id: Ib79e9eabd44d3eb444be7a33d30d5a1f9839d548 Reviewed-on: https://code.wireshark.org/review/7794 Reviewed-by: Pascal Quantin commit 355e913 Author: Peter Wu Date: Sun Mar 22 11:40:11 2015 +0100 delete_includes.py: Python 3 compatibility While improving python 3 compatibility, fix whitespaces and remove the useless try/except block as these modules are part of core. Tested with Python 2.5.6, 2.6.6, 2.7.9, 3.2.6, 3.4.3 (with "make" replaced by "true" and by comparing stdout). Change-Id: I9c585da89aef76f01672c8f7320ac4a13c6cc7d7 Reviewed-on: https://code.wireshark.org/review/7790 Reviewed-by: Martin Mathieson commit 7a90a6b Author: Gerald Combs Date: Sun Mar 22 08:05:50 2015 -0700 [Automatic manuf, services and enterprise-numbers update for 2015-03-22] Change-Id: Icddd1da625dd7bb333f888fd9832e12d7c6512d1 Reviewed-on: https://code.wireshark.org/review/7786 Reviewed-by: Gerald Combs commit c274014 Author: Alexis La Goutte Date: Sat Mar 21 14:53:41 2015 +0100 IPv6: fix using extended field designator is an extension [-Wextended-offsetof] Change-Id: Ibe5fce79a195b27e5d8e84c86613298083dabef2 Reviewed-on: https://code.wireshark.org/review/7780 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 4afaad7 Author: Michael Mann Date: Fri Mar 20 21:26:00 2015 -0400 Remove proto_tree_add_text from packet-ospf.c Change-Id: Ice87c69902a09874d5bdfa996523db9a9af50706 Reviewed-on: https://code.wireshark.org/review/7785 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 67fc01c Author: Alexis La Goutte Date: Sat Mar 21 18:39:41 2015 +0100 IPv6: fix indent (use 4 spaces) and Modelines info Change-Id: Iabd6de1e3ca7e7de156847fd33d38a25ac14f1c2 Reviewed-on: https://code.wireshark.org/review/7784 Reviewed-by: Michael Mann commit 461911b Author: Michael Mann Date: Sat Mar 21 08:20:36 2015 -0400 Replace copying of packet_info with just saving fragmented member of packet_info. Bug:11071 Change-Id: I6d87ace5f6bed1b1d0db98eef25204130ba21c9e Reviewed-on: https://code.wireshark.org/review/7777 Reviewed-by: Anders Broman commit ce76a64 Author: Alexis La Goutte Date: Sat Mar 21 10:35:50 2015 +0100 Proto.h: fix parameter 'err' not found in the function declaration [-Wdocumentation] Change-Id: Ibca63a9119b9c45e6a24fe3dc14dc7ed86c3576a Reviewed-on: https://code.wireshark.org/review/7774 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit f0311ab Author: Guy Harris Date: Fri Mar 20 23:14:28 2015 -0700 Rename update_interface_list() and remove local interface code from it. It's only used to update the remote interface list, and never updates anything else (it sets iftype_id to CAPTURE_IFREMOTE and never changes it, so all tests for whether iftype_id is == or >= CAPTURE_IFREMOTE succeed); remove the code that would be executed if, somehow, iftype_id got stomped on, and rename it to update_remote_interface_list(). Change-Id: I3bd80fb19bb14ef5bdf2c1a77a10f1f32bb62aba Reviewed-on: https://code.wireshark.org/review/7773 Petri-Dish: Guy Harris Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris commit 2450bf9 Author: janssend Date: Tue Feb 10 18:24:51 2015 +0100 Updated sercos discriptor CP0 for MDT0 and AT0 Updated the sercos discriptor for CP0. Some additional flags were added in AT0 and MDT0 during specification improvement. Change-ID: I784b1686b6c4adad154fe0747202f299e5c8095b Reviewed-on: https://code.wireshark.org/review/7061 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 6c38340 Author: Alexander Stein Date: Fri Mar 20 20:24:34 2015 +0100 MQTT: Prevent subsequent messages from overwriting the Info column Without a fence col_add_fstr will overwrite the whole column on each message. Instead of adding a fence and adding the message info use col_append_sep_str which also supports a separator out of the box. e.g. "Connect Command, Publish Message, Disconnect Req" Change-Id: I346d9b659a044143cd31f08081ad145b9186307c Signed-off-by: Alexander Stein Reviewed-on: https://code.wireshark.org/review/7771 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 2afb524 Author: Alexander Stein Date: Mon Mar 16 20:21:38 2015 +0100 MQTT: Dissect on default port automatically There is a IANA reserved port number for MQTT: 1883 Change-Id: I9bc3c83b9d7eda291728fe7311f4b7a817d3a833 Signed-off-by: Alexander Stein Reviewed-on: https://code.wireshark.org/review/7770 Reviewed-by: Pascal Quantin Reviewed-by: Michael Mann commit 14c9b17 Author: Stig Bjørlykke Date: Thu Mar 19 19:32:37 2015 +0100 DMP: Make dmp.body.data FT_BYTES With this it's possible to fetch the body from a Lua script again. Change-Id: Ie1502d47ca3c137aedb4197c6a345b3eb340735a Reviewed-on: https://code.wireshark.org/review/7769 Reviewed-by: Stig Bjørlykke Tested-by: Stig Bjørlykke commit f620be5 Author: Pascal Quantin Date: Thu Mar 19 23:13:13 2015 +0100 MBIM: use proto_tree_add_item_ret_uint Change-Id: I70c348222f4f30a651c69ccfd479180684d9c9fe Reviewed-on: https://code.wireshark.org/review/7763 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann Reviewed-by: Pascal Quantin commit d7b2327 Author: Bill Meier Date: Thu Mar 19 21:43:40 2015 -0400 (Benign) Fix warning [-Werror=logical-not-parentheses] (GCC 5.0.0) Add some parentheses to prevent warning: "logical not is only applied to the left hand side of comparison" Change-Id: I8f11f93e12d24a1ea09032cf0198042fe9a87068 Reviewed-on: https://code.wireshark.org/review/7768 Reviewed-by: Anders Broman commit e7fd1bf Author: Michael Mann Date: Thu Mar 19 20:59:42 2015 -0400 Reduce epan dependence on dissectors by having print module "cache" the protocol and field ids that it needs. Change-Id: I4ec48067e9ca2cbe88e1cf2e6c9dc1e382379221 Reviewed-on: https://code.wireshark.org/review/7767 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 019c3af Author: Gerald Combs Date: Thu Mar 19 17:52:17 2015 -0700 1.99.5 → 1.99.6. Change-Id: Iff642606bdb9858dc54b90abe02bf1572f44fc25 Reviewed-on: https://code.wireshark.org/review/7766 Reviewed-by: Gerald Combs