aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-11-02make-version.pl: fix --print-vcs outputPeter Wu1-13/+17
Detect earlier whether to write VCSVERSION to version.h such that the --vcs-version output matches the contents of version.h. Change-Id: I5c05087679bb7861cd5884426b39fa362bf23a16 Fixes: v2.1.0rc0-2770-geeded81 ("Add option to disable version.h") Reviewed-on: https://code.wireshark.org/review/18599 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-02Openflow (v4/v5): Add vOXM vlan mask fieldAlexis La Goutte2-0/+20
Bug: 12979 Change-Id: I7f0e806081704dfeaf40ce1e4e41271ffd5e3023 Reviewed-on: https://code.wireshark.org/review/18618 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-02FIX: fix spelling typo found by lintianAlexis La Goutte5-6/+6
Change-Id: I3616de3ecd7ca52f2da4af13f35967eeed61414e Reviewed-on: https://code.wireshark.org/review/18613 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-02btatt: fix spelling typo found by lintianAlexis La Goutte1-8/+8
Change-Id: I3fdc71e927bdb0d5408db46656c23b23dc31489a Reviewed-on: https://code.wireshark.org/review/18621 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2016-11-02SNA: fix dissection of GDS VariablesPascal Quantin1-11/+26
Decode the header as specified in http://www.retrocomputing.net/info/doc/GA27-3136-20_SNA_Formats.pdf chapter 13. Note that the Information field is not decoded yet. Bug: 13084 Change-Id: Iaaee344ef0b2805906a3eeae1134479abf9d403e Reviewed-on: https://code.wireshark.org/review/18616 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-11-02Packaging: Add dependencies for lz4 and snappy packagesBenoît Canet5-4/+35
Do it for Debian-like, RPM-based, and MacOS (via Homebrew) systems. Signed-off-by: Benoît Canet <benoit@scylladb.com> Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Change-Id: I52802301815243021c039da6a27af6c534792439 Reviewed-on: https://code.wireshark.org/review/18272 Reviewed-by: Benoît Canet <benoit@scylladb.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-11-02Qt: add "search authors" feature.Dario Lombardo3-11/+39
Add a search field in the authors tab. The list of authors has became huge and it's very hard to find someone in it. Having a fast way to search yourself or your friends would be fun. Change-Id: I0c6a5e8d5893d6f7b5a3258e63bdc91969f53d31 Reviewed-on: https://code.wireshark.org/review/18594 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-11-02pre-commit: fix indentAlexis La Goutte1-1/+1
Change-Id: I50291be3fd275cde8af42c45c17e52345d1c6215 Reviewed-on: https://code.wireshark.org/review/18619 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-02Fix some errors.Guy Harris1-49/+7
Th link throughput and latency objects are just 32-bit integers; process them as such and, as they're bytes-per-second and microsecond values, respectively, show them as decimal, rather than as hex, as most of us have 10, not 16, fingers. The ETX metric object is a 16-bit integer; process it as such, and show it in decimal as well. Attach an expert info representing an error to the item in error. Change-Id: I57dfac0127d263724cc6940a0457d63e17616b64 Reviewed-on: https://code.wireshark.org/review/18617 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-11-02Add snappy compression library setupJoerg Mayer1-0/+52
Change-Id: I060d3056dc386f44aec703ddd0fe024866a51fcf Reviewed-on: https://code.wireshark.org/review/18611 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-11-02Validate the Diameter XML files in the pre-commit script.Jeff Morriss2-7/+17
Validation requires xmllint but will pass (with a complaint) if the committer does not have xmllint installed. Change-Id: I336a1c8ad8e1f98805a284d8c4736810b1a9c54e Reviewed-on: https://code.wireshark.org/review/18609 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-11-02opa-mad: Fixed malformed SA(FabricInfoRecord) reserved fieldAdam Goldman1-2/+2
Change-Id: I1b20a49008e41728cb10cd11765833a762f66505 Reviewed-on: https://code.wireshark.org/review/18603 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-11-02Add a few more T6a/T6b and charging AVPs.Jeff Morriss2-1/+136
Fix a mistake in a comment. Change-Id: Ibb12ff3036fb42fe5e3955c67c7c9989f8ffca63 Reviewed-on: https://code.wireshark.org/review/18610 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-11-02Move Base32_encode from packet-fc00.c to wsutil (as ws_base32_decode)Michael Mann6-45/+146
There could be some reuse out of it, so but it with the rest of the general utilities. Change-Id: I404c135b933660a82678510b9ca2701985c5632a Reviewed-on: https://code.wireshark.org/review/18589 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-11-02packet-infiniband: Fixed IP based connections & other minor fixesParav Pandit2-67/+133
1. Fixed setting right address type instead of AT_IB for RoCE and RRoCE depending on address type given by pinfo where address type would be IPv4 or IPV6. Fail to do so was resulting into infiniband dissector adding conversation info based on AT_IB type vs payload dissectors dissecting based on pinfo. Fixing this allows to add/search based on right address type. (Tested for Infiniband and RRoCE) 2. Added support to pass already parsed CM attribute id from infiniand to other mad private data dissectors so that right dissection of private data can be done based on CM attribute id (message type). Moved CM attribute id definitions to header file so that private data dissectors based on CM attribute id can reuse these values without duplicate defines. (Tested for Infiniband and RRoCE) 3. Added direction client to server/server to client, (active/passive) to conversation_data for payload dissectors which cannot dissect only based on payload content without knowing the direction. (Tested for RRoCE) 4. Fixed IP CM to claim all 92 bytes of private data (including consumer private data), instead of just 36 bytes of header because its part of IP CM private data. (Tested for Infiniband and RRoCE) 5. Fixed MAD header to claim all 232 (256-24) bytes of data as it belongs to it in the tree. (Tested for Infiniband and RRoCE) 6. Fixed getting ip version by performing AND operation first to extract IP version field. (Tested for RRoCE-IPV4 and Infiniband) Change-Id: I37daca6a089784b61c25e10cdc8f3cf028ca8c58 Tested-by: paravpandit@yahoo.com Reviewed-on: https://code.wireshark.org/review/18573 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-02Small fixes for JSON outputPascal Quantin1-4/+6
- reinitialize the variable used to insert comma between packets when performing a new export - ensure that escaped ASCII characters are code on 4 digits characters Change-Id: Ib557da4843f6b98f793b60e417260ebb27a38b99 Ping-Bug: 13073 Reviewed-on: https://code.wireshark.org/review/18598 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-02gtp: fix and improve user location informationJoakim Karlsson1-69/+93
* Fixed RAI which was broken * Improved CGI and SAI Change-Id: I1807b628ef54e2f3e94551c26301f1376bef0914 Reviewed-on: https://code.wireshark.org/review/18604 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-02Add lz4 setup.Joerg Mayer1-0/+52
Change-Id: If3b51e719a0a745eac0862f882b912e1d0f72587 Reviewed-on: https://code.wireshark.org/review/18608 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-11-02gtp: correction of octet14 in QoSProfileJoakim Karlsson1-10/+20
* Added Spare4 * Corrected order Change-Id: I93384452d73bd519784b8c11ab5671797d16fc99 Reviewed-on: https://code.wireshark.org/review/18606 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-02MAUSB: Fix width of Cancel Transfer Status fieldSean O. Stalley1-1/+1
Width of this field was increased in the 1.0a MA USB Update. Change-Id: Ib1a40dee6fbcfd389c982b53c4b51f538c1973e7 Reviewed-on: https://code.wireshark.org/review/18607 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-02Add BGP dissector support for draft-heitz-idr-large-community-04Arjen Zonneveld1-0/+49
Parses large communities as specified in https://tools.ietf.org/html/draft-heitz-idr-large-community-04 Path Attribute - LARGE_COMMUNITY: 65536:1:1 65536:1:2 65536:1:3 Flags: 0xc0, Optional, Transitive: Optional, Transitive, Complete 1... .... = Optional: Optional .1.. .... = Transitive: Transitive ..0. .... = Partial: Complete ...0 .... = Length: Regular length Type Code: LARGE_COMMUNITY (32) Length: 36 Large communities: 65536:1:1 Global Administrator: 65536 Local Data Part 1: 1 Local Data Part 2: 1 Large communities: 65536:1:2 Global Administrator: 65536 Local Data Part 1: 1 Local Data Part 2: 2 Large communities: 65536:1:3 Global Administrator: 65536 Local Data Part 1: 1 Local Data Part 2: 3 Bug: 13083 Change-Id: I8db0601f621ceb6fb2e170ed9bfc2747091495ee Reviewed-on: https://code.wireshark.org/review/18172 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-11-01gtp: decoding correlation-idJoakim Karlsson1-2/+8
Change-Id: Ie9d399c10b6599bfc463e27ca3cfcb3c06d8b588 Reviewed-on: https://code.wireshark.org/review/18605 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-11-01[GTPv2] Basic dissection of IE Integer Number and value_string updates.AndersBroman1-13/+66
Change-Id: I4b5fa57121b56daf55ac2ae3a966679c5ab874fb Reviewed-on: https://code.wireshark.org/review/18602 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-11-01gsm_dtap: fix spelling typo found by lintianAlexis La Goutte1-1/+1
Change-Id: I4f3895195c61b908dd081dd6950b16832d62519f Reviewed-on: https://code.wireshark.org/review/18600 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-10-31GPRSCDR: remove obsolete ASN.1 filesPascal Quantin20-10193/+1627
Change-Id: I4264f594a9c60c07a400187148d6c68120986c3c Reviewed-on: https://code.wireshark.org/review/18597 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-31GPRS_CDR: update record definitionsJan Spevak8-207/+3630
Records defined according to 3GPP TS release 14 in new .asn files. Updated Makefiles and dissector files generated via asn2ws Change-Id: I6da2782c58178550962f63dbd526b827e0d8394b Reviewed-on: https://code.wireshark.org/review/18552 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-31PW_ACH: Use proper symbolic namesJaap Keuter10-26/+50
Collect all used PW Associated Channel Types and use them in the subdissector table registrations. Change-Id: I5d196bceefdb4560b1f4388ff86898e316e5e2ae Reviewed-on: https://code.wireshark.org/review/18590 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-31bitmask: add missing break statementThomas Wiens1-0/+1
Change-Id: Ia9cb54431c8c274c46e299b6a6da8cac14bda88e Reviewed-on: https://code.wireshark.org/review/18591 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-10-31sshdump: remove default filter from capture mode.Dario Lombardo1-6/+1
This allow to capture without any filter. Bug: 13048 Change-Id: I29fb1a7367375b9f3d83a4f610789ae159735198 Reviewed-on: https://code.wireshark.org/review/18561 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-10-31Handle -K, -n, -N, and -u in the common dissection option code.Guy Harris14-160/+125
Also update tfshark to use that code. Change-Id: Ic03fb8ff48c8bfc460298d180b436e53f0076cbe Reviewed-on: https://code.wireshark.org/review/18588 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-31Have the routine that handles dissection options not exit.Guy Harris4-9/+16
Have it return TRUE if the option is OK and FALSE if it isn't, and let its caller exit as appropriate. Also, rename it - it's not adding something to a collection, it's just handling the option. Change-Id: I41863cbb67b7c257d900d3011609891b9b4a7467 Reviewed-on: https://code.wireshark.org/review/18587 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-30Don't use proto_tree_add_{uint,uint64}() to add signed integer values.Guy Harris1-8/+13
Change-Id: I8c5506b746f16e5b79d024be5594cb71f95eced1 Reviewed-on: https://code.wireshark.org/review/18584 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-30Have routines for parsing options that affect dissection.Guy Harris12-154/+297
Have them handle -d, -t, --disable-protocol, --disable-heuristic, and --enable-heuristic for TShark and both flavors of Wireshark. Change-Id: I612c276b1f9df8a2092202d23ab3d48be7857e85 Reviewed-on: https://code.wireshark.org/review/18583 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-30POP: replace wmem_strndup by tvb_memcpyPascal Quantin1-6/+4
gdd3b977 introduced the use of wmem_strndup to ensure that the string is NULL terminated. But it also stops as soon as it finds a NULL character, which can happen with malformed packets. So let's copy all the bytes with tvb_memcpy and add manually a NULL character at the end of the buffer for safeness. Bug: 13074 Change-Id: I9ae65d739a92bc6167e4acfc275e1909f3890815 Reviewed-on: https://code.wireshark.org/review/18582 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-10-30InterfaceList: Fix build without pcapRoland Knall2-10/+42
Change-Id: I2b1a955270e7d3fe0097b09517a268263facd1be Reviewed-on: https://code.wireshark.org/review/18580 Reviewed-by: Roland Knall <rknall@gmail.com>
2016-10-30[Automatic update for 2016-10-30]Gerald Combs12-5126/+5928
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I192e3989204931901b9890366860abdfddf990a4 Reviewed-on: https://code.wireshark.org/review/18577 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-10-30Update libssh to 0.7.3.Guy Harris1-18/+3
Also, don't try to uninstall it, as CMake helpfully provides no uninstall target. Change-Id: I936a8adeecc3c1f0ca71d044467846ffc33ae7b2 Reviewed-on: https://code.wireshark.org/review/18574 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-10-30dnp3: improve data link layer dissectionGraham Bloice1-52/+78
Improve the dissection of the data chunks. Change-Id: Ic87c84f0c3ea2ccceecb376698eed6b2f6a4e614 Reviewed-on: https://code.wireshark.org/review/18566 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-10-30wlan_statistics_dialog (Qt): Fix display when there is no packets_Alexis La Goutte2-3/+15
Make sure we don't pass an invalid value to PercentBarDelegate. Make sure PercentBarDelegate handles invalid values more gracefully. Change-Id: I18f07542be3432d0fcf5dff479eef2ea4d5e7931 Reviewed-on: https://code.wireshark.org/review/18276 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-10-30sip: fix Authorization header with mixed quoted parameterserikdejong1-20/+29
Fix to correctly read unquoted parameter values in Authorization lines. Code in master branch will look for double quotes as the end of a parameter value even in case the value is not enclosed in double quotes. This fix checks if the first character in a value is a double quote in which case it will scan until a non-escaped finishing double quote is found to determine the end of the value string. If no double quote is found as the start of the parameter value it will scan for a comma as the end of the value string. Change-Id: I5322caa146d3213bc94ad24528c2fa23cdea10f2 Bug: 13035 Reviewed-on: https://code.wireshark.org/review/18344 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-10-30hpfeeds: restore channel name in tree.Dario Lombardo1-2/+16
The channel name is also set in pinfo->match_string to be printed by the json subdissector. Change-Id: I9a1c4576ce6d253ef415bda7392b37f2c063c2db Reviewed-on: https://code.wireshark.org/review/18560 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-10-30Allow ampq messages to be bigger than 64kMichael Mann1-11/+11
Also fix a field type conflict noticed in provided capture Bug: 13050 Change-Id: I3d2643299b6db2729641c72b2e1f054f170b4907 Reviewed-on: https://code.wireshark.org/review/18571 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-10-30Fix two warnings when compiling with rpcap support on macOS.Joerg Mayer2-3/+1
One is an unused variable warning turning error, the other is [ 71%] Building C object ui/CMakeFiles/ui.dir/recent.c.o /Users/jmayer/worktmp/wireshark/git/ui/recent.c:494:23: error: implicit conversion loses integer precision: 'glong' (aka 'long') to 'gint' (aka 'int') [-Werror,-Wshorten-64-to-32] rh->auth_type = auth_type; ~ ^~~~~~~~~ 1 error generated. Please review. Change-Id: If838f8fa1e8a76dc8c6cc78db495befdd527da92 Reviewed-on: https://code.wireshark.org/review/18544 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-10-30DHCPv6: Remove check for Relay Data option about Bulk Leasequery replyAlexis La Goutte1-6/+0
Bug: 13025 Change-Id: Ie9c12d4f013b5b88b9cce6a09577bc017a3ed655 Reviewed-on: https://code.wireshark.org/review/18480 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-30OpenFlow 1.4: check length to avoid rewinding offsetPascal Quantin1-4/+32
Bug: 13071 Change-Id: Ia9d55212fe8423311222330ed516da35ee9f53de Reviewed-on: https://code.wireshark.org/review/18565 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-30DCERPC: save strings in wmem file scopePascal Quantin2-3/+3
Bug: 13072 Change-Id: Ib5f3d91be822a3d7180d95e3299dec978941c1d5 Reviewed-on: https://code.wireshark.org/review/18564 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-10-29dnp3: fix indent and variable namesGraham Bloice1-12/+12
Change-Id: I86339a47f78c7b54e57896cc42184a27b5326cb0 Reviewed-on: https://code.wireshark.org/review/18563 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-10-29ieee802154: avoid extra dissection on Payload IEs & Cmd IDYasuyuki Tanaka1-4/+10
Bug:13068 Change-Id: I4db500030ac2608e57bab4281f44576de9792076 Reviewed-on: https://code.wireshark.org/review/18558 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-10-29ieee802154: handle multiple slotframe descriptors properlyYasuyuki Tanaka1-9/+23
Bug: 13069 Change-Id: Ia89b29413b565235c8af40adb5722b9e2528d651 Reviewed-on: https://code.wireshark.org/review/18559 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-10-29Revert "Instead of supressing the warning of policy 42, set MACOSX_RPATH.":Jörg Mayer1-2/+4
--------- CMake Warning (dev): Policy CMP0042 is not set: MACOSX_RPATH is enabled by default. Run "cmake --help-policy CMP0042" for policy details. Use the cmake_policy command to set the policy and suppress this warning. MACOSX_RPATH is not specified for the following targets: epan wiretap wscodecs wsutil This warning is for project developers. Use -Wno-dev to suppress it. ----------- This reverts commit 4728bc201bddc34a7834aedf65704c7aa1c9daf1. Change-Id: I7ea056d56c0352b54be5bebadc35de6173ef593f Reviewed-on: https://code.wireshark.org/review/18562 Reviewed-by: Jörg Mayer <jmayer@loplof.de>