summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-08-19Use MAC address documentation range in filter examplesJoão Valverde2-2/+2
https://www.iana.org/assignments/ethernet-numbers/ethernet-numbers.xhtml Change-Id: I997440b7622dae4ea25d94e4041971f89b63fd04 Reviewed-on: https://code.wireshark.org/review/10121 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-08-19IPv6: Minor variable name fixJoão Valverde1-3/+3
Change-Id: Iaef41fa2a212577f1fbdf7705eca65a928faa8c3 Reviewed-on: https://code.wireshark.org/review/10122 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-08-19.mailmap: sort using sort -uAlexis La Goutte1-9/+9
Change-Id: I276331070c654e6c57bccb2c26cd0430ac656b26 Reviewed-on: https://code.wireshark.org/review/10069 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-19Mergecap: add test suite for various merging scenariosHadriel Kaplan7-3/+265
Add a test suite for mergecap (and indirectly capinfos I guess). This is not exhaustive, but it's a start. Change-Id: I9442b4c32e31a74b1673961ad6ab50821441de3e Reviewed-on: https://code.wireshark.org/review/10082 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-19capinfos: add more info about file and interfacesHadriel Kaplan5-197/+342
Add more information about the capture file, and about the interface descriptions in it. Also remove long-unused g_options code. Change-Id: I93cbd70fc7b09ec1b8b2fd6c85bb885c7f749543 Reviewed-on: https://code.wireshark.org/review/10073 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-19Added TDMoP protocol dissectorAndrew Chernyh6-1/+393
Bug: 11340 Change-Id: I04408db376718c7a5392f9521d7d75d0481ec30e Reviewed-on: https://code.wireshark.org/review/9514 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-19[IPv6] Make "ip.version" field pretty(er)João Valverde1-2/+4
Change-Id: I1e32f666118e36f48edcc1678d75db3ca3f62776 Reviewed-on: https://code.wireshark.org/review/10075 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-19Update .mailmapAlexis La Goutte1-1/+15
Change-Id: Ib61ed614c3cfb6885d81a61d82b0974beba786f5 Reviewed-on: https://code.wireshark.org/review/10068 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-19IPv6 Jumbogram expert info cleanupJoão Valverde1-6/+6
Change-Id: Ic06e50a30330758d6ed0b1b1d9ba0d7f74929a9a Reviewed-on: https://code.wireshark.org/review/10111 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-19Add IPv6 examples to capture/display filtersJoão Valverde2-6/+10
Also use TEST-NET-1 for IPv4 examples. Replaced note using comma with parentheses Change-Id: I9855207aec7a335b80986aa63bd235edc4278d3a Reviewed-on: https://code.wireshark.org/review/10061 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-19DVBCI: fix typo in commentLuke Mewburn1-1/+1
Change-Id: I0f6e57b7f16526e7c1b96fb8bd69c003c89b7f42 Reviewed-on: https://code.wireshark.org/review/10119 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-18UDP multicast stream dialog.Gerald Combs22-94/+713
Add the UDP multicast stream dialog. Abuse TapParameterDialog a bit more so that we can edit parameters. Remove some unused struct members and an unused function. Change-Id: I962c70344e792f0959527e4bcba8a20bd7e8acf9 Reviewed-on: https://code.wireshark.org/review/10084 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-18Move an include guard.Gerald Combs1-1/+1
Move an include guard to match our conventions (and make it easier to spot). Change-Id: I4bad61a0194219f69217713d051e0ff53ff5a76a Reviewed-on: https://code.wireshark.org/review/10110 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-18simple_statistics_dialog(.h): fix parameter 'st_table' not found in the ↵Alexis La Goutte1-1/+1
function declaration [-Wdocumentation] Change-Id: I69814a05fa6ad65315e36fa75ae60634e934be5c Reviewed-on: https://code.wireshark.org/review/10117 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-18pcapng(file): fix duplicate breakAlexis La Goutte1-1/+0
Change-Id: Ife7170c050402ab94d368acc6c233714be764824 Reviewed-on: https://code.wireshark.org/review/10114 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-18Qt: Syntax check display filter when fields changedStig Bjørlykke5-13/+21
Change-Id: I7179d7918e7958373806fb9627a36554ab4b9ddc Reviewed-on: https://code.wireshark.org/review/10115 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-08-18Clean up handling of time stamps.Guy Harris1-43/+58
Use common code for all time stamps, so it's handled the same for the Packet Block, Enhanced Packet Block, and Interface Statistics Block. Show the high and low parts of the time stamp as fields; file dissectors should show the raw file details. Mark the calculated time stamp as generated, as it's not the raw file data. Get the 64-bit time stamp by shifting the high part left 32 bits and ORing in the low part; no need to play games with unions and byte order Change-Id: I19b2c3227a3ca1e93ec653f279136aa18687581f Reviewed-on: https://code.wireshark.org/review/10116 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-18Cast away 64 -> 32 narrowing complaints.Guy Harris1-1/+1
"secs" in an nstime_t is a time_t; cast the calculated seconds portion to time_t. Change-Id: Ieaad4c18bb21384a5781f50eadd3a537b414a369 Reviewed-on: https://code.wireshark.org/review/10113 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-18Init values set (found by American Fuzzy Lop).Dario Lombardo3-5/+5
Change-Id: Iddd2b4a0ceb409db1afb1a412339134634de631c Reviewed-on: https://code.wireshark.org/review/10104 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-08-18Update comment.Guy Harris1-3/+3
Change-Id: I51e14a280ba898a321455168ac8ded1853f55e64 Reviewed-on: https://code.wireshark.org/review/10109 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-08-18Qt: Reload widgets using prefs when reloading Lua pluginsStig Bjørlykke3-0/+10
Widgets using prefs must be closed because the prefs may have been free'd when reloading Lua plugins. Change-Id: I4b79b7aff18d7923c77a9eb05acadc29b156edbf Reviewed-on: https://code.wireshark.org/review/10108 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-08-18Improve file merging for mergecap and wiresharkHadriel Kaplan9-734/+1139
Refactor the file merging code by removing the duplicate logic from mergecap.c and file.c's cf_merge_files(), into a new merge_files() function in merge.c. Also the following user-visible changes: * Removed the '-T' encap type option from mergecap, as it's illogical for mergecap and would complicate common merge code. * Input files with IDBs of different name, speed, tsprecision, etc., will produce an output PCAPNG file with separate IDBs, even if their encap types are the same. * Added a '-I' IDB merge mode option for mergecap, to control how IDBs are merged. * Changed Wireshark's drag-and-drop merging to use PCAPNG instead of PCAP. Bug: 8795 Bug: 7381 Change-Id: Icc30d217e093d6f40114422204afd2e332834f71 Reviewed-on: https://code.wireshark.org/review/10058 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-18Add casts to passify buildboot.AndersBroman1-2/+2
Change-Id: I8aa4695f1f8dfdfc5bfcd4fb4f36e1b332581d5a Reviewed-on: https://code.wireshark.org/review/10106 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-18pcap: add init value.Dario Lombardo1-1/+1
Found compiling with gcc version 4.8.4 (Ubuntu 4.8.4-2ubuntu1~14.04). Change-Id: I21bd3a5ab3365f0065c919aba7d6bd00b878d041 Reviewed-on: https://code.wireshark.org/review/10105 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-08-18Fix typo in makefileMichal Labedzki1-1/+1
Typo: file.pcapng.c -> file-pcapng.c Change-Id: I72c40fd086f1b68b69e950c065877b2733279a04 Reviewed-on: https://code.wireshark.org/review/10102 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-08-18File-format: BTSNOOP: Add option to dissect next layersMichal Labedzki1-1/+67
Show next layers of each packet. Change-Id: I8c56eab969fef9a0a712b479dc2cdef6cc1578ae Reviewed-on: https://code.wireshark.org/review/221 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-18File-format: Add PCAP and PCAPNG dissectorsMichal Labedzki6-3/+2516
They have educational values and can be used to debugging some issues. Now Wireshark can open three files (BTSNOOP, PCAP, PCAPNG) in two modes: Capture (Traditional) and File-Format. Change-Id: I833b2464d11864f170923dc989a1925d3d217943 Reviewed-on: https://code.wireshark.org/review/10089 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-18Add udp_dissect_pdus.Michael Mann4-21/+168
It works similar to tcp_dissect_pdus, but only works on a single packet. Intended for protocols that go over TCP and UDP so that they can have a common dissection function. Will of course, also work on UDP-only protocols with a fixed length header and size. Used DNP3 as a guinea pig since "multiple PDU support" over UDP was just added. Change-Id: Ib7af8eaf7102c96b4f8b5c1b891ae2d8f0886f9d Reviewed-on: https://code.wireshark.org/review/10083 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-18Bluetooth: Update Assign NumbersMichal Labedzki2-7/+42
+18 ATT attributes to be implemented (IPS 1.0 - 19 May 2015, etc.) Change-Id: Ib30ea20fe9b32a4be842f01ad5b8e8ee081a14ff Reviewed-on: https://code.wireshark.org/review/10095 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-18Bluetooth: ATT: Add some remaining attributesMichal Labedzki1-29/+2018
Add 14 attributes (not as easy as the previous), there are still 19 + 3 (no idea for now [Valid Range, Report, IEEE 11073-20601 Regulatory Certification Data List]) attributes to be implemented (soon). Change-Id: Iee5cde4673b62f93084923a592b11824c0683605 Reviewed-on: https://code.wireshark.org/review/10094 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>
2015-08-18Qt: Fix use-after-free patternStig Bjørlykke6-7/+11
QString.toUtf8() returns a QByteArray object and .constData() returns a pointer inside that object. It is not safe to store this pointer as it will become invalid after the statement. Change-Id: I8f54ede75577719008835038934e935cd5feba3f Reviewed-on: https://code.wireshark.org/review/10067 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-18Preparation Host Flows: Dissector Packet ICMP and ICMPv6Pascal Artho2-0/+2
see https://code.wireshark.org/review/#/c/9976/ Change-Id: Ic301db4deea1a02b9e08c123b3e21e70817a2c85 Reviewed-on: https://code.wireshark.org/review/10097 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-18Qt: Add another C++ missing header: <algorithm> for std::sort()Michal Labedzki2-0/+3
Fix build error: ui/qt/packet_list_model.cpp:270:5: error: 'sort' is not a member of 'std' std::sort(visible_rows_.begin(), visible_rows_.end(), recordLessThan); Change-Id: I3a577a268f6c12e8fd97b7b6fd2429989c28e2f5 Reviewed-on: https://code.wireshark.org/review/10092 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-08-18Qt/Minimap: Fix for Qt < 4.8Michal Labedzki1-0/+4
I hope it is quite right solution. Change-Id: Ia9c883a832ddd03985eda37a9b344c4d7c8135e2 Reviewed-on: https://code.wireshark.org/review/10091 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-08-18Pcapng: clean up Section Header Block handlingHadriel Kaplan10-84/+149
Change-Id: I8516d0c561ed0b63e49a3594027c9c15bb789258 Reviewed-on: https://code.wireshark.org/review/9726 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-18rewrite the H1 dissectorMartin Kaiser1-198/+166
* use the offset variable to keep track of where we are, remove the position variable (previously, offset remained 0 all the time...) * use proto_tree_add_item() * highlight the correct bytes for each field * define a block type and block length instead of naming these fields differently for each block * indent by 4 spaces Change-Id: Ie0995e5fe6364605fd30020f171e51458844fa59 Reviewed-on: https://code.wireshark.org/review/10080 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-18Eliminate proto_tree_add_text from XMPP dissectors.Michael Mann7-17/+93
Change-Id: I32fdf085ef484d147d9f0b27c56efba41bb827bf Reviewed-on: https://code.wireshark.org/review/10086 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-18Lua: add FT_PROTOCOL as a ProtoField typeHadriel Kaplan1-3/+24
Bug: 11450 Change-Id: Ic77ddd193246c0202efcc9c11e61e8f6f85329c5 Reviewed-on: https://code.wireshark.org/review/10087 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-17Install GTK3 too.Jeff Morriss1-3/+3
It was in the list of packages but not in the final command line. Change-Id: I361e660cc4ac91121314a3f8a7388b48fb2c61b7 Reviewed-on: https://code.wireshark.org/review/10081 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-08-17Fixup tap listener registration.Gerald Combs6-20/+17
Make sure we run make-tap-reg.py on files that register tap listeners. Make sure Qt-specific registration routines start with register_tap_listener_qt_. Change-Id: Idca382180f475db71e4d1965a70ae4cc2fa4f9d5 Reviewed-on: https://code.wireshark.org/review/10074 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-17h1: remove if (tree) checks, indent according to the modelinesMartin Kaiser1-92/+83
Change-Id: I878aa23b5d718653b9039aeb94a0ece88c9c03cf Reviewed-on: https://code.wireshark.org/review/10079 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-08-17h1: don't THROW() an exception from a dissectorMartin Kaiser1-2/+2
leaving the parsing loop should be enough in this case... Change-Id: Ic250961aeb4d3cfcd74ee8caacb59657c32444de Reviewed-on: https://code.wireshark.org/review/10078 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-08-17Qt: Avoid double call to toUtf8()Stig Bjørlykke1-1/+1
Change-Id: I4d31063b4aa37e4b0a68b5dbc17be22ef2cd151a Reviewed-on: https://code.wireshark.org/review/10077 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-08-17Qt: Always rebuild columns when fields changedStig Bjørlykke3-8/+12
The columns must be recreated even if no capture file is loaded because custom columns may have reference to deregistered fields. Change-Id: I4ed7345b3200e5af211695f1a6511ee229d5f13c Reviewed-on: https://code.wireshark.org/review/10076 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-08-17Improve multicast address checking.Gerald Combs1-11/+23
Check for IPv4 and IPv6 multicast addresses. We might have captured on an "any" interface, or on a PPP link, or used some other method that doesn't result in dl_dst.type == AT_ETHER. Change-Id: I18b0597fd432e4cec8c388a3c7d2d18ac4da0fad Reviewed-on: https://code.wireshark.org/review/10009 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-08-17Add Decryption support for LwmeshSelvamegala1-12/+133
Bug: 10783 Change-Id: Id598838f036b1f312791d9dddbf3767dcbfd1aee Reviewed-on: https://code.wireshark.org/review/9937 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-08-17Pcapng: set interface description's tsprecision when reading fileHadriel Kaplan1-0/+1
Bug: 11447 Change-Id: I5fe14616ed6e86e0bfe02c58cc9fb31e43bc23ef Reviewed-on: https://code.wireshark.org/review/10071 Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-08-17BPDU: Fix some Dead Store (Dead assignement/Dead increment) Warning found by ↵Alexis La Goutte1-4/+0
Clang Change-Id: I91cc96f92ae2e6b07144120d70f8db5b7ad45fce Reviewed-on: https://code.wireshark.org/review/10070 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-17dissect_ip_heur(): Remove TODO (done)João Valverde1-1/+0
Change-Id: I0c36179b63f5d60037de80badfea352c903c2525 Reviewed-on: https://code.wireshark.org/review/10065 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-08-17Remove proto_tree_add_text from packet-xml.cMichael Mann2-9/+34
Required introducing packet_info* to xml_frame_t structure. Change-Id: Ie777fe3bc8c7ea052d3441dd31e0631ce47324cb Reviewed-on: https://code.wireshark.org/review/10063 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>
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-29 08:23:47 +0000