commit 22f06b2 Author: Gerald Combs Date: Thu Mar 19 09:05:54 2015 -0700 Add a couple of items to the release notes. Change-Id: I0d27b436c6cae363a7c7ff9917707829fd30b52b Reviewed-on: https://code.wireshark.org/review/7754 Reviewed-by: Gerald Combs commit b307ffe Author: AndersBroman Date: Fri Feb 13 09:34:16 2015 +0100 Implement proto_tree_add_item_ret_int() and proto_tree_add_item_ret_uint() which works as proto_tree_add_item(), but also returns the value of (u)ints of 8,16,24 and 32 bits length in a 32 bit variable. It's based on Hadriels previous work. Change-Id: If3b4b8588b63251f1ee9b954a202acde7c02ce86 Reviewed-on: https://code.wireshark.org/review/7230 Petri-Dish: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit ef7e4c5 Author: Uli Heilmeier Date: Mon Mar 16 16:54:01 2015 +0100 Netflow/Ipfix: Add Citrix Netscaler AppFlow This commit adds dissection of Citrix Ntscaler Appflow templates to Netflow/Ipfix. The documenation for the templates was found at: https://raw.githubusercontent.com/splunk/ipfix/master/app/Splunk_TA_IPFIX/bin/IPFIX/information-elements/5951.xml Due to non-disclosure I can't provide any sample pcap. Change-Id: I1d34ad4298a51c71986bc8565cc5f3802b0df3c2 Reviewed-on: https://code.wireshark.org/review/7740 Reviewed-by: Alexis La Goutte commit f7b1678 Author: Michael Mann Date: Wed Mar 18 07:59:05 2015 -0400 Replace enumerated preference for choosing subdissector with a subdissector table and Decode As functionality. This makes it much easier for other subdissectors (and plugins) to associate themselves with CAN. Change-Id: I49dd832af51651d0c91f9850c100e544d178b8c4 Reviewed-on: https://code.wireshark.org/review/7734 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit da3e4f9 Author: Guy Harris Date: Wed Mar 18 23:38:12 2015 -0700 Make the snapshot-length member of interface_t an int. That matches what it is in other structures, and eliminates a compiler warning. While we're at it, remove an empty if statement revealed by that change. Change-Id: I5e8c8f92fdb3567e75800c729443737032a1bcc7 Reviewed-on: https://code.wireshark.org/review/7752 Reviewed-by: Guy Harris commit baa8391 Author: Michael Mann Date: Wed Mar 18 09:22:46 2015 -0400 Eliminate decode_bitfield_value from "public" use. This "encourages" (forces) dissectors to use the bitmask field of the header_field_info structure to get "bitmask formatting" of a field. other_decode_bitfield_value should be treated the same (eventually eliminated), but there are still replacements to be made in the dissectors. Change-Id: I8a0d829c3fef2d5e5a588667a259e231bca559e6 Reviewed-on: https://code.wireshark.org/review/7736 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit a1ea3ce Author: Guy Harris Date: Wed Mar 18 18:16:30 2015 -0700 Fix another call to capture_dev_user_snaplen_find(). Change-Id: I20064f782b7ad8ebffc70322a877d88501d6ef60 Reviewed-on: https://code.wireshark.org/review/7749 Reviewed-by: Guy Harris commit a4eb512 Author: Guy Harris Date: Wed Mar 18 18:13:15 2015 -0700 Squelch a "no implicit conversions in C++" warning. Change-Id: Ib2876e055e8bfb1d0de36bbf7bb3b1e52217f108 Reviewed-on: https://code.wireshark.org/review/7748 Reviewed-by: Guy Harris commit cb31cc6 Author: Guy Harris Date: Wed Mar 18 17:47:55 2015 -0700 Fix extracting of parameter. We have to find the closing parenthesis before overwriting the opening parenthesis, otherwise the end of the string, from which strrchr() searches, is at the point where the opening parenthesis was. Fix incorrect arithmetic (-1 + -1 + 1 = -1, not 1). Change-Id: Ida47dd9670b36269eef28368aa845301a7185c3f Reviewed-on: https://code.wireshark.org/review/7747 Reviewed-by: Guy Harris commit c691af8 Author: Guy Harris Date: Wed Mar 18 17:30:12 2015 -0700 Fix a comment. Change-Id: I6e85f4abdc41ac01296b276f6b394376e75abe47 Reviewed-on: https://code.wireshark.org/review/7746 Reviewed-by: Guy Harris commit 1fdfee6 Author: Guy Harris Date: Wed Mar 18 17:27:57 2015 -0700 Patch some memory leaks. capture_dev_user_descr_find() and capture_dev_user_cfilter_find() return g_malloc()ated strings; we don't need to g_strdup() them to get a g_malloc()ated string, and we *do* need to free them if we aren't going to use them any more. Document that while we're at it, and give more details for the functions returning integer user-specified interface parameters as well. Change-Id: Icf98a48992b1c4168ead54bdc4cc2847da89d665 Reviewed-on: https://code.wireshark.org/review/7745 Reviewed-by: Guy Harris commit ab45f1d Author: Guy Harris Date: Wed Mar 18 17:23:56 2015 -0700 Unused parameters are done differently in C++. Change-Id: If6324e7ee57156e067c2584b80df835620f94ac0 Reviewed-on: https://code.wireshark.org/review/7744 Reviewed-by: Guy Harris commit 04f6b55 Author: Gerald Combs Date: Wed Mar 18 17:01:46 2015 -0700 Add a comment. Change-Id: I82d31ce4435f1c136e158a007c9d4507e47a73a6 Reviewed-on: https://code.wireshark.org/review/7743 Reviewed-by: Gerald Combs commit face2c7 Author: Guy Harris Date: Wed Mar 18 16:59:30 2015 -0700 Fix space before tab. Change-Id: I8e9de014bd1e69102edb0eb2ec65d8da12ab8311 Reviewed-on: https://code.wireshark.org/review/7742 Reviewed-by: Guy Harris commit 096e523 Author: Guy Harris Date: Wed Mar 18 16:58:15 2015 -0700 Fix parsing of interface properties strings. The first entry in the list does not have a leading comma, so a strstr() for ",{ifname}(" will not work. Instead, use g_strsplit() with a comma for all of the preferences. Have common code for all the "uncomplicated" preferences. Have a specialized handler for the one "complicated" preference. Change-Id: I2144a98ab0cb70db56eaaba88175d6e03885de2a Reviewed-on: https://code.wireshark.org/review/7741 Reviewed-by: Guy Harris commit 9762c32 Author: Gerald Combs Date: Wed Mar 18 11:44:57 2015 -0700 Complete the fix from g6b5c71a. Change-Id: I18360cbc50d790a22e69e85dcc16363f8c682c64 Reviewed-on: https://code.wireshark.org/review/7739 Reviewed-by: Gerald Combs commit 6b5c71a Author: Gerald Combs Date: Wed Mar 18 11:25:06 2015 -0700 Don't cache existing IPv4 and IPv6 hostnames. In the Qt UI redrawing the packet list redissects our visible packets, which might call add_ipv{4,6}_name, which sets new_resolved_objects = TRUE, which emits the addressResolutionChanged signal, which redraws the packet list, which ... Break out of the loop by checking to see if we've already cached an IPv4 or IPv6 hostname. Change-Id: Icb2841e3453fb98d4cf0ea06a0f49737e2b8f25e Reviewed-on: https://code.wireshark.org/review/7738 Reviewed-by: Gerald Combs commit 13b3fcb Author: Michael Mann Date: Wed Mar 18 09:07:28 2015 -0400 Eliminate decode_bitfield_value from dissectors. Change-Id: I37f5dbd5e88fd4dd8f736b014d36aae926082d1f Reviewed-on: https://code.wireshark.org/review/7735 Reviewed-by: Michael Mann commit e6f3da9 Author: Michal Labedzki Date: Mon Mar 16 14:51:44 2015 +0100 Qt: Fix recent files threads Fix crash and memory leak. Please not that Recent File Status objects and threads still continously grow and shrink memory usage, but do not grow continuously. Bug: 10893 Change-Id: Icc8b7fefd6572b902ac81d22e5f7b16e304fcf16 Reviewed-on: https://code.wireshark.org/review/7699 Petri-Dish: Michal Labedzki Reviewed-by: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit dfc0689 Author: AndersBroman Date: Wed Mar 18 09:46:40 2015 +0100 [BOOTP] Try to fix the build boot by casting a variable to 32bits while at it replace tvb_length() with tvb_reported_length(). Change-Id: Ic2a0c99c20320ddd15d2f4ec173d73229dcf41f6 Reviewed-on: https://code.wireshark.org/review/7733 Reviewed-by: Anders Broman commit 52a579d Author: Alexis La Goutte Date: Wed Mar 18 07:55:45 2015 +0100 DNS: fix Coverity scan (1238867: Missing Break in switch) Change-Id: I4f1042cebe527874c3f890411f5e44aa71da5d28 Reviewed-on: https://code.wireshark.org/review/7732 Reviewed-by: Anders Broman commit 77b3532 Author: AndersBroman Date: Tue Mar 17 16:51:38 2015 +0100 [H248] Use hf fields from the SDP dissector to make it possible to find related SDP in other protocols such as SIP. Change-Id: I5fb01128e6070f21b09b4f8364b5650f71fa305e Reviewed-on: https://code.wireshark.org/review/7719 Reviewed-by: Anders Broman commit 98b7f21 Author: AndersBroman Date: Tue Mar 17 12:59:27 2015 +0100 [Reassembly] Fix a reassembly case where the two fragments are in the same frame but in different SCTP DATA chunks, whitout the patch the message is reassembled in both chunks leading to duplicated upper layer PDU:s in the frame. Change-Id: Ie31142c38c728018178947544b571622447d8e8f Reviewed-on: https://code.wireshark.org/review/7716 Reviewed-by: Anders Broman commit ae2d244 Author: Michael Mann Date: Mon Mar 16 17:25:34 2015 -0400 Remove proto_tree_add_text from packet-bootp.c Change-Id: I651211cbe7365409e6c42ef1840122a03460aa42 Reviewed-on: https://code.wireshark.org/review/7731 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 7ff40ce Author: Michael Mann Date: Sun Mar 15 18:05:50 2015 -0400 Remove proto_tree_add_text from packet-gtp.c Change-Id: I53dcee56565e2a82bf0789199ce1c552f622840b Reviewed-on: https://code.wireshark.org/review/7730 Reviewed-by: Anders Broman commit 47fbd03 Author: Michael Mann Date: Sun Mar 15 09:35:12 2015 -0400 Remove proto_tree_add_text from packet-x25.c Change-Id: I8b08c922515d16350f6f80256564389ae3e408c4 Reviewed-on: https://code.wireshark.org/review/7729 Reviewed-by: Anders Broman commit 4e82b9c Author: Michal Labedzki Date: Tue Mar 17 08:39:18 2015 +0100 Qt: Start address resolver timer Change-Id: Ic3de3db089f25d9fdfd6100f916b3960e52046f0 Reviewed-on: https://code.wireshark.org/review/7715 Petri-Dish: Michal Labedzki Reviewed-by: Anders Broman Reviewed-by: Michal Labedzki commit 29bccdb Author: Guy Harris Date: Tue Mar 17 13:35:55 2015 -0700 Don't say "Capturing on..." if we're not capturing on. Only print the "Capturing on..." message if we're actually capturing, not if we're printing link-layer types. Change-Id: Icc554776a6a2826276893acb38f7d700effd5f78 Reviewed-on: https://code.wireshark.org/review/7726 Reviewed-by: Guy Harris commit 7a14f89 Author: Guy Harris Date: Tue Mar 17 13:11:12 2015 -0700 Allow multiple -D/-L/-d/-S flags, only allow one -k flag. Multiple instances of a single flag from -D/-L/-d/-S should behave like a single instance of that flag; -D plus -L, for example, is not supported, but -D plus another -D should be. -k, however, takes an argument, and we only support one. Change-Id: I8baced346fbffd75f8d768497213f67bb9a0555f Reviewed-on: https://code.wireshark.org/review/7723 Reviewed-by: Guy Harris commit 6637f4d Author: Guy Harris Date: Tue Mar 17 11:45:43 2015 -0700 Fix "Save All" for Export Objects. Fix the loop that goes through all the objects to be saved so that it looks at all the objects to be saved rather than repeatedly looking at the first object. When letting the user select a directory in which to save, restrict them to looking at directories. QDir doesn't do what we actually want here - QDir.setCurrent() might do a chdir() but it doesn't appear to set the QDir's path, so when we use it to construct pathnames it constructs them based on wsApp->lastOpenDir() rather than the directory the user selected. Use Boring Old GLib's g_build_filename(), as we do in the GTK+ version, for now. (It also does something we *don't* want, namely, at least as the documentation implies, a chdir().) Bug: 11062 Change-Id: I705292dc2713b9dba615b0d59a4cf8313f357d82 Reviewed-on: https://code.wireshark.org/review/7720 Reviewed-by: Guy Harris commit f59ad07 Author: Alexis La Goutte Date: Tue Mar 17 13:55:52 2015 +0100 MIP6: Add Localized Routing for Proxy Mobile IPv6 (RFC6705) * Add LRI and LRA Mobility Header * Add MAG IPv6 Mobility Option * Remove one proto_tree_add_text Change-Id: Ib96eddc0a349214d0a112cdd92efe129f97be1ab Reviewed-on: https://code.wireshark.org/review/7717 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 5848328 Author: Alexis La Goutte Date: Tue Mar 17 14:00:29 2015 +0100 IP: fix soft-deprecated APIs (tvb_length) Change-Id: Ifcf70a3eb9fb603e5ba06f90a71184533736c69d Reviewed-on: https://code.wireshark.org/review/7718 Reviewed-by: Anders Broman commit b313c71 Author: Stefan Metzmacher Date: Tue Mar 17 08:43:15 2015 +0100 packet-dcerpc-*: fix alignment of dissect_ndr_ctx_hnd() Change-Id: I9685f37580d1def6c0956d786398e3e70e819cee Signed-off-by: Stefan Metzmacher Reviewed-on: https://code.wireshark.org/review/7714 Reviewed-by: Anders Broman commit 17afb04 Author: Cedric Izoard Date: Wed Dec 10 17:56:45 2014 +0100 Fix Wai dissector - Add description for attribute type, verification and authentication results - Fix Certificate Authentication Response The second signature is optional - Fix Access WAI Authentication Response The Multiple Certificate Verification Result field is actually the content of Certificate Authentication Response : result plus one or two signature - FIx CErtificate Authentication request THe last filed is optional and it is a identity list bug: 11061 Change-Id: Ia6710046d8d28ca3c53354f7a997a3d76f09373d Reviewed-on: https://code.wireshark.org/review/7708 Reviewed-by: cedric izoard Reviewed-by: Anders Broman commit 60b4f20 Author: Gerald Combs Date: Mon Mar 16 13:09:58 2015 -0700 CMake: Fix an uninstall.exe dependency. Make sure building nsis_package doesn't clobber uninstall.exe. Change-Id: I8d00adb7fd3813c48118a0690feccb6a06bf15cb Reviewed-on: https://code.wireshark.org/review/7710 Reviewed-by: Gerald Combs commit 8197c76 Author: Guy Harris Date: Mon Mar 16 13:57:37 2015 -0700 Update an error message to reflect all the run-dumpcap-and-quit arguments. Change-Id: I3c270279b4ea044919de5497d373c283ea87c5bf Reviewed-on: https://code.wireshark.org/review/7709 Reviewed-by: Guy Harris commit ce55eb3 Author: Alexis La Goutte Date: Mon Mar 16 14:54:03 2015 +0100 DNS: Add CSYNC (Child-to-Parent Synchronization in DNS RFC7477) Change-Id: Ida53904b4db1ca982055de267ce6f4fdcedd248b Reviewed-on: https://code.wireshark.org/review/7701 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit e328324 Author: Lars Sundström Date: Mon Mar 16 11:14:15 2015 +0100 Add dissection of E-UTRAN Description in Cell selection indicator after release of all TCH and SDCCH IE Change-Id: I552c436fe8bea5971863fd7ba023a86aa08f2f0c Reviewed-on: https://code.wireshark.org/review/7700 Petri-Dish: Michael Mann Reviewed-by: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 2baa8aa Author: Francesco Fondelli Date: Tue Mar 10 17:06:54 2015 +0100 PCEP, support new drafts: Conveying path setup type in PCEP messages, draft-ietf-pce-lsp-setup-type-00 PCEP Extensions for Segment Routing, draft-ietf-pce-segment-routing-01 Bug: 11046 Change-Id: Ib2ea9a96079324377fa65ef8c3ab37a98f530793 Signed-off-by: Francesco Fondelli Reviewed-on: https://code.wireshark.org/review/7618 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit dc21957 Author: Vik Date: Thu Mar 12 20:32:48 2015 -0700 Fix for waitpid return EINTR sometimes on launch. The return of EINTR is not exactly a failure of child process but may be because of any number of reasons. Adding logic to retry to get status of child process. Bug: 10889 Change-Id: Ic2de7248cb7bd9c801b917c841ce911fb7c17dcc Reviewed-on: https://code.wireshark.org/review/7669 Petri-Dish: Graham Bloice Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit f0855e0 Author: Michael Mann Date: Sat Mar 14 23:16:50 2015 -0400 Remove proto_tree_add_text from packet-ssl.c Change-Id: Icb81649363725c92f94dde5cb28cbba0f6ab5099 Reviewed-on: https://code.wireshark.org/review/7687 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 4ea604f Author: Michael Mann Date: Sat Mar 14 11:51:40 2015 -0400 Remove proto_tree_add_text from packet-synphasor.c Change-Id: If7cf7ab42ca6a886deb1eab6bc1f391d993e1dad Reviewed-on: https://code.wireshark.org/review/7677 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit edc2f4e Author: Michael Mann Date: Sat Mar 14 20:24:59 2015 -0400 Remove proto_tree_add_text from packet-edonkey.c Change-Id: I42a06b728d807853d2c9b87a18ed36e1e0321085 Reviewed-on: https://code.wireshark.org/review/7685 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 8093968 Author: Michal Labedzki Date: Sun Mar 15 18:35:47 2015 +0100 Qt: Fix overloaded CPU QTreeView also use timerEvent() to do something... so call its overloaded method and make CPU happy again. Bug: 11035 Change-Id: I405c8c2763ae0b96c0483aedcb314a5f259e76a1 Reviewed-on: https://code.wireshark.org/review/7696 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki commit 7696991 Author: Remi Vichery Date: Sun Mar 15 14:20:17 2015 +0100 Added MPLS over UDP support Change-Id: Ifdffdf042908c5b4b25704c56d734e9c942d24f4 Reviewed-on: https://code.wireshark.org/review/7690 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 1d3d90d Author: Pascal Quantin Date: Sat Mar 14 20:30:53 2015 +0100 SRVLOC: always intialize prot before calling sscanf It prevents using an uninitialized variable if sscanf fails Bug: 11060 Change-Id: I3866d35ae05e8114263fd13a8ccc5e20c3a0d63a Reviewed-on: https://code.wireshark.org/review/7683 Reviewed-by: Michael Mann Reviewed-by: Pascal Quantin commit 1b90259 Author: Gerald Combs Date: Sun Mar 15 08:05:41 2015 -0700 [Automatic manuf, services and enterprise-numbers update for 2015-03-15] Change-Id: Ia77e5cac3d0c79f10d87f21bd4e19bd8187a01ff Reviewed-on: https://code.wireshark.org/review/7691 Reviewed-by: Gerald Combs commit bed6816 Author: Michal Labedzki Date: Sat Mar 14 17:46:32 2015 +0100 Qt: Sort names in DecodeAs dialog This should increase user experience. Change-Id: Id2713e7c5af8ca0f0d87e3ae52542b4f189ace9a Reviewed-on: https://code.wireshark.org/review/7681 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki commit a32f040 Author: Michael Mann Date: Sat Mar 14 20:18:44 2015 -0400 Fix copy/pasteo of packet-eigrp.c Change-Id: I2721086221c435d228bf27aef62f9dc5f6d9ee10 Reviewed-on: https://code.wireshark.org/review/7684 Reviewed-by: Michael Mann commit f292d76 Author: Pascal Quantin Date: Sat Mar 14 20:28:30 2015 +0100 Update Custom.nmake.example with the change done in g2ef72cb Change-Id: I8d2dc7325da9cd573e87ac924feafe9b55f44a5f Reviewed-on: https://code.wireshark.org/review/7682 Reviewed-by: Pascal Quantin commit 9babe6b Author: Alexis La Goutte Date: Sat Mar 14 18:47:31 2015 +0100 TX: Update translations (Manual sync 2015-03-14) Change-Id: I1aca20f4fd091db5d835d1ee12123a5f7cafe08d Reviewed-on: https://code.wireshark.org/review/7680 Reviewed-by: Alexis La Goutte commit 8eab7c6 Author: Mato Date: Sat Mar 14 12:17:44 2015 -0400 Support gtpp data record format version older than 6 Bug: 11051 Change-Id: I04b1f1c852b60182ef7f5405716c0b6733d0f44a Reviewed-on: https://code.wireshark.org/review/7679 Reviewed-by: Michael Mann commit 22ed5a1 Author: Michael Mann Date: Wed Mar 11 22:46:28 2015 -0400 Correct comm_type length field. Change-Id: Ia0cbb36e9962c762648ead8dddd3bb0a794cec74 Reviewed-on: https://code.wireshark.org/review/7678 Reviewed-by: Michael Mann commit 77d9a05 Author: Michal Labedzki Date: Sun Mar 8 14:59:32 2015 +0100 Qt: Fix DecodeAs Previously DecodeAs neither save its changes nor changes dissector tables. Do that and redissect packets to refresh view. Bug: 10553 Change-Id: Icd8453c9650f0265852f6b6b58bc483b35570a15 Reviewed-on: https://code.wireshark.org/review/7676 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki commit 32a815b Author: Cedric Izoard Date: Thu Mar 12 13:30:54 2015 +0100 802.11: Fix MAC header Address mapping A1,A2,A3 and A4 in 802.11 MAC header were not correctly mapped to SA/TA/DA/RA/BSSID Change-Id: I050cbb544500d8c3bf3d545f85144ca853079dde Reviewed-on: https://code.wireshark.org/review/7655 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit e5f3fe2 Author: Michael Mann Date: Wed Mar 11 22:46:28 2015 -0400 Remove proto_tree_add_text from packet-eigrp.c Change-Id: Idb2d9e070c7f65540ad27b011bd4a3dcaa3dd7e4 Reviewed-on: https://code.wireshark.org/review/7667 Reviewed-by: Michael Mann commit f074647 Author: Gerald Combs Date: Fri Mar 13 09:21:01 2015 -0700 Add a test-programs target everywhere. Add a "test-programs" target to each toolchain which builds each unit test executable. "test-programs" must now be built before running the unit test suite. Change-Id: I9317a1e305d987f244c4bd8b4a7f05d11fed7090 Reviewed-on: https://code.wireshark.org/review/7673 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 8f9e543 Author: Pascal Quantin Date: Fri Mar 13 19:45:49 2015 +0100 LTE RRC: enhance dissection of Extended Access Barring Category Change-Id: I6e13ae8c4e95f5915541bc33d89faa61dade2058 Reviewed-on: https://code.wireshark.org/review/7674 Petri-Dish: Pascal Quantin Reviewed-by: Pascal Quantin commit 1dedcf3 Author: Gerald Combs Date: Thu Mar 12 17:37:18 2015 -0700 Add packet-opensafety.h to the distribution. Change-Id: Ifde4b7c276e8e2163a4a5e77bc036393e9e4493a Reviewed-on: https://code.wireshark.org/review/7668 Reviewed-by: Gerald Combs commit a98bf38 Author: Michael Mann Date: Tue Jan 27 08:02:53 2015 -0500 Make epan/iana_snap_pid.h the header file of packet-iana-oui.c Change-Id: I123c591cb0eb83b561163119a4b00c616bcd0990 Reviewed-on: https://code.wireshark.org/review/7666 Reviewed-by: Michael Mann commit 2ef72cb Author: Gerald Combs Date: Tue Jan 6 15:07:50 2015 -0800 CMake: Add a top-level nsis_package target. Add packaging/nsis/CMakeLists.txt and use it to generate each NSIS include file. Add macros to generate packaging-related targets and invoke them from the top-level CMakeLists.txt. Add a top-level "plugins" target. Copy plugins to "plugins" in each of our staging directories instead of "plugins/$VERSION". Add missing files to the copy_data_files and copy_cli_dlls targets. Add all files in the NSIS package from the staging directory. Drop a bunch of no-longer-needed defines, e.g. MSVC_VARIANT. Change-Id: Ib1079260d164c65118050f1431af8e582cd577fa Reviewed-on: https://code.wireshark.org/review/6459 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 436a064 Author: Pascal Quantin Date: Thu Mar 12 22:43:30 2015 +0100 MP2T: restore addresses once fragments are added to the hash table It allows to have "Follow UDP stream" context menu working again Bug: 11055 Change-Id: I8eae15bfddb45ea033eb8dd2e3f7ca038057421a Reviewed-on: https://code.wireshark.org/review/7662 Reviewed-by: Pascal Quantin Reviewed-by: Anders Broman commit f01a0fa Author: Jeff Morriss Date: Thu Mar 12 13:44:50 2015 -0400 Use FT_FRAMENUM_ACK in SCTP too. Also fix up the hf description to make it clearer (to me) that this frame number is pointing *to* the ACK, not *from* it. Change-Id: Ic60e949e65f3988f9ac34fff39d4addc28a1fdbc Reviewed-on: https://code.wireshark.org/review/7658 Reviewed-by: Anders Broman commit 803d120 Author: Pascal Quantin Date: Tue Mar 10 23:11:59 2015 +0100 PER: fix dissection of known-multiplier character strings with ub less or equal to 2^b-1 See ITU-T X.691 chapter 30.5 for details Change-Id: I6ac31494997349c6bff19b196e72859a31634af4 Ping-Bug: 11039 Reviewed-on: https://code.wireshark.org/review/7633 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 17b57ec Author: Pascal Quantin Date: Thu Mar 12 19:13:11 2015 +0100 checklicenses.py: check the first 150 lines of a file It should solve the recent failure seen since gdf164df Change-Id: If86bff18fcd9157941ea843ad5029c9d0b2f0b32 Reviewed-on: https://code.wireshark.org/review/7659 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice commit 8bae919 Author: Gerald Combs Date: Fri Mar 6 16:10:37 2015 -0800 One check mark for ACKs, two check marks for dup ACKs. Add FT_FRAMENUM_ACK and FT_FRAMENUM_DUP_ACK and set them for tcp.analysis.acks_frame and tcp.analysis.duplicate_ack_frame. Draw a single or double check mark in the packet list accordingly. These are probably specific to TCP, but as it happens there are a lot of TCP packets. Change-Id: I35416506419159a79ad8cc2e35f8a14485edfb7e Reviewed-on: https://code.wireshark.org/review/7568 Reviewed-by: Anders Broman commit dd8a799 Author: Roland Knall Date: Mon Mar 2 07:32:50 2015 +0100 openSAFETY: Separate definitions into header To allow future tap interfaces as well as analysis plugins to use the same definitions the dissector used, all defines are being separated into a header file Change-Id: Iec38e361ded46aab6684c2713ba9a047193a6694 Reviewed-on: https://code.wireshark.org/review/7468 Reviewed-by: Roland Knall Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit b255d8a Author: Gerald Combs Date: Sat Mar 7 10:43:45 2015 -0800 CMake: Update wslua build and test. Process wslua/CMakeLists.txt using add_subdirectory instead of include. Generate files in the build directory instead of the source directory. Copy lua scripts to DATAFILE_DIR instead of DATAFILE_DIR/lua. That's where init.lua looks for console.lua. Always set WIRESHARK_RUN_FROM_BUILD_DIRECTORY when testing. We presumably want to test our source files and not files which may or may not be in the system path. When we're running from the build directory look for lua scripts in both the Autotools and CMake build locations. Change-Id: Ic15ab8c58ff1b170d000c9b3e0a329af2ec44b7b Reviewed-on: https://code.wireshark.org/review/7590 Reviewed-by: Gerald Combs Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Graham Bloice Reviewed-by: Anders Broman commit df164df Author: Mikhail Koreshkov Date: Fri Mar 6 22:57:17 2015 +0300 GSM_A-BCC: dissector for BCC Protocol Added dissector for Broadcast call control protocol (3GPP TS 44.069 version 11.0.0 Release 11) Change-Id: I179801d30fc2d32d8c4187a92dd0b1c9709711c7 Reviewed-on: https://code.wireshark.org/review/7627 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Reviewed-by: Anders Broman commit 2833365 Author: Jeff Morriss Date: Wed Mar 11 22:51:52 2015 -0400 Don't pass a t4-non-ecm-sig-end to the tap if we didn't see the start of the data: the invalid frame number will crash Wireshark. Bug: 10885 Change-Id: I3ae278b77a9449136fbaaac52f2bbaa8a510bf76 Reviewed-on: https://code.wireshark.org/review/7651 Reviewed-by: Anders Broman commit ad1b3ee Author: Peter Wu Date: Sat Mar 7 17:45:00 2015 +0100 Qt: enable autoscroll on initial capture start The capture timer was never enabled on capture start or disabled on capture stop. This is now implemented. Bug: 10601 Change-Id: Iae23a952986a2c5dddf92b6ac0d1f1bc1c83719c Reviewed-on: https://code.wireshark.org/review/7582 Reviewed-by: Peter Wu Tested-by: Peter Wu Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 5ab8490 Author: Gerald Combs Date: Thu Feb 26 13:02:06 2015 -0800 Qt: Allow multiple lines in the packet list. Remove the setUniformRowHeights(true) call in the PacketList constructor. This means that the packet list now calculates its height by querying the Qt::SizeHintRole for every item instead of simply multiplying item_height * number_of_rows. Implement SizeHintRole in PacketListModel::data so that size calculations aren't unbearably slow. We don't have any row text until an item is drawn (via DisplayRole), so items with multiple lines end up being rendered twice. Note where we make assumptions on line heights. Although we call gtk_tree_view_set_fixed_height_mode() in the GTK+ UI we don't have this problem there. GTK+ is apparently less strict about enforcing row heights. Bug: 10924 Change-Id: I98e9f4f5f321c2e03f18498e0a7e7556f88792a1 Reviewed-on: https://code.wireshark.org/review/7430 Petri-Dish: Evan Huus Reviewed-by: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki Reviewed-by: Anders Broman commit 410b40d Author: Peter Wu Date: Mon Feb 16 10:50:02 2015 +0100 Export CLIENT_RANDOM with Export SSL Session Keys This allows for exporting the SSL session keys for captures which were decrypted using a RSA certificate, but where the server does not support session resumption. To avoid frequent reallocations, the expected length is used as initial string size. Tested against a nginx server with ssl_session_cache off. Note that all keys loaded via ssl.keylog_file are exported, not just the displayed ones! Change-Id: Ie3a93d3692885502f46442953fa53303d16672d7 Reviewed-on: https://code.wireshark.org/review/7175 Reviewed-by: Peter Wu Petri-Dish: Peter Wu Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte Reviewed-by: Anders Broman commit 6c1e4d2 Author: Peter Wu Date: Tue Mar 10 12:05:25 2015 +0100 http2: improve heuristics, remember conversation Enable the reliable Magic Hello heuristics by default and dissect further packets as HTTP2 as well. The weak frame heuristics is still disabled by default. Change-Id: I783d036fb6c6d867daedf251a5264fdf3b475447 Reviewed-on: https://code.wireshark.org/review/7615 Reviewed-by: Pascal Quantin Tested-by: Peter Wu Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Tatsuhiro Tsujikawa Reviewed-by: Anders Broman commit caebab5 Author: Alexis La Goutte Date: Thu Mar 12 14:29:10 2015 +0100 DNS: SSHFP Update Algo and fingertype Change-Id: I78376c5578ee1f1871260db478a9c0d994f5bd38 RFC6594: Use of the SHA-256 Algorithm with RSA, Digital Signature Algorithm (DSA), and Elliptic Curve DSA (ECDSA) in SSHFP Resource Records RFC7479: Using Ed25519 in SSHFP Resource Records Reviewed-on: https://code.wireshark.org/review/7654 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit ca9508a Author: Alexis La Goutte Date: Mon Mar 9 08:38:56 2015 +0100 ICMP(v4): Remove proto_tree_add_text Part 2 Change-Id: I4fa4a48fe047b7231f1cf084d8c798ada15372c5 Reviewed-on: https://code.wireshark.org/review/7607 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit dcb087f Author: AndersBroman Date: Thu Mar 12 14:38:47 2015 +0100 [Diameter] Add 3GPP AVPs Change-Id: I1152114ff6b8ea103f0dee3cc9206aefc39db0bc Reviewed-on: https://code.wireshark.org/review/7653 Reviewed-by: Anders Broman commit 70d34ee Author: Peter Wu Date: Thu Mar 12 03:01:37 2015 +0100 ssl,dtls: fix CertificateVerify dissection for TLSv1.2 TLSv1.2 gained an additional SignatureAndHashAlgorithm field for fields marked with the digitally-signed attribute. This was already implemented before for ServerKeyExchange, let's reuse that. Note that the SignatureAndHashAlgorithm tree and fields (hash algo, signature algo) are repurposed in a different context, but since the structure is the same it is kept like this. By the way, add support for DTLSv1.2 too. RFC 6347 section 4.2.6 suggests that the implementation is the same (as far as the dissector is concerned). Also update the comments and remove the additional "Signature with client's private key" subtree since the CertificateVerify message has no other items. Bug: 11045 Change-Id: I025901b85e607f04d60357ff14187cc13db2ae5d Reviewed-on: https://code.wireshark.org/review/7650 Reviewed-by: Peter Wu Tested-by: Peter Wu Reviewed-by: Michael Mann commit 95ce392 Author: Gerald Combs Date: Wed Mar 11 10:19:03 2015 -0700 Fix the Lua FPM dissector test. In the FPM dissector test, only check the fields produced by the frame and FPM dissectors. Change-Id: I212afb8a8a4a7a9aa54391b0d5971b982b819395 Reviewed-on: https://code.wireshark.org/review/7643 Reviewed-by: Graham Bloice Tested-by: Graham Bloice commit 8e709fc Author: Jeff Morriss Date: Wed Mar 11 22:54:24 2015 -0400 Assert that the row number passed to packet_list_get_row_data() is valid. Unfortunately that row number may come from a dissector/tap but allowing us to continue just causes us to die horribly later (and we can't except out of processing a tap). Change-Id: I37f03385db55dbe55f91e2ec6a03add5664857ba Ping-Bug: 10885 Reviewed-on: https://code.wireshark.org/review/7652 Reviewed-by: Anders Broman commit c18a3c9 Author: matibens Date: Wed Mar 11 10:53:44 2015 +0100 Add mip6.mnid.identifier as string with filter string instead of simple text Change-Id: If9ecbb6ff77fff8131adf526bfec2bb08aa644aa Reviewed-on: https://code.wireshark.org/review/7642 Reviewed-by: Michael Mann Petri-Dish: Michael Mann Reviewed-by: Anders Broman commit a9c75ca Author: Peter Wu Date: Thu Mar 12 01:47:02 2015 +0100 Avoid abort on zero-length fields Since commit v1.99.4rc0-70-g0bec885 (Remove use of sprintf for ftype string formatting), Wireshark aborts with "Null pointer passed to bytes_to_hexstr_punct()". This happened with a SSL capture where the ssl.handshake.extensions_padding_data had a zero length. Fix it by producing a zero-length string instead (as done by the previous implementation). Change-Id: I711d786a9ae692eb44c5e49a30d5fea41c5af31e Reviewed-on: https://code.wireshark.org/review/7649 Reviewed-by: Michael Mann commit 0bec885 Author: Michael Mann Date: Sat Mar 7 10:02:08 2015 -0500 Remove use of sprintf for ftype string formatting Change-Id: I656d6193aad740ab88bf16fb25c202e766e3092a Reviewed-on: https://code.wireshark.org/review/7616 Petri-Dish: Michael Mann Reviewed-by: Michael Mann commit b5d062b Author: Peter Wu Date: Wed Mar 11 19:31:56 2015 +0100 Fix buffer overflow in 802.11 decryption The sha1 function outputs a multiple of 20 bytes while the ptk buffer has only a size of 64 bytes. Follow the hint in 802.11i-2004, page 164 and use an output buffer of 80 octets. Noticed when running Wireshark with ASAN, on exit it would try to free a "next" pointer which was filled with sha1 garbage. It probably got triggered via 3f8fbb734915aaf74eb006898e8fabb007afbf48 which made AirPDcap responsible for managing its own memory. Bug: 10849 Change-Id: I10c1b9c2e224e5571d746c01fc389f86d25994a1 Reviewed-on: https://code.wireshark.org/review/7645 Reviewed-by: Evan Huus Petri-Dish: Michael Mann Reviewed-by: Peter Wu Tested-by: Peter Wu Reviewed-by: Michael Mann commit 90797b9 Author: Martin Kaiser Date: Fri Mar 6 19:13:23 2015 +0100 relay USB control messages without payload to protocol-specific dissectors at the moment, we don't forward such messages and therefore see lots of generic USB control messages that could be dissected further even if there's no data, a protocol-specific dissector may still set the columns based on conversation info Change-Id: If3fc0f0ce3bdec1f91b7e3cadc3affd56b8c8969 Reviewed-on: https://code.wireshark.org/review/7584 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit c19860d Author: Evan Huus Date: Sat Mar 7 22:25:28 2015 -0500 lbmr: fix possible infinite loop Ensure that we handle when option_len is zero so we don't go into an infinite loop. Reported by Vlad Tsyrklevich and found by the "joern" tool. Also fix what appears to be two misplaced "curr_offset" values which would have resulted in a bad loop anyways. Bug: 11036 Change-Id: I79e70fcf79015cb0add1744aff695143e11312aa Reviewed-on: https://code.wireshark.org/review/7593 Reviewed-by: David Ameiss Reviewed-by: Evan Huus commit 9b9aa9a Author: Alexis La Goutte Date: Wed Mar 11 07:51:31 2015 +0100 RADIUS: Sync with FreeRADIUS Master commit 37620296eb862aedafe88d417405aba13f9e2b91 Author: Alan T. DeKok Date: Mon Mar 9 16:06:50 2015 -0400 Fix Cisco attributes. Fixes #921 Change-Id: I1a7686eb010b87b576437555ea3e90fe803d3403 Reviewed-on: https://code.wireshark.org/review/7636 Reviewed-by: Evan Huus commit 1bc0c48 Author: Jérôme LAFORGE Date: Wed Mar 11 10:12:45 2015 +0100 Minor fix of RFC's number into comment. Change-Id: I51035034397aa9bc42ed5b4aadc6c7fca52b2d5d Reviewed-on: https://code.wireshark.org/review/7638 Reviewed-by: Michael Mann commit 14b2320 Author: Pascal Quantin Date: Tue Mar 10 20:48:06 2015 +0100 QNET6: check that string is not null before accessing to it Bug: 11048 Change-Id: I7921f19ad378d6d0b6707251a546c84405b8dcf4 Reviewed-on: https://code.wireshark.org/review/7623 Reviewed-by: Pascal Quantin commit fdcae1f Author: Alexis La Goutte Date: Mon Mar 9 09:01:29 2015 +0100 ICMP(v4): Enhance display of checksum stuff (like ICMPv6) Change-Id: I74d0751b9efc3eac99b6bbadf3fe19207e2086db Reviewed-on: https://code.wireshark.org/review/7609 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 5988f6d Author: Alexis La Goutte Date: Sat Feb 7 23:11:37 2015 +0100 ICMP(v4): Remove proto_tree_add_text Change-Id: Iad5e28aab54a6f22148aa1e81f2dc87fbaf7ccea Reviewed-on: https://code.wireshark.org/review/7016 Reviewed-by: Dario Lombardo Reviewed-by: Anders Broman commit ea72d08 Author: Alexis La Goutte Date: Tue Mar 10 21:02:11 2015 +0100 RADIUS: Update Aruba dictionary (from ClearPass 6.5.0) Change-Id: I82f4a14d18ad0c1f6911a5cb8c4eebaaa7cd9658 Reviewed-on: https://code.wireshark.org/review/7626 Reviewed-by: Anders Broman commit ce9ac00 Author: Alexis La Goutte Date: Tue Mar 10 22:39:19 2015 +0100 ICMPv6: Enhance / Update dissector * Update to the last IANA icmpv6-parameters (2014-01-30) * Add ICMP Locator Update message (RFC 6743) * Add RFC 7400 (6LoWPAN-GHC: Generic Header Compression for IPv6 over Low-Power Wireless Personal Area Networks) (Add new ND Option) Change-Id: I3d6c7f06b6f654e57844046d63c8091e5e33037a Reviewed-on: https://code.wireshark.org/review/7629 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit 20afdbc Author: Alexis La Goutte Date: Tue Mar 10 22:45:06 2015 +0100 VSIP: Add Modelines info Change-Id: I6b578bad375687651e06508ea9c532bbad3472c8 Reviewed-on: https://code.wireshark.org/review/7631 Reviewed-by: Michael Mann commit 45a06db Author: Alexis La Goutte Date: Tue Mar 10 23:05:34 2015 +0100 VSIP : fix initializing 'const void *' with an expression of type 'void (*)(gchar *, guint32)' converts between void pointer and function pointer [-Wpedantic] Change-Id: Idb7f075f67402d4ca02934a22ad0fd1127c89369 Reviewed-on: https://code.wireshark.org/review/7632 Reviewed-by: Alexis La Goutte Petri-Dish: Alexis La Goutte Reviewed-by: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit e991610 Author: Gerald Combs Date: Tue Mar 10 16:51:19 2015 -0700 Update the buildbot URL. Change-Id: Ia3a9e8e919d3702a4499351df0289294cd10f808 Reviewed-on: https://code.wireshark.org/review/7634 Reviewed-by: Gerald Combs commit a3bdf14 Author: Alexis La Goutte Date: Tue Feb 3 07:46:09 2015 +0100 Bootp: fix typo Change-Id: I6f6ac0bcb7b1ddc124f161b5cacd046aeef5043f Reviewed-on: https://code.wireshark.org/review/7630 Reviewed-by: Alexis La Goutte commit 0bbbda7 Author: Pascal Quantin Date: Mon Mar 9 21:28:24 2015 +0100 TCP: use curr_num_layer as key for p_(add|get)_proto_data It allows to properly handle a use case were several TCP connections would be encapsulated Note that it is safe to use the same key for struct tcp_analysis and proto_tree as they are not using the same scope (and thus list) Change-Id: I37423eca225960f2e72817f6faf543f6676cf489 Reviewed-on: https://code.wireshark.org/review/7606 Reviewed-by: Pascal Quantin Reviewed-by: Anders Broman commit cac102e Author: Gerald Combs Date: Tue Mar 10 10:46:50 2015 -0700 Change a lot of http:// URLs to https://. Most of our sites are now HTTPS-only. Update URLs accordingly. Update other URLs while we're at it. Remove or comment out dead links. Change-Id: I7c4f323e6585d22760bb90bf28fc0faa6b893a33 Reviewed-on: https://code.wireshark.org/review/7621 Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs commit 7f61e90 Author: Pascal Quantin Date: Tue Mar 10 20:01:59 2015 +0100 SPNEGO: fix compilation without Kerberos Remove a dead increment while we are at it Change-Id: I4a453bbd959e71ff6e85be06d079176abdc33a95 Reviewed-on: https://code.wireshark.org/review/7622 Reviewed-by: Pascal Quantin commit 16d8525 Author: Pascal Quantin Date: Tue Mar 10 19:14:59 2015 +0100 VSIP: fix extended value string declaration Change-Id: I10e243bfa33f2e2415c937dcb12fca0578bcb7a9 Reviewed-on: https://code.wireshark.org/review/7620 Reviewed-by: Pascal Quantin commit 75e8d91 Author: Pascal Quantin Date: Sun Mar 8 19:36:43 2015 +0100 TCP: fix addition of tcp.pdu.size field Bug: 11007 Change-Id: I902d07f6492bffe5d44f6687be9db53b11b0acd3 Reviewed-on: https://code.wireshark.org/review/7602 Reviewed-by: Peter Wu Reviewed-by: Pascal Quantin commit 8ff55a9 Author: Evan Huus Date: Sat Mar 7 22:14:52 2015 -0500 forces: make redirecttlv robust to invalid lengths Fixes a potential infinite loop reported by Vlad Tsyrklevich found via the "joern" tool. I'm pretty sure the semantics of proto_tree_add_item would have prevented this, but not 100% and making it explicit doesn't hurt. Bug: 11037 Change-Id: I92049a95d23ca9c233b3fd830637e6bca19a7434 Reviewed-on: https://code.wireshark.org/review/7592 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit 5a1b32b Author: Stefan Metzmacher Date: Fri Feb 20 08:40:34 2015 +0100 packet-spnego: fix krb5_cfx_wrap without encryption We need to use rrc, as the checksum is likely to be rotated before the plaintext payload. For now we only handle the two common cases rrc == 0 and rrc == ec... Ping-Bug: 9398 Change-Id: I548f2f0650716294b6aeb361021be6e44ae8f1b3 Signed-off-by: Stefan Metzmacher Reviewed-on: https://code.wireshark.org/review/7271 Reviewed-by: Michael Mann commit ea0e489 Author: Stefan Metzmacher Date: Sat Feb 21 23:06:56 2015 +0100 packet-ldap: use the correct tvb to report the SASL wrapped payload Ping-Bug: 9398 Change-Id: I163d3dc99562b3388470c58d05e2d4d2e2f6d00c Signed-off-by: Stefan Metzmacher Reviewed-on: https://code.wireshark.org/review/7477 Reviewed-by: Michael Mann commit d2b9a4b Author: Charles Nepveu Date: Sat Mar 7 19:26:52 2015 -0500 Add Video Services over IP (VSIP) dissector. Took the original patch from bug 5116 and made the dissector "human readable". Bug: 5116 Change-Id: Ic5cc35f919865bc84ee8a3d0589f498ef13e8f6f Signed-off-by: Michael Mann Signed-off-by: Alexis La Goutte Reviewed-on: https://code.wireshark.org/review/7605 Tested-by: Petri Dish Buildbot commit 082d03d Author: Michael Mann Date: Fri Mar 6 19:43:14 2015 -0500 Add support to display unsigned integer "field type" in hex. Ping-Bug: 10318 Change-Id: Idb8790681cda901788df10fc1484179001bbb35c Reviewed-on: https://code.wireshark.org/review/7566 Reviewed-by: Anders Broman commit 1e3840e Author: AndersBroman Date: Tue Mar 10 10:53:41 2015 +0100 [GTPv2] Dissect ULI Timestamp. Change-Id: If257831315423e5654cbbc3f6af99703cfad7f90 Reviewed-on: https://code.wireshark.org/review/7614 Reviewed-by: Anders Broman commit e9a4010 Author: Alexis La Goutte Date: Mon Mar 9 08:42:18 2015 +0100 ICMP(v4): fix Found soft-deprecated APIs (tvb_length,tvb_length_remaining) Change-Id: Ib79a55d4f2459119feff29aa06dc8eda8bea6954 Reviewed-on: https://code.wireshark.org/review/7608 Reviewed-by: Anders Broman commit 296bb23 Author: Alexis La Goutte Date: Tue Mar 10 07:36:40 2015 +0100 ui uitls (Qt): fix parameter 'val' not found in the function declaration [-Wdocumentation] Change-Id: I5fb1afca4b412697c56d80a8eb7be4140cd9420f Reviewed-on: https://code.wireshark.org/review/7612 Petri-Dish: Alexis La Goutte Reviewed-by: Anders Broman commit d36c2ad Author: Alexis La Goutte Date: Tue Mar 10 07:47:28 2015 +0100 CMakeLists: fix indent (use tabs) Change-Id: If1a0a7dbe85eada1926eb278d973ddd1c55becda Reviewed-on: https://code.wireshark.org/review/7613 Reviewed-by: Anders Broman commit 8ec6ab6 Author: Pascal Quantin Date: Mon Mar 9 23:13:37 2015 +0100 ETSI CAT: upgrade dissector to v12.2.0 Change-Id: Ifd5f901aa3856e5469f213c4c63c53f3d8f1b4c8 Reviewed-on: https://code.wireshark.org/review/7611 Reviewed-by: Pascal Quantin commit 44dbae7 Author: Gerald Combs Date: Mon Mar 9 14:19:37 2015 -0700 ProtoTree: Fix crashes. Don't dereference a null pointer. Remove g_assert()s copied from ui/gtk. This fixes problems mentioned in bug 11044 but not the bug itself. Change-Id: Iab75ab5cc6a184c8145a094b1c529a634e3c1c0d Ping-Bug: 11044 Reviewed-on: https://code.wireshark.org/review/7610 Reviewed-by: Gerald Combs commit ae8b538 Author: Richard Sharpe Date: Sat Mar 7 12:55:33 2015 -0800 Add dissection of the SMB2 FSCTL_SET_INTEGRITY_INFORMATION FSCTL based on documentation on the MS website and a capture I have. Still have to dissect FSCTL_GET_INTEGRITY_INFORMATION. Change-Id: I17ada4daa479810d8d8512c7e7b8798bcb650081 Signed-off-by: Richard Sharpe Reviewed-on: https://code.wireshark.org/review/7587 Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte commit 5fbf88f Author: Jeff Morriss Date: Fri Mar 6 18:31:41 2015 -0500 Use the new request/response framenum hints. Change-Id: Ic4a3750a55523a5cf8ea72002055ffea1f081dd1 Reviewed-on: https://code.wireshark.org/review/7565 Reviewed-by: Michael Mann Reviewed-by: Jeff Morriss commit 7c5fbda Author: Alexis La Goutte Date: Tue Mar 3 13:23:11 2015 +0100 Proto.c: fix no previous prototype for ... [-Wmissing-prototypes] proto.c:8733:1: warning: no previous prototype for 'proto_tree_add_uint64_bits_format_value' [-Wmissing-prototypes] proto.c:8812:1: warning: no previous prototype for 'proto_tree_add_int64_bits_format_value' [-Wmissing-prototypes] proto.c:8861:1: warning: no previous prototype for 'proto_tree_add_boolean_bits_format_value64' [-Wmissing-prototypes] Change-Id: Ic40ca6f32739b415a423fc978e8677d669a95867 Reviewed-on: https://code.wireshark.org/review/7509 Reviewed-by: Alexis La Goutte Reviewed-by: Anders Broman commit a242c09 Author: Dario Lombardo Date: Thu Feb 12 14:41:56 2015 +0100 Small improvement in incomplete dissectors check. This avoids logging "frame" as incomplete dissector. Change-Id: Ifd32c4326fbe9e86d14c94e065b602ca45cb0a7e Reviewed-on: https://code.wireshark.org/review/7390 Reviewed-by: Evan Huus Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman commit bd64823 Author: Alexis La Goutte Date: Thu Mar 5 16:51:06 2015 +0100 HTTP2: Update to libnghttp2 0.7.5 Change-Id: Idcaf31b177b387b4a7199c8e1a9f591e3bf8a58f Reviewed-on: https://code.wireshark.org/review/7541 Petri-Dish: Alexis La Goutte Reviewed-by: Alexis La Goutte Reviewed-by: Anders Broman commit 6bc138c Author: Peter Wu Date: Sat Mar 7 22:53:05 2015 +0100 Qt: fix heap use-after-free wrt. data sources When a different packet is changed, the packet scoped memory for tvbuff is freed before clearing data source tabs. This results in heap-use-after free when resizeEvent is called as a result of clearing tabs for data sources. Avoid resize events by hiding the tabs. Caught with ASAN: ==18816==ERROR: AddressSanitizer: heap-use-after-free on address 0x6060004cd970 at pc 0x7fffebf46618 bp 0x7fffffffbb10 sp 0x7fffffffbb00 READ of size 4 at 0x6060004cd970 thread T0 #0 0x7fffebf46617 in tvb_captured_length epan/tvbuff.c:423 #1 0x773062 in ByteViewText::updateScrollbars() ui/qt/byte_view_text.cpp:489 #2 0x76f307 in ByteViewText::resizeEvent(QResizeEvent*) ui/qt/byte_view_text.cpp:197 ... #24 0x9f2348 in ByteViewText::~ByteViewText() ui/qt/byte_view_text.h:46 #25 0x9f23f5 in ByteViewText::~ByteViewText() ui/qt/byte_view_text.h:46 #26 0x76b9d6 in ByteViewTab::clear() ui/qt/byte_view_tab.cpp:54 #27 0x5de685 in PacketList::selectionChanged(QItemSelection const&, QItemSelection const&) ui/qt/packet_list.cpp:477 ... freed by thread T0 here: ... #5 0x53d763 in cf_select_packet file.c:3827 #6 0x5ddfa5 in PacketList::selectionChanged(QItemSelection const&, QItemSelection const&) ui/qt/packet_list.cpp:454 #7 0x7fffe58ec980 (/usr/lib/libQt5Widgets.so.5+0x3bc980) #8 0x7fffe4d55dd6 in QItemSelectionModel::selectionChanged(QItemSelection const&, QItemSelection const&) (/usr/lib/libQt5Core.so.5+0x23fdd6) ... Change-Id: I9c1c01398713389de58259d13ebbaddd2d6e5c52 Reviewed-on: https://code.wireshark.org/review/7589 Reviewed-by: Peter Wu Reviewed-by: Gerald Combs commit 758ee3d Author: Peter Wu Date: Sat Mar 7 13:30:46 2015 +0100 Qt: fix use of uninitialized variable Fixes error reported by UBSan: ui/qt/packet_list.cpp:537:13: runtime error: load of value 190, which is not a valid value for type 'bool' The method is apparently called earlier for other timers, resulting in an error on startup. Initialize rows_inserted_ to avoid warnings when the event is triggered later. Change-Id: Iad919d79264ff1c3c17c9458c869d584234fcd5d Reviewed-on: https://code.wireshark.org/review/7575 Reviewed-by: Peter Wu commit 27ff75c Author: Pascal Quantin Date: Sun Mar 8 21:27:27 2015 +0100 ULP/ILP: add dissection of MSISDN, MDN and IMSI numbers Bug: 11038 Change-Id: If4602a8ad434c46ea7986eec566751f4bb667002 Reviewed-on: https://code.wireshark.org/review/7603 Petri-Dish: Pascal Quantin Reviewed-by: Anders Broman Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 54c301a Author: Gerald Combs Date: Sun Mar 8 10:41:13 2015 -0700 Add the @2x expert indicators. We currently load the expert indicator resources using an tag. According to QTBUG-36383 the @2x versions won't load unless you've built with Qt 5.4.0 or later. Change-Id: I003fd5d5f10e779f2e7ca6ba9fbb8e033df85b80 Reviewed-on: https://code.wireshark.org/review/7601 Reviewed-by: Gerald Combs commit 29f7c7a Author: Gerald Combs Date: Sat Mar 7 20:47:24 2015 -0800 Update the expert indicators. Add @2x versions. Remove expert_ok. It appears to be unused. Change-Id: If36f839f622e235334a4237a9c5424c15a9945bc Reviewed-on: https://code.wireshark.org/review/7594 Reviewed-by: Gerald Combs commit 87c0df3 Author: Gerald Combs Date: Sat Mar 7 09:23:03 2015 -0800 Qt: Paint elided LableStack text by hand. Change-Id: I9481598f59531c219a20209429e6ff876ba50cf0 Reviewed-on: https://code.wireshark.org/review/7591 Reviewed-by: Gerald Combs commit cf5f2c9 Author: Gerald Combs Date: Sun Mar 8 08:05:54 2015 -0700 [Automatic manuf, services and enterprise-numbers update for 2015-03-08] Change-Id: I32655186b47b95923aa31426bc710e4838c8fc1e Reviewed-on: https://code.wireshark.org/review/7598 Reviewed-by: Gerald Combs commit 1a57201 Author: Martin Kaiser Date: Sun Mar 8 13:11:47 2015 +0100 Revert "[Qt translations] create the .qm files during the build" This reverts commit 7d01a84d0e2833f685b7e70c3a52097891286566. cmake doesn't get the dependencies right if the .qm files are gone I'll work on this off-line and resubmit it as one commit rather than trying to approach this step-by-step Change-Id: Ibbd60163f910adbd571b3df2a980d64dbf1ea924 Reviewed-on: https://code.wireshark.org/review/7596 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit fa2a15e Author: Pascal Quantin Date: Sat Mar 7 20:58:22 2015 +0100 TCP: let's pacify the OSX 10.5 x86 buildbot Change-Id: Ie0655285d6e27b8a60ef5d2c4a970facac8cf4a9 Reviewed-on: https://code.wireshark.org/review/7585 Reviewed-by: Pascal Quantin commit 7d01a84 Author: Martin Kaiser Date: Sun Mar 1 19:04:32 2015 +0100 [Qt translations] create the .qm files during the build create the .qm files from the .ts files at compile time for now, this works for autotools only don't fail if Qt's lrelease tool is not available, skip building the .qm files in this case Change-Id: I869a6dc8220eb03e7ffc8bfdb2b6f3930f6cac72 Reviewed-on: https://code.wireshark.org/review/7460 Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 9b19d9a Author: Pascal Quantin Date: Sat Mar 7 17:16:53 2015 +0100 TCP: remove what seems to be a useless volatile attribute It allows to get rid of the following error when compiling with gcc 4.7.2: variable 'plen' might be clobbered by 'longjmp' or 'vfork' [-Werror=clobbered] Change-Id: I1a647a6de7ddd25136b76237914ee7c5a8c7fa0a Reviewed-on: https://code.wireshark.org/review/7580 Reviewed-by: Pascal Quantin Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Martin Kaiser Tested-by: Martin Kaiser commit 40fc001 Author: Pascal Quantin Date: Sat Mar 7 15:20:15 2015 +0100 GVSP: add an option to deactivate (a rather weak) heuristic dissector Also add the ability to use "Decode As" function Change-Id: I8be0ecd1d5d6b86d4aa9d69907e9216791be2ae0 Reviewed-on: https://code.wireshark.org/review/7577 Petri-Dish: Pascal Quantin Reviewed-by: Pascal Quantin commit 56a9036 Author: Peter Wu Date: Sat Mar 7 17:18:36 2015 +0100 Qt: fix CPU hogging due to status bar http://doc.qt.io/qt-5/qwidget.html#updatesEnabled-prop says: "Re-enabling updates implicitly calls update() on the widget." This results in an infinite paintEvent series, hogging the CPU. Updating the text twice does not seem to be a bad idea after all... Change-Id: Id6cd733e68512f6963fc7d70d91859ca88ab8d38 Reviewed-on: https://code.wireshark.org/review/7581 Reviewed-by: Gerald Combs commit 1f00574 Author: Pascal Quantin Date: Sat Mar 7 16:32:17 2015 +0100 GSM SMS: minor fixes to DELIVER, DELIVER REPORT and STATUS_REPORT dissection Change-Id: I9bf3b0529e353ff9c2e936e75e86fffae17506fd Reviewed-on: https://code.wireshark.org/review/7579 Reviewed-by: Pascal Quantin commit 07d3610 Author: Pascal Quantin Date: Sat Mar 7 16:30:17 2015 +0100 LAPDm: set captured and reported lengths properly when building the tvb forwarded to subdissectors Change-Id: I6ab6bfd90a70411703d2fa8b3ff5225cedb8d2fb Reviewed-on: https://code.wireshark.org/review/7578 Reviewed-by: Pascal Quantin commit 7a76e3d Author: Pascal Quantin Date: Sat Mar 7 14:41:33 2015 +0100 GVSP: fix gvsp.zonedirecton field registration Change-Id: I1d53bf13c6692ee719a4fcfa55e3c5b1b67a893f Reviewed-on: https://code.wireshark.org/review/7576 Reviewed-by: Pascal Quantin commit 9a5cd7d Author: Gerald Combs Date: Fri Mar 6 20:41:54 2015 -0800 Fix the exec call and paths in the test wrapper. Change-Id: Ie36e9c7dc9a60715248aea300cffde8040cb0768 Reviewed-on: https://code.wireshark.org/review/7574 Reviewed-by: Gerald Combs commit 5e67ae7 Author: Guy Harris Date: Fri Mar 6 20:33:41 2015 -0800 Get rid of an unused structure member. Change-Id: I2941bb7e6dc0fce3e1256af6e5e19d2997de5801 Reviewed-on: https://code.wireshark.org/review/7573 Reviewed-by: Guy Harris commit b6ecff7 Author: Gerald Combs Date: Fri Mar 6 20:28:10 2015 -0800 Try adding "set -o igncr". Maybe the test wrapper should be a Python script. Change-Id: I38a5089c83ef643fb6c7c76acd599cef6aba39f4 Reviewed-on: https://code.wireshark.org/review/7572 Reviewed-by: Gerald Combs commit 2d5255e Author: Gerald Combs Date: Fri Mar 6 19:21:27 2015 -0800 Add GenerateTestSh.cmake to the distribution. Change-Id: I4cd6b91db7fa0202d6c1918feec9f34b819f09d1 Reviewed-on: https://code.wireshark.org/review/7571 Reviewed-by: Gerald Combs commit acb62f1 Author: Gerald Combs Date: Fri Mar 6 17:49:24 2015 -0800 CMake: Generate a wrapper for test.sh. Create a wrapper script that cd's to the test directory and execs test.sh. We need to handle build configurations so the path is a bit roundabout. Change-Id: I4c2a48c041bce2479422830110b1251b3f2c5a94 Reviewed-on: https://code.wireshark.org/review/7570 Reviewed-by: Gerald Combs commit 394d23e Author: Gerald Combs Date: Fri Mar 6 12:16:46 2015 -0800 Qt: Automatic scrolling shouldn't select the last packet. If packet_list_moveto_end does anything it should scroll, not select. Make it a no-op for the time being. Change-Id: I149815c8f9e50e95a4a77b91b7582c44eed6db4b Ping-Bug: 10601 Reviewed-on: https://code.wireshark.org/review/7564 Reviewed-by: Gerald Combs commit 5da5693 Author: Dario Lombardo Date: Fri Mar 6 14:43:43 2015 +0100 jsmn: bugfix in jsmn_parse() (found by clang). Change-Id: Id5a9888a3e17c861a9de06343bd99ec0c4aacdce Reviewed-on: https://code.wireshark.org/review/7555 Petri-Dish: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin commit 9ca58d7 Author: Pascal Quantin Date: Fri Mar 6 13:25:09 2015 +0100 MBIM: add request/response visual indicators Change-Id: I5f4ce93bb5b164fb8b75c0acf7dd8825663110b8 Reviewed-on: https://code.wireshark.org/review/7556 Reviewed-by: Pascal Quantin commit 9c2b593 Author: Evan Huus Date: Thu Mar 5 22:52:28 2015 -0500 alljoyn: more robust signature handling There were two bugs in the handling of all-joyn struct signatures: - we were advancing the pointer without decrementing the length remaining - we were not checking for the string's null-terminator (which is only necessary if the string is malformed, but that's entirely possible) Bug: 11028 Change-Id: I38b98cf3f43681f709846e3cb9068d20c4fdce82 Reviewed-on: https://code.wireshark.org/review/7552 Reviewed-by: Evan Huus Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit ebc47e4 Author: Dario Lombardo Date: Wed Mar 4 15:37:00 2015 +0100 slarp: added reliability field + expert info Change-Id: Ic288c429b69b858be77a9de1c571cc65a6e49b81 Reviewed-on: https://code.wireshark.org/review/7520 Petri-Dish: Alexis La Goutte Reviewed-by: Alexis La Goutte Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann commit 2e8639d Author: Michal Labedzki Date: Sun Mar 1 15:39:36 2015 +0100 Bluetooth: ATT: Add request/response visual indicators Use feature for visual tracking request/response on Packet List. Change-Id: Iabe2ddf46425ebd586ec462140b3f7d8f7ebbf56 Reviewed-on: https://code.wireshark.org/review/7525 Petri-Dish: Michal Labedzki Tested-by: Petri Dish Buildbot Reviewed-by: Michal Labedzki commit df8b1a0 Author: Gerald Combs Date: Thu Feb 26 10:46:15 2015 -0800 Qt: Fix a couple of resource leaks found by Coverity. Change-Id: Ic3156d8afc2fa237407f3893c34672b1306866fa Reviewed-on: https://code.wireshark.org/review/7420 Reviewed-by: Michael Mann Reviewed-by: Evan Huus commit 49b8f99 Author: Alexis La Goutte Date: Thu Mar 5 11:11:29 2015 +0100 bthfp: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Change-Id: Ic87f34d793bdddb3843dd8007231a70d5d08d6c6 Reviewed-on: https://code.wireshark.org/review/7539 Reviewed-by: Michael Mann Reviewed-by: Evan Huus commit 4ca3dba Author: Peter Wu Date: Fri Feb 20 19:33:16 2015 +0100 tcp: support variable-length tcp_dissect_pdus Originally suggested by Bill Meier for the MQTT protocol[1], but the Websocket protocol can also benefit from this. Since DESEGMENT_ONE_MORE_SEGMENT is a valid packet length, use the zero length instead as an indicator that the length is not yet known. Updated documentation too and remove the function documentation from packet-tcp.c since it is duplicated in packet-tcp.h. A noteworthy WSDG change is that the get_pdu_len parameter of tcp_dissect_pdus gained another void pointer since v1.99.2rc0-890-gceb8d95 ("Lua: Expose tcp_dissect_pdus() to Lua"). [1]: https://www.wireshark.org/lists/wireshark-dev/201405/msg00044.html Change-Id: I4eba380e00cd757635eb5639c2857356dae3171e Reviewed-on: https://code.wireshark.org/review/7279 Reviewed-by: Guy Harris Reviewed-by: Michael Mann Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit 554c8fd Author: Guy Harris Date: Thu Mar 5 16:43:37 2015 -0800 Reflect wsutil changes. Change-Id: Iecffc41714c6ffe67eaa954d85cb664aba5c143e Reviewed-on: https://code.wireshark.org/review/7551 Reviewed-by: Guy Harris commit c3870d7 Author: Guy Harris Date: Thu Mar 5 14:10:24 2015 -0800 There's no proto_tree_add_bytes_with_bytes() routine. Change-Id: If2e3dc7bfdd65ee7df725e7acc291fd6e4aa3e40 Reviewed-on: https://code.wireshark.org/review/7550 Reviewed-by: Guy Harris commit 1bc4091 Author: Evan Huus Date: Thu Mar 5 11:55:34 2015 -0500 kafka: misc minor tweaks Use the new request/response framenum hints. Replace some deprecated APIs. Change-Id: Ia58c49da7e12d01477dadfc7f5a42b152730dc71 Reviewed-on: https://code.wireshark.org/review/7547 Petri-Dish: Evan Huus Tested-by: Petri Dish Buildbot Reviewed-by: Evan Huus commit 8664de0 Author: Gerald Combs Date: Wed Mar 4 15:43:33 2015 -0800 Qt: Constify a bunch of strings. Change-Id: I601e429408fc042fc5b18a4750d40e260da47f43 Reviewed-on: https://code.wireshark.org/review/7535 Petri-Dish: Gerald Combs Reviewed-by: Gerald Combs commit 89270fb Author: Gerald Combs Date: Thu Mar 5 12:15:53 2015 -0800 1.99.3 → 1.99.4. Change-Id: I96953b6ca34140972a783c3066614399981ca1e2 Reviewed-on: https://code.wireshark.org/review/7549 Reviewed-by: Gerald Combs