aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-02-08tools: remove garbage from licensecheck.pl.Dario Lombardo1-1/+0
Change-Id: I9a0e00c9e033618ee2ced94dadf1a98640e0d914 Reviewed-on: https://code.wireshark.org/review/25684 Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-02-08tools: add new SPDX GPL format to licensecheck.pl.Dario Lombardo1-2/+7
Change-Id: Ie148f8a660027df8194bd3890a108c0639a18823 Reviewed-on: https://code.wireshark.org/review/25680 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-08tools: remake the indentation of licencecheck.pl.Dario Lombardo1-547/+549
Change-Id: Ib1b320e5b99e8842df61fd3dc584b6df4fc461f8 Reviewed-on: https://code.wireshark.org/review/25639 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-08packet: Whitespace cleanupStig Bjørlykke1-44/+43
Change-Id: I47d7994b5670ec6b954444b53aa9572f3ba5a047 Reviewed-on: https://code.wireshark.org/review/25682 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-02-08json: Add for decode-as udp.portStig Bjørlykke1-0/+2
Change-Id: Ibd03cd64aa8de7fee8ad3cc7b7cc61e0370399ff Reviewed-on: https://code.wireshark.org/review/25681 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-02-08Cleanup HTTP Referer tracking code and use less memoryMoshe Kaplan1-66/+86
Change-Id: I7d9d8a1ab6ed9f180511281348d6b679b5fba1fb Reviewed-on: https://code.wireshark.org/review/25665 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Moshe Kaplan <me@moshekaplan.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-08Get rid of unneeded #includes.Guy Harris2-4/+0
Change-Id: Ica457e3fb2a6e2318ca1e03fb7b2569c7d8e6aba Reviewed-on: https://code.wireshark.org/review/25679 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-08Fix white space.Guy Harris1-1/+1
Change-Id: I90047f070f42991a67da5215b6eda60f70d7945f Reviewed-on: https://code.wireshark.org/review/25678 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-08Get rid of unused structure member.Guy Harris2-4/+5
Change-Id: I86c32f18f8168d776fc5eb2116bc600a87ab57e0 Reviewed-on: https://code.wireshark.org/review/25677 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-08Get rid of a calculation whose result is not used.Guy Harris1-7/+0
Change-Id: Ic481636d35953476b26be15d169f22e6db149828 Reviewed-on: https://code.wireshark.org/review/25676 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-07Distinguish between "probably not pcapng" and "probably bad pcapng" errors.Guy Harris1-55/+85
Go back to having pcapng_read_block() and pcapng_read_section_header_block() treating SHB read errors that might be due to the file not being a pcapng file separately from other errors. This keeps us from treating pcapng files with malformed SHBs as not being pcapng files, making us dissect them using the pcapng file dissector rather than reporting the malformation. Change-Id: I1d92cc4ac521668b88638b2b3ed5257340451798 Ping-Bug: 14402 Reviewed-on: https://code.wireshark.org/review/25675 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-07Clean up the null pointer check in profile_exists().Guy Harris1-3/+10
Check only in the if (global) case, and note that it's necessary in that case; in the !global case, note why we don't have to check for a null pointer. Change-Id: I80322204ec94eb3901f7bceabccb29351794adc8 Reviewed-on: https://code.wireshark.org/review/25674 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-07Squelch an rc warning.Gerald Combs1-0/+2
Don't include glib if RC_INVOKED is defined so that the Microsoft Windows Resource Compiler doesn't generate the following complaint: \path\to\glib/gatomic.h(87): warning RC4011: identifier truncated to '__GCC_HAVE_SYNC_COMPARE_AND_SWA' Change-Id: I6637aee2842de4e7041b66ff4428f617478efcb4 Reviewed-on: https://code.wireshark.org/review/25670 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-07Don't crash if an IDB resolution value is too high.Guy Harris1-23/+98
When dissecting an if_tsresol option in an IDB, calculate the resolution from the base and the offset. If the result overflows, mark it as an overflow; otherwise, mark it with the units for more values than 1 microsecond. Store the calculated resolution, which we initialize to the default of 1 microsecond. When displaying time stamps in blocks, use the calculated resolution, rather than re-calculating it. If it's 0, it means the resolution is too high, so don't calculate it and end up dividing by zero. Bug: 14402 Change-Id: Idc34ededb4f7250b3604b14d4468c32f6592793f Reviewed-on: https://code.wireshark.org/review/25673 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-07WSDG: Remove references to Windows XP and Vista.Gerald Combs1-4/+2
Change-Id: Id3945f53722b7a69afa4a62eb3cfc2f8e8193d74 Reviewed-on: https://code.wireshark.org/review/25671 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-07tools: Add SPDX MIT to licensecheck.pl.Gerald Combs1-0/+4
Add a check for "SPDX-License-Identifier: MIT". Change-Id: Id69c87e7d8d7fd3904a02f9fb410bae8e9d99d10 Reviewed-on: https://code.wireshark.org/review/25669 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-07NSRPC: fix heuristic dissectorPascal Quantin1-2/+2
Do not check reported length but captured length, otherwise it can can trigger an exception when trying to fetch at offset 4. Once the (very basic heuristic) is verified, cann the right dissection function. Bug: 14399 Change-Id: Ie09d80e04f2501c940693a2ea9ecbd2f84d1e22f Reviewed-on: https://code.wireshark.org/review/25666 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-07wsutil: Allow NULL as profile nameStig Bjørlykke1-1/+3
Using NULL as profile name indicates the Default profile and profile_exists() must not return FALSE for the Default profile. This is a regression from ge0d04a75. Change-Id: I2463a7d3e12dda794f3391d999442a303d80621c Reviewed-on: https://code.wireshark.org/review/25659 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-07netmon: Initialize struct netmonrec_comment on allocStig Bjørlykke1-1/+1
This avoids an illegal pointer to free() on error. Bug: 14397 Change-Id: Id6e535141c7a3ee7b3d1822875b571e2199a5387 Reviewed-on: https://code.wireshark.org/review/25660 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-02-07Include as "ui/summary.h", as is done elsewhere.Guy Harris1-1/+1
Change-Id: I832c74554854bf380984cab83a53e7ffe165ad84 Reviewed-on: https://code.wireshark.org/review/25658 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-07Move summary.[ch] to libui.Guy Harris14-12/+11
Change-Id: I49f1eeb4fc3a90e436da116577a7d0c5ba982eee Reviewed-on: https://code.wireshark.org/review/25657 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-07caputils: use SPDX identifiers.Dario Lombardo16-225/+16
Change-Id: I7c30002025c31a74dfa60c10ca7f7c0dd384e1c9 Reviewed-on: https://code.wireshark.org/review/25559 Petri-Dish: Dario Lombardo <lomato@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-07[PFCP] Fixed order of bytes in UP Function Features IEMatej Tkac1-37/+45
3GPP TS 29.244 V14.2.0 Section 8.2.25 Change-Id: I22395d05bfcdb5dce5355c0836ffb9bbdef7a8dd Reviewed-on: https://code.wireshark.org/review/25631 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-07Generate HTTP Referer statisticsMoshe Kaplan5-5/+167
The main benefit of this feature is that it enables users to see the succession of HTTP requests that led to a specific request. A sample PCAP is available here: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=16085 Change-Id: I7c521315b848fbce659fdc01e43f261d804a3a48 Reviewed-on: https://code.wireshark.org/review/25319 Reviewed-by: Moshe Kaplan <me@moshekaplan.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-07wsutil: use SPDX identifiers.Dario Lombardo5-74/+9
Change-Id: I4863416ddc425b9138ffa47621eee823db9e7fda Reviewed-on: https://code.wireshark.org/review/25557 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-07tools: add files from wsutil and caputils to checklicense whitelist.Dario Lombardo1-0/+9
Change-Id: I35b6df8fbb31c209e7e79d5c002568d5194f3485 Reviewed-on: https://code.wireshark.org/review/25641 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-07LPPe: use V1_0-20160714-C specificationPascal Quantin7-5274/+3286
Bug: 14361 Change-Id: I845e732100d866913bd17742dc18593938baac4a Reviewed-on: https://code.wireshark.org/review/25646 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-07tools: add licenses to licensecheck.pl.Dario Lombardo1-0/+14
Include the following licenses in licensecheck.pl 1. LGPL-2.0-or-later 2. Zlib 3. BSD-3-Clause Change-Id: I65f0ca1f957ee072ed595ab56d20ec200bd7047e Reviewed-on: https://code.wireshark.org/review/25638 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-07ieee1905: Fix the handling of AP Metric Queries.Richard Sharpe1-0/+9
They changed when the spec was updated. This seems to be the last change needed here. Change-Id: Id47c1de5b5890bffa0842c33ae02033ddf6c8325 Reviewed-on: https://code.wireshark.org/review/25656 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-07Added wmem_map_contains and wmem_map_lookup_extendedMoshe Kaplan3-0/+100
Change-Id: I2943c67238fb913258f0f1f15df968c17b1ea002 Reviewed-on: https://code.wireshark.org/review/25626 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-07Remove range_foreach_r from debian symbolsMichael Mann1-1/+0
Change-Id: I209fde24ca421b8e2dfd982408b4610bc5e63d82 Reviewed-on: https://code.wireshark.org/review/25655 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-07FCP: Add NULL check to prevent crash.Michael Mann1-1/+1
Fragmented FCP may not be called on the first pass, so add a NULL check for proto_data that may not be there. Bug: 14374 Change-Id: Icbbee8f0eb3a33655323283dbb5a01c350d784dc Reviewed-on: https://code.wireshark.org/review/25649 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-07Don't assume all packets have time stamps.Guy Harris1-31/+43
We explicitly allow the not to, and, for example, Simple Packet Blocks in pcapng files don't have time stamps. Change-Id: If1db5747c9e06faa7550162df8e04dc60b71d954 Reviewed-on: https://code.wireshark.org/review/25650 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-07Reapply "Fix typo in DTN dissector"Justin Dailey1-3/+3
Sgement -> Segment Change-Id: Ibf4aa2db14fd87c854a65da0de979ad4772243d8 Reviewed-on: https://code.wireshark.org/review/25640 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-on: https://code.wireshark.org/review/25648 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-062.5.0 → 2.5.1.Gerald Combs5-9/+9
Change-Id: I185a3f359acfe5dfd06c0b7f5fff3b6586be1ff9 Reviewed-on: https://code.wireshark.org/review/25647 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-06Temporarily revert "Fix typo in DTN dissector"Gerald Combs1-3/+3
This will be restored after the 2.5.0 release is complete. This reverts commit 61cc7691691c5f8bd2e11b2caffe52cd8e14aab2. Change-Id: I0b7d2435fe010070aaced5f395c75a1cd65b3f83 Reviewed-on: https://code.wireshark.org/review/25645 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-06Fix typo in DTN dissectorJustin Dailey1-3/+3
Sgement -> Segment Change-Id: I275495fafdf76308ca36083256d6fcd2bed35203 Reviewed-on: https://code.wireshark.org/review/25640 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-06Build 2.5.0.Gerald Combs4-7596/+2722
Change-Id: I8be543c87d289b616b92ab178458382c93580f12 Reviewed-on: https://code.wireshark.org/review/25644 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-06Get rid of the pkt_encap field in struct packet_info.Guy Harris7-16/+20
pinfo->pkt_encap is jsut a copy of pinfo->phdr->pkt_encap; no need for the copy. Expand a comment while we're at it. Change-Id: I5fcfe694ecba42507f1d629d01440da0a0989501 Reviewed-on: https://code.wireshark.org/review/25643 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-06Change the way we infer the type of the physical address.Guy Harris1-3/+9
Use the address type of the link-layer source address, rather than the encapsulation of the outermost packet layer, to determine the type of the physical client address in a Dead Station frame. That should, for example, handle cases where the actual Ethernet packets are being carried within packets on some non-Ethernet network, or where the packets aren't Ethernet packets but are packets on some other network using MAC-48 addresses. Change-Id: Ibd2e2322b03e81aa52c71b080f3c91d2f83fc3b4 Reviewed-on: https://code.wireshark.org/review/25642 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-06Make sure we pass valid addresses to find_conversation.Gerald Combs1-4/+10
Pass empty (AT_NONE) addresses to find_conversation and conversation_create_endpoint instead of NULL, similar to the LBTxx and other dissectors. Bug: 14394 Change-Id: Ia4573b276551a9c3d2da155faf786e8d15229100 Reviewed-on: https://code.wireshark.org/review/25620 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-02-06[SBC-AP] Enhance info column information.AndersBroman2-5/+27
Change-Id: If02d2b1dcda5df8a09b3689b2ba3dc5914db3420 Reviewed-on: https://code.wireshark.org/review/25635 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-06about_dialog (qt): Fix Dead Store (Dead assignement/Dead increment) Warning ↵Alexis La Goutte1-2/+0
found by Clang Change-Id: Ib7c673980909551d9f817d60bbe2d77ed180b661 Reviewed-on: https://code.wireshark.org/review/25599 Reviewed-by: Roland Knall <rknall@gmail.com> Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2018-02-06[Thrift] Handle optional elememts in struct.AndersBroman2-1/+18
Change-Id: Iee494c299f8f10588146f0b41b759ce0272d9caf Reviewed-on: https://code.wireshark.org/review/25634 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-06[Thrift] Add methods for the 64bit types.AndersBroman2-0/+56
Change-Id: I4a3ca0eb715562c9ed535df471edb62830215369 Reviewed-on: https://code.wireshark.org/review/25630 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-06Use the Wayback Machine for a reference.Guy Harris1-1/+1
Change-Id: I4745cdf6ba863674525851e98c8a52422d4e65f0 Reviewed-on: https://code.wireshark.org/review/25628 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-06Use separate dissectors for LAPD and LAPD-with-Linux-SLL-header.Guy Harris1-7/+22
That obviates the need to check pinfo->pkt_encap. Change-Id: I038e065932282ce9d3362fbc9ba6ea653a63f399 Reviewed-on: https://code.wireshark.org/review/25627 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-02-06BACapp: Fix a loop check.Gerald Combs1-106/+107
Fix an offset check in a nested loop. Make our offset checks more paranoid. Bug: 14387 Change-Id: I2890b27731ec293a3cb08dcfdf7a18aef808ad31 Reviewed-on: https://code.wireshark.org/review/25622 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-02-06IPMI: Add NULL pointer checks.Gerald Combs1-2/+2
Check for a valid data->curr_frame in ipmi_set_data and ipmi_get_data. Bug: 14393 Change-Id: I615975015da864718dbd486d875aa3020db94edd Reviewed-on: https://code.wireshark.org/review/25621 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-02-06Proto tree: Update left arrow navigation behavior.Gerald Combs2-0/+13
If the user presses the left arrow when a non-expaned proto tree item is selected, jump to its parent item as described in the "Main Window Navigation" section of the User's Guide.. Change-Id: Ie7478a2c292df9a225555f5539d7ba90ab5e132d Reviewed-on: https://code.wireshark.org/review/25623 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-22 04:13:19 +0000