aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2018-05-12html2txt.py: replaced 2 occurences of '{}' with equal '{0}' because of ↵Matej Tkac1-2/+2
CentOS 6.x+Python2.6.6 issues Change-Id: Ibf395007e32db70f49b7bdae22fff8c377ae41b0 Reviewed-on: https://code.wireshark.org/review/27457 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-12gsm_a_gm: fix potential buffer overrun (read)Peter Wu1-3/+5
When the string "str" is empty, "str+1" is invalid. This function can be called from functions using SET_ELEM_VARS in packet-gsm_a_common.c which appear to check the length first, but packet-etsi_card_app_toolkit.c and packet-camel.c do not. Err on the safe side and do not add the item. Change-Id: I6bd559593bb10ff0b8bf08a48d828613e3d8ccf5 Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=4311 Reviewed-on: https://code.wireshark.org/review/27470 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-12bluecom: remove dead stores/increments (found by clang).Dario Lombardo1-4/+0
Change-Id: I07475225ca2e81ba22d0669a7ef474d76b46e2cb Reviewed-on: https://code.wireshark.org/review/27445 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-05-12rtmpt: fix dissection of multiple packets on second passPeter Wu1-4/+6
The previous fix for the infinite loop in bug 13347 resulted in loop termination after one round, resulting in ignoring all but the last packet in a TCP segment. Observe that the purpose of this loop is to collect all packets where "tp->seq" refers to the first offset and "tcp->lastseq" refers to the last position of the packet. If a full packet "tp" is found, then the previous packet ends at "tp->seq-1" instead of "tp->lastseq-1" (assuming no overlapping TCP segments). The infinite loop from bug 13347 occured because of a single packet of length 1 (tp->seq=0, tp->lastseq=0) and lastseq-1 overflowed. To address that, terminate the loop once the begin is reached (tp->seq == 0). Bug: 14650 Change-Id: Ibef382a09c6481b1024dd64dbc8bde904025f057 Fixes: v2.3.0rc0-2153-gee185445f4 ("rtmpt: Ensure sequence count is incremented for stored fragments") Reviewed-on: https://code.wireshark.org/review/27319 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-12CIP Motion: Various UpdatesDylan Ulis2-127/+194
1. Feedback Mode: Should only use the lower 4 bits. 2. Axis Response: Add more enumerated values 3. Axis Status: Add more bit interpretations 4. Add more Motion Attributes 5. Minor cleanup Change-Id: I0a6568ca263afb8d7827961907cb7d0a42b376f4 Reviewed-on: https://code.wireshark.org/review/27400 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-12test: add test for resolved addressesPeter Wu1-0/+27
Tests that the documented "-z hosts,ipv4" filter actually works and that the resolved addresses table is correct (it implicitly tests that the definition of WS_INET_ADDRSTRLEN in wsutil/inet_addr.h is sane). Change-Id: If7babe665ea5ecb37e38078a9809c88873cb323c Ping-Bug: 14667 Reviewed-on: https://code.wireshark.org/review/27454 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-12cli: make "-z host,ipv4" filter actually workPeter Wu1-8/+12
Respect the "ipv4" and "ipv6" filters and actually restrict the output. Change-Id: I06ee62ee2c85cb45fb33a52e86ce3698452d175f Fixes: v1.11.0-rc1-2592-ge3cccd17f4 ("Get rid of some users the addrinfo_list.") Reviewed-on: https://code.wireshark.org/review/27452 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-11CIP: Data Type updatesDylan Ulis1-53/+49
1. Convert lots of things to use the new BASE_UNIT_STRING feature 2. ANSI Symbol: Print size correctly in generated response 3. Attribute Status is a 1 byte value in Get/Set_Attribute_Lists 4. Forward Open: Indicate this is a Safety connection in info column. This is useful because Safety connections aren't obvious from the CIP Class like other connections (eg: Motion) Change-Id: I8cb00fd0141d75a3e9425d8e618b1f54d12807be Reviewed-on: https://code.wireshark.org/review/27447 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-11MAC LTE: fix mac-lte.slsch.format fieldPascal Quantin1-2/+2
Bug: 14669 Change-Id: I7326046e3707867d7dfef2e4eb341c95f1b2cdab Reviewed-on: https://code.wireshark.org/review/27461 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-05-11Remove wireshark-gtk.desktop.Gerald Combs1-111/+0
Change-Id: Iee575c2084b7bcfe503131467cbd226cc33e0f52 Reviewed-on: https://code.wireshark.org/review/27458 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-11NSIS: Fixup some uninstall variables.Gerald Combs1-3/+2
Add back the PROGRAM_NAME_GTK definition, since its links might be left over from a previous install. Remove the PROGRAM_NAME_QT references, since it's been the same as PROGRAM_NAME for quite a while. Change-Id: I79724a6a1c9861ffae9aed6a59d48205a40941cd Reviewed-on: https://code.wireshark.org/review/27459 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-11wsutil: fix WS_INET_ADDRSTRLEN definition on WindowsPeter Wu1-15/+4
On Windows, epan/addr_resolv.c has a different definition of structures "hashipv4_t" (and "hashipv6_t") because the size of the "ip" member is dependent on "WS_INET_ADDRSTRLEN". A mismatch resulted in two different structures where the "name" field got shifted (resulting in empty names in the resolved addresses table due to leading nul bytes). Since including ws2tcpip.h for the appropriate definition results in various compile errors (config.h, packet-dcerpc-misc.h, ...) and the larger definition is actually not needed, just use constants again. Bug: 14667 Change-Id: I4f8b300eb977be55f16ac40cacc78a5549e2732f Fixes: v2.5.0rc0-1503-gde1b26a3c6 ("More ws_inet_ntop() tweaks.") Reviewed-on: https://code.wireshark.org/review/27453 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-11List some removed features in the release notes.Gerald Combs2-20/+11
Require Qt 5.2 in CMakeLists.txt. Remove some old Qt 4 checks. Change-Id: I06814b3776b488d55a0ce1a26aaada43fb5e096c Reviewed-on: https://code.wireshark.org/review/27446 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-11NSIS: Modernize the installer and remove GTK+ entries.Gerald Combs7-321/+248
Migrate the Additional Tasks page to nsDialog. Create it using NSIS Dialog Designer. Migrate the Modern UI code (WinPcapPage.ini and USBPcapPage.ini) to Modern UI2. Use LogicLib flow control instead of Gotos+labels in more places. Change-Id: I1a3733f0202ca372456074f43e5ae23b1da4e1b9 Reviewed-on: https://code.wireshark.org/review/27449 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-11WiX: Remove remaining GTK+ content.Gerald Combs4-69/+1
Change-Id: I3dc06b62f8a6afa2de82b2a2a5f7dc8a63400ac3 Reviewed-on: https://code.wireshark.org/review/27451 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-11CMake: Remove FindFreetype.Gerald Combs2-132/+3
Remove the FindFreetype module. It was required by the FindGTK2 module, but it's no longer used. Change-Id: Id7575d024b5c13b5800989434a994e3a0dcb2b26 Reviewed-on: https://code.wireshark.org/review/27450 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-10wiretap: DPA-400 logfile supportDirk Eibach5-0/+273
Wiretap support for reading the Unigraf DPA-400 DisplayPort AUX channel monitor logfiles. Bug: 14651 Change-Id: Ia8714a72a9439dd566ef604e001ebf45ecaab76d Reviewed-on: https://code.wireshark.org/review/27415 Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Petri-Dish: Guy Harris <guy@alum.mit.edu> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-10DisplayPort AUX channel protocol dissectorDirk Eibach6-0/+692
Dissector for the VESA DisplayPort AUX channel protocol. Bug: 14651 Change-Id: I5c0c7668bda969086d9d6e5069aad87e929f6340 Reviewed-on: https://code.wireshark.org/review/27311 Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-10wsutil: null-terminate string in ws_read_string_from_pipe (CID: 1364684).Dario Lombardo1-18/+8
Change-Id: I713e7466843e5ccaa7252744c57c7ac4c7020809 Reviewed-on: https://code.wireshark.org/review/27422 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-05-10nettrace: add g_assert in write_packet_data (CID 1435482).Dario Lombardo1-0/+2
proto_col_str could have been nulled by line 409, but in that case EXP_PDU_TAG_COL_PROT_BIT is not set, then strlen doesn't get called in line 432. Coverity raised a false positive and g_assert will pacify it. Change-Id: Ib22868a549319913c9c2a25ede0b63fed3af6eb0 Reviewed-on: https://code.wireshark.org/review/27424 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-05-10gitignore: add test log files.Dario Lombardo1-0/+1
They are generated by 'test' target and should be ignored. Change-Id: Ie378c356ba586e826946abfcfcd8faf2c3ad3c2d Reviewed-on: https://code.wireshark.org/review/27382 Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-05-10wslua: fix memleak in Dir.remove_all on error pathPeter Wu1-3/+2
While at it, use g_build_filename. Found by Clang Static Analyzer. Change-Id: I5c50f50abb8c16a553586c548ccd1ae6c3cdd8c1 Reviewed-on: https://code.wireshark.org/review/27439 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-10Remove a bunch of unused images.Gerald Combs65-5311/+0
Remove leftover GTK+ UI images. Change-Id: I17ab057a1bb63a99293ab67f1972ff6a00f3558a Reviewed-on: https://code.wireshark.org/review/27401 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-09fp: Avoid changes to info column after payload dissectionSayuri Mizushima1-3/+2
Previously info was appended to the end of the info set by an underlying protocol (mostly rlc/rrc) Change-Id: I7fe0d8d485f81ed2c108099e76d15c887108164f Reviewed-on: https://code.wireshark.org/review/27399 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-09fp: Fix incorrect framingSayuri Mizushima1-0/+29
A rare case was matching against both dch and pch checks Change-Id: I1aa01636355a6fb5d0804b184f3f9b58bec99ffd Reviewed-on: https://code.wireshark.org/review/27367 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-09nas_5gs: remove legacy return (CID: 1435476).Dario Lombardo1-2/+0
Change-Id: I99be7b1431f564a147ee3f9090ce93792ecf2b1f Reviewed-on: https://code.wireshark.org/review/27430 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-09zbee-zcl-general: fix typo (CID 1435473).Dario Lombardo1-1/+1
Change-Id: I9a5d06c991c6c0f0b8e89f27cf9e06b8df77f44e Reviewed-on: https://code.wireshark.org/review/27429 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-09packet-ieee80211: fix infinite loop (CID 1435463).Dario Lombardo1-1/+2
Change-Id: I1eee5cc0fa87a6add901f4e86b13e1f4564134cd Reviewed-on: https://code.wireshark.org/review/27423 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-09Windows: Make sure native dialogs handle HiDPI.Gerald Combs4-80/+135
Enable per-monitor v2 DPI awareness before displaying native file dialogs so that they will render correctly on HiDPI displays. Add some notes about DPI awareness in our manifest and in wireshark-qt.cpp. Remove win32_get_ofnsize while we're here. Change-Id: Ic553fdeea0c05020c3a7ff06f648692cb814b3eb Reviewed-on: https://code.wireshark.org/review/27435 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2018-05-09ui/tap-rtp-common: fix some memleaksPeter Wu1-4/+10
If a stream with the given parameters was already known, the addresses and payload_type_name would be leaked. There are potential other leaks for rtp_stream_info_t (also in Qt RtpAnalysisDialog::showPlayer), but that requires a more careful analysis. Found by Clang Static Analyzer. Change-Id: I2fb19464b4c0f89d597a7e6117d219111922b4f2 Reviewed-on: https://code.wireshark.org/review/27346 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-09ui/voip_calls: fix memleak in is_mgcp_signalPeter Wu1-2/+6
Change-Id: I91226fc88f6e200c0c45ff74cc4232521e602fd3 Reviewed-on: https://code.wireshark.org/review/27345 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-09Qt: fix memleaks in CompiledFilterOutputPeter Wu1-4/+3
QString already copies the memory, no need to strdup it. Simplify use of GString as well (str is NUL terminated). Found by Clang Static Analyzer. Change-Id: Ic3ba3daa9121736529e0bee2d41adc95a55a3feb Fixes: v1.99.0-rc1-253-gdf8c4bf264 ("Capture Interfaces Dialog:") Reviewed-on: https://code.wireshark.org/review/27344 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-09Qt: fix memleak of profile name on copying a profilePeter Wu1-0/+1
add_to_profile_list (via add_profile_entry) clones the name and does not own it, so free it afterwards. Found by Clang Static Analyzer. Change-Id: I340c91b65d97b24a52812fd6f4b85933cfb15f89 Reviewed-on: https://code.wireshark.org/review/27343 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-09Always explicitly set tm_isdst before calling mktime().Guy Harris3-0/+3
Except in rare cases, we want to set it to -1 so that we let mktime() determine whether DST/Summer Time was in effect at the given date and time rather than pretending that we know whether it's in effect or not. Change-Id: I0ea75317dd308a515cedf4d1260b583e1592cc9b Reviewed-on: https://code.wireshark.org/review/27431 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-09Qt: remove unused vars in main_window_preferences_frame (CID 1435498).Dario Lombardo1-2/+0
Change-Id: Ibd20bdb3f88b3800d2bfa93e32d41c4827e24dcb Reviewed-on: https://code.wireshark.org/review/27421 Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-09proto: don't overrun buffer.Dario Lombardo1-1/+1
This is shown by a bunch of coverity reports all pointing at this line. Every buffer has a ITEM_LABEL_LENGTH, but label_mark_truncated access it at ITEM_LABEL_LENGTH (off-by-one). CIDs: 1435461 1435462 1435465 1435466 1435471 1435472 1435477 1435481 1435483 1435484 1435485 1435489 1435492 1435500 Fixes: v1.11.3-rc1-1837-gf94674d2fb ("truncate UTF-8 strings only at the boundary between two characters") Change-Id: I3781c36594f7db880bc9f76b64d261dbc498c0ce Reviewed-on: https://code.wireshark.org/review/27425 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-05-09extcap: Fix required indicatorRoland Knall1-1/+9
Fix required indicator on reset and change an assert to a simple drop-out Change-Id: I355980223f213fef8ee4c6ac7d6bcb0fce1a7913 Reviewed-on: https://code.wireshark.org/review/27416 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
2018-05-09Qt: Add Show as UTF-16 in Show Packet BytesStig Bjørlykke2-0/+14
Change-Id: Ia7c7af162ac0010e2a5b83caf1ac467012432567 Reviewed-on: https://code.wireshark.org/review/27420 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-05-09Qt: Add plural translationsStig Bjørlykke2-8/+9
Add plural translations in capture file dialog preview. Reworded text for "error after X records(s)" to use same format as similar messages. Change-Id: I7b2c8811a9c0c0f76587c5aad1a648a1b969f37a Reviewed-on: https://code.wireshark.org/review/27412 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-05-09Qt: Update frame selected in several casesStig Bjørlykke3-8/+15
Ensure that frameSelected(0) is emitted when not having a proto tree field selected because of: 1. No match when trying to restore selected field 2. Search selects a packet with no field to select 3. Current packet is deselected This will disable functionality which requires a selected field and updates the status bar according to selected field. Bug: 14658 Change-Id: I158fae4f26c02f718cee0030ef9e38b597876381 Reviewed-on: https://code.wireshark.org/review/27395 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-05-09You have to set tm_isdst before calling mktime().Guy Harris1-0/+2
You either need to tell mktime() that 1) DST/Summer Time is in effect, 2) DST/Summer Time isn't in effect, or 3) we don't know whether DST/Summer Time is in effect, you figure it out. We set tm_isdst to -1, to choose option 3), which is what we want. Fixes Coverity CID 1435496. Change-Id: I0f22ef1201ee8abefb3fa75aa3432b021fb13cfd Reviewed-on: https://code.wireshark.org/review/27408 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-09You have to set tm_isdst before calling mktime().Guy Harris1-0/+1
You either need to tell mktime() that 1) DST/Summer Time is in effect, 2) DST/Summer Time isn't in effect, or 3) we don't know whether DST/Summer Time is in effect, you figure it out. We set tm_isdst to -1, to choose option 3), which is what we want. Fixes Coverity CID 1435496. Change-Id: Iff24e51807ab42c0e6d9629f72848ad9f8d325fb Reviewed-on: https://code.wireshark.org/review/27404 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-09Fix infinite loop.Guy Harris1-0/+1
If a variable is a count of items, and we're looping while the count is non-zero, we need to decrement it after every item we process. Fixes Coverity CID 1435501. Change-Id: Iabb0cb6276d4bcf4b1bdea9ec3ba943dac1b9938 Reviewed-on: https://code.wireshark.org/review/27402 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-09smb: fix memleak in export objectsPeter Wu1-3/+3
"aux_smb_fid_type_string" is used as "%s" argument for g_strdup_printf, there is no need to clone it. I checked all calls and "fid_type" should always be valid, but in case of a bug, let's not return a NULL pointer but "?". Found by Clang Static Analyzer. Change-Id: I09896638eb5512f22b3d1a227462499e12cedcde Reviewed-on: https://code.wireshark.org/review/27349 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: ronnie sahlberg <ronniesahlberg@gmail.com>
2018-05-08Windows: prioritize Npcap over WinPcapPascal Quantin2-27/+13
It is now considered stable enough to be our default capture driver if present Change-Id: I7f3cdabcbaea526949afa47164e520202e6b93f2 Reviewed-on: https://code.wireshark.org/review/27393 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-05-08sshdump/ciscodump: use groups in config.Dario Lombardo3-32/+34
Change-Id: I3d6689738aee32bf720e6ebca1d4462429fdc1eb Reviewed-on: https://code.wireshark.org/review/27397 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-05-08dtls: Remove period from Version blurbStig Bjørlykke1-1/+1
Change-Id: I5e50554daf25d2b2e71795c28e393f08d117ad6f Reviewed-on: https://code.wireshark.org/review/27396 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-05-08Qt: fix IPv4 GeoIP lookup in endpoints dialogPascal Quantin1-1/+3
maxmind_db_lookup_ipv4() expects an address in network byte order Bug: 14656 Change-Id: Ie47e3ae44d305d040e409d42f4398f55ae8c2395 Reviewed-on: https://code.wireshark.org/review/27391 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Christopher Maynard Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-05-08sharkd: fix IPv4 GeoIP lookupPascal Quantin1-1/+2
maxmind_db_lookup_ipv4() expects an address in network byte order Change-Id: Iaff404e370d8a171fa27bf63cb3d827863e6b0ac Ping-Bug: 14656 Reviewed-on: https://code.wireshark.org/review/27390 Reviewed-by: Christopher Maynard Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-05-08extcap: Group argumentsRoland Knall6-34/+177
Group arguments together to better present them, as well as to have the possibility to better facilitate settings categories. The order of tabs is defined by the numbering of arguments and their appearance. If no tab can be found or no group has been defined for the argument, a default tab will be added. Change-Id: I032881193e09d4ad5d65c9f73fede87695acdace Reviewed-on: https://code.wireshark.org/review/27054 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>