aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-01-15extcap: Add list of extcaps to about dialogRoland Knall7-55/+155
Adds the list of available extcaps to the plugin list in the About dialog of Wireshark (Qt only). To do this, and additional sentence is provided in the extcap arguments list, which allows for additional information to be passed (as of right now, just version and display is used) Additionally, cleans up the code when using g_free. Bug: 11683 Change-Id: I04a958e2b73c9a707ab1cb4f2fc8345833a854a9 Reviewed-on: https://code.wireshark.org/review/13224 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>
2016-01-15uaudp: fix buffer overrun while reading prefPeter Wu1-39/+17
Drop the custom str_to_addr_ip, it overruns the buffer with at most 3 bytes when an empty string is passed. Remove sizeof(guint8) while at it, the C standard requires this to be 1. Avoid overwriting uaudp.system_ip to avoid an invalid free of the preference. Change-Id: I39cb0a35364f2ecd32b780fcb7c0253bd866f329 Reviewed-on: https://code.wireshark.org/review/13145 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>
2016-01-15ssl: avoid duplicate PDU dissectionsPeter Wu1-4/+30
When a single frame contains multiple SSL segments and the higher-level PDU requests desegmentation, then each segment will trigger a dissection, resulting in a new tree for each. This seems to happen because the SSL dissector tries to complete a reassembly whenever a segment is found in the last frame. When doing the second pass, the fully reassembled segment is known and as a result the payload dissector is called for all SSL segments in a single frame. Fix this by checking whether the end of the segment covers the whole reassembled data. Another workaround is added to avoid "[SSL segment of a reassembled PDU]" in the Info column when desegmentation finishes. Also fix the SSL version in the Protocol column when a segment is part of a reassembled PDU. Bug: 11079 Change-Id: I9ae0c8ae5c56ed0dd7b071dec8bcc87e838a068d Reviewed-on: https://code.wireshark.org/review/12307 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>
2016-01-15DICOM: fix addition of item subtreesPascal Quantin1-10/+20
Bug: 12011 Change-Id: Idcb0b547d49dcf4b87ddfc05aceb24d06c38ab32 Reviewed-on: https://code.wireshark.org/review/13295 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>
2016-01-15LTE RRC: upgrade dissector to v13.0.0Pascal Quantin8-1798/+14189
Change-Id: Ie41471f79191097c491d58949c4e90b314cade04 Reviewed-on: https://code.wireshark.org/review/13300 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-15[editcap] Pacify OS X buildbot.Michael Mann1-3/+3
Change-Id: I3ec3c4723d29d84b25419982712707126351a01c Reviewed-on: https://code.wireshark.org/review/13301 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14autotools: Remove old hack and bugfix CPPFLAGSJoão Valverde1-6/+0
This was intended to be set as: CPPFLAGS="$CPPFLAGS -DQT_GUI_LIB" but got misplaced/misfixed. It is unsetting all the previous CPPFLAGS in autoconf. No longer needed, remove. Change-Id: I0c87b5f68917ef4a9eb45735ed4255c8952908d9 Reviewed-on: https://code.wireshark.org/review/13293 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-14Adding Device Temperature Configuration Cluster for ZigbeeDarshan Nevgi2-0/+231
Change-Id: I574b0364a3007c02d45bbb8cfbfed786a78da0a5 Reviewed-on: https://code.wireshark.org/review/13289 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-14[editcap] Remove excess parsing when packets are kept.Matej Košík1-15/+32
Also allow for range to include "the rest" (ex 10- would include all the packets starting at number 10) Bug: 9686 Change-Id: Ib02e52b22acf49b0e52df0a75fa4fa0d5f37aa31 Reviewed-on: https://code.wireshark.org/review/13291 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-14[BER] Fix Wireshark heap-based out-of-bounds read in ↵AndersBroman1-1/+9
dissect_ber_constrained_bitstring Bug: 11828 Change-Id: I43c493ed261e73e0f3b31892c161dcfc46071054 Reviewed-on: https://code.wireshark.org/review/13292 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-01-14ssh/randpktdump: Add version to extcap utilityRoland Knall2-0/+2
Add a version to each utility, displayed in the about dialog of Wireshark Change-Id: I64936072b13116b3e173c50411e9fff45d5fbf4c Reviewed-on: https://code.wireshark.org/review/13290 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-14[editcap] Bugfix tree compare function.Michael Mann1-5/+8
Bug: 12007 Change-Id: Icd31988ebbfe1e0bf4d29f32462c58c6c2c55547 Reviewed-on: https://code.wireshark.org/review/13277 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-01-14Adding IAS WD cluster and IAS ACE Cluster for Zigbee Protocol.Aditya Jain5-1/+793
Change-Id: Ib5cf998cd0217e9335d826962efdc29ff13af12a Reviewed-on: https://code.wireshark.org/review/13214 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-01-14Adding On/Off Switch Configuration Cluster for ZigbeeDarshan Nevgi2-0/+200
Change-Id: Ie21553cf487dbf3920f4ba955503a819103d7b51 Reviewed-on: https://code.wireshark.org/review/13279 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-01-14Qt: fix Z-order assignment: '' is not a valid widget warningPascal Quantin1-1/+0
Change-Id: Ic9f41f34b017d161f13604cf8813bc70aa7a68d4 Reviewed-on: https://code.wireshark.org/review/13284 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-01-14IPv6 fragment header's reserved octet is 8 bitsKevin Bracey1-1/+1
Change-Id: I14d8245ee5ca51d15c7b6eda3d5993a805680530 Reviewed-on: https://code.wireshark.org/review/13287 Reviewed-by: João Valverde <j@v6e.pt>
2016-01-14ranap: Sync with asn1 sourceStig Bjørlykke2-3/+3
Change-Id: I3b16427f43603bc665385b5c59d6e278797a2b96 Reviewed-on: https://code.wireshark.org/review/13285 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-01-14RTPS: Call dissector for user data using Type NameJuanjo Martin1-25/+54
With this dissector, anyone can write a plugin to dissect their data type and RTPS will call it if the dissector is registered using the Type Name (what is the common thing to do). Also, added a fix in dissect_APP_ACK so now the APP_ACK messages are properly dissected. It had a couple of wrong offsets and was calling dissect_serialized_data instead of directly adding the serialized data (dissecting an encapsulation that is not there). Bug: 11917 Change-Id: Ie1c6880d60e3537a1cbae4840cc6ff6e1a62ca0e Reviewed-on: https://code.wireshark.org/review/12824 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-14Expand a comment.Guy Harris1-1/+10
Change-Id: I9d749c43727291768a36adc0c1956f73a5374f91 Reviewed-on: https://code.wireshark.org/review/13283 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14Qt: Separate window titles with Em dash on OS XStig Bjørlykke1-4/+8
The window titles on OS X are usually separated by Em dash, so use this when appending prefs.gui_window_title. Change-Id: Ice46179fc872eefc7662b42052b428eabf1b6d61 Reviewed-on: https://code.wireshark.org/review/13256 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-01-14Qt: Add back setWindowFilePathStig Bjørlykke1-7/+7
With support for prepend and append to the window title. Change-Id: I2215a080b85d36ceb47495bbb94617743fc3f83e Reviewed-on: https://code.wireshark.org/review/13031 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-01-14Get rid of unused dissector handles.Guy Harris1-4/+0
Change-Id: Id439256b4a6705fed4ded69884bc371a8d6ce47b Reviewed-on: https://code.wireshark.org/review/13280 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14ssl: improve interaction with heuristics subdissectorsPeter Wu2-38/+79
Do not call heuristics dissectors when the SSL application data protocol is known (via STARTTLS or via an earlier packet in session). When the protocol is *not* known, first try heuristics on the initial payload. If a match is found, it can then override the protocol that would otherwise be used due to a port number match. The HTTP2 dissector is adjusted to take advantage of that such that HTTP2 on non-standard ports still get detected as HTTP2. Also save dissector registration to avoid the http2 dissector from showing up as "(null)". Now HTTP2 is really shown as "http2" and not "http" in the "Application Data Protocol"! The CredSSP dissector is untested and not modified as I don't know if the whole stream will be SSL. Tested with fix-ssl.pcap and a http2 capture (from bug 11331) wrapped in SSL (without ALPN). Change-Id: I134e2d4ac22287bc0a5aeadb1e38cb4059fa108b Reviewed-on: https://code.wireshark.org/review/13179 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-14fix,ssl: "fix" FIX over SSLPeter Wu1-0/+16
Enable FIX dissection over SSL using a heuristics dissector for SSL application data. Tested with fix-ssl.pcap from the SampleCaptures wiki page which I generated using f8test from Fix8 1.3.4 (compiled/running on Debian Jessie with OpenSSL 1.0.1k-3+deb8u1). Bug: 8625 Change-Id: Ib29c30352f22f49dcf4c5b5f1915c43031064c34 Reviewed-on: https://code.wireshark.org/review/12263 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-14Present PDU header timestamps with microsecond resolution as exists in ↵alpartis1-7/+7
packet data. On behalf of SimPhonics, Inc. IEEE 1278.1-2012 DIS spec details the PDU header timestamp in section 6.2.88 as a 31-bit unsigned integer count of microseconds since the start of the current interval. Likewise, the DIS dissector should reflect this information accurately, based on the actual complete contents of captured packets. Tested with DIS packets generated from VPlus for radio simulation by SimPhonics. Change-Id: I73b9689e1fb35900b7063746cac604a72a69ab16 Reviewed-on: https://code.wireshark.org/review/13210 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-01-14Clarify IPHC dissection of IPv6 ECN and DSCPKevin Bracey1-27/+34
6LoWPAN IPHC dissection displayed ECN and DSCP as if they were an IPv6-layout bitfield. Remove this extra abstraction layer, and output them more simply as individual bit items, with a generated field to indicate the IPv6 equivalent. Change-Id: Iff1473ce181fb40ae07a773689a5fee7bd9e98c7 Reviewed-on: https://code.wireshark.org/review/13185 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-14[airpcap] Fix parsing of GTKCedric Izoard1-54/+44
- When parsing key data for GTK, check both the IE ID (0xdd) and OUI-type (00-0F-AC 1) as key data may contains more that one IE with ID (0xdd) and GTK KDE is not always the first one - Determine key type (TKIP/CCMP) based on actual key length and not size of the whole key_data part - Remove arbitrary limit on size of key_data Bug: 11973 Change-Id: I8f71fe970c07a092131eada2be3936c12a61cdd5 Reviewed-on: https://code.wireshark.org/review/13182 Reviewed-by: Michael Mann <mmann78@netscape.net> Tested-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-14Fix capture output options.Gerald Combs2-107/+60
Remove the "permanent file" checkbox. We weren't properly checking its value and it was extraneous. Add placeholder text about temporary files. Move the filename above the other options. That's where it is in the GTK+ UI and it's arguably the most important. When capturing to multiple files the size and duration settings aren't mutually exclusive. Change-Id: I1da1d3524e3c2de2361050913281472a172faa3a Reviewed-on: https://code.wireshark.org/review/13269 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: Anders Broman <a.broman58@gmail.com>
2016-01-14Qt: "Conversation" → "Coloring"Gerald Combs3-11/+9
Change actionViewColorizeNewConversationRule to actionViewColorizeNewColoringRule and change its text accordingly. We're building a rule based on a general filter, not a conversation. Change-Id: Ic408050eed6f24690e3e759e6963f9930fe4b5e9 Reviewed-on: https://code.wireshark.org/review/13266 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: Anders Broman <a.broman58@gmail.com>
2016-01-14test: Add test in decryption test suite for 802.11wCedric Izoard3-0/+23
- Add a test to check decryption of management frames Bug: 11995 Change-Id: I588d0f17b9e5efc841266b9dae4764e5e931be3f Reviewed-on: https://code.wireshark.org/review/13259 Reviewed-by: Graham Bloice <graham.bloice@trihedral.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-01-14Update.Guy Harris1-1/+7
Change-Id: Ie91477eae534b558106442621224b8da40d5de7b Reviewed-on: https://code.wireshark.org/review/13276 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14Rename new_register_per_oid_dissector to register_per_oid_dissector.Guy Harris2-3/+3
There's no "old" register_per_oid_dissector, so the new_ is redundant. Change-Id: Iaf85a0bec120c5171d68ca4b12b6724a77df8305 Reviewed-on: https://code.wireshark.org/review/13274 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14Rename new_dissector_t to dissector_t.Guy Harris38-95/+95
There are no longer any "old" dissectors, so "new_" is redundant. Change-Id: I5fee51228c2a8562166f5991e1f30c2c697e45c8 Reviewed-on: https://code.wireshark.org/review/13273 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14Clean up indentation.Guy Harris1-4/+4
Change-Id: I140a6c7ac2f9380335ce9756824319b4d4a5b323 Reviewed-on: https://code.wireshark.org/review/13272 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14Use the return value of register_dissector().Guy Harris1-2/+1
Change-Id: I6814616be9d46e0a075cc3f1d97ded131493b67e Reviewed-on: https://code.wireshark.org/review/13271 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14Have various ATM dissectors use the data arguments for pseudo-headers.Guy Harris6-234/+233
Don't use the pseudo-header pointed to by pinfo->pseudo_header; have the argument either point to a struct atm_phdr or to a pwatm_private_data_t. Don't *overwrite* the pseudo-header pointed to by pinfo->pseudo_header if you need to construct an ATM pseudo-header for a dissector; have your own struct atm_phdr structure, fill it in, and pass a pointer to *that* to the sub-dissector. Cleans things up a bit. Change-Id: I4464924def4de41c625002b2d273592bd529e46e Reviewed-on: https://code.wireshark.org/review/13270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-13Qt: Show the horizontal scrollbar in the packet detail.Gerald Combs1-0/+8
Call resizeColumnToContents when we fill, clear, expand, or contract items. This make sure the horizontal scrollbar shows up instead of eliding items. A commonly suggested solution is to call header()->setSectionResizeMode(QHeaderView::ResizeToContents) followed by header()->setStretchLastSection(false). This makes the scroll bar show up when the tree is wider than the window, but when the column is narrower than the window we end up with unused white space on the right. Change-Id: I5896f6048385bed27858f0ac676b29a1bf1255cd Reviewed-on: https://code.wireshark.org/review/13265 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-13Swapped align error and crc error bit in EtherCAT Switch Link dissector.richardk1-4/+5
Change-Id: I218b1c412c5b8e41025c6a9434caef38653a36df Reviewed-on: https://code.wireshark.org/review/13262 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-01-13Enable USB sub-dissectors for MA USB.Sean O. Stalley5-445/+393
MA USB packets with USB payload are now passed into the USB dissector. This allows the payload to be dissected by the USB sub-dissectors. 1. Refactor dissect_usb_common() and put the code needed for finding USB subdissectors into a seperate helper function. 2. Add dissect_usb_payload() call 3. Add dissect_mausb_pkt_common() helper function 4. Put code for dissecting all types of MA USB packets into helper function dissect_mausb_pkt(). 5. Add dissect_mausb_pkt_data() helper function 6. Put code for dissecting MA USB datapacket-specific fields into helper function dissect_mausb_pkt(). 7. Use proto_tree_add_bitmask() call for MA USB bitfields. 8. Create packet-mausb.h to expose MA definitions to USB dissector 9. Dissect MA USB payload with USB subdissectors 10. Undeclare USB calls no longer used by MA USB dissector Change-Id: I456714572cd8dfc9982b087670ca73c17e25a26c Signed-off-by: Sean O. Stalley <sean.stalley@intel.com> Reviewed-on: https://code.wireshark.org/review/13187 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-01-13Do not filter on "http" when Following HTTP streams.Michael Mann1-25/+1
Change-Id: I5be0ce9168e987e8fd5ba404338111c8b8706c9f Reviewed-on: https://code.wireshark.org/review/13243 Reviewed-by: Pascal Quantin <pascal.quantin@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>
2016-01-13RRC: follow-up of g588955dPascal Quantin8-745/+760
Change-Id: I46d23e57441f5776a63776adc8cbf7fedffad49c Reviewed-on: https://code.wireshark.org/review/13264 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-13[RRC] Update to V13.1.0 (2015-12)AndersBroman7-9772/+16400
Change-Id: Ic9c19bf7f8ee4233ac1150bc372b3693502d986d Reviewed-on: https://code.wireshark.org/review/13261 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-13Use result of register_dissectorPeter Wu33-134/+81
Assign result of `register_dissector(..., func, proto)` to FOO_handle and remove `FOO_handle = create_dissector_handle(func, proto)`. Found by looking for files named packet-FOO.c having the above create_dissector_handle pattern. Some files (with different dissect routines for the two functions) remain unchanged. Change-Id: Ifbed8202c6dbc63a1dae9acc03313980ffbbbb90 Reviewed-on: https://code.wireshark.org/review/13247 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-13Move structure definition outside another structure definition.Guy Harris1-4/+6
I guess the ability to define a structure inside another structure is a C-ism discarded by C++, so it causes warnings if you disallow stuff that can't be handled by a C++ compiler, as we do. Change-Id: I8cf52af0424708eb663ab6dbfecbf317fe3bccdb Reviewed-on: https://code.wireshark.org/review/13257 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-13Get rid of debugging printouts.Guy Harris1-5/+0
Change-Id: I78fd79ebf915e9066f9e2548dcceb3c9e6440551 Reviewed-on: https://code.wireshark.org/review/13255 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-13Clean up handling of the data before the Ethernet packet in ERF files.Guy Harris5-29/+42
The data before the Ethernet packet isn't a 16-bit little-endian integer, it's two bytes, one byte of offset and one byte of padding. Change-Id: I327b88f058dda184b79d3c2c6cf0dea52c0d28b1 Reviewed-on: https://code.wireshark.org/review/13254 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-13Do not apply color rule filter every dissectionPeter Wu6-9/+33
Introduce a frame_data flag "need_colorize" to indicate that coloring rules need to be evaluated and set it for the GUI (not tshark). This restores the original performance characteristics. It additionally fixes a regression where the color filter name and filter is not shown anymore in the tree (I guess it is related to the edt->tree being NULL when re-selected, resulting in empty color_filter). Remaining problems: - Display filter cannot contain frame.coloring_rule.* fields. Code is present to enable this, but then a method is needed to avoid an expensive second calculation (which is why it is disabled). - The columns are still not updated after coloring rule change. - The two frame.coloring_rule fields in the tree are not updated when the coloring rule is changed (e.g. Ctrl-1). The last two issues were supposed to be fixed by the previous patch, but there is probably some missing code... Tested with GTK and Qt. Bug: 11980 Change-Id: I3ef7713b28db242e178d20f6a5f333374718b52e Reviewed-on: https://code.wireshark.org/review/13170 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-01-13Fix issue with dumping to logcat_text from UPPER_PDUmichal.orynicz1-0/+11
When using UPPER_PDU to wrap logcat text data it was not possible to dump underlying data to logcat textfiles. Add ability to write it down properly. Change-Id: Ia20142cc340f34d80de93e213084cf1df83099d6 Reviewed-on: https://code.wireshark.org/review/13230 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-01-13Fix some memory leaks in ws80211_utilsMikael Kanstrup1-0/+4
Valgrind report memleaks like these when using the wireless toolbar to create a monitor interface and/or changing channel: 4,168 (72 direct, 4,096 indirect) bytes in 1 blocks are definitely lost in loss record 31 of 32 at 0x4C2CC70: calloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) by 0x5BD0742: ??? (in /lib/x86_64-linux-gnu/libnl-3.so.200.16.1) by 0x116308: ws80211_create_on_demand_interface (ws80211_utils.c:699) by 0x116308: ws80211_set_freq (ws80211_utils.c:729) by 0x10D70E: set_80211_channel (dumpcap.c:4262) by 0x10D70E: main (dumpcap.c:4935) 4,168 (72 direct, 4,096 indirect) bytes in 1 blocks are definitely lost in loss record 32 of 32 at 0x4C2CC70: calloc (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so) by 0x5BD0742: ??? (in /lib/x86_64-linux-gnu/libnl-3.so.200.16.1) by 0x116400: ws80211_set_freq (ws80211_utils.c:733) by 0x10D70E: set_80211_channel (dumpcap.c:4262) by 0x10D70E: main (dumpcap.c:4935) Change-Id: Ia1de630859d96653310fbb3efebdc439ebf107b8 Reviewed-on: https://code.wireshark.org/review/13237 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: Anders Broman <a.broman58@gmail.com>
2016-01-13Qt: Update some keyboard shortcuts to match the GTK+ UI.Gerald Combs1-11/+11
As the QKeySequence documentation says, "On Mac OS X, references to "Ctrl", Qt::CTRL, Qt::Control and Qt::ControlModifier correspond to the Command keys on the Macintosh keyboard, and references to "Meta", Qt::META, Qt::Meta and Qt::MetaModifier correspond to the Control keys. Developers on Mac OS X can use the same shortcut descriptions across all platforms, and their applications will automatically work as expected on Mac OS X." This also applies to Qt Creator on OS X. If you assign a shortcut to an action that contains the Control key, it will draw the ^ symbol in the UI but will save "Meta" in the .ui file instead of "Ctrl", in the manner of a well-meaning-but-not-helpful comedy sidekick. This happened for the actions listed below. Replace "Meta" in their shortcuts with "Ctrl". - Unmark all (Ctrl+Alt+M) - Next marked packet (Ctrl+Shift+N) - Previous marked packet (Ctrl+Shift+B) - Show packet times... (Ctrl+Alt+1 - Ctrl+Alt+8) This matches the GTK+ UI on Windows and Linux, and uses the Command key on OS X. If we really want to use the Control key everywhere we can override the action sequences in main_window.cpp. We might want to do this for the "mark" actions since Command+M is the standard key for "Minimize this window". Change-Id: I1537cee5bc27a32b505bace01c1de3703a18dd6a Reviewed-on: https://code.wireshark.org/review/13238 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-23 02:37:46 +0000