summaryrefslogtreecommitdiff
path: root/epan
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-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-04pluginIF: Allow en-/disable of elementsRoland Knall2-1/+9
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 Mann1-7/+26
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-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-03pluginIf: Add/Remove single entries from selectorRoland Knall2-4/+44
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-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-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-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 Jong23-668/+753
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-02Use glib-compatAndersBroman2-10/+2
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-02include <wsutil/glib-compat.h> to allow use of g_list_free_full() withAndersBroman1-0/+1
older glibs. Change-Id: I3eb7e178dcb844ddbac47f53f221a98e2d32f413 Reviewed-on: https://code.wireshark.org/review/20334 Reviewed-by: Anders Broman <a.broman58@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-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-28IEEE 802.11: Handle Atheros paddingJaap Keuter1-3/+7
For some unknown reason between 802.11 protocol fields end and LLC protocol field start two octets of padding may appear. These octets (value 0x00) were observed on the OLPC laptop, heuristically detected and marked as OLPC mysterious stuff. It seems that Atheros chipset drivers also show this behaviour, although the padding is not 0x0000, but seem to be a duplicate of the sequence control field. This is now also heuristically detected and marked more generically as payload padding. Bug: 13411 Change-Id: I1e817e07dc19be8b3917ff302ede3328ca6a4938 Reviewed-on: https://code.wireshark.org/review/20284 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2017-02-28RSVDv2 support - 2nd stageVolodymyr Khomenko1-34/+288
Improved META_OPERATION_START (CreateSnapshot, ApplySnapshot) Added VHDSET_QUERY_INFORMATION (SnapshotEntry) Added DELETE_SNAPSHOT Minor fixes: RSVD Status field of RSVD header shown as NT_STATUS Using more structural names for RSVDv2 hf_ Change-Id: I0199527a2de819796c7b34b663df73547f32d2fd Ping-Bug: 11232 Reviewed-on: https://code.wireshark.org/review/20300 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-02-28Some ERF pseudo-headers have color instead of lctr valuesfd1-3/+26
Don't report expert-info warnings for lctr when it is actually color. Change-Id: I689ec84dd8f1cafa1ec7e8740f9bc4091339929a Reviewed-on: https://code.wireshark.org/review/20306 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>
2017-02-27Return correct filter for get_hostlist_filter()Jakub Zawadzki3-4/+46
It was returning (ip.src == ... && <protocol>.port == ...). Now, I think correctly returns (ip.addr == ... && <protocol>.port == ...) Change-Id: I242e13c0c79c2222e2b27fc2f9ee348b89d21ec1 Reviewed-on: https://code.wireshark.org/review/20281 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-27print_stream: free memory on exit.Dario Lombardo1-1/+1
Change-Id: I6c4acaa9026cfdf1d4230c28c30bccfb6c025cef Reviewed-on: https://code.wireshark.org/review/19920 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: Dario Lombardo <lomato@gmail.com>
2017-02-27Free radius dissector memory on shutdownMichael Mann3-8/+48
Change-Id: I19eef65e8144d7cb6d5c9eea454581a532420c75 Reviewed-on: https://code.wireshark.org/review/20292 Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-27wslua: fix documentation of Struct.fromhexPeter Wu1-1/+1
The default separator is really an empty string, not a single space. This has been wrongly documented since the beginning. Change-Id: I5598daec1486ce17cfeeaf5697f9759172db9cf5 Fixes: v1.11.3-rc1-1760-g860747e1e7 ("Adds some Lua helper functions: some commonly used functions, and to help troubleshooting Lua scripts") Reviewed-on: https://code.wireshark.org/review/20296 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-26HTTP: do not call g_path_get_basename with a NULL pointerPascal Quantin1-1/+1
If the HTTP request was not found / captured, the request_uri pointer in conversation data is set to NULL. Do not call g_path_get_basename in that case. Bug: 13441 Change-Id: I86eef2072ad4932e8e415580e3144d1d95796c4f Reviewed-on: https://code.wireshark.org/review/20289 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>
2017-02-26ppp: fix conflict for hf fieldAlexis La Goutte1-4/+2
ccp.opt.oui' exists multiple times with NOT compatible types: FT_BYTES and FT_UINT24 Change-Id: If6a3bbaf0012ab41722648a950f7b7007cf9a3b3 Reviewed-on: https://code.wireshark.org/review/20291 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>
2017-02-26Remove executable bit, from not executable files.Jakub Zawadzki2-0/+0
Change-Id: I8afa246172cd8d5a86513ade2f482566e3f9957a Reviewed-on: https://code.wireshark.org/review/20272 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2017-02-26[Automatic update for 2017-02-26]Gerald Combs2-12/+102
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I3094033ff26c1d8da5abcc22a25e4075f6bc087f Reviewed-on: https://code.wireshark.org/review/20285 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-02-26 plugin_if: fix no previous prototype for ‘ext_toolbar_find_item’ ↵Alexis La Goutte1-1/+1
[-Wmissing-prototypes] Change-Id: Ie11bc347b609bce754b85516601b57f6b0174f7b Reviewed-on: https://code.wireshark.org/review/20279 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>
2017-02-26plugin_if(.h): fix commas at the end of enumerator lists are a C++11 ↵Alexis La Goutte1-1/+1
extension [-Wc++11-extensions] Change-Id: I09fa357dbf9fee44a83ae9e9d78d8512b1aa9ee8 Reviewed-on: https://code.wireshark.org/review/20277 Reviewed-by: Roland Knall <rknall@gmail.com>
2017-02-26smb2: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+1
Change-Id: Ib1a74394195a945c8c723299f08dc9709233a5af Reviewed-on: https://code.wireshark.org/review/20245 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-02-25json2pcap support addedMartin Kacer1-31/+79
Modified tshark -T json -x output Added tshark -T jsonraw output json2pcap.py (can be used for basic packet editing by modifying json) The modification in tshark -T json -x and new tshark -T jsonraw output add into hex-data output in JSON also information on which position each field is dissected in the original frame, what is the field length, bitmask (for not byte aligned fields) and type. This information can be used for latter processing. One use-case is json2pcap script which assembles the protocol layers back together from upper to lowers layers, which allows the basic packet modification/editing/rewriting. Change-Id: Ibf948eb8fc7e3b0b51c12df6c3855f705a9c7925 Reviewed-on: https://code.wireshark.org/review/19990 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-25Convert a few more dissectors to use wmem_hash instead of GHashtable.Michael Mann3-93/+55
Change-Id: I86c9e485b447b380f00195bf407ce28c05bb1822 Reviewed-on: https://code.wireshark.org/review/20268 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-02-25packet-fw1.c: header should be packet scoped, not epan scopedMichael Mann1-4/+1
Subtle memory leak Change-Id: I39e3f2d35de5a8c48469f3e0992cdfec09ff0755 Reviewed-on: https://code.wireshark.org/review/20269 Petri-Dish: Michael Mann <mmann78@netscape.net> 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>
2017-02-24dtd: fix build due to -Wtypedef-redefinitionPeter Wu1-2/+2
dtd.h defines the type, so avoid redefining to avoid this warning: epan/dtd_preparse.l:113:3: warning: redefinition of typedef 'Dtd_PreParse_scanner_state_t' is a C11 feature [-Wtypedef-redefinition] Change-Id: Id6dddb8fe082717b483a6eeae08dfde468c19c89 Fixes: v2.3.0rc0-2505-ge1282f2875 ("dtd: free memory on shutdown.") Reviewed-on: https://code.wireshark.org/review/20266 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2017-02-24dtd: free memory on shutdown.Dario Lombardo3-7/+13
Change-Id: I502e505730b9310066563bfd9c8df9fceddd0301 Reviewed-on: https://code.wireshark.org/review/20229 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2017-02-24PluginIF: AdditionalToolbarRoland Knall2-22/+493
Creates an interface for plugins and other parts of the code, to add a new toolbar to the system and have various widget types interact with this toolbar. All toolbars added via this interface, will be added to an additional submenu called "Additional Toolbars" within Wireshark. Also a demo plugin is being provided, demonstrating various features of the toolbar, including updating the gui elements. It also demonstrates how to update toolbar items. Change-Id: I8d0351224b3d7f4b90220d58970b51695551d7e3 Reviewed-on: https://code.wireshark.org/review/19803 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Roland Knall <rknall@gmail.com>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-06 13:31:38 +0000