summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2017-03-04Add wmem_tree_count.Michael Mann3-0/+30
There are cases where wmem_tree needs to know its number of nodes. Change-Id: I6411cf4275fd4d85a1d76382e1922d236be3b176 Reviewed-on: https://code.wireshark.org/review/20005 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-04packet-hp-erm.c: Add is_tagged flagGene Cumm1-21/+26
Remove the high bit from hp_erm.unknown3 for hp_erm.is_tagged flag. This value was found by observation. Also realign the static value declarations and some other cleanup Change-Id: I8ca701cad0456c1af561fe4238e4686dc9c83c40 Signed-off-by: Gene Cumm <gene.cumm@gmail.com> Reviewed-on: https://code.wireshark.org/review/20288 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-04Logcat-text: use GRegex optimizationsMichal Labedzki1-8/+8
"G_REGEX_OPTIMIZE - Optimize the regular expression. If the pattern will be used many times, then it may be worth the effort to optimize it to improve the speed of matches." - Glib documentation. It is possible to capture a lot of Logcat logs or these log may flooding us. Optimizations are welcome. Change-Id: If753e795efe30b014a5fad11c8ebbcd4da3824a6 Reviewed-on: https://code.wireshark.org/review/20357 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-04RPKI-RTR: Add new error codeAlexis La Goutte1-0/+1
From RFC-ietf-sidr-rpki-rtr-rfc6810-bis-09 Change-Id: Ice24416515448c633eb436f5f08320561c2a6a6a Reviewed-on: https://code.wireshark.org/review/20384 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-04extcap: Minor improvementsRoland Knall3-16/+62
Add method for searching for tools by ifname and minor improvements in the interface callback to save time and space Change-Id: I0073c96fbee846cc5ff6304823fa14564ff36c22 Reviewed-on: https://code.wireshark.org/review/20376 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-03-04Fix the calculation of the number of levels in the radix tree.Guy Harris1-5/+19
The algorithm being used calculated the number of levels in a 1024-leaf-node tree as being 2, but it's 1 - 0 elements means 0 levels, 1 through 1024 elements means 1 level, 1025 through 1024^2 elements means 2 levels, etc.. With a count of 1024, the loop would bump the level count from 0 to 1, and divide the element count by 1024, yielding 1, so the loop would not terminate, and the level count would them go from 1 to 2 and the element count would go to 0. This could cause problems if exactly 1024 packets were seen. Just use an if chain, similar to the one used when adding elements to the tree. Bug: 13433 Change-Id: I3eaeaf374bb65b37b38a59e95f77cac6690614ed Reviewed-on: https://code.wireshark.org/review/20379 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-04Bluetooth: HCI: A few minor improvementsMichal Labedzki2-8/+5
1. According to ESR05 there is no event called "Bluetooth Logo Testing". 2. According to ESR09 error code 0x23 is also "LL Procedure Collision" 3. Add some HCI status for event for HCI Summary bthci_evt is now up-to-date with Bluetooth Core 4 + CSA4 + CSS6 and ERS09 - nothing to implementing... Change-Id: Ief9e2de61be91942ab2211de6bc44a8f15d12426 Reviewed-on: https://code.wireshark.org/review/20355 Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-04Qt: Apply selected bookmark display filterStig Bjørlykke3-4/+12
When selecting a display filter from the bookmark list this filter should be applied, because that's the most common action for a user. Holding down the the Alt key will only prepare the filter. Change-Id: I567ee8a2a70a3de07fea33fa5763d9efba591de3 Reviewed-on: https://code.wireshark.org/review/20317 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-03-04pluginIF: Allow en-/disable of elementsRoland Knall6-9/+92
Allow the enable/disable of an element Change-Id: I9652e8d74b261ba259cebfba53e7bc7ef560d347 Reviewed-on: https://code.wireshark.org/review/20370 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-03-03Check profile directory before personal directory for services and subnets fileMichael Mann2-7/+30
Bug: 11228 Change-Id: Id8bcc51ff694ef9f2019bc7509e440021d049d22 Reviewed-on: https://code.wireshark.org/review/19735 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: Peter Wu <peter@lekensteyn.nl>
2017-03-03Fix compile error about missing intializer.Joerg Mayer1-1/+1
Change-Id: I5ff757c199df5cf78d9c625bf2f69e9c62dc3f61 Reviewed-on: https://code.wireshark.org/review/20375 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2017-03-03Bluetooth: HCI_EVT: Implement all remaining events/commandsMichal Labedzki1-6/+369
Event: Authenticated Payload Timeout Expired Commands: Set Connectionless Slave Broadcast Set Connectionless Slave Broadcast Receive Set MWS Signaling Read Synchronization Train Parameters Write Synchronization Train Parameters Read Secure Connections Host Support Read Authenticated Payload Timeout Read Local OOB Extended Data Read Extended Page Timeout Read Extended Inquiry Length LE Read Suggested Default Data Length LE Write Suggested Default Data Length LE Read Resolving List Size LE Read Peer Resolvable Address LE Read Local Resolvable Address LE Read Maximum Data Length Change-Id: Id57693b284151b054b7e06237744629a6af98057 Reviewed-on: https://code.wireshark.org/review/20354 Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-03Qt: Fix goto next/prev packet toolbar buttonsStig Bjørlykke1-4/+6
Use bitwise AND to check if a modifier bit is set. Also changed from MetaModifier to AltModifier to match the comment and the modifier key used in "Next/Previous Packet in History". Change-Id: I89072a1dfdd14a2beb7344a672cbc18a3ace8924 Reviewed-on: https://code.wireshark.org/review/20359 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2017-03-03Update documentation with reference to $XDG_CONFIG_HOMEPeter Wu4-19/+30
Since v2.1.0rc0-184-gb0b53fa593, $XDG_CONFIG_HOME/wireshark (instead of $HOME/.wireshark) is used, clarify this in the WSUG and manuals. Change-Id: I74a6f9b86bd8d54ee326ca83d7536e091d6da08a Reviewed-on: https://code.wireshark.org/review/20364 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: Michael Mann <mmann78@netscape.net>
2017-03-03SIP: Add digest verification functionalityerikdejong1-9/+254
Added functionality to verify SIP authorization lines. With this functionality it's possible to find faulty passwords that were added to configuration by automatic processes (eg having unescaped '&' characters in XML config files) resulting in authorization failures that cannot be diagnosed otherwise. Other uses include bug hunting in SIP stacks. Bug: 13444 Change-Id: I5abecd048480c8f5130a5112c531587c5993f12f Reviewed-on: https://code.wireshark.org/review/20314 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-03IAX2: Add a timestamp check.Gerald Combs1-16/+24
Don't try to process timestamps that are more than 60 seconds apart. Avoids the infinite loop in bug 13432. Bug: 13432 Change-Id: I05aea4c733c94cbfe832f03ba826c74a41e6bb2f Reviewed-on: https://code.wireshark.org/review/20366 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-03-03Qt: reduce minimum window size requirementPeter Wu2-2/+2
Strip some padding from the main welcome screen and lower the minimum width to allow the window to be shrinked. Even when a capture file was open, the minimum dimensions from the main welcome screen would apply. The minimum dimensions on Arch Linux with Qt 5.8.0-5 and Plasma 5.9.2 (with the default Breeze theme) for a window have changes as follows: - main screen/pcap loaded: 746x626 -> 702x590 - with search bar opened: 826x658 -> 826x622 (These numbers exclude 35x10 window decoration.) Change-Id: Iccc43ee55803abb8105c0d9664368aab09e8cfcf Reviewed-on: https://code.wireshark.org/review/20343 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-03-03pluginIf: Add/Remove single entries from selectorRoland Knall6-35/+179
Allow to add and remove single items from a selector list and also fixing the selection of items in a selector list Change-Id: I0c69ea97db6ca1a6932939f0df9049c6fb720f77 Reviewed-on: https://code.wireshark.org/review/20363 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-03-03WSDG: update for $XDG_CONFIG_HOMEPeter Wu1-1/+2
Since v2.1.0rc0-184-gb0b53fa593, the config directory has changed. Change-Id: Idbeb62f2393d1a4ec192da2d85e6bfb76782aeb8 Reviewed-on: https://code.wireshark.org/review/20365 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-03-03ieee80211: fix minimum TCLAS lengthMarcin Rokicki1-2/+2
TCLAS IE contains a set of parameters to identify incoming frames with a TS. During verification with various types of classifier types Wireshark prints Error/Malformed message for type 2 (IEEE802.1Q) IEEE802.11e defines that for classifier type 2 frame length is 5 not 6. Change-Id: Icf61f7fb65e5b119aedbb664b4adaee1f1e9fde8 Signed-off-by: Marcin Rokicki <marcin.rokicki@gmail.com> Reviewed-on: https://code.wireshark.org/review/20361 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>
2017-03-03Having business-as-usually unused words for specific "users" in TIPC not shownMartin Peylo1-64/+137
as needlessly highlighted expert info but as normal text in the protocol tree. Change-Id: I41028b00c6c5cdb85e399c959df721d768f674e1 Reviewed-on: https://code.wireshark.org/review/20360 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>
2017-03-03Diameter 3GPP: update Rx Feature-List AVPPascal Quantin1-2/+9
Change-Id: Ia4fa3687173f8642f80e650df3e713a26e9a17b5 Reviewed-on: https://code.wireshark.org/review/20362 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: Anders Broman <a.broman58@gmail.com>
2017-03-03Bluetooth: HCI_EVT: Implement "Read Local Supported Codecs"Michal Labedzki1-3/+95
Implement event reponse for command "Read Local Supported Codecs". Change-Id: I38946f4744b2d2d586384125700e937db698038c Reviewed-on: https://code.wireshark.org/review/20353 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>
2017-03-03Bluetooth: HCI_EVT: Add missing unit for generated fieldMichal Labedzki1-1/+1
Add missing unit [ms] for "Command-Response Delta" Change-Id: I7ba31fc6bf3baae161608432ea5fcd1015414604 Reviewed-on: https://code.wireshark.org/review/20356 Petri-Dish: Michal Labedzki <michal.tomasz.labedzki@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-03Qt: Add selection history navigation.Gerald Combs7-6/+131
Add the ability to move back and forth in the packet selection history similar to GTK+. Update the documentation accordingly. Change-Id: If1fdc1e59b240c0588c292dc0f7f0a5f083c30e1 Reviewed-on: https://code.wireshark.org/review/20320 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>
2017-03-03BT-DHT: add IPv6 support for find_node responsesFlorian Adamsky1-11/+42
Change-Id: I4ce38892b6c287c2dc51f438a12a5be5920197b6 Reviewed-on: https://code.wireshark.org/review/20323 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-03Qt: allow Packet Bytes view to be shrinkedPeter Wu2-0/+7
Even if a packet has only one or two lines for the byte view, Qt autoresizing insists to require a minimum of 5.5 lines (or 7.5 lines for packets without multiple data sources). Remove this artificial requirement and allow the packet bytes view to be resized to show nothing (except for possible data sources tabs). This makes it easier to fit more packets and details for screenshots. Change-Id: I3ea997b9effa8292b396dc2ceb2ab1c35cead410 Reviewed-on: https://code.wireshark.org/review/20342 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-03Squelch a warning from VS Code Analysis.Guy Harris1-2/+2
It warns that a 32-bit value is being shifted left and then converted to a 64-bit type; presumably it means "this might overflow and not give you the result you expect". That's unlikely to be the case here, as few UN*X file systems have a recommended I/O block size > 2^30, but we might as well throw in a cast so the convert-to-a-64-bit-type is done first. Change-Id: Id6ab11d750d5cf4cc03d060d63edc01b66cd179d Reviewed-on: https://code.wireshark.org/review/20352 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-03Fix compilation with old libcrypt versions.Guy Harris1-1/+13
Change-Id: If9c0631435e5380d3f158ebe6578adaf65a429bb Reviewed-on: https://code.wireshark.org/review/20351 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>
2017-03-03erf: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+1
Change-Id: I7214adc58362902790c006e1e22f77104be5df2e Reviewed-on: https://code.wireshark.org/review/20341 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-02Rewrite dissectors to use Libgcrypt functions.Erik de Jong41-2437/+831
As discussed on the mailinglist, rewriting dissectors to use Libgcrypt functions as Libgcrypt will be mandatory after change 20030. Removal of following functions: - crypt_md4 - crypt_rc4* - aes_cmac_encrypt_* - md5_* - sha1_* - sha256_* Further candidates: - aes_* - rijndael_* - ... Added functions: - ws_hmac_buffer Added const macros: - HASH_MD5_LENGTH - HASH_SHA1_LENGTH Changes on epan/crypt/* verified with captures from https://wiki.wireshark.org/HowToDecrypt802.11 Changes on packet-snmp.c and packet-radius.c verified with captures from https://wiki.wireshark.org/SampleCapture Changes on packet-tacacs.c verified with capture from http://ccie-in-3-months.blogspot.nl/2009/04/decoding-login-credentials-regardless.html Change-Id: Iea6ba2bf207cf0f1bf2117068fb1abcfeaafaa46 Link: https://www.wireshark.org/lists/wireshark-dev/201702/msg00011.html Reviewed-on: https://code.wireshark.org/review/20095 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-03-02Remove a cast that now causes rather than squelching warnings.Guy Harris1-1/+1
We're now comparing an unsigned with an expression made mostly of unsigned, so there's no need to cast the expression to long to squelch signed vs. unsigned warnings. Change-Id: I3b8c6f6faf26a9c252eb55d9e69fb298a3ad4c3b Reviewed-on: https://code.wireshark.org/review/20347 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-02Make sure nspr_getv20recordsize() returns an unsigned value.Guy Harris1-1/+1
The record size fields are guint8, but NSPR_V20RECORDSIZE_2BYTES was 0x80, which has type int, promoting the result to int. Make it 0x80U, which means everything is unsigned. This squelches a compiler warning. Change-Id: I1c63e485352a90c7f675ab0dacaaeba794235b35 Reviewed-on: https://code.wireshark.org/review/20344 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-02Add more sanity checks.Guy Harris1-14/+27
Bug: 13431 Change-Id: I330cb087c6e89277120057019cb5155f005ed269 Reviewed-on: https://code.wireshark.org/review/20337 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-02Use glib-compatAndersBroman6-61/+22
Change-Id: I510af18d433c4db360243dda72260e59eb84355f Reviewed-on: https://code.wireshark.org/review/20336 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-02[packet snort] Fix build on SuSE 11.4AndersBroman1-2/+2
packet-snort.c: In function snort_dissector: packet-snort.c:882: error: converted_content_length may be used uninitialized in this function packet-snort.c:882: note: converted_content_length was declared here packet-snort.c:880: error: content_offset may be used uninitialized in this function packet-snort.c:880: note: content_offset was declared here Change-Id: I8fb990492f31fc4ce942244005f547f3b3c9bba3 Reviewed-on: https://code.wireshark.org/review/20335 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-02Docbook: Replace "OS X" with "macOS".Gerald Combs8-22/+22
Change-Id: Ic2ab4f9050c9c76349d8d872b8fc2bf9feb7827d Reviewed-on: https://code.wireshark.org/review/20325 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: 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>
2017-03-02include <wsutil/glib-compat.h> to allow use of g_list_free_full() withAndersBroman2-0/+2
older glibs. Change-Id: I3eb7e178dcb844ddbac47f53f221a98e2d32f413 Reviewed-on: https://code.wireshark.org/review/20334 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-03-02Do more record length checks.Guy Harris1-15/+45
Do the check early in the process of processing the record, and do it for all record types. Bug: 13429 Change-Id: Id7f4d12415c6740241850d8f873cff52909e7110 Reviewed-on: https://code.wireshark.org/review/20330 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-02Don't go past the end of a page in a NetScaler file.Guy Harris1-16/+69
Records in a properly formatted NetScaler file shouldn't go past the end of a page, but nothing guarantees that a NetScaler file will be properly formatted. NetScaler 3.x files allow record bodies to go past the end of a page, but 1.x and 2.x files don't, so treat record headers that go past the end of a page, and record bodies in 1.x and 2.x files that go past the end of a page, as errors. Clean up some stuff while we're at it. Bug: 13430 Change-Id: I3b1d56086e3bb14b246406f306e3d730df337561 Reviewed-on: https://code.wireshark.org/review/20326 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-01udpdump: fix recvfrom error on windows.Dario Lombardo1-2/+19
Change-Id: Ia88d00593163b1c1e9a0e120aeff5e36f0135474 Reviewed-on: https://code.wireshark.org/review/20319 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> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2017-03-01Fix spelling mistakeRémy Léone1-1/+1
Change-Id: I21ef4e5b19299f843a6f2a644bfa7068abd90fc4 Reviewed-on: https://code.wireshark.org/review/20321 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-03-01extcap: Create callback structureRoland Knall1-32/+56
To ease development of callbacks and new parameters, move all parameters for the callback methods to a struct Change-Id: I160277acf4d0473897172124f7c7aa744718da9c Reviewed-on: https://code.wireshark.org/review/20316 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2017-03-01radius: remove unused rule, add clarifying commentPeter Wu1-9/+6
Since commit fdb5257f7cc8e19e6f8bcd35edee225cf44438a2 the ATTR_W_VENDOR symbol was never matched, so remove it. Change-Id: I5a56f48ce1995c23f9eca518308d3543a15ad049 Reviewed-on: https://code.wireshark.org/review/20313 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>
2017-02-28Expand a comment.Guy Harris1-1/+3
Change-Id: I4b040665582ec1fd3f97b915b3819ff2d8850a6f Reviewed-on: https://code.wireshark.org/review/20315 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-02-28radius: fix use-after-free after recent memleak fixesPeter Wu3-12/+25
The same data is referenced by the ID-to-name and name-to-ID mapping, so be make sure that the ID mapping is responsible (as the name mapping is just used for duplicate detection and while parsing dictionary files). Still to be done is fixing duplicate attribute numbers (by adding support for OIDs and changing TLV attribute type IDs to OIDs) and fixing duplicate attribute names (by prefixing the Vendor Names to them). Also not handled is fixing Value memleaks. Reproducers of the crash under ASAN: tshark -G fields >/dev/null tshark -r radius-ms-mppe-etrl-bug.cap (from bug 796) Change-Id: Ifa4055901072bc830e19fe06937af67ce524a3be Fixes: v2.3.0rc0-2536-gd4cf57100c ("Free radius dissector memory on shutdown") Reviewed-on: https://code.wireshark.org/review/20307 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: Michael Mann <mmann78@netscape.net>
2017-02-28radius: fix memleaks of value_stringPeter Wu2-13/+19
The value_string was taken from the GArray and added to radius_attr_info_t, but these were not properly freed. Change-Id: I8de2b84760887c41229a57881ff46cedcef1d22f Reviewed-on: https://code.wireshark.org/review/20311 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-28radius: fix final memleak due to malformed dictionaryPeter Wu1-7/+7
The VENDOR line did not have a proper ID, so scanning the full line failed and the "yyextra->vendor_name" was not freed. Import the current version from FreeRadius to fix this problem. (Since the attributes are now grouped by the vendor, the conflict comment no longer applies.) Change-Id: Id6020c0a5f34c624aedbb0acebe70dc643402e41 Reviewed-on: https://code.wireshark.org/review/20312 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-28text2pcap: free memory on exit.Dario Lombardo2-4/+7
Make also text2pcap_lex_destroy() public to be called from main. Change-Id: I360c3dd3991d027afe6e4542ea5f9680e92f92cf Reviewed-on: https://code.wireshark.org/review/20226 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: Dario Lombardo <lomato@gmail.com>
2017-02-28Qt: Fix -Wshorten-64-to-32 warningsStig Bjørlykke9-16/+16
Fix some warnings when building with -Wshorten-64-to-32 flag for C++ code. Fixes for warnings from QList, QTimer and QVector has been pushed upstream, so some time we may be able to enable this flag for C++. Change-Id: Iae7457f9afc469c63f3edbe23dbf272b5c6c9e5e Reviewed-on: https://code.wireshark.org/review/20310 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>