Compare commits

...

407 Commits

Author SHA1 Message Date
Daniel Willmann adc002a045 Add AMR codec support
CMake work and rebase on current wireshark master by Pau Espin Pedrol.
Rebase on 3.4.7 by Oliver Smith.

Change-Id: I5ec963b910f8f271aa2e5d680ea33e2170a6f367
2021-08-02 12:30:45 +02:00
Oliver Smith 8ca21cbe7a === Osmocom specific patches start here ===
Related: OS#2537
Change-Id: I619a20fe2e5d6b3fb0af52440998eca16ee91cf4
2021-08-02 12:09:20 +02:00
Gerald Combs e42cbf6a41 Build 3.4.7.
[skip ci]
2021-07-14 09:47:58 -07:00
Gerald Combs 1307804147 Prep for 3.4.7. 2021-07-13 10:30:45 -07:00
Gerald Combs dac0e6b083 [Automatic update for 2021-07-11]
Update manuf, services enterprise numbers, translations, and other items.
2021-07-11 09:53:57 +00:00
Martin Mathieson e479ced643 DT2000: Fix buffer length in wiretap code
CID: 1477941


(cherry picked from commit af57fb94ac)
2021-07-10 22:07:00 +00:00
Martin Mathieson aa0f0f65e7 Snort config: Avoid leaks when fail to open config file.
CID: 1477713
CID: 1477850


(cherry picked from commit bbcd42be87)
2021-07-10 21:38:02 +00:00
Clément Notin bc38bea800 ldap: Add Active Directory OIDs
From [MS-ADTS] specification
https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-adts/3c5e87db-4728-4f29-b164-01dd7d7391ea


(cherry picked from commit 5b248ac4d0)
2021-07-10 21:23:36 +00:00
Taisuke Sasaki fb2ed68545 OSPF: Fixed SRLB and SRMS Preference TLV types (rfc8665)
- Fixed TLV types of SRLB and SRMS Preference
- Added type/length for unknown Opaque RI TLV


(cherry picked from commit d8ee53e078)
2021-07-10 20:54:18 +00:00
Martin Mathieson 7799b0f577 RSL: Fix mask of eMLPP Priority field.
9.3.49 in 48.058wq


(cherry picked from commit ba0d6f69ab)
2021-07-10 20:25:10 +00:00
Alexis La Goutte cbbe611c7a dcerpc: Fix warning found by Clang Analyzer
packet-dcerpc.c:4381:17: warning: Assigned value is garbage or undefined [core.uninitialized.Assign]


(cherry picked from commit 558a32ba86)
2021-07-10 20:10:14 +00:00
ZhongYao Luo 2450e2220b Fix null pointer
In some cases, the fds parameter of frame_data_sequence_find is invalid,
causing the software to crash, For example, this command
echo'{"req":"frame","bytes":"yes","proto":"yes","frame":"1" }'|sharkd-


(cherry picked from commit 64155132ea)
2021-07-10 16:07:28 +00:00
João Valverde 60dee56e4c Change my email address
(cherry picked from commit ab37610f08)
2021-07-10 14:13:30 +00:00
Martin Tschoepe f6362dd30c PROFINET: Ensure multiple submodules are parsed
GSML parsing has a bug related to multiple submodules,
such that, the first submodule found in the GSDML needs
to be the PROFIsafe element, otherwise the description
is not parsed.


(cherry picked from commit d3ec582c26)
2021-07-10 11:53:22 +00:00
Thomas Dreibholz 40496f3185 Bugfix for S101 dissector:
Make sure that the packet has an S101 header, before setting the protocol name
with col_set_str(). Otherwise, all TCP packets on port 9000 may be
misidentified as S101 packets.


(cherry picked from commit 8e256b7e69)
2021-07-10 11:20:13 +00:00
Pascal Quantin 490fe2684b DNP: use the proper free function
g618661b22e introduced a free for a so called memory leak (which wasn't
a real leak due to the pinfo->pool garbage collector) but used the wrong
free function. Let's keep the explicit free but use the right function.

Closes #17462


(cherry picked from commit 029a7fcec5)
2021-07-10 10:51:40 +00:00
Andreas Schultz be7bb332fe GTPv2: fix decoding of (extended) eNodeB id
3GPP TS 29.274, clause 8.21.7 and 8.21.8 clearly specify a total
length of 6 bytes for these fields.


(cherry picked from commit 4992806dba)
2021-07-10 09:53:44 +00:00
Prince Paul 3e42a64f6f ASTERIX: Fix Value of hf_010_202_VY from VX to VY
Fix typo VX to VY


(cherry picked from commit 79f62acbe7)
2021-07-08 17:59:06 +00:00
Prince Paul 3e836977cd ASTERIX: Fix Data Item 010/091
Fixed Item Number from 110 to 091


(cherry picked from commit 30058542e9)
2021-07-08 16:38:08 +00:00
Joakim Andersson 427cd8fd42 nordic_ble: Fix packet times for multiple interfaces
Fix packet times calculations when using multiple interfaces.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-07-08 08:15:21 +00:00
Joakim Andersson 3b330cf647 Bluetooth: Fix parsing of CTE Info field in extended advertising header
Fix parsing of the CTE Info field in the extended advertising header.
The bit-mask of the different fields was wrongly placed.
The text of the different fields all said "CTE Info".
The CTE Time field was added twice.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-07-08 07:23:07 +00:00
Joakim Andersson 4cbec00089 Bluetooth: Fix parsing of empty extendend advertising header
Fix parsing of extended advertising when the extended advertising header
is empty. The flag field is excluded when none of the fields are present
and the extended header length field is 0.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-07-08 07:23:07 +00:00
Joakim Andersson de9d5f76ff bluetooth: Fix sync info in extended advertising header
Fix the sync info field length in extended advertising header set to the
wrong length.

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-07-08 07:23:07 +00:00
Andre Luyer 3afd332455 tshark/wireshark: Fix check ring buffer option for packets
tshark and wireshark did not allow only -b packets:value option, while dumpcap does.
This change adds the same check in tshark and wireshark as in dumpcap.

Quick fix for issue mentioned at https://ask.wireshark.org/question/23437/why-does-tshark-b-packetsvalue-not-work/


(cherry picked from commit 9f8e6b1acb)
2021-07-04 20:49:52 +00:00
Gerald Combs bf35c11265 [Automatic update for 2021-07-04]
Update manuf, services enterprise numbers, translations, and other items.
2021-07-04 16:12:00 +00:00
Pascal Quantin 9b21140c8e NR RRC: fix dissection of MeasTriggerQuantityOffset element
(cherry picked from commit aa5df68171)

Conflicts:
	epan/dissectors/packet-nr-rrc.c
2021-07-04 13:12:53 +02:00
Guy Harris bb4c32b75e wireless timeline: add a destructor to free the hash table.
Destroy the hash table if we're destroying the timeline widget, so that
it doesn't leak.


(cherry picked from commit ad3e6b1be6)
2021-06-28 21:41:31 +00:00
Guy Harris 5318290a05 wireless_timeline: make sure the hash table is always allocated.
At least on my Mac, if I start up Wireshark, start a capture
(non-monitor-mode) on the Wi-Fi adapter, add a comment to the SHB and
the first packet while it's capturing, stop the capture, and try to save
it, it warns that the wireless timeline hash table pointer is null.

Allocate it in the constructor.


(cherry picked from commit 693a02e760)
2021-06-28 10:01:40 +00:00
Gerald Combs c23daa12fe [Automatic update for 2021-06-27]
Update manuf, services enterprise numbers, translations, and other items.
2021-06-27 09:53:30 +00:00
Guy Harris 9fc3cd04a8 mergecap: improve the example.
Explain, in detail, exactly what it's trying to do and, for each of the
three commands in the example, what each step does, as well as
explaining what the calculation using the end time of one capture and
start time of another capture is doing.

(Where did this example come from?  What is the real-world goal of this
exercise?  And why is it an example in which all the fancy stuff is done
in commands *other* than mergecap?)


(cherry picked from commit 628fe2549a)
2021-06-21 00:09:35 +00:00
Gerald Combs 2d967ebad1 [Automatic update for 2021-06-20]
Update manuf, services enterprise numbers, translations, and other items.
2021-06-20 09:54:06 +00:00
Gerald Combs 69977f3109 GitLab CI: Add initial Windows package builds.
Manually copy over the Win64 Package and Win32 Package jobs from
2d9280089c in master and adapt for the 3.4 release builds.
2021-06-19 17:21:07 -07:00
Guy Harris 1afaa65fdd pcap-common: set the time stamp precision correctly for LINKTYPE_ERF.
LINKTYPE_ERF pcap files are really ERF files inside a thin pcap wrapper
(don't even ask what a pcapng file with some or all interfaces being
LINKTYPE_ERF is...), so the time stamp comes from the ERF record, not
from the pcap packet header or pcapng block header.

The time stamp reslution for the record should reflect that, so set it
to WTAP_TSPREC_NSEC (ERF time stamps are fractional-power-of-2, not
fractional-power-of-10, so that's the best we can do).


(cherry picked from commit 39315979c6)
2021-06-19 01:11:41 +00:00
Guy Harris 755a470644 erf: handle errors in some routines more completely.
Have them take error code and error information string arguments and,
for various failures, fill them in as "internal error" indications.

Check their return codes to see if they got an error.


(cherry picked from commit 02cffb51a9)
2021-06-19 00:17:21 +00:00
Guy Harris 930d8f763c libpcap: don't generate a fake interface for LINKTYPE_ERF files.
The ERF code will generate interfaces based on the ERF records in the
file, so don't bother adding an additional dummy interface.


(cherry picked from commit d69d1271f0)
2021-06-18 22:53:24 +00:00
Guy Harris 4a34fa38f1 erf: set the tsprecision value of a newly-created IDB.
Don't assume the default is correct, because there's no guarantee of
that - in fact, there's currently a guarantee that it's not, as it's
initialized to 0, which is WTAP_TSPREC_SECS.


(cherry picked from commit 49ec11f5aa)
2021-06-18 10:00:24 +00:00
Guy Harris 18c4baa9f3 wslua_tvb: fix documentation for reported_length_remaining().
In the past, tvb_reported_length_remaining(), and thus
Tvb:reported_length_remaining(), may have returned -1 if the offset was
invalid.  That's no longer the case; the former returns 0, and, as the
latter just returns the former's return value, that's true of the latter
as well.


(cherry picked from commit 6c043d5c73)
2021-06-16 08:04:07 +00:00
Guy Harris 18e13337ea wslua: a tvbuff doesn't have an "actual length".
It has a "reported length", which is the closes thing to an "actual
length", as it represents the length the packet, or subset thereof, had
on the network, and a "captured length", which is the amount of the
packet that the capture process saved.

In 99.999999999999999999999999999999% of all cases, a dissector should
look at the "reported length", not at the "captured length".

Rename the "len" method to "captured_len", leaving "len" around for
backwards compatibility.

Fix the documentation to reflect reality, to avoid issues such as #15655.


(cherry picked from commit bd9ceaebef)
2021-06-16 07:31:22 +00:00
Gerald Combs 9ea88b3ee2 [Automatic update for 2021-06-13]
Update manuf, services enterprise numbers, translations, and other items.
2021-06-13 09:53:07 +00:00
João Valverde 018ea00ff2 wsutil: argv[] is a NULL terminated array
(cherry picked from commit 70cea91c8a)
2021-06-10 19:05:22 +00:00
Alexis La Goutte 64bedfad27 wifi-nan: Fix length for availability attribute
Issue reported by Behzad Mokhtari

Fix #17431


(cherry picked from commit b716e2f1a2)
2021-06-10 06:27:41 +00:00
Uli Heilmeier ad6a337dde QT: Fix printer dialog
Fix EXC_BAD_ACCESS error by using printer variable.


(cherry picked from commit ea20002a07)
2021-06-09 05:34:56 +00:00
Gerald Combs 61c2ba5b16 [Automatic update for 2021-06-06]
Update manuf, services enterprise numbers, translations, and other items.
2021-06-06 09:53:22 +00:00
Christian Reusch 9eb1c665c6 tcp: Fix dissection of DSACK
DSACK blocks (the first SACK block in a TCP SACK option, with right edge
being lower or equal to the ACK filed) are now identified correctly.

Closes #17315


(cherry picked from commit 7179e1d1fb)
2021-06-05 10:17:05 +00:00
Guy Harris 57776c7641 file-pcapng: fix name of expert info.
The entry was copied and pasted, and the variable name and descriptive
text were changed, but the field name wasn't.


(cherry picked from commit deb6786ed4)
2021-06-04 22:11:44 +00:00
Simon Barber 793d971db2 ieee80211_radio: Use calculated bitrate if not supplied
For 802.11n if the bitrate is not supplied then the calculated bitrate is used. This change does the same for 11ac and 11ax.

Sniffer traces taken on recent versions of Macos no longer supply the bitrate for 11ac frames in the RADIOTAP header, this change allows the wireless timeline to work with these traces.

Fixes #17419.


(cherry picked from commit 5202119239)
2021-06-02 21:48:43 +00:00
Gerald Combs 17a3789ad8 GitLab CI: Move dfilter list generation.
Create the display filter list in the APT Test step.
2021-06-02 13:05:21 -07:00
Gerald Combs fd6a83dfec Version: 3.4.6 → 3.4.7
[skip ci]
2021-06-02 12:23:39 -07:00
Gerald Combs 6357ac1405 Build: 3.4.6
[skip ci]
2021-06-02 10:40:21 -07:00
Guy Harris 65a554b976 pcapng: set the length of the options item.
It runs up to either the end of the option data or the terminating
end-of-options option (readers MUST handle lists of options that
contains an end-of-options option and lists of options that don't).


(cherry picked from commit 2f5c0ffdb2)
2021-06-02 02:17:03 +00:00
Guy Harris 73fe213954 ascend: set rec->rec_type.
REC_TYPE_PACKET is 0, so if it's been initialized to 0, and never gets
overwritten, this fixes code withotu fixing a visible bug, but it should
be done anyway.

(backported from commit 162251176a)
2021-05-31 03:03:35 -07:00
Gerald Combs e8938c10a2 [Automatic update for 2021-05-30]
Update manuf, services enterprise numbers, translations, and other items.
2021-05-30 17:37:02 +00:00
Pascal Quantin 225352970b Windows: upgrade Npcap to 1.31 2021-05-29 12:48:58 +02:00
Gerald Combs 389025227e Prep for 3.4.6 2021-05-28 16:08:48 -07:00
João Valverde 7308ab766b dfilter: Fix handling of escaped quotes in macros
We can't unescape characters when expanding a display filter macro.
The escaping must be preserved until the expression is evaluated in
the display filter engine, otherwise it will likely generate a syntax
error in the parser.

In the macro body we allow '$' (or any other char) to be escaped
with backslash (preserving the backslash).

Fixes #17160.


(cherry picked from commit 1dba58789d)
2021-05-28 11:17:03 +00:00
Gerald Combs e6eb1d7370 Tools: Show only filenames when fuzzing.
Show only the basename of each capture file when fuzzing, which is less
noisy than the full pathname.


(cherry picked from commit 4266e1e9ba)
2021-05-27 21:55:04 +00:00
John Thacker 0d8be1fb79 DVB-S2-BB: Prevent infinite loop
Commit 4bf4ee88f0 removed an else
statement that broke out of the BBFrame processing loop. Without
it, infinite loops might be possible if the GSE frames have bit errors
in the length field.


(cherry picked from commit 0137c24d60)
2021-05-26 04:54:11 +00:00
John Thacker b20a77698d ftype-protocol: Fix crash when comparing _ws.expert to literals
The ftype-protocol has two components to its value - a tvb, which is
allowed to be be NULL (most notably in _ws.expert), and a string
description. They can also be created from string literals, such as
in display filters. It's possible to compare protocols with a NULL
tvb with protocol terms created from literals, e.g. entering the
display filter "_ws_expert < 1".

Partially revert 69e2603c48 so that
this doesn't crash, by assigning proto_string to the empty string
instead of null when creating from a literal. Fixes #17316


(cherry picked from commit 31297dbb82)
2021-05-25 23:09:21 +00:00
Gerald Combs 13546c7a18 CMake: Update autogen properties.
Set the AUTOMOC, AUTOUIC, and AUTORCC properties for the qtui and
wireshark targets to match what we currently do in master. This should
keep us from running moc and uic on unwanted targets.
2021-05-25 21:58:05 +00:00
Pascal Quantin 113062025d Qt: fix some Qt 5.15.2 deprecation warnings
(cherry picked from commit fb2414ae6d)
2021-05-25 20:28:48 +00:00
Gerald Combs 1d22f8f6b6 Release notes: The Windows installers now ship with Qt 5.15.2. 2021-05-25 12:44:08 -07:00
Gerald Combs 6da1114152 GitLab CI: Enable ccache for fuzz builds.
Enable ccache for our fuzz builds. Add sections as described at
https://docs.gitlab.com/ee/ci/jobs/#expand-and-collapse-job-log-sections
for the CMake step as well.


(cherry picked from commit 02f4dcb0ad)
2021-05-25 18:43:34 +00:00
John Thacker ffe59d91a1 RANAP: Don't attempt to re-register heuristic dissectors
Move the RANAP heuristic dissector registration under the initialization
guard that they're only registered once. Prevents console warnings about
the dissectors already being registered to the sccp and sua tables if
a RANAP preference is changed. (Backported manually to regenerate the
dissector via asn2wrs.py)
2021-05-24 19:43:20 -04:00
Guy Harris 67ca5e98c7 k12: plug a memory leak.
If the two putative number-of-records values don't match (meaning one of
them is presumably the number of records and the other one isn't - we
don't know which is the case), free up the private data structure we
allocated before returning an error.


(cherry picked from commit 7f6c5d0137)
2021-05-24 06:39:33 +00:00
Guy Harris 7438c67f06 erf: set USERAPPL if we have the application version but not the name.
Just say "(Unknown application) <version>".

This also means that we don't leak the app_version string if there's no
app_name string.


(cherry picked from commit 297b6c5407)
2021-05-24 04:46:47 +00:00
Guy Harris ac7673bd0a netscaler: plug a memory leak.
Free the read buffer if the first read fails.


(cherry picked from commit 976ccc9a00)
2021-05-24 01:16:32 +00:00
Guy Harris 7c969e2deb tacacs: free a buffer if it's not used.
Plugs a leak.


(cherry picked from commit 1bb64b7e0c)
2021-05-24 00:28:05 +00:00
Guy Harris f032d776e6 dnp: plug a memory leak.
If we're throwing away the data, *throw away the data* - free it, as
we're not using it as the backing data for a tvbuff.


(cherry picked from commit 618661b22e)
2021-05-23 22:08:25 +00:00
Gerald Combs 191e6744f9 [Automatic update for 2021-05-23]
Update manuf, services enterprise numbers, translations, and other items.
2021-05-23 16:20:18 +00:00
Guy Harris ecf1616e35 OID handling: fix a memory leak.
There's a "break" in some code that appears to be copied and pasted from
a switch statement; the break would exit the loop (and leak memory
allocated within the loop), which does not appear to be the intent, so
it may have been copied over incorrectly.  Remove it.

While we're at it, redo the "constant-time append to the end of a loop"
code to be a bit clearer, both to humans reading the code and code
analyzers reading the code.


(cherry picked from commit c73ab16bef)
2021-05-23 09:54:43 +00:00
Guy Harris faea31d0a1 epl-profile-parser: plug a memory leak.
g_key_file_get_groups() returns a pointer to g_mallocated data; we need
to pass its return value to g_strfreev() when we're done with that data,
to free it up.


(cherry picked from commit 64f3f08702)
2021-05-23 07:27:31 +00:00
Guy Harris 54b8952150 Plug another leak.
If cf_export_specified_packets() succeeds, and it wrote to a temporary
file, it leaks the name of the file to which it was writing.  Free that
after we've renamed that file on top of the target file (safe save).


(cherry picked from commit 8ca86b29bf)
2021-05-23 02:23:09 +00:00
Guy Harris 93e794c373 Plug a memory leak.
If the user aborted the process of exporting packets, if we're writing
to a temporary file, we unlink the file, but we don't free the
g_mallocated name of the file, so it's leaked.  Free it.


(cherry picked from commit 54508703b0)
2021-05-22 19:44:34 +00:00
Guy Harris d072335658 fuzzshark: close a leak.
If init_progfile_dir() fails, it returns a g_mallocated string with an
error message.  After printing the error message, free the string.


(cherry picked from commit c22b857942)
2021-05-22 02:57:49 +00:00
Guy Harris 0e6c7c7bb2 protobuf: close another leak.
Close the directory handle we've opened before returning a failure
indication if pbw_load_proto_file() or load_all_files_in_dir() reports a
failure.


(cherry picked from commit f0abd29e48)
2021-05-22 02:35:02 +00:00
Guy Harris 161e765500 protobuf: close a leak when file loading fails.
Free the path we've constructed before returning a failure indication if
pbw_load_proto_file() or load_all_files_in_dir() reports a failure.

Also, explicitly compare pbw_load_proto_file()'s return value against 0,
to make it a little clearer that it's *not* a Boolean, it's a return
code (with 0 meaning success and different non-zero values meaning
failure; if it matters *which* failure it is, we should probably have
otherwise we should just make it a Boolean).


(cherry picked from commit f1ffe7d421)
2021-05-22 02:02:52 +00:00
Nardi Ivan 4a17759938 QUIC: improve handling of unencrypted padding data
0af60377b4 added an heuristic to detect (unencrypted) padding data;
it is based on the fact that all coalesced QUIC packets must have the
same CID.
Unfortunately it doesn't work when the CID length is 0.

Treat decryption error of SH packets as a non fatal error, report them
as possible padding data misdetectd as coalesced packets and try
decrypting next traffic.

Close #17383

(cherry picked from commit 389a899a18)
2021-05-20 11:50:48 +00:00
Guy Harris dd0c60a001 AUTHORS.src: fix Jeffrey Wildman's entry.
[AT]ify his email address.

This should address the recently-added problem mentioned #16658.
2021-05-19 14:56:30 -07:00
Guy Harris 82b0eac6af PortsModel: don't populate it by doing a lot of weird string-pushing.
When enumerating port-to-name entries, the callback to
wmem_map_foreach() gets passed:

- a key, which is the port number for the entry;
- a value, which is a pointer to a structure containing pointers to port
names for various transport protocols;
- a user data pointer.

That's sufficient (if you work around some C++ annoyances) to append a
row to a PortsModel, if the user data pointer is a pointer to the
PortsModel.

The existing code, instead, appended to a QStringList of lines (in
effect, undoing the effort of the code that read the services file and
filled in the wmem_map, re-generating a set of lines) in the callback,
and then iterated over all the lines, splitting them with blanks and
appending rows.

Looking at that made my eyeballs bleed so badly that I decided not to
spend any time figuring out why it wasn't working.

So I just make the callback just append rows, avoiding all the
string-pushing.

Fixes #17395.


(cherry picked from commit 6e95a0aa47)
2021-05-18 09:41:00 +00:00
Gerald Combs 4a5dece155 [Automatic update for 2021-05-16]
Update manuf, services enterprise numbers, translations, and other items.
2021-05-16 09:53:30 +00:00
Gerald Combs 5254d5e822 Tools: Try to exit more gracefully from fuzzing.
If we catch a signal while we're fuzzing, exit with a successful status
and clean up after ourselves.


(cherry picked from commit dacbfc4ae9)
2021-05-11 18:23:15 +00:00
Gerald Combs b45185f1c0 [Automatic update for 2021-05-09]
Update manuf, services enterprise numbers, translations, and other items.
2021-05-09 09:53:41 +00:00
Gerald Combs 28aecbba66 GitLab CI: Set our Clang version. 2021-05-08 09:30:33 -07:00
Gerald Combs 728ae2de5f GitLab CI: Fix our fuzzing resource group. 2021-05-07 17:09:42 -07:00
Gerald Combs 2410d8b6eb GitLab CI: Add fuzzing to the 3.4 branch.
Backport part of d7bdd77a4c, which adds a -t option to
tools/fuzz-test.sh which lets you specify a maximum fuzz time.

Copy over the current (as of 7c6df3848f) fuzz jobs from the master
branch.
2021-05-07 14:09:10 -07:00
Gerald Combs 66cba93e39 GitLab CI: Give our jobs proper names.
GitLab's job YAML parser allows spaces in key names and our jobs are
visible in the web UI, so give them proper names.
2021-05-07 20:11:37 +00:00
Gerald Combs c1cf92283c GitLab CI: Restore the ability to run pipelines from the web UI.
(cherry picked from commit bedf0eb21c)
2021-05-07 19:26:51 +00:00
Gerald Combs 219978c50d GitLab CI: Miscellaneous updates.
Copy over various updates from the master branch including:

- Setting a git clone depth.
- Running manually in forks.
- Rule reuse.
- Using "extends" instead of YAML anchors.
2021-05-04 15:56:16 -07:00
Gerald Combs b191395e0e [Automatic update for 2021-05-02]
Update manuf, services enterprise numbers, translations, and other items.
2021-05-02 09:36:02 +00:00
Guy Harris 347f60c37b tap_export_pdu: we don't have packet flags, don't claim that we do.
We don't set rec.rec_header.packet_header.pack_flags, so don't set
WTAP_HAS_PACK_FLAGS in the presence flags.  (Copy-and-pasteo?)


(cherry picked from commit faf2e62db8)
2021-04-29 21:55:16 +00:00
Uli Heilmeier ab13858b7f PTP: Check for enough bytes
Make sure we have enough bytes for Length and Type fields before we read
from tvb.
Using existing msg_len for the checks.

Closes: wireshark/wireshark#17355


(cherry picked from commit fd14396972)
2021-04-26 14:11:04 +00:00
Gerald Combs aa169ab224 [Automatic update for 2021-04-25]
Update manuf, services enterprise numbers, translations, and other items.
2021-04-25 09:52:21 +00:00
Gerald Combs 31a3ec04a8 Version: 3.4.5 → 3.4.6.
[skip ci]
2021-04-21 11:56:15 -07:00
Gerald Combs 7db1feb42c Build: 3.4.5
[skip ci]
2021-04-21 10:14:36 -07:00
Gerald Combs 6548abd191 Prep for 3.4.5. 2021-04-20 11:21:00 -07:00
Gerald Combs 04f9d3e097 MS-WSP: Don't allocate huge amounts of memory.
Add a couple of memory allocation sanity checks, one of which
fixes #17331.


(cherry picked from commit b7a0650e06)
2021-04-20 16:05:59 +00:00
Gerald Combs 19d03ef4ac CMake: Enable AUTO{MOC,UIC,RCC} according to our CMake version.
As noted in be2b0fc810, we need to set CMAKE_AUTO* before searching for
Qt packages when using 3.20.0 and later. However, this fails if we're
using CMake 3.9.6 or earlier. Set CMAKE_AUTO* where needed depending on
our CMake version.

Ping #17314.

(cherry picked from commit a80ea46ff7)

Conflicts:
	ui/qt/CMakeLists.txt
2021-04-19 12:27:02 -07:00
naf eee907aeb5 QT ByteViewText: calculate string widths consistently to prevent clipping
For QT >5.11, stringWidth() uses horizontalAdvance, which gives different
(longer) widths than the old boundingRect().width() method.

Other locations use the boundRect().width() method directly, resulting
in underestimating line widths and clipping the last characters in
the byte view window.

Fix by forcing all width calculations to use stringWidth().
Closes #17087.

(cherry picked from commit 95f3d1b075)

Conflicts:
	ui/qt/widgets/byte_view_text.cpp
2021-04-19 20:08:17 +02:00
Gerald Combs cc954fae7e [Automatic update for 2021-04-18]
Update manuf, services enterprise numbers, translations, and other items.
2021-04-18 09:52:11 +00:00
Stefan Metzmacher e49430b4d3 packet-ldap: fix regression for SASL handling
commit 19b3376a24
("LDAP bogus malformed errors: decoding encrypted data")
introduced 2 problems:

- guint decr_len = tvb_reported_length(decr_tvb); was
  always called with decr_tvb==NULL

- dissect_ldap_payload() was not called if sasl_tree is NULL,
  it needs to be called even if the tree pointer are NULL
  in order to have the COL_INFO setup correctly.

I guess this should also be backported to stable branches
(together with 2e6d3b571b
 "LDAP: SASL Buffer doesn't include Length field")

https://gitlab.com/wireshark/wireshark/-/issues/17347

Signed-off-by: Stefan Metzmacher <metze@samba.org>


(cherry picked from commit 1d623fd541)
2021-04-16 11:53:00 +00:00
Uli Heilmeier 0c1743656f LDAP: SASL Buffer doesn't include Length field
SASL Buffer starts after the SASL Buffer Length field. Therefore
we should only mark the bytes without the Length field.

Sample capture can be found in wireshark/wireshark#15128


(cherry picked from commit 2e6d3b571b)
2021-04-16 11:03:16 +00:00
Simon Holesch d28ded7244 ptvcursor: Fix crash with deeply nested subtrees
If the proto tree is more than 8 levels deep, the subtree_lvl array
length is extended, by allocating a new area and copying everything into
that new area. However the old array length wasn't calculated correctly,
so only part of the subtree_lvl array was copied, causing a crash after
two ptvcursor_pop_subtree() calls.


(cherry picked from commit fa483ac191)
2021-04-16 07:44:56 +00:00
Michael Tuexen 489fc40a49 Fix conversation table when using epoch based time
Ensure that if using tshark -q -t e -z conv,tcp the reported
start time is relative to the epoch time and not relative to
the time of the first packet in the capture file.

Thanks to Theresa Enghardt for reporting the issue and to
Peter Lei for initialy looking into it.

(cherry picked from commit f099bd179a)
2021-04-15 14:27:02 +02:00
Gerald Combs cb432b878e [Automatic update for 2021-04-11]
Update manuf, services enterprise numbers, translations, and other items.
2021-04-11 09:53:17 +00:00
Guy Harris cdca1f2d03 pcapng: expand a comment and tweak the version test.
Drop in the comment from libpcap about version 1.2 (I wrote that
comment, and generously double-license it under the BSD license and the
GPL :-)).

Redo the version test as

    if (!({version is one we handle}))

to match the way it's done in libpcap.


(cherry picked from commit 7de6b0822a)
2021-04-09 06:31:05 +00:00
Loris Degioanni 716dd09605 sysdig: a couple more fixes
- parse the number of system call arguments in a way that works for both V1 and V2 event blocks
- returned the correct error string when unable to read the nparams entry from a sysdig event block V2

(cherry picked from commit 7894b1d0ea)
2021-04-08 22:09:56 -07:00
Loris Degioanni 4e7df5af01 sysdig: implementation fixes
- make sure nparams is initialized
- validate block_total_length in the correct way for sysdig event blocks

(cherry picked from commit cbbe660504)
2021-04-08 22:08:04 -07:00
Loris Degioanni 180c96beb8 sysdig: simplified the separate handling of the two different sysdig block types
(cherry picked from commit 8c70dd8d17)
2021-04-08 22:05:47 -07:00
Loris Degioanni e94d9f4549 sysdig: support the most recent version of sysdig
Update the pcap-ng reader and sysdig event dissector to support the second version of the sysdig event block, which was introduced after Wireshark's original implementation

(cherry picked from commit fbe8d3a00f)
2021-04-08 21:58:20 -07:00
Gerald Combs 1be17e2d30 GitLab CI: Switch to our new Windows runner.
(cherry picked from commit 85b36ef4b6)
2021-04-04 22:53:46 +00:00
David Perry f1677bd31c maxmind: add optional synchronous lookups
When tshark enables synchronous resolution of IP addresses to names,
forces calls to maxmind_db_lookup_ipv4()/_ipv6() to block-wait for the
maxmind response.

Proposed fix for #14691.

(backported from commit c0abaa06f7)
2021-04-04 02:16:48 -07:00
Vahap Emin Agaogullari 3e35fecccb PROFINET: Multiple write in record dissection
COContainerContent dissects PDInterfaceMrpDataAdjust and
PDInterfaceMrpDataAdjust dissects remaining COContainerContent
because of offset problem. Offset problem is fixed.

(cherry picked from commit ccec04ede0591a5e83d2664c26ed5cb4481a6809)
(cherry picked from commit ecbe04e0bbc6634eaa6c54968870fee61760107c)
2021-03-31 17:22:27 +00:00
Guy Harris 4a7ddb6b1a tvbuff_subset: fix its implementation of string scanning.
Both subset_find_guint8() and subset_pbrk_guint8() pass the parent
tvbuff to tvb_find_guint8()/tvb_ws_mempbrk_pattern_guint8(), along with
the offset in that tvbuff.

That means that the offset they get back is relative to that tvbuff, so
it must be adjusted to be relative to the tvbuff *they* were handed.

For subsets of frame and "real data" tvbuffs, there's a single lump of
data containing the content of the subset tvbuff, so they go through the
"fast path" and get the offset correct, bypassing the broken code;
that's the vast majority of calls to those routines.

For subsets of *composite* tvbuffs, however, they don't go through the
"fast path", and this bug shows up.

This causes both crashes and misdissection of HTTP if the link-layer is
PPP with Van Jacobson compression, as the decompression uses composite
tvbuffs.

Fixes #17254 and its many soon-to-be-duplicates.


(cherry picked from commit 2ba52cdc0e)
2021-03-29 01:20:38 +00:00
Gerald Combs 636f7f1c09 [Automatic update for 2021-03-28]
Update manuf, services enterprise numbers, translations, and other items.
2021-03-28 09:54:39 +00:00
Guy Harris 193b1fc545 wslua_tvb: correctly trim off the end of a tvbuff.
The length specified in a TvbRange is the *actual packet length*, not
the *sliced-to* length, so use tvb_new_subset_length() to cut it short.

This fixes the fix for #15655, and addresses at least some of the issues
in #17255.


(cherry picked from commit cda18f951e)
2021-03-28 03:01:34 +00:00
Gerald Combs 6ef6e8f607 CMake: Enable AUTO{MOC,UIC,RCC} earlier.
Enable CMAKE_AUTOMOC, CMAKE_AUTOUIC, and CMAKE_AUTORCC before searching
for Qt packages. This is apparently required for CMake 3.20.0 and later.
Fixes #17314.

(cherry picked from commit be2b0fc810)

 Conflicts:
	ui/qt/CMakeLists.txt
2021-03-26 14:50:21 -07:00
Nardi Ivan 3bca4e3b3f SMB2: fix two memory leaks
* Since c3342930 we don't free anymore the entries in the files hashtables.
The cleanest solution is probably to convert these hashtables into two
wmem_map_t structures and let the wmem core handling any cleanup.

* b0f5b2c174 added supported for chained compression; the uncompressed
tvb must be freed


(cherry picked from commit e677a909e1)
2021-03-25 16:01:01 +00:00
Uli Heilmeier 6b072b63f0 DNS: Fix pointer for is_multiple_responses
As discussed in wireshark/wireshark!2497 there is no need
for a pointer to a pointer.


(cherry picked from commit 337bdf8eb3)
2021-03-23 15:35:55 +00:00
Uli Heilmeier 06e20df535 DNS: IXFR/AXFR queries with multiple responses
IXFR and AXFR queries can have multiple DNS responses. As all responses
belong to one transaction, they have the same transaction ID.

We shouldn't handle them as retransmits.

Fix: wireshark/wireshark#17293
(cherry picked from commit 07fb47111e)
2021-03-23 11:49:13 +00:00
Guy Harris 878e8058a6 Do the LFS checks before processing any subdirectories.
That's necessary in order to make sure that the required -D flags show
up when building code from all subdirectories.

(cherry picked from commit 3f556a6e76)
2021-03-22 19:39:50 -07:00
Guy Harris d0fdecc6b6 Replace the Large File Support CMake stuff.
The existing stuff doesn't appear to work (I tried it on 32-bit Ubuntu
18.04, and it did *not* add any flags to the compilation, as it appeared
not to conclude that they were necessary, even though they were).

Pull in the stuff from libpcap, which *does* appear to work.  (it does
so in my 32-bit Ubuntu testing).

This should fix #17301.

While we're at it, fix cppcheck.sh so that it doesn't attempt to run
cppcheck on files that have been deleted.

(cherry picked from commit 0cc59d38ab)
2021-03-22 12:38:48 -07:00
Gerald Combs 76f01ea726 [Automatic update for 2021-03-21]
Update manuf, services enterprise numbers, translations, and other items.
2021-03-21 09:57:41 +00:00
Darius Davis b2d8858b9a Minor doc cleanups.
Here's a grab bag of trivial cleanup to the documentation.  This change:

- Cleans up some comments in the asciidoctor macros which are no longer
  accurate (and do not appear in the build products anyway).

- Fixes a missing space in the text "Wireshark Q&A" in the release notes.

- Allows the "docbook" backend to produce hyperlinks too... That seems to be
  necessary if we want to start using our custom link macros in WSDG, which
  seems like a reasonable thing to do.  And fixes up a wrong variable name in
  the handling of the case where we are not able to produce a hyperlink.


(cherry picked from commit 4c513fb4ab)
2021-03-20 17:31:42 +00:00
Guy Harris f63d93957d caputils: pull the includes out of extern "C" { ... }.
Have separate #ifdef HAVE_LIBPCAP ... #endif sections for the includes
and the definitions/declarations.

(There are no good solutions that don't require hopping in a time
machine and changing history.)


(cherry picked from commit 5a4cb7ce33)
2021-03-18 04:52:55 +00:00
Guy Harris fcefe78a67 caputils: get rid of the extern "C" { idiom.
Instead, declare each function with EXTERN_C, #defined as extern "C" in
C++ and just extern in C.

This avoids all the thrashing to try to keep headers outside extern "C"
{ by the simple expedient of not *having* extern "C" {.


(cherry picked from commit 4584b9d1d3)
2021-03-17 23:15:57 +00:00
Dario Lombardo 2974b30150 caputils: fix compilation without pcap.
The extern declaration must be put outside the ifdef to match the
closing statement as well as surrounding al the functions.

Fixes: 2820156fbd (Move still *more* headers outside of extern "C".)


(cherry picked from commit 9ca121bcf8)
2021-03-17 22:45:12 +00:00
Guy Harris 95c7c1c0f2 kerberos: regenerate packet-kerberos.h.
We updated the template; regenerate the header.


(cherry picked from commit 7efb2120bc)
2021-03-16 22:42:49 +00:00
Guy Harris b5d65c0074 Move still *more* headers outside of extern "C".
If a header declares a function, or anything else requiring the extern
"C" decoration, have it wrap the declaration itself; don't rely on the
header itself being included inside extern "C".

(cherry picked from commit 2820156fbd)
2021-03-16 15:03:17 -07:00
Guy Harris 0b8c953533 Move even more headers outside extern "C".
If a header declares a function, or anything else requiring the extern
"C" decoration, have it wrap the declaration itself; don't rely on the
header itself being included inside extern "C".

(cherry picked from commit e434d404d0)
2021-03-16 11:35:00 -07:00
Guy Harris f1f937dd26 Move more headers outside extern "C".
If a header declares a function, or anything else requiring the extern
"C" decoration, have it wrap the declaration itself; don't rely on the
header itself being included inside extern "C".


(cherry picked from commit 1e1f4e6b5f)
2021-03-16 11:21:16 +00:00
Michal Ruprich d0e6ad310b Moving glib.h out of extern C
(cherry picked from commit c8246c9973)
2021-03-16 02:07:58 -07:00
Guy Harris f6cfb8362c debian-setup: include GCC and G++ in the basic list.
At least on my just-now-installed Kubuntu 20.04 VM, G++ wasn't installed
by default, and you need that to compile Wireshark (you can avoid it if
you're not building the GUI code, but the GUI code is Qt-based, so it's
in C++).  Add both GCC and G++ to the basic list.


(cherry picked from commit 5f0dc153dd)
2021-03-15 04:59:42 +00:00
Guy Harris 82f93c42f7 Fix the captions for the buttons in the "export specified packets" dialog.
The "Selected packet" caption is wrong, as there could be more than one
packet selected.  Furthermore, in the non-Windows "export specified
packets" dialog, the caption is "Selected packets only", so go with the
full caption.

The "Marked packets" caption also lacks the "only" that it has in the
other dialog; add it as well.


(cherry picked from commit f785cf5340)
2021-03-15 00:40:42 +00:00
Guy Harris 7e0360206e Clean up "Export PDUs to File" code.
Combine exp_pdu_file_open() is called only by do_export_pdu(); just
combine them into one routine.

Get rid of the exp_pdu_t * argument to do_export_pdu(); instead, have
the exp_pdu_t structure be a local variable in that routine.  There's no
need to initialize exp_pdu_data.pkt_encap in
ExportPDUDialog::on_buttonBox_accepted() - do_export_pdu() already does
so.

The return value of do_export_pdu() isn't used; don't return anything.

(backported from commit 01151ec332)
2021-03-14 07:21:53 -07:00
Gerald Combs 6cbf30fa88 [Automatic update for 2021-03-14]
Update manuf, services enterprise numbers, translations, and other items.
2021-03-14 12:55:16 +00:00
Guy Harris 3d9603e051 tap_export_pdu: free err_info for WTAP_ERR_INTERNAL.
WTAP_ERR_INTERNAL also returns an err_info script describing the
internal error, so it should be freed to avoid leaking it.


(cherry picked from commit d4c55ba464)
2021-03-14 09:37:35 +00:00
Guy Harris 7a7da50fc3 pcapng: make sure the packet encapsulation matches the interface encapsulation.
If an attempt is made to write a packet with one encapsulation for an
interface with a different encapsulation, report an internal error.


(cherry picked from commit 610dffbb19)
2021-03-14 08:20:47 +00:00
John Thacker 4482949ddc export_pdu: set pkt_encap to a WTAP_ENCAP value, not a pcap LINKTYPE_ value.
rec.rec_header.packet_header.pkt_encap expects WTAP encapsulation types,
not PCAP encapsulation types, so don't call
wtap_wtap_encap_to_pcap_encap().

Also, set the output file encapsulation, and the link-layer type of the
fake interface, to exp_pdu_tap_data->pkt_encap rather than wiring it to
WTAP_ENCAP_WIRESHARK_UPPER_PDU (we set exp_pdu_tap_data->pkt_encap to
WTAP_ENCAP_WIRESHARK_UPPER_PDU, but this is a bit cleaner).

(backported from commit ea60a57826)
2021-03-13 23:18:12 -08:00
Guy Harris 53a7984431 tshark: clean u the way the -U option lists available taps.
Allow "-U ?" as well as an empty argument; an empty argument is a bit
counterintuitive.

Simplify the introductory line of output - asking for a list of taps
isn't an error in which the user failed to supply a tap name, it's a
case where the user suplied a request for a list of tap names.

Just use fprintf() to print the list, and indent the elements of the
list, as we do with other lists of valid arguments.

List the valid arguments if the user specified an invalid argument as
well.


(cherry picked from commit 9bd144b8ea)
2021-03-13 23:49:44 +00:00
Guy Harris 392d01c2cc tshark: fix handling of "you're writing to a closed pipe" errors on Windows.
On Windows, a write to a pipe where the read side has been closed
apparently may return the Windows error ERROR_BROKEN_PIPE, which the
Visual Studio C library maps to EPIPE, or may return the Windows error
ERROR_NO_DATA, which the Visual Studio C library maps to EINVAL.

So, on Windows, for errors other than the ones for which we're reporting
a special error message, check for EINVAL with a *Windows* error of
ERROR_NO_DATA and, if that's what we have, don't print an error message;
otherwise, print an error message that reports a message based on the
Windows error (rather than a relatively uninformative "Invalid argument"
error).

This should fix issue #16192.

Clean up indentation while we're at it.


(cherry picked from commit 1eb4a62dbc)
2021-03-13 12:58:18 +00:00
Alexis La Goutte 20a013b835 NAN(WiFi): Fix wrong variable size
NDPE Attribute is not dissected

Issue (and fix) reported by Darren Chen

Closed #17278


(cherry picked from commit 73de7b1325)
2021-03-12 12:14:28 +00:00
Alexis La Goutte fbbaa3d03d EAP: fix a memory leak
(cherry picked from commit 20a6fea312)
2021-03-12 08:52:21 +00:00
Guy Harris fd940a364c pcapng: clean up pcapng_block_read().
Instead of pcapng_open() calling pcap_block_read() to do all the work of
reading the initial SHB, have it do the read of the initial SHB itself,
by calling the same routines that pcap_block_read() calls.

That way, pcap_block_read() doesn't have to be prepared to be called to
read that block, so it can treat all issues with an SHB that it reads as
errors, rather than possibly reporting them as "not a pcapng file", and
it doesn't have to support being called without a pointer to the
pcapng_t for the file being read, as it no longer ever is.  It can now
just return a gboolean success/failure indication.

That makes pcapng_open() a little more complicated but it makes
pcap_block_read() less complicated.

Fix some use of : as ' in comments, and fix some indentation, while
we're at it.

(backported from commit aab0bd12a5)
2021-03-11 03:52:01 -08:00
Dr. Lars Völker 3a657cb4fb TECMP: Adding missing reserved flag to timestamp (BUGFIX)
This patch fixes a bug in the current TECMP dissector that leads to
wrong timestamps, whenever the reserved flag is set to true.

Closes: #17279


(cherry picked from commit 5d709459c4)
2021-03-11 07:38:24 +00:00
Gerald Combs e8421b1a0e GitLab CI: Add a `tshark -G` artifact.
Dump `tshark -G fields` to a file and add it as an artifact. This
automates a step in the release process.
2021-03-10 23:56:12 +00:00
Guy Harris 580812874a pcapng: get rid of the local pcapng_t in pcapng_open().
Pass a null pointer to pcapng_read_block(), instead.  In
pcapng_read_block(), treat that as the indication that we're trying to
read the purported first SHB, rather than treating a null section_info
pointer as that indication.

This addreses one, but not all, of the problems reported in issue #17281.


(cherry picked from commit 7446a16247)
2021-03-10 22:32:57 +00:00
Martin Mathieson 2f7cf6e528 DECT: "tranceiver" -> "transceiver"
(cherry picked from commit 933e7f5eb6)
2021-03-10 22:04:47 +00:00
Gerald Combs 45aed9966c Version: 3.4.4 → 3.4.5.
[skip ci]
2021-03-10 12:26:33 -08:00
Gerald Combs c33f6306cb Build: 3.4.4
[skip ci]
2021-03-10 10:21:20 -08:00
Gerald Combs 144380001b Windows: Update our spandsp packages.
Use the versions of lrint and lrintf defined by Visual C++. This should fix

    91>C:\buildbot\builders\wireshark-master-64\wireshark-win64-libs\spandsp-0.0.6-win64ws\include\spandsp/fast_convert.h(320,5): error C2169: 'lrint': intrinsic function, cannot be defined (compiling source file C:\buildbot\builders\wireshark-master-64\windows-2019-x64\build\plugins\codecs\G726\G726decode.c) [C:\buildbot\builders\wireshark-master-64\windows-2019-x64\build\cmbuild\plugins\codecs\G726\g726.vcxproj]
    91>C:\buildbot\builders\wireshark-master-64\wireshark-win64-libs\spandsp-0.0.6-win64ws\include\spandsp/fast_convert.h(325,5): error C2169: 'lrintf': intrinsic function, cannot be defined (compiling source file C:\buildbot\builders\wireshark-master-64\windows-2019-x64\build\plugins\codecs\G726\G726decode.c) [C:\buildbot\builders\wireshark-master-64\windows-2019-x64\build\cmbuild\plugins\codecs\G726\g726.vcxproj]

for Visual C++ 16.9.1 and later.

(cherry picked from commit 4b07a92103)

Conflicts:
	tools/win-setup.ps1
2021-03-09 15:36:16 -08:00
Gerald Combs 733c52cc0b Prep for 3.4.4. 2021-03-08 11:00:46 -08:00
Gerald Combs f8acbe7598 [Automatic update for 2021-03-07]
Update manuf, services enterprise numbers, translations, and other items.
2021-03-07 10:33:11 +00:00
Nardi Ivan 0de80702bd GQUIC: fix parsing of unknown (but valid) tags
This commit should be a proper fix for the regression reported in #17250
(7fd71536 is a simple workaround). Such regression has been introduced by
b287e716 while fixing the infinite loop reported in #16897.

b287e716, while fixing the infinite loop, broke the decoding of perfectly
valid tags not yet supported by Wireshark.

AFAIK, the root cause of the infinite loop is the overflow of the `offset`
variable. Therefore checking for this overflow should be sufficient to avoid
the loop.
Note that we already check for sensible values for the 'tag_len' variable;
we should update `total_tag_len` accordingly.

Some words about testing: other than correctly handling unknown but valid
tags, it is important that this commit doesn't reintroduce the infinite
loop bug.
Fortunately #16897 provided a POC trace. Unfortunately, if you revert
b287e716, this POC doesn't work anymore in master-3.4 and master branches,
but it still triggers the infinite loop in master-3.2 branch.
Therefore I have been able to manually check that this MR + the
overflow check is enough to avoid the infinite loop bug, at least in master-3.2.

Some traffic with unknown but valid tags is available in e2ee14ae03.


(cherry picked from commit 142cfb03ac)
2021-03-01 16:10:34 +00:00
Gerald Combs 8c997a57da [Automatic update for 2021-02-28]
Update manuf, services enterprise numbers, translations, and other items.
2021-02-28 10:31:23 +00:00
Nardi Ivan 16bc7095b9 GQUIC: add decoding of CGST tag
Regression introduced by b287e7165e.

To avoid an infinite loop with malformed packets, that commit stops
parsing the tags list after finding an unknown tag.
When this "unknown" tag is perfectly valid but not supported by
Wireshark, we don't decode any subsequent (valid) tags anymore.

GQUIC is going to die soon and it is quite unlikely it will change in
the next future. Therefore the best/quick solution is simply decoding
any valid tag.

Close #17250


(cherry picked from commit 7fd7153696)
2021-02-24 19:45:30 +00:00
Guy Harris 4560ac0527 Lua: add routines to return pcap/nsec pcap/pcapng file type/subtypes.
These will be backported, for the benefit of Lua scripts that want those
specific file types/subtypes (typically in order to write files of those
types); that allows those types to be fetched without having to know the
right string to hand to wslua_wtap_name_to_file_type_subtype().

(cherry picked from commit bc3cc17bc4)
2021-02-23 00:10:40 -08:00
Gerald Combs 077a9c9354 [Automatic update for 2021-02-21]
Update manuf, services enterprise numbers, translations, and other items.
2021-02-21 10:31:58 +00:00
Gerald Combs 3fb8be3b91 NVMe Fabrics RDMA: Initialize a variable.
Make sure q_ctx is fully initialized. Fixes #17233.


(cherry picked from commit e29c934d72)
2021-02-16 08:49:37 +00:00
Gerald Combs b2c58d020c Be more strict about opening URLs.
In the proto tree, copy URLs instead of opening them.

In the export dialog, enable previews only if the advertised MIME type
*and* the contents of the file are plain text, GIF, JPEG, or PNG.

Add warnings to the wslua browser_open_url and browser_open_data_file
documentation.

Fixes #17232.


(cherry picked from commit e99c9afce8)
2021-02-15 16:50:02 +00:00
Guy Harris 5e1db6219a rpm-setup: install libgcrypt by default.
Wireshark now requires it.


(cherry picked from commit 3c404abf2c)
2021-02-15 10:02:14 +00:00
Chuck Craft 418c3360bf ip: ip_ttl _ws.expert fields not set if no tree
See 'if (tree) ...' comment
Closes #17228


(cherry picked from commit dde65b96cd)
2021-02-15 07:51:26 +00:00
Gerald Combs 24b27195f1 [Automatic update for 2021-02-14]
Update manuf, services enterprise numbers, translations, and other items.
2021-02-14 10:31:21 +00:00
Guy Harris 66e6f092f9 WSDG: deprecate wtap_filetypes.
Recommend the use of wtap_name_to_file_type_subtype() to get filetype
values, unless you need to run on older versions of Wireshark that don't
have it.

Don't even *mention* wtap_filetypes in the documentation for the new
wtap_ routines, as, if you have those routines, you have
wtap_name_to_file_type_subtype(), because it's one of those routines.

Fix references to "nul" while we're at it - it's "nil" in Lua.

(That part of the WSDG - the Lua reference - is generated, so this
involves changing the source code implementing the Lua routines.)


(cherry picked from commit 5b3c3d0682)
2021-02-14 06:35:08 +00:00
Guy Harris 3213fb0a19 iseries: report Unicode files as Unicode rather than ASCII.
While we're at it, that's "Unicode", not "UNICODE" - it's not an
initialism, and isn't all-caps.


(cherry picked from commit 8ec5906fd6)
2021-02-14 05:00:39 +00:00
Guy Harris b88fcfafd7 wiretap: remove spaces from file format names.
File format names are used on the command line, so don't require them to
be quoted - replace the space in "systemd journal" with an underscore.


(cherry picked from commit 8bba6ebe5c)
2021-02-13 18:58:00 +00:00
Jaap Keuter db364ed3d5 ASTERIX: fix dissection of I010_041 and I010_042 fields
Fixes #17226


(cherry picked from commit b9bdc803bb)
2021-02-13 14:52:33 +00:00
Guy Harris 3a60e4992d wslua: expose some libwiretap APIs in Lua.
Provide Lua version of wtap_file_type_subtype_string(),
wtap_file_type_subtype_short_string(), and
wtap_short_string_to_file_type_subtype().

This will be backported to the 3.2 and 3.4 branches, to allow scripts
not run on the bleeding-edge version to use them.


(cherry picked from commit f0ebc50762)
2021-02-13 05:48:04 +00:00
Gerald Combs 21f9f3f1f2 TShark: Load extcap preferences only when needed.
In our first pass through our options, look for ones that might require
extcap. Call extcap_register_preferences() only when that's the case.

Warn about missing extcap preferences only when we've loaded them.

(cherry picked from commit c7f66cf934)

Conflicts:
	tshark.c
2021-02-11 13:47:44 -08:00
Constantine Gavrilov 90ed3ff952 Fix dissection of transport connect payload for NVMEoF with RDMA.
(cherry picked from commit 28937e9022)
2021-02-11 10:17:39 +00:00
Guy Harris 108b84a591 dumpcap: don't mention Npcap if we're not using it.
(cherry picked from commit 99c712ff5a)
2021-02-09 20:14:39 +00:00
Guy Harris 098fe77ec6 dumpcap: provide more information to put into an Npcap bug.
Turn the sequence of details to supply in an Npcap bug into a list, with
one element per line, and provide the interface name, Windows version
string, and Npcap version string.  Put that into a common routine.


(cherry picked from commit b09514f3b3)
2021-02-09 07:53:03 +00:00
Guy Harris 089889acf2 dumpcap: use the display name in error messages.
That adds the description, if present, on UN*X, and replaces the ugly
GUID-based name with a friendly name on Windows.


(cherry picked from commit 9b771d2c14)
2021-02-09 04:23:06 +00:00
Guy Harris ab6fb92ba3 dumpcap: give details on how to fix Npcap bugs.
Give a whole bunch of details to put into the bug, in the (vain?) hope
that the user will put them in the bug, to try to help Daniel and
possibly Microsoft networking stack folk figure out what's happening.

(Remove an extra report_capture_error() left over from the previous
commit.)


(cherry picked from commit 37f5e0f7fd)
2021-02-09 01:10:15 +00:00
Guy Harris 34dbb3bc32 dumpcap: show the interface name in capture errors.
dumpcap can capture on more than one interface at a time.  If the
capture stops due to an error on an interface, report the name of the
interface on which the error occurred.


(cherry picked from commit b3db9e3aa1)
2021-02-08 23:49:56 +00:00
Guy Harris 375f76bdeb "The device has been removed." can happen if it has, indeed, been removed.
So only tell the user to report that as an Npcap bug if they *haven't*
removed the device.


(cherry picked from commit d28021cacb)
2021-02-08 23:05:22 +00:00
Guy Harris ebb55c3c02 dumpcap: look for "PacketReceivePacket error: .* (1617)".
The error message text for ERROR_DEVICE_REMOVED (1617) might be in the
user's language; just look for the numeric error code.


(cherry picked from commit 27cbb68525)
2021-02-08 22:30:46 +00:00
Guy Harris ebba9d3f45 dumpcap: improve some secondary error emssages.
For "PacketReceivePacket error: The device has been removed. (1617)",
report the error in that fashion, indicate that the interface is no
longer attached, *and* suggest that this may be an Npcap bug and that
the user should report it as such; give the URL for the Npcap issue
list.

For "The other host terminated the connection", report the error in that
fashion, and suggest that it might be a problem with the host on which
the capture is being done.

Hopefully this will mean fewer bugs filed as *Wireshark* bugs for those
issues.

(And, with any new capture API in libpcap, these should all turn into
specific PCAP_ERROR_ codes, to make it easier to detect them in callers
of libpcap.)


(cherry picked from commit 152fd1fdab)
2021-02-08 21:34:33 +00:00
Gerald Combs 653071f630 [Automatic update for 2021-02-07]
Update manuf, services enterprise numbers, translations, and other items.
2021-02-07 10:33:33 +00:00
Harald Welte 5b97f29a9a packet-fr: Register for SLL dispatch to Frame Relay dissector
Without this patch, any Linux cooked packet capture on HDLC / frame
relay devices will not be dispatched to the proper dissector.

Such packets do carry a proper sll_hatype set to ARPHRD_FRAD and should
be dispatched accordingly.  However, the packet-fr dissector so far
did not register itself accordingly.


(cherry picked from commit b83f92a458)
2021-02-05 23:05:34 +00:00
Jaap Keuter d742da0e53 SIP: Fix header Id mapping
Fixes #17215


(cherry picked from commit 7401dbaa82)
2021-02-04 20:35:32 +00:00
Gerald Combs e372771997 Docs: Change the default wsbuglink text to "Issue".
Change the default text in the AsciiDoctor wsbuglink macrom from "Bug"
to "Issue".


(cherry picked from commit 9177f0e71a)
2021-02-04 17:10:10 +00:00
João Valverde 003a730a20 Don't include config.h in system headers
Config.h must not be installed so configuration must be performed by client code.

Fixes #17190.


(cherry picked from commit 10178fdb09)
2021-02-03 14:56:33 +00:00
Jaap Keuter 49393cf362 S7COMM: remove array size from function interface
Fixes #17198


(cherry picked from commit 55d53dbf1b)
2021-02-03 08:22:49 +00:00
Dario Lombardo 39da36ad6e
ntp: remove size constraint for invalid refid.
When the refid contains non-ascii chars, the conversion function
returns a string longer than 4 chars. This results in an invalid
string if the output is limited to 4 bytes. Incidentally this
results in an invalid PDML output as well that caught this bug
in the first place.

Fix: #17112.
2021-02-02 11:36:27 +01:00
Gerald Combs 564a52be19 [Automatic update for 2021-01-31]
Update manuf, services enterprise numbers, translations, and other items.
2021-01-31 10:30:58 +00:00
Gerald Combs e0abfddcc5 Version: 3.4.3 → 3.4.4.
[skip ci]
2021-01-29 11:52:30 -08:00
Gerald Combs 6ae6cd335a Build: 3.4.3
[skip ci]
2021-01-29 10:10:04 -08:00
Gerald Combs b442b8d9d1 Prep for 3.4.3. 2021-01-28 18:30:47 -08:00
Gerald Combs 57e14a4190 USB HID: Avoid allocating a huge amount of memory (second try).
10204490d7 / MR 80 ensured that we didn't grow field.usages due to an
underflow, but it neglected to check for a sane array size. Add another
check to make sure we don't wmem_array_grow() too much. Fixes #17165 and
fixes #16809 more completely.


(cherry picked from commit 785e291c1b)
2021-01-28 22:20:52 +00:00
John Thacker 247f8a4b33 USB HID: Usage Minimum and Usage Maximum are inclusive
Usage Minimum and Usage Maximum are an inclusive, closed interval.
This fixes an fencepost error where the Usage Maximum value was
not being included as a possible value in the bitfield. Related
to #17014


(cherry picked from commit 5ca608f519)
2021-01-28 21:55:50 +00:00
Jaap Keuter 935de5c4eb ZVT: clean up some data points
(cherry picked from commit b4f74bac74)
2021-01-28 11:49:03 +00:00
Guy Harris 1b22b8ed51 epan: don't print nanoseconds if seconds isn't representable.
Fix for previous fixes to #17179.


(cherry picked from commit 4715f5021c)
2021-01-28 08:18:16 +00:00
Guy Harris 9bcc1785c1 epan: don't use gmtime_s().
It has the "feature" that, if handed a negative value, it might just
exit.  gmtime() doesn't have that "feature", and is sufficiently
thread-safe for our purposes; use it instead, and check to make sure it
doesn't return a null pointer.

The previous fix for #17179 still used gmtime_s(); this doesn't, so it's
a better fix for #17179.


(cherry picked from commit bf265d7e7a)
2021-01-28 06:58:45 +00:00
Guy Harris e072a71256 epan: don't assume gmtime_s() or gmtime_r() succeed.
At least on Windows, gmtime_s() will *not* succeed if passed a negative
value.

Fixes #17179.


(cherry picked from commit 4e4a7c11c7)
2021-01-28 06:17:57 +00:00
Jaap Keuter 303a7cc58f ZVT: Use standard TCP segment reassemble support function
Fixes #17177


(cherry picked from commit 616d44cbb6)
2021-01-28 00:00:50 +00:00
Gerald Combs e5478357e2 wiretap: Fixup the sdjournal block length in pcapng.
Fix our entry length check and put our trailing '\0' in the right
location. Fixes #17174.


(cherry picked from commit cd278f5fd9)
2021-01-27 07:58:38 +00:00
Grzegorz Niemirowski cbdee60912 Fix TID bitmap name
(cherry picked from commit 6a860c979a)
2021-01-26 07:19:49 +00:00
Gerald Combs 24f56bec53 USB HID: Fix a memory leak.
Replace mismatched g_strdup() + g_free()s with
wmem_strdup_printf(wmem_packet_scope(), ...). Fixes #17124.


(cherry picked from commit 26f0db01a7)
2021-01-26 00:45:32 +00:00
Gerald Combs 2248cba00c [Automatic update for 2021-01-24]
Update manuf, services enterprise numbers, translations, and other items.
2021-01-24 10:30:17 +00:00
Jim Young 1b8d89accd tshark: Fix typo in comment from ascci to ascii
(cherry picked from commit a7ad6c271f)
2021-01-24 06:23:06 +00:00
Enrique Giraldo edaa78ceac tshark: Unconditionally call extcap_register_preferences
extcap_register_preferences is only called with the -G option
(to dump information) and extcap preferences are not loading,
loading it unconditionally avoids this, as it is done in the
GUI startup.


(cherry picked from commit 506f1c650f)
2021-01-24 03:09:03 +00:00
Jason Cohen c8bc83cb9e f5ethtrailer: Some trailers are not detected
This corrects 2 issues with the detection heuristic for f5ethtrailers
causing trailers to be missed.

Fixes #17171
Fixes #17172

(cherry picked from commit b297afee3e)
2021-01-22 08:58:34 -06:00
Jaap Keuter 227ed8cced FC ELS: Fix address length of FCWWN address in logout message
Closes #17168


(cherry picked from commit 13e04a2192)
2021-01-22 11:51:50 +00:00
Pascal Quantin 4ea329548c NAS 5GS: fix display of IPv6 interface identifier
Do not use FT_IPV6 as an interface identifier could be wrongly identified
as an IPv4-Compatible IPv6 Address format by inet_ntop() and displayed
as such.

(cherry picked from commit f64eddfd01)

Conflicts:
	epan/dissectors/packet-nas_5gs.c
2021-01-20 15:49:11 +00:00
Pascal Quantin 632df36405 NAS EPS: fix display of IPv6 interface identifier
Do not use FT_IPV6 as an interface identifier could be wrongly identified
as an IPv4-Compatible IPv6 Address format by inet_ntop() and displayed
as such.


(cherry picked from commit b794e4798a)
2021-01-20 15:28:41 +00:00
Guy Harris 79b075365f Don't dereference a known-to-be-null pointer.
In dump_dfilter_macro_t(), if the dfilter_macro_t pointer is null, just
give up after printing the message that indicates that.

This should squelch several nullPointerRedundantCheck warnings from
cppcheck.


(cherry picked from commit 05b9e53777)
2021-01-20 09:27:38 +00:00
Guy Harris 886465a976 Squelch "Clarify calculation precedence" warning from cppcheck.
For

        A & B ? C : D

put "A & B" in parentheses, to clarify the precedence.


(cherry picked from commit 138041b545)
2021-01-20 07:35:44 +00:00
Guy Harris 3ff5fc344f Squelch "Clarify calculation precedence" warning from cppcheck.
For

	A & B ? C : D

put "A & B" in parentheses, to clarify the precedence.


(cherry picked from commit 6b85987e4a)
2021-01-20 00:11:12 +00:00
Guy Harris 22cc9f3f7f dup() can fail; check whether it does.
If, for example, you run out of file descriptors, dup() can fail, and
ws_dup() is a wrapper around it on UN*X.  Don't just pass the result of
ws_dup() to ws_fdopen(); instead, save its result, check against -1 and,
if it's -1, give up, otherwise pass it to ws_fdopen().

This addresses Coverity CID 1471708.

Also, if ws_fdopen() fails, close the descriptor we got from ws_dup();
this closes a possible FD leak.


(cherry picked from commit 165792fb31)
2021-01-19 07:50:33 +00:00
Gerald Combs f8d662d787 Qt+tools: Fix most of our lupdate warnings.
Fix various warnings with the following changes:

Pass a list of include directories to lupdate. Fixes:

    ui/qt/proto_tree.cpp:57: Qualifying with unknown namespace/class ::ProtoTree

and similar warnings.

Use QT_TRANSLATE_NOOP instead of QT_TR_NOOP. Fixes:

    ui/qt/lte_rlc_statistics_dialog.cpp:993: tr() cannot be called without context
    ui/qt/lte_mac_statistics_dialog.cpp:911: tr() cannot be called without context
    ui/qt/font_color_preferences_frame.cpp:28: tr() cannot be called without context
    ui/qt/font_color_preferences_frame.cpp:29: tr() cannot be called without context
    ui/qt/font_color_preferences_frame.cpp:30: Discarding unconsumed meta data

Add Q_OBJECT to the class definition. Fixes:

    ui/qt/models/filter_list_model.cpp:120: Class 'FilterListModel' lacks Q_OBJECT macro

The following warnings were not fixed. This might require moving IOGraph
to its own file:

    ui/qt/io_graph_dialog.cpp:320: Qualifying with unknown namespace/class ::IOGraphDialog
    ui/qt/io_graph_dialog.cpp:555: Qualifying with unknown namespace/class ::IOGraphDialog
    ui/qt/io_graph_dialog.cpp:1059: Qualifying with unknown namespace/class ::IOGraphDialog
    ui/qt/io_graph_dialog.cpp:1485: Qualifying with unknown namespace/class ::IOGraphDialog


(cherry picked from commit 85a7938925)
2021-01-18 16:57:04 +00:00
Nardi Ivan c297de3b27 QUIC: improve error reporting
When unable to decrypt SH packets we should visualize an error, via
expert info. This way we handle SH and LH errors in the same way.

Close #17077


(cherry picked from commit 9faf6d4e7b)
2021-01-17 11:53:09 +00:00
Gerald Combs 48f42d78b1 [Automatic update for 2021-01-17]
Update manuf, services enterprise numbers, translations, and other items.
2021-01-17 10:29:07 +00:00
Dr. Lars Völker f4d5d56592 AUTOSAR-NM: True-False-String wrong way around for PNI (BUGFIX)
This patch fixes the PNI TFString, which was wrong. Correct is:
0 = "... contains no Partial Network ..."
1 = "... contains Partial Network ..."

Fixes #17154


(cherry picked from commit 238446dc91)
2021-01-14 13:39:46 +00:00
Pascal Quantin 9fd813398f Windows: add a notice to NSIS in case of BSOD while installing Npcap
(cherry picked from commit a07898a280)
2021-01-14 06:06:52 +00:00
Pascal Quantin b7e7e0b37f Windows: upgrade Npcap to 1.10 2021-01-14 00:06:47 +00:00
Pascal Quantin c6c0556b3a Windows: fix USBPcap page link display in NSIS installer
(cherry picked from commit 511aeaa44a)
2021-01-13 22:03:34 +00:00
Dr. Lars Völker 85320d2b80 DoIP: Adding 2019 DoIP Type
Adding ISO13400-2019 DoIP Version 3.


(cherry picked from commit 69710ff117)
2021-01-13 10:45:03 +00:00
Uli Heilmeier 75c00f6d0d SIP: Fix parsing of multiple contact-param
contact-params are optional (s. https://tools.ietf.org/html/rfc3261#section-20.10).
Therefore, independently of contact-params, we should also check for additional contact-param.

Fixes: wireshark/wireshark#13752


(cherry picked from commit 02f2d18b2e)
2021-01-13 09:32:31 +00:00
John Thacker a666035948 Qt: Make the checkSaveAsWithComment dialog box appear.
Set the parent of the QMessageBox in the constructor instead of calling
QMessageBox::setParent(). The latter inherits from QDialog, and it
"clear[s] the window flags specifying the window-system properties for
the widget (in particular it will reset the Qt::Dialog flag)."
(See https://doc.qt.io/qt-5/qdialog.html#details )
This makes the dialog properly appear instead of attempting to save a file
with comments to a file type that does not support comments silently failing.
Fixes #17146.


(cherry picked from commit fb422bed91)
2021-01-12 11:29:27 +00:00
Gerald Combs 0bb6c70189 [Automatic update for 2021-01-10]
Update manuf, services enterprise numbers, translations, and other items.
2021-01-10 10:31:22 +00:00
Eugene Adell 39f15f4d3f Just correct the documentation for this obvious mistake. Closes #17141.
(cherry picked from commit 9b0c3f5eaf)
2021-01-09 19:08:00 +00:00
Dr. Lars Völker d412877409 TECMP: Fixing wrong size of HW version in Status CM Msg (Bugfix)
The HW version is correctly parsed as 2 bytes but shown as 3 bytes in
the dissection. This is fixed here.

Fixes #17133


(cherry picked from commit 1546a0af26)
2021-01-06 17:04:51 +00:00
John Thacker 6f489ee857 macos-setup: Update CMake for Apple Silicon
Apple Silicon requires CMake 3.19.2, but the binaries provided
for 3.19.2 only run on MacOS 10.10 and later, so we have more
bifurcation of the CMake we try to install. Get rid of some of
the old 2.x paths to compensate.


(cherry picked from commit d74bfc569e)
2021-01-05 22:32:46 +00:00
Stig Bjørlykke ee43965024 Qt: Fetch OverlayScrollBar sliderPosition from the real ScrollBar
In OverlayScrollBar return the real ScrollBar sliderPosition to ensure
the correct value is used when handling the actionTriggered signal in
vScrollBarActionTriggered().

This improves turning on and off auto scroll during capture when page
stepping using the packet list slider, because the value is propagated
after this signal.


(cherry picked from commit 7980f25f99)
2021-01-05 08:24:25 +00:00
Orgad Shaneh c57c306762 TPNCP: Fix exception for commands/events without CID
+ Simplify length checks

(cherry picked from commit 4003a5f3ce)
2021-01-04 09:16:20 +02:00
Gerald Combs 0b17762519 [Automatic update for 2021-01-03]
Update manuf, services enterprise numbers, translations, and other items.
2021-01-03 10:29:33 +00:00
Orgad Shaneh e71ff74953 TPNCP: Misc fixes for backward compatibility
(cherry picked from commits d2abcb09c1
and 26a822c968)
2021-01-03 08:25:53 +00:00
Orgad Shaneh 1d6e13c12e TPNCP: Fix spelling
(partially cherry picked from commit
eef4ba7ed7)
2021-01-03 08:03:23 +00:00
Orgad Shaneh 417b694990 TPNCP: Update tpncp.dat
(cherry picked from commit a973416077)
2021-01-03 08:57:22 +02:00
Stig Bjørlykke 09d182d987 Qt: Connect QScrollbar::actionTriggered to OverlayScrollBar
This will fix the issue where auto scroll during capture is not turned
off when the scroll bar position is changed.


(cherry picked from commit a42ab09b72)
2021-01-02 22:10:45 +00:00
Stig Bjørlykke f95baf9c9c Happy New Year 2021
(cherry picked from commit 85bf15fd76)
2021-01-01 11:56:25 +00:00
Nardi Ivan 17b2a16b5a TLS: fix display of Google QUIC Version in Transport Parameters
(cherry picked from commit a23915c9a8)
2020-12-31 11:45:09 +00:00
Jirka Novak 4bbab577e7 voip_calls_dialog/voip_calls: Fix for #16952
The fix solves issue #16952. It reverts commit 88813716 which introduced memory leak which causes the issue. The original issue with duplicating entries is solved too.
Because commit was cherry picked to 3.4.0 (might be in more branches), this patch should be cherry picked too.


(cherry picked from commit 71e3969d63)
2020-12-29 20:03:55 +00:00
Jirka Novak 0985a2ef2a VoIP: VoIP calls statistics are cleared when retap is issued
Every press of Play Stream or Prepare Filter caused incorrect increasing
of Packets count and added Comments.
The reason was that callinfo statistics were not clear before recap
therefore all new values were added to exiting ones.
Patch solves it.


(cherry picked from commit ff3fffcf5c)
2020-12-29 19:36:52 +00:00
Valerii Zapodovnikov 89f62ccec2 DHCPv6: typo
(cherry picked from commit fbccfe9996)
2020-12-29 17:16:15 +00:00
Jaap Keuter b67f9a2f26 pcapng: add missing file format interpretation of EPB options
Add the file format interpretations of Enhanced Packet Block options which
are being read by wiretap, but missing from the file format dissector.


(cherry picked from commit c657a6f5e7)
2020-12-29 08:36:14 +00:00
Gerald Combs 92cea416e7 [Automatic update for 2020-12-27]
Update manuf, services enterprise numbers, translations, and other items.
2020-12-29 00:22:56 +00:00
Guy Harris cbd1e0e040 dumpcap: Improve the secondary error for promiscuous mode failure.
On Windows, some devices don't let promiscuous mode be enabled, and
return an error rather than silently ignoring the request to use
promiscuous mode (as UN*X devices tend to do).  Check for the error
message from that error, and suggest that the user turn off promiscuous
mode on that device.


(cherry picked from commit c15a37db51)
2020-12-27 21:22:51 +00:00
Guy Harris c92409657d editcap: one more integer -> Boolean.
selected() returns a Boolean value indicating whether the packet with a
given number was selected by the packet-range arguments or not.


(cherry picked from commit f75e2e5956)
2020-12-24 07:51:00 +00:00
Guy Harris ac3579da34 editcap: make verbose a Boolean as well.
And, to catch people habituated to -r and -v toggling the flag, fail if
it's already been set, to dishabituate them.

Not having them toggle makes it easier to document their semantics.


(cherry picked from commit 0d0071a302)
2020-12-24 02:20:30 +00:00
Guy Harris 4ee9ca7681 editcap: treat the "keep packets" flag as a Boolean.
Give it the type gboolean, initialize it to FALSE, and have -r set it to
TRUE.

This makes it a little clearer what it's doing.


(cherry picked from commit d98106876c)
2020-12-24 01:30:31 +00:00
Moshe Kaplan 8ea18fe50c mate_setup: allocate correct amount of memory
When creating a _mate_cfg_gog, instead of
allocating space for a `_mate_cfg_gop`,
allocate space for a _mate_cfg_gog. Also, use
`g_new` instead of `gmalloc`.


(cherry picked from commit 1c7edf49f8)
2020-12-23 08:31:11 +00:00
Jaap Keuter 54ddb2e9f9 Let the CLI programs tell about how to show their version
Add to the help text the option to show the version of the CLI program.


(cherry picked from commit 38ab00a094)
2020-12-22 23:19:35 +00:00
Gerald Combs ed87507e1a macOS: Force dark mode support.
We initially disabled dark mode support in Info.plist when we didn't
support it very well, and later passively enabled it depending on our
SDK version. Go ahead and force it on since we officially support dark
mode. Closes #17098.


(cherry picked from commit b3352bd639)
2020-12-22 20:04:01 +00:00
Gerald Combs 2bf67916e5 CMake: macOS version updates.
Set MIN_MACOS_VERSION to 10.14 if we're building with Qt 6.0 or later.
Print both our deployment target and our base SDK at configure time.


(cherry picked from commit 2c303c725f)
2020-12-22 19:43:07 +00:00
Dario Lombardo c3b3e09f94 gitlab-ci: fix build:ubuntu-dist.
(cherry picked from commit 33ab986589)
2020-12-22 18:04:59 +00:00
Gerald Combs bab5339f3a GitLab CI: Copy over the build:ubuntu-dist job from master. 2020-12-21 16:05:27 -08:00
Guy Harris d09878a74b Fix the way we get high-resolution time.
If we're not on Windows, use clock_gettime(CLOCK_REALTIME) *if* we have
it; otherwise, fall back on gettimeofday().

(Note: neither Linux, nor macOS, nor Windows necessarily "have"
particular APIs; particular *versions* of Linux distributions
(kernel+libc) have them, particular *versions* of macOS have them, and
particular *versions* of Windows+MSVC have them.

And Linux, Windows and macOS aren't the only platforms on which we run.)

Fixes #17101.


(cherry picked from commit ca99a821b4)
2020-12-20 22:31:49 +00:00
Gerald Combs 498192a7b4 [Automatic update for 2020-12-20]
Update manuf, services enterprise numbers, translations, and other items.
2020-12-20 20:08:18 +00:00
Nardi Ivan f209b56885 GQUIC: add decoding of QLVE tag
Latest GQUIC versions encapsulate their first flight in Q043 packets.


(cherry picked from commit bfb889910a)
2020-12-20 14:29:29 +00:00
Nardi Ivan 2fa8940607 QUIC: improve heurist to avoid false positives
Improve visualization of "Version Negotiation" fields


(cherry picked from commit 60401ca54e)
2020-12-20 13:52:21 +00:00
Guy Harris e898cf7257 macos-setup: clean up snappy uninstall to match the trunk version.
[skip ci]
2020-12-19 21:33:42 -08:00
Guy Harris 8ecb2b907f macos-setup: various cleanups.
In uninstall_autoconf, when running uninstall subfunctions, pass the
arguments to the subfunctions.

When uninstalling Ninja, remove the "we've finished installing this"
indicator file.

Get rid of a debugging "set +x".


(cherry picked from commit 9fbf79c045)
2020-12-20 04:44:38 +00:00
Guy Harris ba3e22673a macos-setup: work around a botch in GLib "make distclean".
[skip ci]


(cherry picked from commit f3dc269df6)
2020-12-20 04:37:34 +00:00
Guy Harris 7e54366ef9 macos-setup: don't configure p11-kit to use libffi.
See comment for an explanation.


(cherry picked from commit 1949b6a5ee)
2020-12-20 03:09:15 +00:00
Guy Harris 5e31174b33 macos-setup: remove tabs.
Consistenly use spaces for indentation.


(cherry picked from commit 2db0c64034)
2020-12-20 02:37:58 +00:00
Guy Harris 566f03b3c3 macos-setup: get rid of a debugging "set -x".
(cherry picked from commit ca13c3ce49)
2020-12-20 02:19:11 +00:00
Guy Harris 1aeaf65ea5 macos-setup: fix uninstallation of libtasn1.
Fix a copy-and-pasteo.


(cherry picked from commit f2af1ea66d)
2020-12-20 01:50:54 +00:00
Guy Harris 303ee87fd2 macos-setup: clean up uninstallation of snappy.
For a CMake build done in a subdirectory of the source directory, the
equivalent of "make distclean" is "rm -rf {that subdirectory}".  Make it
so.

When uninstalling the stuff snappy installs with "rm -rf", use $DO_RM,
so it's done with sudo iff /usr/local isn't writable by us, just as
"make uninstall" is done with $DO_MAKE_UNINSTALL so it's done with sudo
iff /usr/local isn't writable by us.

Fix up the list of what to remove, now that we're building snappy as a
shared library, so that it removes shared libraries rather than the
non-existent static library.

Update a comment while we're at it, as Lua isn't the only dependency
that doesn't support "make uninstall".


(cherry picked from commit 7d01e3a74e)
2020-12-20 01:18:15 +00:00
Guy Harris dec868cb42 macos-setup: build snappy as a shared library.
The older versions of snappy apparently used autotools and build a
shared library by default; for example, Wireshark 3.2.6 for macOS is
built with snappy, and includes a snappy dynamic library in the app
bundle.

The current version uses CMake and does *not* build a shared library by
default.  Instead, it builds a static library, which, when you try to
link it to a C-only shared library...

...does not work.

The linker sees that you're statically linking in a bunch of C++ .o
files and gets upset because it can't find C++ standard library routines
used by that code.

If it's a dynamic library, the library was itself already linked with
the C++ standard library, so the external references to that library
from the snappy library are already marked as having been resolved to
the extent that they're expected to be in the C++ standard library at
run time - and, when the dynamic snappy library is built, it's marked as
depending on the C++ standard library, so the run time linker will, when
it loads the snappy dynamic library, see that the C++ standard library
is required and will load it if it hasn't already been loaded.


(cherry picked from commit e92119c608)
2020-12-20 00:45:17 +00:00
Guy Harris c98e80f365 Snappy uses CMake, and they didn't bother to provide an unintall target.
Or a distclean target, for that matter.

Do the best we can.

(libpcap and tcpdump support both autotools and CMake, and Wireshark
uses only CMake; all of them support an uninstall target in CMake.  Go
forth, read what they did, and sin no more.)


(cherry picked from commit 504f2ea42a)
2020-12-19 23:29:36 +00:00
Guy Harris 0717bf0a99 Work around more NeXTStEP-induced pain.
GNU libtool has a libtool program and a libtoolize program.

The development tools for NeXTStEP, apparently, had a libtool program as
well, and the current version of the development tools for the current
version of NeXTStEP, generally known as "Xcode for macOS", still have
that program.

This means that we do some renaming after installing GNU libtool, so
that its "libtool" becomes "glibtool" and its "libtoolize" becomes
"glibtoolize".

That meant we had to compensate for that when running autoreconf when
building and installing minizip.

It turns out we have to do that when running autogen.sh when building
and installing GLib as well.


(cherry picked from commit 2ecb606142)
2020-12-19 23:06:34 +00:00
John Thacker 5c1c84f415 macOS: Enable PKCS #11 support when building with macos-setup.sh
Enable PKCS #11 support in macOS builds with macos-setup.sh (already
supported on macOS via Homebrew and on all other OSes with GnuTLS 3.4
or greater) by installing p11-kit (and its dependency libtasn1) and
building nettle and GnuTLS against it.


(cherry picked from commit fe1f947540)
2020-12-19 22:41:57 +00:00
Joerg Mayer 6e6b4c9e7a macos-setup.sh: Update various software versions
Update versions of xz, lzip, gettext, libgpg, libgpg-error, libgcrypt, gnutls and gmp
to newest releases.

Also update glib but only to last version with autotools support - meson build is left
for another time.

Current versions of glib require a libpcre with unicode enabled which the Catalina system
version does not provide, so install the current version of libpcre as well.

Update some additional tools to commit 3a42bf0de2b9e35efcc3cea38153ab95cb71b352:
brotli, libmaxminddb, lz4, and snappy

(backported from commit 77e9d7d3f9)

These are the versions being used to build 3.4, so we're updating this
so that the 3.4 source tree's macos-setup.sh can be used to set up the
build environment for 3.4.

[skip ci]
2020-12-19 14:35:39 -08:00
Jaap Keuter af66bef360 IPv6: SRH setup correct DA for pseudo header
When a Segment Routing Header is present in the IPv6 packet provisions
have to be made to setup the right destination address for the pseudo
header used in checksum calculations. When segments are left in the header
the first address in the list has to replace the destination address.

Closes #17097


(cherry picked from commit 7052994a19)
2020-12-19 09:43:01 +00:00
Dr. Lars Völker 3b13b3051f SOME/IP-SD: hidden fields for entries are 16 bytes off (Bugfix)
This patch fixes a bug that lead to 7 hidden fields being off by
16 bytes.

Closes #17091


(cherry picked from commit ff23fb9f0c)
2020-12-19 08:17:47 +00:00
Guy Harris d09e9fe0ea macos-setup: explain why we're running autoreconf on minizip.
[skip ci]


(cherry picked from commit 8b0d19c634)
2020-12-19 07:54:41 +00:00
Guy Harris f647aebf86 macos-setup: fix the name of the -done file for Minizip.
It's minizip-$installed_minizip_version-done, not
zlib-$installed_minizip_version-done; the tarball is
zlib-$installed_minizip_version.tar.gz, because it's a contributed file
in the zlib package, but we don't use zlib in the name of the -done
file.

[skip ci]


(cherry picked from commit 0cdbdcc5a4)
2020-12-19 07:46:25 +00:00
Guy Harris ffb049f040 macos-setup: do "make clean", not "make distclean", for zstd.
It has no configure script, so there's no need for "make distclean", and
the Makefile supplied with it has no "make distclean" rule; just do
"make clean".

[skip ci]


(cherry picked from commit 806f524a10)
2020-12-19 07:21:26 +00:00
Guy Harris 10985f6e27 In Wireshark's version info, indicate whether we were built with Minizip.
We can't determine the version number, as there's nothing in the header
to indicate the version with which we were compiled, nor is there an API
to determine the version with which we're running.


(cherry picked from commit 6498bde741)
2020-12-19 06:42:39 +00:00
Gerald Combs 03ebce0c30 Version: 3.4.2 → 3.4.3.
[skip ci]
2020-12-18 13:57:11 -08:00
Gerald Combs a889cf1b1b Build 3.4.2. 2020-12-18 10:46:47 -08:00
Nardi Ivan 7ac76765fc QUIC: update to draft-33
QUIC (final?) constants for v1 are defined in draft-33


(cherry picked from commit 91bd291b90ab78fa2ccb1eaca27fc1685f6ad0ab)
2020-12-18 07:44:30 +00:00
Gerald Combs 2437f45a49 Prep for 3.4.2. 2020-12-17 16:26:52 -08:00
Guy Harris bd4259557b macos-setup: Update a comment.
Lua isn't the only dependency that doesn't support "make uninstall".

(backported from commit 7d01e3a74e)
2020-12-17 12:33:55 -08:00
Guy Harris d1be8e80e2 Don't assume macOS version numbers are of the form 10.N.
Big Sur goes to 11, and it appears that next year's (San Juan Capistrano?)
will go to 12, and so on.

Split version numbers into major and minor, and do version-number
comparison (alas, whilst CMake has that built in, the Bourne shell
doesn't, and neither does the Bourne-again shell).

This should fix issue #17043.


(cherry picked from commit 8e2815bfc0)
2020-12-17 06:50:37 +00:00
Guy Harris e1535a9aa3 macos-setup: various cleanups.
In uninstall_autoconf, when running uninstall subfunctions, pass the
arguments to the subfunctions.

When uninstalling Ninja, remove the "we've finished installing this"
indicator file.

Get rid of a debugging "set +x".


(cherry picked from commit 9fbf79c045)
2020-12-17 06:23:41 +00:00
Guy Harris 7901947b11 macos-setup: set SDKROOT when running xcrun.
That lets it find the right SDK path if you're not using the default
SDK.

(backported from commit 190442d76e)
2020-12-16 21:59:21 -08:00
Guy Harris 67f0d0ed73 macos-setup: more cleanups.
Fix/update/expand some comments.

Do uninstalls for dependencies using CMake more similarly.

For LZ4, as it comes with a Makefile rather than any
autotools/CMake/etc. configuration, "make distclean" might not be
necessary, so, as it's not supported, just do "make clean".

For libssh, do all removes in the uninstall in a single command, and use
$DO_RM, so that it uses sudo iff /usr/local isn't writable by us.  In
addition, remove the build directory as the equivalent of "make
distclean".

As with libssh, so with brotli.

(backported from commit 02c5f50009)
2020-12-16 21:22:38 -08:00
Gerald Combs 6b950fe6f0 Qt: Force layer backing on Big Sur when needed.
Make sure NSView.wantsLayer is true by setting QT_MAC_WANTS_LAYER=1 at
startup if we're running on Big Sur and we were built with a version of
Qt susceptible to QTBUG-87014. Fixes #17075?


(cherry picked from commit d4b40c0047)
2020-12-17 00:11:52 +00:00
Gerald Combs 4a102163d0 macOS: Add a workaround for libsnappy.
Work around an issue with libsnappy similar to what we do with libssh.


(cherry picked from commit bf45e8c3f1)
2020-12-16 21:39:55 +00:00
Guy Harris 64578cba75 fcdns: the Owner Id field is a 3-octet FC address, not a text string.
Make it FT_BYTES with SEP_DOT, like other 3-octet FC addresses.


(cherry picked from commit 19ffed19bd)
2020-12-16 17:14:54 +00:00
Guy Harris 9bb44ac156 fcswils: fix a comment.
In an ESS capability object, the well-known type and well-known subtype
fields are 1 byte, not 2 bytes.


(cherry picked from commit ed6f6a49aa)
2020-12-16 09:59:27 +00:00
Jaap Keuter 564ec58f6d FC: use ETHERTYPE_UNK when applicable, no excuses
Two interlocking problems cause the dissection of FC to fail in some cases,
as shown in the capture of the related issue.

The FC dissector assumes that ETHERTYPE_UNK in the data structure passed
to it is coming from the MDS header dissector only, and thus that header
sizes have to be taken into account. This is not / no longer the case.
It always passes down ETHERTYPE_FCFT. Therefore the MDS header size
checking does not apply to ETHERTYP_UNK, so is removed as condition.

The other FC related dissectors were forced to setup a data structure to
pass to FC for it to handle that part of the frame. Because these weren't
related to ethernet, these lazily set the ethertype field in the data
structure to 0. This unfortunately matches ETHERTYPE_UNK, triggering the
MDS header size checking in FC, leading to this issue. With the first
problem resolved, now make it explicit that unknown ethertype is indicated
by ETHERTYPE_UNK, not '0'.

Addresses primary part of issue #17084


(cherry picked from commit 3f0fc1b232)
2020-12-15 21:26:37 +00:00
Jaap Keuter e228784c4e FCdNS: use correct header field for field of flags
closes #17084


(cherry picked from commit 354a6fd015)
2020-12-15 20:27:50 +00:00
Nardi Ivan a2ceb50866 QUIC: fix a stack overflow
While at it, fix also a memory leak
Close #17073


(cherry picked from commit 4227e5a1ad)
2020-12-14 11:18:20 +00:00
Gerald Combs f53f5e64d5 [Automatic update for 2020-12-13]
Update manuf, services enterprise numbers, translations, and other items.
2020-12-13 17:27:50 +00:00
j.novak@netsystem.cz c865975463 SNMP: Fix checking of SNMP v3 auth if MD5 method is used
When the user enters row to SNMP Users table in wireshark and Authentication model is set to MD5, row is ignored in processing. The reason is that constant for MD5 is 0, but the code checks if the value is defined by simple 'usm_p.user_assoc' condition. Therefore 0 never succeeds.
As item can have only listed values, I think the check can be removed.
Function verified on sample.

I propose to cherry pick the change to all stable branches.


(cherry picked from commit 7f376c7ced)
2020-12-13 16:47:38 +00:00
Nardi Ivan a16388824b QUIC: fix handling of unencrypted padding data
We must be able to correctly detect valid coalesced packets and
recognize them from random padding.

Close #17011
Close #16914


(cherry picked from commit 0af60377b4)
2020-12-13 11:38:54 +00:00
Andrii Vladyka 4908474b1f DOCSIS: Add FDX support to Downstream Active Channel List MDD TLV
(cherry picked from commit 37f11e9a36)
2020-12-12 20:34:03 +00:00
Pascal Quantin b621801877 Qt: fix crash when opening/saving IP map on Windows
According to https://bugreports.qt.io/browse/QTBUG-20372 you need to close
a QFile before calling fclose, otherwise it leads to an unexpected behavior.
Let's duplicate the file handle to avoid this issue as suggested in
https://stackoverflow.com/questions/9465727/convert-qfile-to-file

Closes #17074


(cherry picked from commit 746051d099)
2020-12-12 14:44:34 +00:00
Jaap Keuter 747a03de06 Qt: Add missing break in Win32 file export init dialog function
(cherry picked from commit b09161d758807a6a08b5afcbfdb416ca0781a946)
2020-12-12 13:50:54 +00:00
Gerald Combs 862a55ae54 Win32: Add an include guard.
Add "#ifdef _WIN32" to file_dlg_win32.c so that it's ignored by
tools/validate-clang-check.sh.


(cherry picked from commit 6e1142c33a)
2020-12-12 12:49:43 +00:00
Gerald Combs bf311c44a5 Tools: skip commit validation for merge trains.
Skip commit validation if it looks like we're in a GitLab merge train.


(cherry picked from commit 404802dc34)
2020-12-12 10:18:33 +00:00
Pascal Quantin 81bcbf0ed6 Qt: create endpoint IP map in temp folder
Closes #17074


(cherry picked from commit 9fb03566c2)
2020-12-12 08:25:57 +00:00
Jaap Keuter 18ada21232 USB-HID: Tertiery is usually three
(cherry picked from commit 976738cd6c)
2020-12-10 22:37:07 +00:00
Pascal Quantin 655cb724fd sshdump: fix detection of custom version in Windows
(cherry picked from commit 10377c4d92)
2020-12-10 06:14:14 +00:00
Gerald Combs 19cf6c5600 GitLab CI: Use our images. 2020-12-09 19:11:23 -08:00
Gerald Combs 273eb0efcc GitLab CI: Remove more external dependencies. 2020-12-10 02:42:10 +00:00
Gerald Combs 1bf7c9a693 CI: Fix Ubuntu tests.
The wireshark/wireshark-ubuntu-dev image was recently upgraded to Ubuntu
20.04. Since then the following tests have been failing:

---- FAILED
test/suite_capture.py::case_wireshark_capture::test_wireshark_capture_from_fifo
FAILED
test/suite_capture.py::case_wireshark_capture::test_wireshark_capture_from_stdin
FAILED
test/suite_capture.py::case_tshark_capture::test_tshark_capture_from_fifo
FAILED
test/suite_capture.py::case_tshark_capture::test_tshark_capture_from_stdin
FAILED
test/suite_capture.py::case_dumpcap_capture::test_dumpcap_capture_from_fifo
FAILED
test/suite_capture.py::case_dumpcap_capture::test_dumpcap_capture_from_stdin
FAILED
test/suite_capture.py::case_dumpcap_autostop::test_dumpcap_autostop_filesize
FAILED
test/suite_capture.py::case_dumpcap_autostop::test_dumpcap_autostop_packets
FAILED
test/suite_capture.py::case_dumpcap_ringbuffer::test_dumpcap_ringbuffer_filesize
FAILED
test/suite_capture.py::case_dumpcap_ringbuffer::test_dumpcap_ringbuffer_packets
FAILED
test/suite_capture.py::case_dumpcap_pcapng_sections::test_dumpcap_pcapng_multi_in_multi_out
FAILED
test/suite_capture.py::case_dumpcap_pcapng_sections::test_dumpcap_pcapng_multi_in_single_out
FAILED
test/suite_capture.py::case_dumpcap_pcapng_sections::test_dumpcap_pcapng_single_in_multi_out
FAILED
test/suite_capture.py::case_dumpcap_pcapng_sections::test_dumpcap_pcapng_single_in_single_out
FAILED
test/suite_clopts.py::case_dumpcap_options::test_dumpcap_interface_chars
FAILED
test/suite_clopts.py::case_dumpcap_options::test_dumpcap_invalid_chars
FAILED
test/suite_clopts.py::case_dumpcap_options::test_dumpcap_valid_chars
----

This is because dumpcap can't load our local libraries after setting cap_net_raw+cap_net_admin:

----
-- Begin stderr for command ('/builds/wireshark/wireshark/build/run/dumpcap', '-D') --
/builds/wireshark/wireshark/build/run/dumpcap: error while loading shared libraries: libwsutil.so.0: cannot open shared object file: No such file or directory
-- End stderr for command ('/builds/wireshark/wireshark/build/run/dumpcap', '-D') --
----

Add $(pwd)/run to our rpath.


(cherry picked from commit ef10cc74d1)
2020-12-10 02:20:08 +00:00
Gerald Combs 10a02a65d7 Version: 3.4.1 → 3.4.2.
[skip ci]
2020-12-09 18:09:17 -08:00
Gerald Combs 1a27f40587 Build 3.4.1. 2020-12-09 14:15:23 -08:00
George Powers 295d0a19fa Fix reported_len in Lua framewark when creating tvb from range.
This bug affects Lua plugin dissectors for encapsulation protocols like
GRE.  Typically the dissector creates a range for the payload packet, then
calls the next dissector with a tvb derived from the range, using
TvbRange_tvb().  The original version calls
tvb_new_subset_length_caplen() using the remaining capture length for the
reported_len argument.  The fix passes -1 as the reported length, and
tvb_new_subset_length_caplen() calculates the new reported_len as required.

The bug only affects large packets captured with a snaplen and
truncated, then decoded with a Lua plugin for the encapsulation header.

Here's the typical bug symptom, gleaned from tshark decode of
an encapsulated IP payload:

        [Expert Info (Error/Protocol): IPv4 total length exceeds packet length (114 bytes)]
            [IPv4 total length exceeds packet length (114 bytes)]

Closes #15655.

(cherry picked from commit e7ec6739b6)
2020-12-09 21:53:32 +00:00
Gerald Combs 01fb136ec9 GitLab CI: Stop installing external dependencies.
Remove the last package installation instances from .gitlab-ci.yml. Add
a comment at the top noting that dependencies should be added to our
Dockerfiles instead.
2020-12-09 13:25:10 -08:00
John Thacker 181eb5cf82 epan: Fix format_text treament of Greek, Arabic, etc.
format_text uses the wrong bitmask when checking for two byte UTF-8
characters, resulting in rejecting half the possible two bytes characters,
including all of Arabic and Greek, and substituting REPLACEMENT CHARACTER
for them. Fixes #17070, and add some comments about the current behavior
that doesn't match existing comments.


(cherry picked from commit 770746cca8)
2020-12-09 13:31:23 +00:00
Yoshihiro Ueda 9cee503a87 SOME/IP: Fixed incorrect resetting offset of static array.
Fixed resetting offset of array to enable only when created tvb subset. Fixes #17057


(cherry picked from commit 2ab153527d)
2020-12-09 11:28:10 +00:00
Stig Bjørlykke b668d0a9d5 Qt: Support ampersand in funnel menu and button
An ampersand in the menu item or a button is used as shortcut, so
use "&&" to get a real ampersand.


(cherry picked from commit c84681aca2)
2020-12-09 10:14:35 +00:00
Stig Bjørlykke d5ea403f8d Qt: Fix packet bytes hover rectangle position
For Qt 5.11 and newer use horizontalAdvance() instead of boundingRect().width()
to calculate the width of a QString to position the hover rectangle position,
and to select which byte(s) to highlight.

Closes #17033.

(cherry picked from commit cb3b469d7f)
2020-12-09 09:54:16 +00:00
Stig Bjørlykke 3cd179d007 Lua: Improve Listener error handling
Fix error handlers in Listener draw() and reset() to avoid getting
LUA_ERRERR from lua_pcall(). Added error handler for Listener draw()
callback.

Handle LUA_ERRERR from lua_pcall() to avoid assert on this.
Changed some capitalized words in various error message.

Closes #16974.


(cherry picked from commit d104571e8a)
2020-12-09 07:46:08 +00:00
Uli Heilmeier 41a97c978d SMB/SMB2: FS Name is always Unicode
According to MS-CIFS sections 2.2.8.2.6 [1] FS Name (or Label) string
is in unicode.

[1]: https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-cifs/1011206a-55c5-4dbf-aff0-119514136940

Fixes: wireshark/wireshark#17064


(cherry picked from commit c876b34ed1)
2020-12-09 00:05:42 +00:00
Gerald Combs 1296e05a52 Prep for 3.4.1. 2020-12-08 22:30:50 +00:00
Gerald Combs 3501e40941 GitLab CI: Update lintian excludes.
Add "copyright-excludes-files-in-native-package" to the lintian exclude
list. The wireshark/wireshark-ubuntu-dev image was updated to 20.04
recently, and its lintian added
https://lintian.org/tags/copyright-excludes-files-in-native-package.html.


(cherry picked from commit 7a8a3a8702)
2020-12-08 21:26:54 +00:00
Gerald Combs fa02a5779f [Automatic update for 2020-12-06]
Update manuf, services enterprise numbers, translations, and other items.
2020-12-06 09:26:00 +00:00
Andrii Vladyka e507bee854 DOCSIS: Add FDX Sub-band TLV support in MDD Downstream Active Channel List
(cherry picked from commit 18ae9bd4e2)
2020-12-05 22:22:11 +00:00
Guy Harris d6be39038c editcap: add IDBs to second and subsequent output files.
Remember all the IDBs we've seen from the input file so far and, if
we're writing multiple files (splitting an input file into multiple
output files), add all those IDBs to each of the output files.

Fixes issue #17060.


(cherry picked from commit a11e5261e1)
2020-12-05 21:50:40 +00:00
Andrii Vladyka c3aef32766 DOCSIS: Fixed FDX Sub-band ID/offset TLVs dissection
(cherry picked from commit 708ada8381)
2020-12-04 20:57:07 +00:00
Guy Harris 2491a8f7f3 wlan: fix a bug-number typo in comments.
(cherry picked from commit 00d45cc71a)
2020-12-04 17:24:04 +00:00
John Thacker db14720d63 qt+export objects: Don't sort the header in with the content types
The Export Objects Content-Type filter combobox should not sort the
header of "All Content-Types" in with the list of content types, but
should ensure that it is always the first item, especially as the first
item position is used to show all content. This is particularly an issue
in some localizations; e.g., すべてのコンテントタイプ alphabetizes
after actual content types. Fixes bug #17048


(cherry picked from commit 2d8dd9ed4f)
2020-12-04 08:30:54 +00:00
Teyut c2d9eb4cfd RadioTap: skip present bits for vendor NS.
An error messages was shown when more than 1 present bits was set for a vendor NS because these bits were not skipped properly. Closes https://gitlab.com/wireshark/wireshark/-/issues/17047


(cherry picked from commit 96e31cb116)
2020-12-03 23:05:26 +00:00
Guy Harris 787e19080e wlan: never treat DMG frames as if they have an HT Control field.
At least one ns-3 capture has DMG frames (as indicated by the channel
number being in the 60 GHz band - radiotap currently has no DMG metadata
field) that have the +HTC/Order flag subfield set but have no HT Control
field, causing them to be misdissected.

802.11-2016 says that DMG frames should never have +HTC/Order set; if it
*is* set in a QoS frame known to be a DMG frame, flag it with an expert
info item and don't treat it as having an HT Control field.

Update a bunch of comments to give more information, put comments in the
appropriate places, and speak of 802.11-2016 rather than older standards.

While we're at it, update the title and description of the +HTC/Order
flag to reflect its name as of 802.11-2016.


(cherry picked from commit 3c640ca04a)
2020-12-03 20:37:29 +00:00
Guy Harris 1a79e899df PI_MALFORMED is not a valid error severity; fix it to PI_ERROR.
(cherry picked from commit ac0cf10ab0)
2020-12-03 12:36:18 +00:00
Nardi Ivan d88fadf46d QUIC: fix decryption when "loss-bits" feature is enabled
If the "loss bits" feature has been negotiated between the peers, the
algorithm used by Header Protection cipher must be updated.

See: https://tools.ietf.org/html/draft-ferrieuxhamchaoui-quic-lossbits-03

Close #17010


(cherry picked from commit 5798b91c15)
2020-12-02 17:57:28 +00:00
Gerald Combs fa53725469 Kafka: Limit our decompression size.
Don't assume that the Internet has our best interests at heart when it
gives us the size of our decompression buffer. Assign an arbitrary limit
of 50 MB.

This fixes #16739 in that it takes care of

** (process:17681): WARNING **: 20:03:07.440: Dissector bug, protocol Kafka, in packet 31: ../epan/proto.c:7043: failed assertion "end >= fi->start"

which is different from the original error output. It looks like *that*
might have taken care of in one of the other recent Kafka bug fixes.

The decompression routines return a success or failure status. Use
gbooleans instead of ints for that.


(cherry picked from commit f4374967bb)
2020-12-02 17:36:02 +00:00
Gerald Combs 5edf715c04 epan: Fix a memory leak.
Make sure _proto_tree_add_bits_ret_val allocates a bits array using the
packet scope, otherwise we leak memory. Fixes #17032.


(cherry picked from commit a9fc769d7b)
2020-12-02 16:43:07 +00:00
Harald Welte 970e9bfb2c packet-ehdlc: Fix TEI in COL_INFO
Back in 2017, commit d7bab0b46e introduced
printing the TEI in COL_INFO.  Unfortunatelky it contained a typo and
stated "TEI:1%u" instead of "TEI:%u".  So TEI 0 became TEI 10, etc. -
causing some confusion.

Let's remote that extraneous '1' and at the same time print the sapi
with two digits for better alignment of multiple lines. It is a
two-digit decimal value (0..63).


(cherry picked from commit 9c5ea50b0a)
2020-11-30 20:29:16 +00:00
Orgad Shaneh 29e59a0e20 Qt: fix Qt 5.15 deprecation warning
QFont::ForceIntegerMetrics is deprecated.
2020-11-30 14:51:45 +00:00
Guy Harris 65c6d829db wlan: don't treat non-QoS frames as having an HT Control field.
That's QoS-frame only; for non-QoS frames, the +HTC/Order subfield
doesn't mean there's an HT Control field.

Update the reference to the part of the 802.11 standard mentioning that
subfield to 802.11-2016.


(cherry picked from commit 1fa5687fad)
2020-11-30 07:35:08 +00:00
Guy Harris be38cd2edb wlan: clean up some tests.
It's clearer to say

    if (A) {
        if (B) {
            do this;
        } else {
            do that;
        }
    }

than to say

    if (A && B) {
        do this;
    } else if (A && !B) {
        do that;
    }


(cherry picked from commit baee4a41c7)
2020-11-30 03:00:51 +00:00
Gerald Combs 3d62a28f06 [Automatic update for 2020-11-29]
Update manuf, services enterprise numbers, translations, and other items.
2020-11-29 21:26:37 +00:00
Guy Harris 127f8e47ee 802.11: clean up data frame handling.
Change

    case DATA_FRAME:
        if (condition) {
            do stuff;
            break;
        }
        do other stuff;
        break;

to

    case DATA_FRAME:
        if (condition) {
            do stuff;
        } else {
            do other stuff;
        }
        break;

to make it clearer that it's "do this if condition is true, else do
that".


(cherry picked from commit 258fb14821)
2020-11-29 18:09:47 +00:00
Guy Harris d73b87e52a llc: don't fetch the etype until it's needed and if it's present.
This avoids throwing exceptions in some cases.


(cherry picked from commit ee764b8d7d)
2020-11-29 10:08:12 +00:00
Guy Harris 2f391e81d6 llc: clean up indentation.
(cherry picked from commit 3f8423c267)
2020-11-29 09:21:49 +00:00
Dario Lombardo 5a3c08e27f github: fix actions.
The command add-path within the changed actions has been deprecated
according to

https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/

Use shogo82148/actions-setup-perl for strawberryperl on windows.
Upgrade setup-ruby to 1.1.2 on macos.
2020-11-25 22:32:58 +00:00
Pascal Quantin 4d2c7b9940 S1AP: fix decoding of inter eNB transparent container from NGAP
(cherry picked from commit 74c0b2134b)
2020-11-24 13:45:38 +00:00
Pascal Quantin 095cb11a36 QUIC: fix compilation without HAVE_LIBGCRYPT_AEAD
(cherry picked from commit 8c99f4de8d)
2020-11-24 12:47:46 +00:00
Pascal Quantin dcd7a99f1d NAS 5GS: request type field is 3 bits long
(cherry picked from commit 9fdc3fb3ce)
2020-11-23 22:35:10 +00:00
Uli Heilmeier 8fdffc1113 tshark: set cf values when quiet and tempfile
When there is no do_dissection cf is missing some variables
for cf_close() call. Therefore we have to set them explicitly.

Fixes: wireshark/wireshark#17021


(cherry picked from commit 0fad19b7d9)
2020-11-23 20:07:42 +00:00
Pascal Quantin 7097d817a2 NAS 5GS: fix PDU address type, PDU session type and SSC mode bit width 2020-11-23 16:56:17 +01:00
Nardi Ivan 436cddcc84 QUIC: fix handling of Key Update
After a key update, we should update Packet Protection cipher but
we shouldn't touch the Header Protection one.
With the current code, PP and HP ciphers are quite entangled and we
always reset both of them. Therefore, at the second key update we
reset the used 1-RTT HP cipher too; no wonder even header decryption
fails from that point on.

To properly fix this issue, all the ciphers structures has been rewritten,
clearly separating PP code from HP one.

Close #16920
Close #16916


(cherry picked from commit 5e45f770fd)
2020-11-23 08:47:47 +00:00
Gerald Combs e3c543984d [Automatic update for 2020-11-22]
Update manuf, services enterprise numbers, translations, and other items.
2020-11-22 09:25:59 +00:00
Jaap Keuter 5016b41e6a Avoid python deprecation warning
Fixes ad69ec2e11


(cherry picked from commit 68313f4972)
2020-11-21 20:50:20 +00:00
Joakim Andersson 233f80f21b bluetooth: Fix dissecting of packets received on LE Coded PHY
Fix dissecting of packets received on LE Coded PHY. These packets
will include the extra field "coding indicator" after the access
address.
The assignment of phy in the common bluetooth context was missing,
leading to this field being left out and the offset being wrong.

(cherry picked from commit c586f71a5c)
2020-11-21 18:08:12 +01:00
Guy Harris 899899533c PacketListRecord: add an ensureColorized() method and use it.
Don't call the columnString() and discard the result in order to force
colorization; instead, add a separate method to force colorization and
use that.

This avoids the need to choose a column; we were using 1 as the column
number, but column numbers are zero-origin, so that's column 2, which
isn't guaranteed to exist (a crash ensued if it didn't).


(cherry picked from commit 58aea1de62)
2020-11-20 22:52:22 +00:00
John Thacker 793142cbec RFC2190: Fix bitmasks for several fields in mode A
Fixes some errors that the packet diagram helped make obvious.
Closes #17025.


(cherry picked from commit 5d374fed36)
2020-11-19 01:06:11 +00:00
Jaap Keuter dd88e7a90b HTTP: Restore SSTP support
Add exclusion for SSTP having Contents-Length and no body.
Closes #17024


(cherry picked from commit 0250e4e2e4)
2020-11-18 14:46:20 +00:00
Jason Cohen d304fa8431 f5ethtrailer: Replace ingressslot and ingressport with reserved 2020-11-17 11:07:43 -06:00
Gerald Combs 96d5d2b091 Tools: Update the usb.ids URL in make-usb.py.
The canonical location for the usb.ids file is
http://www.linux-usb.org/usb.ids. Unfortunately that site isn't
accessible over HTTPS so we were using https://usb-ids.gowdy.us/usb.ids
instead. *That* site is down, so switch to the Linux USB project's
SourceForge repository URL, which appears to house the assets for
www.linux-usb.org, including the usb.ids file.


(cherry picked from commit 01d5e8ee51)
2020-11-15 22:48:23 +00:00
Gerald Combs df635a196b [Automatic update for 2020-11-15]
Update manuf, services enterprise numbers, translations, and other items.
2020-11-15 19:12:07 +00:00
Guy Harris f79f407cae Pass an address-family-appropriate socket length to connect().
Some UN*Xes (4.4-lite-derived, such as the obscure, little-known macOS,
FreeBSD, NetBSD, OpenBSD, and DragonFly BSD) have a length field in the
socket address structure.

That was originally done for OSI address support; unlike most transport
addresses, such as IPv4 (and IPv6) addresses, where the size of the
address is fixed, the size of an OSI transport layer address is *not*
fixed, so it cannot be inferred from the address type.

With the dropping of OSI support, that field is no longer necessary in
userland.  System calls that take a socket address argument also take an
address length argument; in newer (all?) versions of the {macOS,
FreeBSD, NetBSD, OpenBSD, DragonFly BSD} kernel, the system call code
sets the length field in the kernel's copy of the address to the address
length field value.

However, that means that you have to pass in the appropriate length; if
you have a sockaddr_storage that might contain an IPv4 address or an
IPv6 address, connect() (and bind()) calls should use the IPv4 address
size for IPv4 addresses and the IPv6 address size for IPv6 addresses,
otherwise, at least on macOS, the call fails.

In cap_open_socket(), report socket() and connect() errors separately,
to make it easier to determine where TCP@ captures fail, if they do
fail.  (That's how I got here in the first place.)


(cherry picked from commit e3047d9b38)
2020-11-15 07:57:41 +00:00
John Thacker cd6afd7c9b Encodings: Fix missing pointer increment in 3GPP TS 28.038 unpacked
The pointer isn't incremented in get_ts_23_038_7bits_string_unpacked
so it just decodes the first octet length times.


(cherry picked from commit 5df3f5d05d)
2020-11-15 07:07:00 +00:00
Pascal Quantin a0ce8fa84d NAS EPS: fix inverted description of 2 N1 UE network capability IE fields
(cherry picked from commit 8c29bfe8b2)
2020-11-14 15:30:45 +00:00
Pascal Quantin 5010face74 NAS-EPS: remove an extra spare bit
It has been replaced by the 15 bearers capability during R15 development


(cherry picked from commit 440d8ceff9)
2020-11-13 18:36:33 +00:00
Pascal Quantin 7e94496598 MBIM: fix mbim.control.ms_app_info.app_name display
(cherry picked from commit ea311f2e21)
2020-11-13 16:05:18 +00:00
Alexis La Goutte f7e8752d2f MMRP: Fix wrong offset for service attribute type
Issue reported by Nils Andersen

Close #17005


(cherry picked from commit 8b512665fc)
2020-11-13 13:15:47 +00:00
Gerald Combs 6ece1c896d RTPS: Fixup our coherent set map.
coherent_set_tracking.coherent_set_registry_map uses a struct as a key,
but the hash and comparison routines treat keys as a sequence of bytes.
Make sure every key byte is initialized. Fixes #16994.

Call wmem_strong_hash on our key in coherent_set_key_hash_by_key instead
of creating and leaking a GBytes struct.


(cherry picked from commit 33e63d19e5)
2020-11-10 22:28:08 +00:00
Gerald Combs d88dc7f29a wiretap: Update pcapng systemd timestamp handling.
It's easy to create systemd blocks with a missing or invalid
__REALTIME_TIMESTAMP= field when fuzz testing. If that's the case, leave
WTAP_HAS_TS unset instead of returning an error. Fixes #16965.


(cherry picked from commit 51145c62e6)
2020-11-10 21:12:47 +00:00
Gerald Combs c8fedf65b2 epan: Limit our bits in decode_bits_in_field.
Limit the number of bits we process in decode_bits_in_field, otherwise
we'll overrun our buffer. Fixes #16958.


(cherry picked from commit d5f2657825)
2020-11-09 17:48:52 +00:00
Gerald Combs 263d7a5272 Tools+test: Call python3 explicitly.
PEP 394[1] says,

"In cases where the script is expected to be executed outside virtual
 environments, developers will need to be aware of the following
 discrepancies across platforms and installation methods:

  * Older Linux distributions will provide a python command that refers
    to Python 2, and will likely not provide a python2 command.

  * Some newer Linux distributions will provide a python command that
    refers to Python 3.

  * Some Linux distributions will not provide a python command at all by
    default, but will provide a python3 command by default."

Debian has forced the issue by choosing the third option[2]:

"NOTE: Debian testing (bullseye) has removed the "python" package and
 the '/usr/bin/python' symlink due to the deprecation of Python 2."

Switch our shebang from "#!/usr/bin/env python" to "#!/usr/bin/env
python3" in some places. Remove some 2/3 version checks if we know we're
running under Python 3. Remove the "coding: utf-8" in a bunch of places
since that's the default in Python 3.

[1]https://www.python.org/dev/peps/pep-0394/#for-python-script-publishers
[2]https://wiki.debian.org/Python


(cherry picked from commit 30c392f166)
2020-11-09 17:11:54 +00:00
Pau Espin 6891c21fe1 rlcmac: Fix EGPRS UL data block TLLI endianess
According to TS 44.060, figure 10.3a.2.1, note 2, the TLLI is
encoded in little endian for EGPRS (while big endian is used in GPRS).


(cherry picked from commit dfa8a3fe5a)
2020-11-09 12:41:59 +00:00
Nardi Ivan ba9ae589ad QUIC: improve migration support
We should keep track of CID reported in Preferred Address Transport Parameter

Close #16915


(cherry picked from commit a175435c0a)
2020-11-09 07:46:56 +00:00
Gerald Combs 2714dd9e6f [Automatic update for 2020-11-08]
Update manuf, services enterprise numbers, translations, and other items.
2020-11-08 09:25:29 +00:00
Nardi Ivan 6988aad8b6 STUN: fix heuristic over TCP
STUN heuristic over TCP (added in 770872790d) doesn't handle multiple
STUN messages in the same TCP payload.

While at it, added a comment (forgotten in 354bbbe7cb) about different
TURN channel support among STUN versions


(cherry picked from commit 905f304d54)
2020-11-05 20:03:54 +00:00
Gerald Combs de66fa058f CI+RPM: Disable the Fedora build for now.
Fedora 33's RPM environent added changes that break CMake. Disable it
for now.


(cherry picked from commit 05bd5cd91e)
2020-11-05 17:36:07 +00:00
Jaap Keuter b387f0c4db giop: free the buffer where its at
Followup on commit 40ce72f1a8


(cherry picked from commit 57b6666920)
2020-11-05 17:04:34 +00:00
Jaap Keuter 30ca9a975e giop: don't use packet scope for allocating a buffer at init time
Followup on commit 2c2ee172eb
Also when reading in lines from the file don't use packet scope.

Fixes #16984


(cherry picked from commit 40ce72f1a8)
2020-11-05 16:26:35 +00:00
Pau Espin a00ac1eb9c rlcmac: Handle properly LI=0 in GPRS data blocks and identify spare bits
The previous handling of LI=0 was a confusion with the LI=0 meaning from
EGPRS (see TS 44.060 B.8.2 Example 2) data block.


(cherry picked from commit 9d5de22a88)
2020-11-05 08:40:31 +00:00
Huang Qiangxiong b97332b12e Protobuf: fix bug about parsing negative enum value number
Change PT_DECIMALLIT, PT_OCTALLIT and PT_HEXLIT tokens to uint64
type, and make PT_IDENT excluding '-' numbers which will be parsed
in protobuf_lang.y. That negative enum number and number type of
constant can be correctly parsed.
Note, intLit is uint32 for parsing fieldNumber and enumNumber,
but might be uint64 as constant.

close #16988


(cherry picked from commit 1fff3cb106)
2020-11-05 08:12:00 +00:00
John Thacker 4e0dbcbc97 Encodings: Add FT_STRINGZ support for GB18030, EUC-KR
(cherry picked from commit abf3eaace8)
2020-11-05 05:36:40 +00:00
Guy Harris 99238a0198 giop: don't use packet scope for allocating a buffer at init time.
You can't use packet scope if you're not dissecting a packet;
read_IOR_strings_from_file() is called from giop_init(), which is called
when a file is opened, not when dissecting a packet.

Use NULL as the scope, which just does a regular allocation, and free
the buffer when we're done.

Expand a comment to indicate that using dissection routines is *also* a
bad idea in code that's not used when dissecting packets.

Fixes #16984.


(cherry picked from commit 2c2ee172eb)
2020-11-05 01:14:26 +00:00
Alexis La Goutte 5cac5d3254 QUIC: Fix typo
Reported by Martin Thomson


(cherry picked from commit ad1cf5eeb0)
2020-11-04 21:56:19 +00:00
Gerald Combs bc09f1a334 Tools: Allow cherry pick lines in validate-commit.py.
Cherry picking tends to add an extra blank line to the commit message.
Update the body check in validate-commit.py to allow for this.

Revert "tools: Skip over commit body checks." This reverts commit
24450d9c51.

(cherry picked from commit dd6b6f48dc)
2020-11-04 13:36:18 -08:00
Uli Heilmeier b3de664f2b QT: progress UI: Fix TextLabel string to loading
Change TextLabel to Loading for progress UI
Fixes: wireshark/wireshark#16987


(cherry picked from commit 48c09fe046)
2020-11-04 19:59:50 +00:00
Orgad Shaneh 2533f666a9 ACDR: Fix dissection of control packets
The recorded protocol on this case is eth and not ip.
2020-11-04 07:12:09 +00:00
Dr. Lars Völker 4d7b07dfe4 SOME/IP: Cleanup of length field parsing (BUG FIX)
This patch makes the parsing of length fields consistent by moving them
below their parent element and adjusting the length of the parent
element. And it fixes some problems by doing this.

Problems fixed by this:
- Bytes skipped after dynamic length arrays. This resolves #16951
- A byte was ignored before unparsed payload.
- Unions not marking the correct byte range.
- String having the length field twice.

Signed-off-by: Dr. Lars Völker <lars.voelker@technica-engineering.de>


(cherry picked from commit 9ac8dcb3a1)
2020-11-03 08:45:04 +00:00
Chuck Craft 5497552ab1 win32: fix MR180 - broke "-i -" input pipe
(cherry picked from commit 44241f694e)
2020-11-02 13:52:36 +00:00
Uli Heilmeier 15f52841ca RTCP: Extended Reports: check for padding
Check if padding flag is set and alter length accordingly.
Display rtcp.xr.bl the same way as rtcp.length.

Fixes: wireshark/wireshark#16933


(cherry picked from commit e07bb433b2)
2020-11-01 20:54:18 +00:00
Gerald Combs 746cf80cce [Automatic update for 2020-11-01]
Update manuf, services enterprise numbers, translations, and other items.
2020-11-01 17:35:58 +00:00
Nardi Ivan daca140dfe QUIC: fix connection lookup for Version Negotiation packets
VN packets don't have any real packet type, even if they have a long header


(cherry picked from commit 9613c943e0)
2020-11-01 09:13:32 +00:00
Nardi Ivan b46c3e2537 QUIC: allow dissection of sessions forcing version negotiation
Right now, these sessions are not dissected as QUIC, let alone decrypted


(cherry picked from commit cafdab3967)
2020-10-31 16:14:42 +00:00
Sylvain Munaut 78ac817a84 usbvideo: Fix dissection of PROBE infos structure
Refer to USB Device Class Definition for Video Devices
document revision 1.5.

 * bmFramingInfo is 1 byte
 * Cut & Paste error for bMaxVersion label

Change-Id: Ib1221886f864a6ab9dbab70a8e5fca6482bf4267
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>


(cherry picked from commit b6222766cc)
2020-10-31 13:44:32 +00:00
Martin Mathieson 006537ad22 GSM A: Uncertainty speed is only 1 byte.
(cherry picked from commit b925734fe2)
2020-10-31 13:18:25 +00:00
Gerald Combs 26a0ee2c4b 3.4.0 → 3.4.1. 2020-10-29 14:10:55 -07:00
Gerald Combs 9733f173ea Build: 3.4.0. 2020-10-29 11:55:07 -07:00
Vadim Yanitskiy 731f847342 GSM A RR: fix wrong cause value in gsm_a_rr_RR_cause_vals
Also, take a chance to correct the comment: section 6.11.0 does
not exit in 3GPP TS 44.018.  In version 15.4.0 Release 15 of
the referenced document it is 10.5.2.31 (table 10.5.2.31.1).


(cherry picked from commit 732591237b)
2020-10-29 10:36:53 +00:00
Jonas Falkevik 34b41729f9 lcsap: fix decode of plmnIdentity
Corretly decode MNC if it consists of 3 digits
Change to what is called big endinan MNC

   8   7   6   5   4   3   2   1
 +---+---+---+---+---+---+---+---+
 |  MCC digit 2  |  MCC digit 1  |  octet x
 +---------------+---------------+
 |    Filler     |  MCC digit 3  |  octet x+1
 +---------------+---------------+
 |  MNC digit 2  |  MNC digit 1  |  octet x+2
 +---------------+---------------+

 MNC of length 3:

   8   7   6   5   4   3   2   1
 +---+---+---+---+---+---+---+---+
 |  MCC digit 2  |  MCC digit 1  |  octet x
 +---------------+---------------+
 |  MNC digit 1  |  MCC digit 3  |  octet x+1
 +---------------+---------------+
 |  MNC digit 3  |  MNC digit 2  |  octet x+2
 +---------------+---------------+

From 3GPP TS 29.171
7.4.27 PLMN Identity

- digits 0 to 9, encoded 0000 to 1001,
- 1111 used as filler digit, two digits per octet,

- bits 4 to 1 of octet n encoding digit 2n-1
- bits 8 to 5 of octet n encoding digit 2n

The Selected PLMN identity consists of 3 digits from MCC followed by either
- a filler digit plus 2 digits from MNC (in case of 2 digit MNC) or
- 3 digits from MNC (in case of a 3 digit MNC).


(cherry picked from commit 156f9e81fc)
2020-10-29 10:07:09 +00:00
Huang Qiangxiong 1d6de11c49 Protobuf: fix bugs about field subdissector
Don't try to dissect bytes as string and show its value item if the
bytes field has a subdissector. And add field subdissector under field
item instead of value item.

close #16956


(cherry picked from commit 1c5d577d63)
2020-10-29 00:02:08 +00:00
Gerald Combs a1909f2343 Qt: Add a recent item for packet diagram field values.
Fixes #16957.


(cherry picked from commit b1d18e41db)
2020-10-28 20:22:45 +00:00
Gerald Combs f49d6000a7 Qt: Fix saving+restoring frozen packet list rows.
Use the packet list selection model to save and restore selected rows
when freezing and thawing. Fixes #16770.


(cherry picked from commit 1c2fd68e26)
2020-10-28 18:14:24 +00:00
Jaap Keuter a4213f2c4f Create protocols to the end of the TVB if length unknown upfront
Creating protocols with unknown length must be created to the end of the TVB
first and reined back using proto_set_len() once the length becomes known.
Not doing so can make indentification of problems harder and prevents analysis
engines like MATE from properly processing the generated protocol trees.
With this change the remaining offending dissectors are corrected for this.

Closes #16961


(cherry picked from commit 918db88055)
2020-10-28 14:38:33 +00:00
Stig Bjørlykke d28275c397 lte-rrc: Pluralize PagingRecord(s)
(cherry picked from commit edd71daa90)
2020-10-28 13:38:14 +00:00
Dieter Dobbelaere 13d0b4e400 Fix typo: 'descriptionfor' -> 'description for'.
(cherry picked from commit 7c9eb8b235)
2020-10-28 11:03:53 +00:00
Guy Harris 928f32e85c Add a new record type REC_TYPE_SYSTEMD_JOURNAL.
Systemd journal entries aren't file-type-specific; they're found in both
systemd journal entry blocks in pcapng files and in systemd journal
export files.  Give it a record type, for use with both file types.

This fixes #16955.

It also means that you can open a systemd journal export file and save
it as a pcapng file.


(cherry picked from commit 889e0d5cb6)
2020-10-28 04:16:42 +00:00
Guy Harris 9837703a11 dumpcap: fix the macOS "no permission to capture" message.
The macOS installer works differently from the way it did when that
message was written (it's now a drag-install for Wireshark, with
separate installers for ChmodBPF and for files to add the Wireshark
binary directory to the default $PATH), and the macOS main screen now
offers a "click this to install" link, running the ChmodBPF installer,
if the user doesn't have permissions to capture.  Update the message
to reflect that (although that's wrong if you directly run dumpcap or
run it via TShark - this needs to be cleaned up in some fashion).

Fix a capitalization error while we're at it.

In the code that generates the main screen message to which the dumpcap
message refers, add a comment saying that, if the main screen message
changes, dumpcap's message should also be updated.


(cherry picked from commit 4fd7983b04)
2020-10-27 09:15:06 +00:00
Guy Harris c53cbf81f4 Use wtap_uses_interface_ids() to check if IDBs are necessary.
Use that, rather than specifically checking for pcapng.


(cherry picked from commit 4740f01134)
2020-10-27 08:53:31 +00:00
Stig Bjørlykke ab41153f22 AT: Handle response without leading \r\n
The AT response may not contain a leading \r\n, so avoid checking
for this to determine if it's a response. This characters will be
removed as a part of white space removal anyway.


(cherry picked from commit 5413331ed3)
2020-10-27 07:46:53 +00:00
Guy Harris ce22707c35 Impose limits on the number of records we read.
Start the limit at 2^32-1, as we use a guint32 to store the frame
number.

With Qt prior to Qt 6, lower the limit to 53 million packets; this
should fix issue #16908.


(cherry picked from commit 639891651f)
2020-10-27 05:45:12 +00:00
Guy Harris b45aad9be2 Apparently, WS_WIKI_URL() can work in Qt C++ code.
(cherry picked from commit 32b64c1694)
2020-10-27 05:05:51 +00:00
Guy Harris 9b437e3c2d Include <ui/urls.h>
If you're going to use #defines from ui/urls.h, it reeeeeeeeeally helps
if you *include* ui/urls.h.


(cherry picked from commit a8d023ba58)
2020-10-27 04:17:27 +00:00
Stig Bjørlykke fe86435dd7 Qt: Avoid crash on ProtoTree item deselect
Handle the case of deselecting a ProtoTree item.


(cherry picked from commit a88d72dc8e)
2020-10-26 14:44:54 +00:00
Gerald Combs 38207edc52 [Automatic update for 2020-10-25]
Update manuf, services enterprise numbers, translations, and other items.
2020-10-25 16:00:26 +00:00
Gerald Combs 74eeba5787 USB HID: Initialize a struct.
Initialize a variable caught by Valgrind. Fixes #16938.


(cherry picked from commit 273eb06390)
2020-10-25 09:32:30 +00:00
Jaap Keuter f7a46fbed9 MATE: Improve MATE debug facility
1) Allow AVP_DEBUGGING settings to be made from Preferences, iff compiled so.
2) Flush MATE/AVP debug output once sequential packet parse has completed.


(cherry picked from commit 5b2901d090)
2020-10-25 09:08:51 +00:00
Gerald Combs 24450d9c51 tools: Skip over commit body checks.
Cherry-pick the part of 507dd98a58 that skips over commit body checks
since they might contain extra newlines due to appending "(cherry picked
from commit xxx)".
2020-10-24 15:21:26 -07:00
John Thacker de81bd705a Export Objects: Don't double increment count
Don't double increment the count when saving all Export Objects,
which effectively halves the maximum number allowed.
(cherry picked from commit 56e19bec49)
2020-10-23 07:52:42 -04:00
Gerald Combs d1865925ee Build: 3.4.0rc1. 2020-10-22 15:21:22 -07:00
Gerald Combs dfae8942af Fix our version, update the release notes. 2020-10-22 13:47:50 -07:00
Gerald Combs eff9f0fb0d Initialize release-3.4.
Initialize the release-3.4 branch.
2020-10-22 11:38:47 -07:00
431 changed files with 12356 additions and 6754 deletions

View File

@ -20,7 +20,7 @@ jobs:
- name: Install biplist
run: pip install biplist
- name: Set up Ruby 2.6
uses: actions/setup-ruby@v1.1.1
uses: actions/setup-ruby@v1.1.2
with:
ruby-version: '2.6'
- name: Install deps

View File

@ -14,13 +14,14 @@ jobs:
- name: Install winflexbison3
run: cinst -y --force winflexbison3 --version 2.5.18.20190508
- name: Install strawberryperl
run: |
choco install strawberryperl
echo "##[add-path]C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin"
uses: shogo82148/actions-setup-perl@v1
with:
perl-version: '5.30'
distribution: strawberry
- name: Install Qt
uses: jurplel/install-qt-action@v2
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.0.0
uses: microsoft/setup-msbuild@v1.0.2
with:
vs-version: 16.4
- name: Set MSVC command prompt

View File

@ -1,34 +1,84 @@
.build: &build
# In the interest of reliability and performance, please avoid installing
# external dependencies here, e.g. via tools/*-setup.sh, apt, dnf, or yum.
# Do so in the appropriate Dockerfile at
# https://gitlab.com/wireshark/wireshark-containers/ instead.
# The resulting images can be found at
# https://hub.docker.com/r/wireshark/wireshark-centos-7-dev
# https://hub.docker.com/r/wireshark/wireshark-debian-stable-dev
# https://hub.docker.com/r/wireshark/wireshark-fedora-dev
# https://hub.docker.com/r/wireshark/wireshark-opensuse-15.1-dev
# https://hub.docker.com/r/wireshark/wireshark-ubuntu-dev
stages:
- build
- test
- fuzz-asan
- fuzz-randpkt
- fuzz-valgrind
variables:
# Ensure that checkouts are a) fast and b) have a reachable tag. In a
# brighter, more glorious future we might be able to use --shallow-since:
# https://gitlab.com/gitlab-org/gitlab-runner/-/issues/3460
# In the mean time, fetching the last 2000 commits does the job.
GIT_DEPTH: "1"
GIT_FETCH_EXTRA_FLAGS: "--depth=2000"
CCACHE_DIR: "${CI_PROJECT_DIR}/ccache"
CLANG_VERSION: 10
# Common rule stanzas
# These must currently be including using "!reference tags". "extends:" and
# YAML anchors won't work:
# https://gitlab.com/gitlab-org/gitlab/-/issues/322992
#
# Commits that have been approved and merged. Run automatically in the main
# repo and allow manual runs in the web UI and in forks.
.if-merged:
- if: '$CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_URL =~ /.*gitlab.com\/wireshark\/wireshark/'
when: always
- if: '$CI_PIPELINE_SOURCE == "web"'
when: always
- if: '$CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_URL !~ /.*gitlab.com\/wireshark\/wireshark/'
when: manual
# Incoming merge requests.
.if-merge-request:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
when: always
# Incoming non-detached merge requests. Must be used for runners which are only
# available in wireshark/wireshark, e.g. wireshark-windows-*
.if-attached-merge-request:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_PROJECT_URL =~ /.*gitlab.com\/wireshark\/wireshark/'
when: always
# Fuzz jobs. Care should be taken when changing this since the scheduler
# often doesn't report errors.
.if-fuzz-schedule:
- if: '$CI_PIPELINE_SOURCE == "schedule" && $SCHEDULE_TYPE == "fuzz"'
when: always
.build:
stage: build
after_script:
- for builddir in build/packaging/rpm/BUILD/wireshark-*/build build/packaging/rpm/BUILD/wireshark-* build obj-*; do [ ! -d "$builddir/run" ] || break; done
- if [[ "$CI_JOB_NAME" == "build:rpm-opensuse-"* ]]; then export LD_LIBRARY_PATH=$builddir/run; fi
- if [ -f $builddir/run/tshark ]; then $builddir/run/tshark --version; fi
# The custom Ubuntu image pre-installs dependencies and compilers to speed up the build:
# https://hub.docker.com/r/wireshark/wireshark-ubuntu-dev
# https://github.com/wireshark/wireshark-ubuntu-dev-docker
.build-ubuntu: &build-ubuntu
<<: *build
.build-ubuntu:
extends: .build
image: wireshark/wireshark-ubuntu-dev
retry: 1
# https://gould.cx/ted/blog/2017/06/10/ccache-for-Gitlab-CI/
cache:
# XXX Use ${CI_JOB_NAME}-${CI_MERGE_REQUEST_TARGET_BRANCH_NAME} instead?
key: ${CI_JOB_NAME}-master
key: ${CI_JOB_NAME}-release-3.4
paths:
- ccache/
before_script:
- apt-get update -qq
- ./tools/debian-setup.sh --install-optional --install-test-deps -y
- useradd user
- locale-gen en_US.UTF-8
- export LANG=en_US.UTF-8
- export PYTEST_ADDOPTS=--skip-missing-programs=dumpcap,rawshark
- mkdir -p ccache
- apt-get install -y ccache
- export CCACHE_BASEDIR=${PWD}
- export CCACHE_DIR=${PWD}/ccache
- ccache --show-stats
- export DEB_BUILD_OPTIONS=nocheck
- export DH_QUIET=1
@ -36,99 +86,114 @@
- mkdir build
- cd build
script:
- cmake -GNinja $CMAKE_ARGS ..
# setcap restricts our library paths
- CFLAGS=-Wl,-rpath=$(pwd)/run CXXFLAGS=-Wl,-rpath=$(pwd)/run cmake -GNinja -DENABLE_CCACHE=ON ..
- ninja
- ninja test-programs
- chown -R user .
- if [ -f run/dumpcap ]; then setcap cap_net_raw,cap_net_admin+eip run/dumpcap; fi
- if [ -f run/dumpcap ]; then su user -c "run/dumpcap -D" ; fi
- su user -c pytest-3
.build-rpm: &build-rpm
<<: *build
.build-rpm:
extends: .build
rules: !reference [.if-merged]
artifacts:
paths:
- build/packaging/rpm/RPMS
expire_in: 3 days
# Rely on fedora:latest and debian-stable jobs for testing a recent GCC version.
clang-10: &clang-10
<<: *build-ubuntu
.test-rpm:
rules: !reference [.if-merged]
stage: test
variables:
CC: clang-10
CXX: clang++-10
GIT_STRATEGY: none
build:rpm-centos-7:
<<: *build-rpm
image: centos:7
# Rely on fedora:latest and debian-stable jobs for testing a recent GCC version.
Clang 10:
extends: .build-ubuntu
rules: !reference [.if-merged]
variables:
CC: "clang-$CLANG_VERSION"
CXX: "clang++-$CLANG_VERSION"
Source Package:
extends: .build-ubuntu
rules: !reference [.if-merged]
script:
- perl ../tools/make-version.pl --set-release || ../perl make-version.pl --set-release
- cmake -G Ninja $CMAKE_ARGS -DENABLE_CCACHE=ON ..
- cd $CI_PROJECT_DIR
- build/packaging/source/git-export-release.sh -d .
after_script:
# - ccache --max-size $( du --summarize --block-size=1M "$CI_PROJECT_DIR/build" | awk '{printf ("%dM", $1 * 1.5)}' )
- for digest in sha256 rmd160 sha1 ; do openssl $digest wireshark-*.tar.* ; done
# This will break if we produce multiple tarballs, which is arguably a good thing.
- if [ -n "$AWS_ACCESS_KEY_ID" ] && [ -n "$AWS_SECRET_ACCESS_KEY" ] && [ -n "$S3_DESTINATION_DIST" ] ; then aws s3 cp wireshark-*.tar.* "$S3_DESTINATION_DIST/" ; fi
artifacts:
paths:
- wireshark-*.tar.*
CentOS 7 RPM Package:
extends: .build-rpm
image: wireshark/wireshark-centos-7-dev
script:
- yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
- tools/rpm-setup.sh --install-optional -y
- mkdir build
- cd build
- cmake3 -GNinja ..
- ninja-build rpm-package
test:rpm-centos-7:
stage: test
image: centos:7
CentOS 7 RPM Test:
extends: .test-rpm
image: wireshark/wireshark-centos-7-dev
script:
- yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
- yum --nogpgcheck localinstall -y build/packaging/rpm/RPMS/x86_64/*.rpm
- tshark --version
dependencies:
- build:rpm-centos-7
variables:
GIT_STRATEGY: none
build:rpm-opensuse-15.1:
image: opensuse/leap:15.1
<<: *build-rpm
dependencies: [ 'CentOS 7 RPM Package' ]
openSUSE 15.1 RPM Package:
extends: .build-rpm
image: wireshark/wireshark-opensuse-15.1-dev
script:
- zypper --non-interactive install update-desktop-files
- tools/rpm-setup.sh --install-optional ruby
- gem install asciidoctor -v 1.5.8 --no-ri --no-rdoc
- mkdir build
- cd build
- cmake -GNinja ..
- ninja rpm-package
test:rpm-opensuse-15.1:
image: opensuse/leap:15.1
stage: test
openSUSE 15.1 RPM Test:
extends: .test-rpm
image: wireshark/wireshark-opensuse-15.1-dev
script:
- zypper --no-gpg-checks install -y build/packaging/rpm/RPMS/x86_64/*.rpm
- tshark --version
variables:
GIT_STRATEGY: none
dependencies:
- build:rpm-opensuse-15.1
build:rpm-fedora:
<<: *build-rpm
image: fedora
dependencies: [ 'openSUSE 15.1 RPM Package' ]
# Disabled for now due to issues with Fedora 33.
.Fedora RPM Package:
extends: .build-rpm
image: wireshark/wireshark-fedora-dev
script:
- dnf upgrade -y
- tools/rpm-setup.sh --install-optional -y
- mkdir build
- cd build
- cmake3 -GNinja ..
- ninja-build rpm-package
test:rpm-fedora:
image: fedora
stage: test
script:
- dnf install -y build/packaging/rpm/RPMS/x86_64/*.rpm
- tshark --version
variables:
GIT_STRATEGY: none
dependencies:
- build:rpm-fedora
# .Fedora RPM Test:
# extends: .test-rpm
# image: fedora
# script:
# - dnf install -y build/packaging/rpm/RPMS/x86_64/*.rpm
# - tshark --version
# dependencies: [ 'Fedora RPM Package' ]
# Job to generate packages for Debian stable
build:debian-stable:
<<: *build
image: debian:stable
before_script:
- ./tools/debian-setup.sh --install-optional --install-test-deps -y --install-deb-deps
Debian Stable APT Package:
extends: .build
rules: !reference [.if-merged]
image: wireshark/wireshark-debian-stable-dev
script:
# Shared GitLab runners limit the log size to 4M, so reduce verbosity. See
# https://gitlab.com/gitlab-com/support-forum/issues/2790
- export DH_QUIET=1
- export MAKEFLAGS=--silent
- dpkg-buildpackage -b --no-sign -jauto
- mkdir debian-packages
- mv ../*.deb debian-packages/
@ -136,30 +201,130 @@ build:debian-stable:
paths:
- debian-packages/*.deb
expire_in: 3 days
test:debian-stable:
image: debian:stable
Debian Stable APT Test:
rules: !reference [.if-merged]
image: wireshark/wireshark-debian-stable-dev
stage: test
script:
- apt-get update
- DEBIAN_FRONTEND=noninteractive apt-get install ./debian-packages/*.deb -y
- tshark --version
after_script:
# Used for https://www.wireshark.org/docs/dfref/
- TSHARK_VERSION=$( tshark --version | head -n 1 | sed -e 's/.*(v//' -e 's/)$//' )
- tshark -G fields > dfilter-list-${TSHARK_VERSION}.txt
artifacts:
paths:
- dfilter-list-*.txt
variables:
GIT_STRATEGY: none
dependencies:
- build:debian-stable
dependencies: [ 'Debian Stable APT Package' ]
Win64 Package:
stage: build
rules: !reference [.if-merged]
tags:
- wireshark-win64-package
before_script:
- $env:WIRESHARK_BASE_DIR = "C:\Development"
- $env:Configuration = "RelWithDebInfo"
- $env:Path += ";C:\Program Files\CMake\bin"
- $env:Path += ";C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin"
- $env:Path += ";C:\qt\5.15.2\msvc2019_64\bin"
- $env:Path += ";C:\Program Files (x86)\NSIS"
- $env:Path += ";C:\Program Files (x86)\WiX Toolset v3.11\bin"
- $env:Path += ";C:\Program Files\Amazon\AWSCLIV2"
# https://help.appveyor.com/discussions/questions/18777-how-to-use-vcvars64bat-from-powershell
- cmd.exe /c "call `"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat`" && set > %temp%\vcvars.txt"
- Get-Content "$env:temp\vcvars.txt" | Foreach-Object { if ($_ -match "^(.*?)=(.*)$") { Set-Content "env:\$($matches[1])" $matches[2] } }
- mkdir build
- cd build
script:
- perl ../tools/make-version.pl --set-release
- cmake -G "Visual Studio 16 2019" -A x64 -DDISABLE_WERROR=OFF -DTEST_EXTRA_ARGS=--enable-release -DENABLE_LTO=off ..
- msbuild /verbosity:minimal "/consoleloggerparameters:PerformanceSummary;NoSummary" /maxcpucount Wireshark.sln
- msbuild /verbosity:minimal /maxcpucount test-programs.vcxproj
- msbuild /verbosity:minimal /maxcpucount nsis_package_prep.vcxproj
- msbuild /verbosity:minimal /maxcpucount wix_package_prep.vcxproj
- C:\gitlab-builds\bin\sign-files.ps1 -Recurse -Path run\RelWithDebInfo
- msbuild /verbosity:minimal nsis_package.vcxproj
- C:\gitlab-builds\bin\sign-files.ps1 -Path packaging\nsis
- msbuild /verbosity:minimal wix_package.vcxproj
- C:\gitlab-builds\bin\sign-files.ps1 -Path packaging\wix
- $plugins = Get-ChildItem run\RelWithDebInfo\plugins\*\*.dll ; signtool verify /v /pa /all run\RelWithDebInfo\*.exe run\RelWithDebInfo\extcap\*.exe $plugins run\RelWithDebInfo\libwireshark.dll run\RelWithDebInfo\libwiretap.dll run\RelWithDebInfo\libwsutil.dll packaging\nsis\Wireshark-win??-*.exe packaging\wix\Wireshark-win??-*.msi
- msbuild /verbosity:minimal pdb_zip_package.vcxproj
- C:\gitlab-builds\bin\mse-scan.ps1
- $packages = Get-ChildItem "packaging\nsis\Wireshark-win??-*.exe", "packaging\wix\Wireshark-win??-*.msi"
- foreach ($package in $packages) { certutil -hashfile $package SHA256 }
- |
if ((Test-Path env:AWS_ACCESS_KEY_ID) -and (Test-Path env:AWS_SECRET_ACCESS_KEY) -and (Test-Path env:S3_DESTINATION_WIN64)) {
foreach ($package in $packages) {
aws s3 cp "$package" "$env:S3_DESTINATION_WIN64/"
}
}
- ctest -C RelWithDebInfo --parallel 3 --force-new-ctest-process --verbose
Win32 Package:
stage: build
rules: !reference [.if-merged]
tags:
- wireshark-win32-package
before_script:
- $env:WIRESHARK_BASE_DIR = "C:\Development"
- $env:Configuration = "RelWithDebInfo"
- $env:Path += ";C:\Program Files\CMake\bin"
- $env:Path += ";C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin"
- $env:Path += ";C:\qt\5.15.2\msvc2019\bin"
- $env:Path += ";C:\Program Files (x86)\NSIS"
- $env:Path += ";C:\Program Files (x86)\WiX Toolset v3.11\bin"
- $env:Path += ";C:\Program Files\Amazon\AWSCLIV2"
# https://help.appveyor.com/discussions/questions/18777-how-to-use-vcvars64bat-from-powershell
- cmd.exe /c "call `"C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsamd64_x86.bat`" && set > %temp%\vcvars.txt"
- Get-Content "$env:temp\vcvars.txt" | Foreach-Object { if ($_ -match "^(.*?)=(.*)$") { Set-Content "env:\$($matches[1])" $matches[2] } }
- $env:Platform = "Win32"
- mkdir build
- cd build
script:
- perl ../tools/make-version.pl --set-release
- cmake -G "Visual Studio 16 2019" -A Win32 -DDISABLE_WERROR=OFF -DTEST_EXTRA_ARGS=--enable-release -DENABLE_LTO=off ..
- msbuild /verbosity:minimal "/consoleloggerparameters:PerformanceSummary;NoSummary" /maxcpucount Wireshark.sln
- msbuild /verbosity:minimal /maxcpucount test-programs.vcxproj
- msbuild /verbosity:minimal /maxcpucount nsis_package_prep.vcxproj
- msbuild /verbosity:minimal /maxcpucount wix_package_prep.vcxproj
- C:\gitlab-builds\bin\sign-files.ps1 -Recurse -Path run\RelWithDebInfo
- msbuild /verbosity:minimal nsis_package.vcxproj
- C:\gitlab-builds\bin\sign-files.ps1 -Path packaging\nsis
- msbuild /verbosity:minimal wix_package.vcxproj
- C:\gitlab-builds\bin\sign-files.ps1 -Path packaging\wix
- msbuild /verbosity:minimal portableapps_package.vcxproj
- C:\gitlab-builds\bin\sign-files.ps1 -Path packaging\portableapps
- $plugins = Get-ChildItem run\RelWithDebInfo\plugins\*\*.dll ; signtool verify /v /pa /all run\RelWithDebInfo\*.exe run\RelWithDebInfo\extcap\*.exe $plugins run\RelWithDebInfo\libwireshark.dll run\RelWithDebInfo\libwiretap.dll run\RelWithDebInfo\libwsutil.dll packaging\nsis\Wireshark-win??-*.exe packaging\wix\Wireshark-win??-*.msi packaging\portableapps\WiresharkPortable_*.paf.exe
- msbuild /verbosity:minimal pdb_zip_package.vcxproj
- C:\gitlab-builds\bin\mse-scan.ps1
- $packages = Get-ChildItem "packaging\nsis\Wireshark-win??-*.exe", "packaging\wix\Wireshark-win??-*.msi", "packaging\portableapps\WiresharkPortable_*.paf.exe"
- foreach ($package in $packages) { certutil -hashfile $package SHA256 }
- |
if ((Test-Path env:AWS_ACCESS_KEY_ID) -and (Test-Path env:AWS_SECRET_ACCESS_KEY) -and (Test-Path env:S3_DESTINATION_WIN32)) {
foreach ($package in $packages) {
aws s3 cp "$package" "$env:S3_DESTINATION_WIN32/"
}
}
- ctest -C RelWithDebInfo --parallel 3 --force-new-ctest-process --verbose
# Build Wireshark manuals
# Note: Need ubuntu:focal with `ruby-coderay` and `ruby-asciidoctor-pdf` packages to build PDF docs
docbook:
Documentation:
stage: build
image: wireshark/wireshark-ubuntu-dev
rules:
- changes:
- "docbook/**"
- "epan/wslua/**"
before_script:
- DEBIAN_FRONTEND="noninteractive" ./tools/debian-setup.sh --install-optional -y g++
- if: '$CI_PIPELINE_SOURCE == "push" && $CI_PROJECT_URL =~ /.*gitlab.com\/wireshark\/wireshark/'
changes:
- "docbook/**"
- "epan/wslua/**"
when: always
script:
# XXX We might want to move this to wireshark-ubuntu-dev or debian-setup.sh.
- DEBIAN_FRONTEND=noninteractive apt-get update
- DEBIAN_FRONTEND=noninteractive apt-get --yes install ruby-coderay ruby-asciidoctor-pdf
- mkdir build
- cd build
- cmake -GNinja ..
@ -178,37 +343,33 @@ docbook:
# https://docs.gitlab.com/ee/user/gitlab_com/index.html#linux-shared-runners
merge-req:commit-checks:
<<: *build-ubuntu
Commit Checks:
extends: .build-ubuntu
rules: !reference [.if-merge-request]
tags:
- docker
rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
script:
# build-ubuntu puts us in `build`.
- cd ..
- bash ./tools/pre-commit 'HEAD^1'
- tools/validate-commit.py
merge-req:ubuntu-dpkg:
<<: *build-ubuntu
Ubuntu .dpkg:
extends: .build-ubuntu
rules: !reference [.if-merge-request]
tags:
- docker
rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
script:
- apt-get install -y lintian
# build-ubuntu puts us in `build`.
- cd ..
- CC=/usr/lib/ccache/gcc CXX=/usr/lib/ccache/g++ dpkg-buildpackage -us -uc -rfakeroot -jauto -Zgzip -zfast
- lintian --suppress-tags library-not-linked-against-libc --display-experimental --display-info --pedantic --profile debian
- lintian --suppress-tags library-not-linked-against-libc,copyright-excludes-files-in-native-package --display-experimental --display-info --pedantic --profile debian
merge-req:ubuntu-gcc-ctest:
<<: *build-ubuntu
GCC Warnings:
extends: .build-ubuntu
rules: !reference [.if-merge-request]
tags:
- docker
rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
script:
# build-ubuntu puts us in `build`.
- perl ../tools/make-version.pl --set-release || ../perl make-version.pl --set-release
@ -218,14 +379,15 @@ merge-req:ubuntu-gcc-ctest:
- chown -R user .
- su user -c "ctest --parallel 3 --force-new-ctest-process --verbose"
merge-req:ubuntu-clang-other-tests:
extends: clang-10
Code Checks + Clang Warnings:
extends: .build-ubuntu
rules: !reference [.if-merge-request]
tags:
- docker
rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
variables:
CC: clang-$CLANG_VERSION
CXX: clang++-$CLANG_VERSION
script:
- apt-get install -y cppcheck clang-tools python-pygments
# build-ubuntu puts us in `build`.
- cd ..
- python3 tools/checklicenses.py
@ -240,20 +402,18 @@ merge-req:ubuntu-clang-other-tests:
artifacts:
paths:
- cppcheck_report.xml
- cppcheck_report.html
- cppcheck_report.html
# XXX This is still beta:
# https://docs.gitlab.com/ee/user/gitlab_com/index.html#windows-shared-runners-beta
# Dockerfile at https://github.com/wireshark/wireshark-windows-dev-docker.
# XXX We currently depend on Qt being installed in C:\Qt on the host. We should
# find a more independent way of installing Qt, e.g. via a download+cache.
merge-req:windows:
Windows Build:
rules: !reference [.if-attached-merge-request]
tags:
- wireshark-windows-dev
- wireshark-windows-merge-req
stage: build
rules:
# The Windows Docker image is currently only available via a dedicated runner.
- if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_PROJECT_URL == "https://gitlab.com/wireshark/wireshark"'
before_script:
# XXX Find a better location.
- mkdir c:\Development
@ -261,7 +421,7 @@ merge-req:windows:
- $env:Configuration = "RelWithDebInfo"
- $env:Path += ";C:\Program Files\CMake\bin"
- $env:Path += ";C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin"
- $env:Path += ";C:\qt\5.15.1\msvc2019_64\bin"
- $env:Path += ";C:\qt\5.15.2\msvc2019_64\bin"
# https://help.appveyor.com/discussions/questions/18777-how-to-use-vcvars64bat-from-powershell
- cmd.exe /c "call `"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat`" && set > %temp%\vcvars.txt"
- Get-Content "$env:temp\vcvars.txt" | Foreach-Object { if ($_ -match "^(.*?)=(.*)$") { Set-Content "env:\$($matches[1])" $matches[2] } }
@ -279,3 +439,85 @@ merge-req:windows:
- msbuild "/consoleloggerparameters:PerformanceSummary;NoSummary" /maxcpucount Wireshark.sln
- msbuild "/consoleloggerparameters:PerformanceSummary;NoSummary" test-programs.vcxproj
- ctest -C RelWithDebInfo --parallel 3 --force-new-ctest-process --verbose
# Fuzz TShark using ASAN and valgrind.
.fuzz-ubuntu:
extends: .build-ubuntu
rules: !reference [.if-fuzz-schedule]
tags:
- wireshark-ubuntu-fuzz
resource_group: fuzz-release-3.4
variables:
CC: "clang-$CLANG_VERSION"
CXX: "clang++-$CLANG_VERSION"
INSTALL_PREFIX: "$CI_PROJECT_DIR/_install"
MIN_PLUGINS: 10
MAX_PASSES: 15
before_script:
- mkdir -p ccache
# Signal after_script, which runs in its own shell.
- echo "export FUZZ_PASSED=true" > /tmp/fuzz_result.sh
- mkdir /tmp/fuzz
- mkdir build
- cd build
after_script:
- . /tmp/fuzz_result.sh
- if $FUZZ_PASSED ; then exit 0 ; fi
- echo Fuzzing failed. Generating report.
- FUZZ_CAPTURE=$( ls /tmp/fuzz/fuzz-*.pcap | head -n 1 )
- FUZZ_ERRORS="/tmp/fuzz/$( basename "$FUZZ_CAPTURE" .pcap ).err"
- printf "\nfuzz-test.sh stderr:\n" >> "$FUZZ_ERRORS"
- cat fuzz-test.err >> "$FUZZ_ERRORS"
- |
if [ -n "$AWS_ACCESS_KEY_ID" ] && [ -n "$AWS_SECRET_ACCESS_KEY" ] && [ -n "$S3_DESTINATION_FUZZ" ] ; then
aws s3 cp "$FUZZ_CAPTURE" "$S3_DESTINATION_FUZZ/"
aws s3 cp "$FUZZ_ERRORS" "$S3_DESTINATION_FUZZ/"
fi
# The cache should be large enough to be useful but it shouldn't take
# too long to restore+save each run.
- ccache --max-size $( du --summarize --block-size=1M "$CI_PROJECT_DIR/build" | awk '{printf ("%dM", $1 * 1.5)}' )
ASan Menagerie Fuzz:
extends: .fuzz-ubuntu
stage: fuzz-asan
script:
- MAX_SECONDS=$(( 4 * 60 * 60 ))
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
- cmake -G Ninja -DBUILD_wireshark=OFF -DCMAKE_BUILD_TYPE=Debug -DENABLE_ASAN=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX -DENABLE_CCACHE=ON ..
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
- ninja
- ninja install
- cd ..
# /var/menagerie contains captures harvested from wireshark.org's mailing list, wiki, issues, etc.
# We have more captures than we can fuzz in $MAX_SECONDS, so we shuffle them each run.
- ./tools/fuzz-test.sh -a -2 -P $MIN_PLUGINS -b $INSTALL_PREFIX/bin -d /tmp/fuzz -t $MAX_SECONDS $( shuf -e /var/menagerie/*/* ) 2> fuzz-test.err || echo "export FUZZ_PASSED=false" > /tmp/fuzz_result.sh
ASan randpkt Fuzz:
extends: .fuzz-ubuntu
stage: fuzz-randpkt
script:
# XXX Reuse fuzz-asan?
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
- cmake -G Ninja -DBUILD_wireshark=OFF -DCMAKE_BUILD_TYPE=Debug -DENABLE_ASAN=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX -DENABLE_CCACHE=ON ..
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
- ninja
- ninja install
- cd ..
- ./tools/randpkt-test.sh -a -b $INSTALL_PREFIX/bin -d /tmp/fuzz -p $MAX_PASSES 2> fuzz-test.err || echo "export FUZZ_PASSED=false" > /tmp/fuzz_result.sh
needs: [ 'ASan Menagerie Fuzz' ]
Valgrind Menagerie Fuzz:
extends: .fuzz-ubuntu
stage: fuzz-valgrind
script:
- DEBIAN_FRONTEND=noninteractive apt-get update
- DEBIAN_FRONTEND=noninteractive apt-get --yes install valgrind
- MAX_SECONDS=$(( 3 * 60 * 60 ))
- printf "\e[0Ksection_start:%s:cmake_section[collapsed=true]\r\e[0KRunning CMake" "$( date +%s)"
- cmake -G Ninja -DBUILD_wireshark=OFF -DCMAKE_BUILD_TYPE=Debug -DENABLE_ASAN=OFF -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX -DENABLE_CCACHE=ON ..
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
- ninja
- ninja install
- cd ..
- ./tools/fuzz-test.sh -g -P $MIN_PLUGINS -b $INSTALL_PREFIX/bin -d /tmp/fuzz -t $MAX_SECONDS $( shuf -e /var/menagerie/*/* ) 2> fuzz-test.err || echo "export FUZZ_PASSED=false" > /tmp/fuzz_result.sh
needs: [ 'ASan randpkt Fuzz' ]

View File

@ -102,7 +102,7 @@ Jeff Oconnell <jeffo@rulez.com> jeff oconnell <jeffo@rulez.com>
Jeroen Sack <jeroen@jeroensack.nl> Jeroen Sack <jsack@lely.com>
Jim Schaettle <jimschaettle@gmail.com> Nick <jimschaettle@gmail.com>
Jiří Engelthaler <engycz@gmail.com> Jiri Engelthaler <engycz@gmail.com>
João Valverde <joao.valverde@tecnico.ulisboa.pt> João Valverde <j@v6e.pt>
João Valverde <j@v6e.pt> João Valverde <joao.valverde@tecnico.ulisboa.pt>
Joeri de Ruiter <joeri@cypherpunk.nl> Joeri <joeri@cypherpunk.nl>
John Miner <optommp@gmail.com> John <optommp@gmail.com>
Jonathan Fleming <jonathan@optigo.net> Jonathan Fleming <jonathanfleming135@gmail.com>

View File

@ -1,7 +1,7 @@
[main]
host = https://www.transifex.com
[wireshark.master]
[wireshark.qt-34]
file_filter = ui/qt/wireshark_<lang>.ts
source_file = ui/qt/wireshark_en.ts
source_lang = en
@ -17,7 +17,7 @@ trans.uk = ui/qt/wireshark_uk.ts
trans.zh_CN = ui/qt/wireshark_zh_CN.ts
type = QT
[wireshark.debian]
[wireshark.po-34]
file_filter = debian/po/<lang>.po
source_file = debian/po/templates.pot
source_lang = en

22
AUTHORS
View File

@ -3979,10 +3979,10 @@ Pavel Moravec <pmoravec[AT]redhat.com>
Robert Long <rlong[AT]sandia.gov>
James Lynch <lynch007[AT]gmail.com>
Chidambaram Arunachalam <carunach[AT]cisco.com>
João Valverde <joao.valverde[AT]tecnico.ulisboa.pt>
João Valverde <j[AT]v6e.pt>
Benoît Canet <benoit[AT]scylladb.com>
Håkon Øye Amundsen <haakon.amundsen[AT]nordicsemi.no>
Jeffrey Wildman <jeffrey.wildman@ll.mit.edu>
Jeffrey Wildman <jeffrey.wildman[AT]ll.mit.edu>
= From git log =
@ -4130,6 +4130,7 @@ Christian Kreibich <christian[AT]corelight.com>
Christian Krump <christian.krump[AT]br-automation.com>
Christian Lamparter <chunkeey[AT]googlemail.com>
Christian M. Amsüss <chrysn[AT]fsfe.org>
Christian Reusch <creusch[AT]crnetpackets.com>
Christian Tellefsen <chris-git[AT]tellefsen.net>
Christian Ullrich <chris[AT]chrullrich.net>
Christoph Burger-Scheidlin <mail[AT]christoph.burger-scheidlin.name>
@ -4146,9 +4147,11 @@ Chuck Lever <chuck.lever[AT]oracle.com>
Chugzilla <chugzilla77[AT]gmail.com>
Chun-Yeow Yeoh <yeohchunyeow[AT]gmail.com>
Claudius Zingerli <czingerl[AT]gmail.com>
Clément Notin <clement.notin[AT]gmail.com>
Cody Doucette <doucette[AT]bu.edu>
Colin Foster <colin.foster[AT]in-advantage.com>
Colin Sames <sames.colin[AT]gmail.com>
Constantine Gavrilov <constg[AT]il.ibm.com>
Craig Jackson <cejackson51[AT]gmail.com>
Cédric Delmas <cedricde[AT]outlook.fr>
D. W. Poon <dwpoon[AT]mail.ubc.ca>
@ -4184,6 +4187,7 @@ David Kreitschmann <dkreitschmann[AT]seemoo.tu-darmstadt.de>
David McKay <mckay.david[AT]gmail.com>
David Morsberger <dave[AT]morsberger.com>
David Perry <boolean263[AT]protonmail.com>
David Perry <d.perry[AT]utoronto.ca>
David Snowdon <daves[AT]metamako.com>
David Tapuska <dave[AT]tapuska.com>
David Zoller <zollerd[AT]gmail.com>
@ -4202,6 +4206,7 @@ DiablosOffens <DiablosOffens[AT]gmx.de>
Didier Arenzana <darenzana[AT]yahoo.fr>
Didier Barvaux <didier.barvaux[AT]toulouse.viveris.com>
Diederik de Groot <ddegroot[AT]talon.nl>
Dieter Dobbelaere <dieter.dobbelaere[AT]excentis.com>
Dirk Eibach <dirk.eibach[AT]gdsys.cc>
Dirk Römmen <dirk.roemmen[AT]cslab.de>
Dirk Weise <code[AT]dirk-weise.de>
@ -4275,6 +4280,7 @@ Gene Cumm <gene.cumm[AT]gmail.com>
Georg Brandl <georg[AT]python.org>
Georg Richter <georg[AT]mariadb.org>
George Hopkins <george-hopkins[AT]null.net>
George Powers <gpowers[AT]google.com>
Gerard Garcia <ggarcia[AT]deic.uab.cat>
Gergely Nagy <ngg[AT]ngg.hu>
Gerhard KHUENY <Gerhard.KHUENY[AT]bachmann.info>
@ -4290,6 +4296,7 @@ Gregor Beck <gbeck[AT]sernet.de>
Gregor Jasny <gjasny[AT]googlemail.com>
Gregor Jasny <gregor.jasny[AT]logmein.com>
Gregor Miernik <gregor.miernik[AT]hytec.de>
Grzegorz Niemirowski <grzegorz[AT]grzegorz.net>
Guillaume Autran <gautran[AT]clearpathrobotics.com>
Guy Davies <aguydavies[AT]gmail.com>
Guy Harris <gharris[AT]sonic.net>
@ -4450,6 +4457,7 @@ Lichen Liu <llc123456a[AT]gmail.com>
Lin Sun <lin.sun[AT]zoom.us>
Loganaden Velvindron <logan[AT]cyberstorm.mu>
Lorenzo Vannucci <vannucci[AT]ntop.org>
Loris Degioanni <loris[AT]sysdig.com>
Lotte Steenbrink <lotte[AT]zombietetris.de>
Luca Melette <luca[AT]srlabs.de>
Lucas Simopoulos <lsimopoulos[AT]gmail.com>
@ -4495,6 +4503,7 @@ Martin Heusse <martin.heusse[AT]imag.fr>
Martin Mathieson <martin.mathieson[AT]keysight.com>
Martin Sehnoutka <msehnout[AT]redhat.com>
Martin Tibenský <martin.tibensky[AT]alcatel-lucent.com>
Martin Tschoepe <martin.tschoepe[AT]web.de>
Martin Vit <martin[AT]voipmonitor.org>
Masashi Honma <masashi.honma[AT]gmail.com>
Matej Košík <5764c029b688c1c0d24a2e97cd764f[AT]gmail.com>
@ -4723,6 +4732,7 @@ Signat Sibirskiy <ord.blant[AT]gmail.com>
Silvio Gissi <silvio.gissi[AT]gmail.com>
Simon Barber <simon.barber[AT]meraki.net>
Simon Graham <simgrxp[AT]gmail.com>
Simon Holesch <simon[AT]holesch.de>
Simon Long <hobei[AT]whitedoor.plus.com>
Simon Vans-Colina <simon[AT]monzo.com>
Simon Zhong <szhong.jnpr[AT]gmail.com>
@ -4758,10 +4768,12 @@ Taisuke Sasaki <taisasak[AT]cisco.com>
Tamir Duberstein <tamird[AT]google.com>
Tatsuhiro Tsujikawa <tatsuhiro.t[AT]gmail.com>
Tengfei Chang <tengfei.chang[AT]inria.fr>
Teyut <teyut[AT]free.fr>
Thibault Gerondal <github[AT]tycale.be>
Thies Moeller <thies.moeller[AT]baslerweb.com>
Thiyagarajan P <psvthiyagarajan[AT]gmail.com>
Thomas Chen <funorpain[AT]gmail.com>
Thomas Dreibholz <dreibh[AT]simula.no>
Thomas Klausner <tk[AT]giga.or.at>
Thomas Portassau <thomas.portassau[AT]hotmail.fr>
Thomas Shen <thomashen[AT]gmail.com>
@ -4799,8 +4811,10 @@ Uwe Kleine-König <uwe[AT]kleine-koenig.org>
Vadim Fedorenko <vadimjunk[AT]gmail.com>
Vadim Yanitskiy <axilirator[AT]gmail.com>
Vadim Yanitskiy <vyanitskiy[AT]sysmocom.de>
Vahap Emin Agaogullari <vahapemin44[AT]gmail.com>
ValdikSS <iam[AT]valdikss.org.ru>
Valentin Vidic <Valentin.Vidic[AT]CARNet.hr>
Valerii Zapodovnikov <val.zapod.vz[AT]gmail.com>
Vanson Lim <vlim[AT]cisco.com>
Vasil Velichkov <vvvelichkov[AT]gmail.com>
Victor Barratault <victor.barratault[AT]gmail.com>
@ -4844,6 +4858,7 @@ Yann Pomarède <yann.pomarede[AT]gmail.com>
Yannik Enss <Yannik.Enss[AT]rohde-schwarz.com>
Yasuyuki Tanaka <yasuyuki.tanaka[AT]inria.fr>
Yehonatan Zecharia <yonti95[AT]gmail.com>
Yoshihiro Ueda <uyoshihiro[AT]users.noreply.gitlab.com>
Yoshiyuki Kurauchi <ahochauwaaaaa[AT]gmail.com>
Yuri Chislov <yuri.chislov[AT]gmail.com>
Yurii Lysyi <yurii.lysyi[AT]ericsson.com>
@ -4852,6 +4867,7 @@ Zachary Holcomb <zholcomb2017[AT]my.fit.edu>
Zdeněk Žamberský <zzdevel[AT]seznam.cz>
Zhao Lin <zlbinghamton[AT]gmail.com>
Zhenhua Hu <fattiger1102[AT]gmail.com>
ZhongYao Luo <LuoZhongYao[AT]gmail.com>
akuchekar <akuchekar[AT]empirix.com>
anonsvn <anonsvn[AT]localhost>
atul358 <atul358[AT]gmail.com>
@ -4865,12 +4881,12 @@ kardam <netkardam[AT]gmail.com>
kkoizumi <kkoizumi46[AT]gmail.com>
liningjie <1350445139[AT]qq.com>
mkg20001 <mkg20001[AT]gmail.com>
naf <naf[AT]sdf.org>
nickvsnetworking <nick[AT]nickvsnetworking.com>
pegah hajiani <pegah_haj[AT]yahoo.com>
rbroker <rstbroker[AT]gmail.com>
shqking <shqking[AT]gmail.com>
subhav8 <subhadevi88[AT]gmail.com>
vahapemin <vahapemin44[AT]gmail.com>
zhongweisitu <zsitu[AT]extremenetworks.com>
zhudewen <zhudewen[AT]iauto.com>
Émilio Gonzalez <egg997[AT]gmail.com>

View File

@ -3979,10 +3979,10 @@ Pavel Moravec <pmoravec[AT]redhat.com>
Robert Long <rlong[AT]sandia.gov>
James Lynch <lynch007[AT]gmail.com>
Chidambaram Arunachalam <carunach[AT]cisco.com>
João Valverde <joao.valverde[AT]tecnico.ulisboa.pt>
João Valverde <j[AT]v6e.pt>
Benoît Canet <benoit[AT]scylladb.com>
Håkon Øye Amundsen <haakon.amundsen[AT]nordicsemi.no>
Jeffrey Wildman <jeffrey.wildman@ll.mit.edu>
Jeffrey Wildman <jeffrey.wildman[AT]ll.mit.edu>
= Acknowledgements =

View File

@ -34,8 +34,8 @@ project(${_project_name} C CXX)
# Updated by tools/make-version.pl
set(GIT_REVISION 0)
set(PROJECT_MAJOR_VERSION 3)
set(PROJECT_MINOR_VERSION 3)
set(PROJECT_PATCH_VERSION 2)
set(PROJECT_MINOR_VERSION 4)
set(PROJECT_PATCH_VERSION 7)
set(PROJECT_BUILD_VERSION ${GIT_REVISION})
set(PROJECT_VERSION_EXTENSION "")
@ -117,7 +117,7 @@ if(WIN32)
file( TO_CMAKE_PATH "$ENV{WIRESHARK_LIB_DIR}" _PROJECT_LIB_DIR )
elseif( DEFINED ENV{WIRESHARK_BASE_DIR} )
file( TO_CMAKE_PATH "$ENV{WIRESHARK_BASE_DIR}" _WS_BASE_DIR )
set( _PROJECT_LIB_DIR "${_WS_BASE_DIR}/wireshark-${WIRESHARK_TARGET_PLATFORM}-libs" )
set( _PROJECT_LIB_DIR "${_WS_BASE_DIR}/wireshark-${WIRESHARK_TARGET_PLATFORM}-libs-3.4" )
else()
# Don't know what to do
message(FATAL_ERROR "Neither WIRESHARK_BASE_DIR or WIRESHARK_LIB_DIR are defined")
@ -261,11 +261,43 @@ if(WIN32)
set(WILDCARD_OBJ wsetargv.obj)
endif(WIN32)
include(CheckSymbolExists)
#
# Large file support on UN*X, a/k/a LFS.
#
# On Windows, we require _fseeki64() and _ftelli64(). Visual
# Studio has had supported them since Visual Studio 2005/MSVCR80,
# and we require newer versions, so we know we have them.
#
if(NOT WIN32)
include(FindLFS)
if(LFS_FOUND)
#
# Add the required #defines.
#
add_definitions(${LFS_DEFINITIONS})
endif()
#
# Check for fseeko as well.
#
include(FindFseeko)
if(FSEEKO_FOUND)
set(HAVE_FSEEKO ON)
#
# Add the required #defines.
#
add_definitions(${FSEEKO_DEFINITIONS})
endif()
endif()
# Banner shown at top right of Qt welcome screen.
if(DEFINED ENV{WIRESHARK_VERSION_FLAVOR})
set(VERSION_FLAVOR "$ENV{WIRESHARK_VERSION_FLAVOR}")
else()
set(VERSION_FLAVOR "Development Build")
#else()
# set(VERSION_FLAVOR "Development Build")
endif()
# These are required in .rc files and manifests
@ -456,16 +488,15 @@ if( CMAKE_C_COMPILER_ID MATCHES "MSVC")
else() # ! MSVC
if(APPLE)
set(MIN_MACOS_VERSION 10.6) # Arbitrary.
# MIN_MACOS_VERSION is used to set LSMinimumSystemVersion
# in Info.plist, so start with something low.
set(MIN_MACOS_VERSION 10.6)
if(CMAKE_OSX_DEPLOYMENT_TARGET)
if(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS MIN_MACOS_VERSION)
message(FATAL_ERROR "We don't support building for macOS < ${MIN_MACOS_VERSION}")
endif()
set(MIN_MACOS_VERSION ${CMAKE_OSX_DEPLOYMENT_TARGET})
message(STATUS "Building for Mac OS X/OS X/macOS ${CMAKE_OSX_DEPLOYMENT_TARGET}")
endif()
elseif(CMAKE_OSX_DEPLOYMENT_TARGET)
message(FATAL_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET only applies when building for macOS")
endif()
#
@ -1199,6 +1230,14 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
find_package(SETCAP)
endif()
if(ENABLE_AMRNB)
set(PACKAGELIST ${PACKAGELIST} AMRNB)
endif()
if(ENABLE_LIBXML2)
set(PACKAGELIST ${PACKAGELIST} LibXml2)
endif()
# Include minizip include directories
if(MINIZIP_FOUND)
include_directories(
@ -1237,12 +1276,11 @@ add_custom_target(dist
)
if(GNUTLS_FOUND AND NOT GNUTLS_VERSION VERSION_LESS "3.4.0")
# While all Linux and Windows builds have PKCS #11 support enabled,
# macos-setup.sh explicitly disables it using --without-p11-kit.
# Calculating public keys from PKCS #11 private keys requires GnuTLS
# 3.4.0 or greater.
#
# Require at least GnuTLS 3.4.0 such that public keys can be calculated
# from PKCS #11 private keys.
include(CheckSymbolExists)
# Check that the support is present in case GnuTLS was compiled
# --without-p11-kit as macos-setup.sh did until recently.
cmake_push_check_state()
if(WIN32)
set(CMAKE_REQUIRED_DEFINITIONS -Dssize_t=int)
@ -1253,6 +1291,65 @@ if(GNUTLS_FOUND AND NOT GNUTLS_VERSION VERSION_LESS "3.4.0")
cmake_pop_check_state()
endif()
if(HAVE_LIBAIRPCAP)
set(HAVE_AIRPCAP 1)
endif()
if(HAVE_LIBLUA)
set(HAVE_LUA_H 1)
set(HAVE_LUA 1)
endif()
if(HAVE_LIBKERBEROS)
set(HAVE_KERBEROS 1)
endif()
if(MAXMINDDB_FOUND)
set(HAVE_MAXMINDDB 1)
endif()
if(LIBSSH_FOUND)
set(HAVE_LIBSSH 1)
endif()
if(JSONGLIB_FOUND)
set(HAVE_JSONGLIB 1)
endif()
if(NGHTTP2_FOUND)
set(HAVE_NGHTTP2 1)
endif()
if(HAVE_LIBCARES)
set(HAVE_C_ARES 1)
endif()
if(NOT HAVE_LIBCARES)
message(WARNING "Not using c-ares.")
message(WARNING "DNS name resolution for captures will be disabled.")
endif()
if(HAVE_LIBNL AND HAVE_AIRPCAP)
message(ERROR "Airpcap and Libnl support are mutually exclusive")
endif()
if(HAVE_LIBSBC)
set(HAVE_SBC 1)
endif()
if(SPANDSP_FOUND)
set(HAVE_SPANDSP 1)
endif()
if(BCG729_FOUND)
set(HAVE_BCG729 1)
endif()
if(AMRNB_FOUND)
set(HAVE_AMRNB 1)
endif()
if(LIBXML2_FOUND)
set(HAVE_LIBXML2 1)
else()
# The (official) FindLibXml2.cmake file sets this cache variable to a
# non-empty value, be sure to clear it when not found.
set(LIBXML2_LIBRARIES "")
endif()
if(EXTCAP_ANDROIDDUMP_LIBPCAP)
set(ANDROIDDUMP_USE_LIBPCAP 1)
endif()
if (HAVE_LIBWINSPARKLE)
set(HAVE_SOFTWARE_UPDATE 1)
endif()
if (QT_FOUND)
if (Qt5Widgets_VERSION VERSION_LESS 5.3)
message(FATAL_ERROR "Qt 5.3 or later is required.")
@ -1298,8 +1395,12 @@ if (QT_FOUND)
)
# https://doc.qt.io/qt-5/supported-platforms.html
# https://doc.qt.io/qt-5.11/supported-platforms-and-configurations.html
# https://doc.qt.io/qt-5.15/supported-platforms.html
# https://doc-snapshots.qt.io/qt6-dev/supported-platforms.html
# CMake < 3.7 doesn't support VERSION_GREATER_EQUAL.
if(Qt5Widgets_VERSION VERSION_GREATER "5.14.999")
if(Qt5Widgets_VERSION VERSION_GREATER "5.999.999")
set(MIN_MACOS_VERSION 10.14)
elseif(Qt5Widgets_VERSION VERSION_GREATER "5.14.999")
set(MIN_MACOS_VERSION 10.13)
elseif(Qt5Widgets_VERSION VERSION_GREATER "5.11.999")
set(MIN_MACOS_VERSION 10.12)
@ -1343,6 +1444,8 @@ if(APPLE)
FIND_LIBRARY (APPLE_APPKIT_LIBRARY AppKit)
FIND_LIBRARY (APPLE_CORE_FOUNDATION_LIBRARY CoreFoundation)
FIND_LIBRARY (APPLE_SYSTEM_CONFIGURATION_LIBRARY SystemConfiguration)
message(STATUS "Building for Mac OS X/OS X/macOS ${MIN_MACOS_VERSION} using SDK ${CMAKE_OSX_SYSROOT}")
endif()
include(ConfigureChecks.cmake)
@ -1537,10 +1640,6 @@ foreach(_plugin_src_dir ${PLUGIN_SRC_DIRS})
add_subdirectory( ${_plugin_src_dir} )
endforeach()
# Large file support (e.g. make off_t 64 bit if supported)
include(gmxTestLargeFiles)
gmx_test_large_files(GMX_LARGEFILES)
set( VERSION ${PROJECT_VERSION} )
if(VCSVERSION_OVERRIDE)
# Allow distributors to override detection of the Git tag and version.
@ -1625,6 +1724,11 @@ set_package_properties(OPUS PROPERTIES
URL "https://opus-codec.org/"
PURPOSE "Support for opus codec in RTP player"
)
set_package_properties(AMRNB PROPERTIES
DESCRIPTION "AMRNB decoder"
URL "https://sourceforge.net/p/opencore-amr"
PURPOSE "Support for AMRNB codec in RTP player"
)
set_package_properties(LIBXML2 PROPERTIES
DESCRIPTION "XML parsing library"
URL "http://xmlsoft.org/"
@ -1922,6 +2026,9 @@ if(WIN32)
if (OPUS_FOUND)
list (APPEND OPTIONAL_DLLS "${OPUS_DLL_DIR}/${OPUS_DLL}")
endif(OPUS_FOUND)
if (AMRNB_FOUND)
list (APPEND OPTIONAL_DLLS "${AMRNB_DLL_DIR}/${AMRNB_DLL}")
endif(AMRNB_FOUND)
if (LIBXML2_FOUND)
foreach( _dll ${LIBXML2_DLLS} )
list (APPEND OPTIONAL_DLLS "${LIBXML2_DLL_DIR}/${_dll}")
@ -2349,6 +2456,9 @@ if(BUILD_wireshark AND QT_FOUND)
LINK_FLAGS "${WS_LINK_FLAGS}"
FOLDER "Executables"
INSTALL_RPATH "${EXECUTABLE_INSTALL_RPATH}"
AUTOMOC ON
AUTOUIC ON
AUTORCC ON
)
if(ENABLE_APPLICATION_BUNDLE OR WIN32)
set_target_properties(wireshark PROPERTIES OUTPUT_NAME Wireshark)
@ -3057,6 +3167,9 @@ if(RPMBUILD_EXECUTABLE)
if (OPUS_FOUND)
list(APPEND _rpmbuild_with_args --with opus)
endif()
if (AMRNB_FOUND)
list(APPEND _rpmbuild_with_args --with amrnb)
endif()
if (LIBXML2_FOUND)
list(APPEND _rpmbuild_with_args --with libxml2)
endif()

View File

@ -37,7 +37,7 @@ else()
endif()
option(BUILD_mmdbresolve "Build MaxMind DB resolver" ON)
option(DISABLE_WERROR "Do not treat warnings as errors" OFF)
option(DISABLE_WERROR "Do not treat warnings as errors" ON)
option(DISABLE_FRAME_LARGER_THAN_WARNING "Disable warning if the size of a function frame is large" OFF)
option(EXTCAP_ANDROIDDUMP_LIBPCAP "Build androiddump using libpcap" OFF)
option(ENABLE_EXTRA_COMPILER_WARNINGS "Do additional compiler warnings (disables -Werror)" OFF)
@ -98,6 +98,7 @@ option(ENABLE_SBC "Build with SBC Codec support in RTP Player" ON)
option(ENABLE_SPANDSP "Build with G.722/G.726 codecs support in RTP Player" ON)
option(ENABLE_BCG729 "Build with G.729 codec support in RTP Player" ON)
option(ENABLE_ILBC "Build with iLBC codec support in RTP Player" ON)
option(ENABLE_AMRNB "Build with AMRNB codec support in RTP Player" ON)
option(ENABLE_LIBXML2 "Build with libxml2 support" ON)
option(ENABLE_OPUS "Build with opus support" ON)

2687
ChangeLog

File diff suppressed because it is too large Load Diff

View File

@ -94,6 +94,19 @@ set(CMAKE_REQUIRED_LIBRARIES ${M_LIBRARIES})
check_symbol_exists("floorl" "math.h" HAVE_FLOORL)
cmake_pop_check_state()
#
# Check whether we have clock_gettime().
# It's not on Windows, so don't waste time checking for it.
# It's in newer POSIX, so some, but not all, UN*Xes have it.
#
if (NOT WIN32)
#
# POSIX - don't bother checking on Windows, as checks
# take time.
#
check_function_exists("clock_gettime" HAVE_CLOCK_GETTIME)
endif (NOT WIN32)
check_function_exists("getopt_long" HAVE_GETOPT_LONG)
if(HAVE_GETOPT_LONG)
#

135
NEWS
View File

@ -1,7 +1,4 @@
Wireshark 3.3.2 Release Notes
This is an experimental release intended to test new features for
Wireshark 3.4.
Wireshark 3.4.7 Release Notes
What is Wireshark?
@ -10,94 +7,38 @@ Wireshark 3.3.2 Release Notes
Whats New
Many improvements have been made. See the “New and Updated Features”
section below for more details.
Bug Fixes
The following vulnerabilities have been fixed:
• wnpa-sec-2021-06[1] DNP dissector crash. Issue 17462[2].
CVE-2021-22235[3].
The following bugs have been fixed:
• TCP dissector - Erroneous DSACK reporting Issue 17315[4].
• No wlan_radio.duration calculated for PHY type: 802.11ac (VHT)
Issue 17419[5].
• NAN Dissector has wrong minimum length for availability attribute
Issue 17431[6].
New and Updated Features
The following features are new (or have been significantly updated)
since version 3.3.1:
• Nothing of note.
The following features are new (or have been significantly updated)
since version 3.3.0:
• The Windows installers now ship with Npcap 1.00. They previously
shipped with Npcap 0.9997.
• The Windows installers now ship with Qt 5.15.1. They previously
shipped with Qt 5.12.8.
The following features are new (or have been significantly updated)
since version 3.2.0:
• Windows executables and installers are now signed using SHA-2
only[1].
• Save RTP stream to .au supports any codec with 8000 Hz rate
supported by Wireshark (shown in RTP player). If save of audio is
not possible (unsupported codec or rate), silence of same length
is saved and warning is shown.
• Asynchronous DNS resolution is always enabled. As a result, the
c-ares library is now a required dependency.
• Protobuf fields can be dissected as Wireshark (header) fields
that allows user input the full names of Protobuf fields or
messages in Filter toolbar for searching.
• Dissectors based on Protobuf can register themselves to a new
'protobuf_field' dissector table, which is keyed with the full
names of fields, for further parsing fields of BYTES or STRING
type.
• Wireshark is able to decode, play, and save iLBC payload on
platforms where the iLBC library[2] is available.
• Wireshark is able to decode, play, and save opus payload on
platforms where the opus library[3] is available.
• “Decode As” entries can now be copied from other profiles using a
button in the dialog.
• sshdump can now be copied to multiple instances. Each instance
will show up a different interface and will have its own profile.
• The main window now supports a packet diagram view, which shows
each packet as a textbook-style diagram.
• Filter buttons (“Preferences → Filter Buttons”) can be grouped by
using “//” as a path separator in the filter button label.
• IPP Over USB packets can now be dissected and displayed
New Protocol Support
Arinc 615A (A615A), Asphodel Protocol, AudioCodes Debug Recording
(ACDR), Bluetooth HCI ISO (BT HCI ISO), Cisco MisCabling Protocol
(MCP), Community ID Flow Hashing (CommunityID), DCE/RPC
IRemoteWinspool SubSystem, (IREMOTEWINSPOOL), Dynamic Link Exchange
Protocol (DLEP), EAP Generalized Pre-Shared Key (EAP-GPSK), EAP
Password Authenticated Exchange (EAP-PAX), EAP Pre-Shared Key
(EAP-PSK), EAP Shared-secret Authentication and Key Establishment
(EAP-SAKE), Fortinet Single Sign-on (FSSO), FTDI Multi-Protocol
Synchronous Serial Engine (FTDI MPSSE), Hypertext Transfer Protocol
Version 3 (HTTP3), ILDA Digital Network (IDN), ILDA Digital Network
(IDN), Java Debug Wire Protocol (JDWP), LBM Stateful Resolution
Service (LBMSRS), Lithionics Battery Management, OBSAI UDP-based
Communication Protocol (UDPCP), Palo Alto Heartbeat Backup
(PA-HB-Bak), ScyllaDB RPC, Technically Enhanced Capture Module
Protocol (TECMP), Tunnel Extensible Authentication Protocol (TEAP),
UDP based FTP w/ multicast V5 (UFTP5), and USB Printer (USBPRINTER)
There are no new protocols in this release.
Updated Protocol Support
Too many protocols have been updated to list here.
ASTERIX, BT LE LL, DCE RPC, DNP, GTPv2, IEEE 802.11 Radio, LDAP, NAN,
NORDIC_BLE, NR RRC, OSPF, pcapng, PNIO, RSL, S101, Snort config, and
TCP
New and Updated Capture File Support
MP4 (ISO/IEC 14496-12)
Catapult DCT2000, ERF, and pcap
Getting Wireshark
@ -109,7 +50,7 @@ Wireshark 3.3.2 Release Notes
Most Linux and Unix vendors supply their own Wireshark packages. You
can usually install or upgrade Wireshark using the package management
system specific to that platform. A list of third-party packages can
be found on the download page[4] on the Wireshark web site.
be found on the download page[7] on the Wireshark web site.
File Locations
@ -123,26 +64,28 @@ Wireshark 3.3.2 Release Notes
The Users Guide, manual pages and various other documentation can be
found at https://www.wireshark.org/docs/
Community support is available on WiresharksQ&A site[5] and on the
Community support is available on Wiresharks Q&A site[8] and on the
wireshark-users mailing list. Subscription information and archives
for all of Wiresharks mailing lists can be found on the web site[6].
for all of Wiresharks mailing lists can be found on the web site[9].
Bugs and feature requests can be reported on the issue tracker[7].
Issues and feature requests can be reported on the issue tracker[10].
Frequently Asked Questions
A complete FAQ is available on the Wireshark web site[8].
A complete FAQ is available on the Wireshark web site[11].
Last updated 2020-10-18 09:04:19 UTC
Last updated 2021-07-14 16:36:15 UTC
References
1. https://support.microsoft.com/en-us/help/4472027/2019-sha-2-code-s
igning-support-requirement-for-windows-and-wsus
2. https://github.com/TimothyGu/libilbc
3. https://opus-codec.org/
4. https://www.wireshark.org/download.html#thirdparty
5. https://ask.wireshark.org/
6. https://www.wireshark.org/lists/
7. https://gitlab.com/wireshark/wireshark/-/issues
8. https://www.wireshark.org/faq.html
1. https://www.wireshark.org/security/wnpa-sec-2021-06
2. https://gitlab.com/wireshark/wireshark/-/issues/17462
3. https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-22235
4. https://gitlab.com/wireshark/wireshark/-/issues/17315
5. https://gitlab.com/wireshark/wireshark/-/issues/17419
6. https://gitlab.com/wireshark/wireshark/-/issues/17431
7. https://www.wireshark.org/download.html#thirdparty
8. https://ask.wireshark.org/
9. https://www.wireshark.org/lists/
10. https://gitlab.com/wireshark/wireshark/-/issues
11. https://www.wireshark.org/faq.html

2
README.osmocom Normal file
View File

@ -0,0 +1,2 @@
This branch contains Osmocom specific patches, see:
https://osmocom.org/issues/2537

View File

@ -11,10 +11,6 @@
#ifndef __CAPCHILD_CAPTURE_SESSION_H__
#define __CAPCHILD_CAPTURE_SESSION_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#ifndef _WIN32
#include <sys/types.h>
#include <stdint.h>
@ -24,6 +20,12 @@ extern "C" {
#include <wsutil/processes.h>
#include "cfile.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#ifdef HAVE_LIBPCAP
/* Current state of capture engine. XXX - differentiate states */
typedef enum {
@ -32,7 +34,6 @@ typedef enum {
CAPTURE_RUNNING /**< capture child signalled ok, capture is running now */
} capture_state;
#include "cfile.h"
struct _info_data;
/*

View File

@ -994,7 +994,7 @@ capture_opts_print_if_capabilities(if_capabilities_t *caps, char *name, int quer
if (queries & CAPS_QUERY_LINK_TYPES) {
if (caps->can_set_rfmon)
printf("Data link types of interface %s when %sin monitor mode (use option -y to set):\n",
name, queries & CAPS_MONITOR_MODE ? "" : "not ");
name, (queries & CAPS_MONITOR_MODE) ? "" : "not ");
else
printf("Data link types of interface %s (use option -y to set):\n", name);
for (lt_entry = caps->data_link_types; lt_entry != NULL;

View File

@ -11,16 +11,19 @@
#ifndef __CAPTURE_PCAP_UTIL_H__
#define __CAPTURE_PCAP_UTIL_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#ifdef HAVE_LIBPCAP
#include "wspcap.h"
#include "capture_opts.h"
#endif
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#ifdef HAVE_LIBPCAP
/*
* A snapshot length of 0 is useless - and libpcap/WinPcap/Npcap don't guarantee
* that a snapshot length of 0 will work, and, on some platforms, it won't

View File

@ -11,12 +11,12 @@
#ifndef __CAPTURE_IFINFO_H__
#define __CAPTURE_IFINFO_H__
#include <glib.h>
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#include <glib.h>
/*
* Explicitly set the interface_type enum values as these values are exposed
* in the preferences gui.interfaces_hidden_types string.

View File

@ -11,12 +11,12 @@
#ifndef __WS80211_UTILS_H__
#define __WS80211_UTILS_H__
#include "ws_attributes.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#include "ws_attributes.h"
enum ws80211_channel_type {
WS80211_CHAN_NO_HT,
WS80211_CHAN_HT20,

View File

@ -1,24 +0,0 @@
/*
* This code was copied from http://www.gromacs.org/
* and its toplevel COPYING file starts with:
*
* GROMACS is free software, distributed under the GNU General Public License
* (GPL) Version 2.
*/
#include <sys/types.h>
/* detect failure even with -Wno-error on command line */
#pragma GCC diagnostic error "-Werror"
int main(int argc, char **argv)
{
/* Cause a compile-time error if off_t is smaller than 64 bits */
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[ (LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1 ];
/* silence unused errors */
(void)off_t_is_large;
(void)argc;
(void)argv;
return 0;
}

View File

@ -1,40 +0,0 @@
/*
* and its toplevel COPYING file starts with:
*
* GROMACS is free software, distributed under the GNU General Public License
* (GPL) Version 2.
*/
#cmakedefine _LARGEFILE_SOURCE
#cmakedefine _LARGEFILE64_SOURCE
#cmakedefine _LARGE_FILES
#cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@
/* detect failure even with -Wno-error on command line */
#pragma GCC diagnostic error "-Werror"
#include <sys/types.h>
#include <stdio.h>
#include <stdlib.h>
int main(int argc, char **argv)
{
/* Cause a compile-time error if off_t is smaller than 64 bits,
* and make sure we have ftello / fseeko.
*/
#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
int off_t_is_large[ (LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1 ];
/* silence unused warnings */
FILE *fp;
off_t offset;
(void)off_t_is_large;
(void)argc;
(void)argv;
fp = fopen(argv[0],"r");
offset = ftello( fp );
fseeko( fp, offset, SEEK_CUR );
fclose(fp);
return 0;
}

View File

@ -0,0 +1,57 @@
# Find the system's opencore-amrnb includes and library
#
# AMRNB_INCLUDE_DIRS - where to find amrnb/decoder.h
# AMRNB_LIBRARIES - List of libraries when using amrnb
# AMRNB_FOUND - True if amrnb found
# AMRNB_DLL_DIR - (Windows) Path to the amrnb DLL
# AMRNB_DLL - (Windows) Name of the amrnb DLL
include( FindWSWinLibs )
FindWSWinLibs( "opencore-amrnb-.*" "AMRNB_HINTS" )
if (NOT WIN32)
find_package(PkgConfig)
pkg_search_module(AMRNB opencore-amrnb)
endif()
find_path( AMRNB_INCLUDE_DIR
NAMES opencore-amrnb/interf_dec.h
HINTS
"${AMRNB_INCLUDE_DIR}"
"${AMRNB_HINTS}/include"
PATHS /usr/local/include /usr/include
)
find_library( AMRNB_LIBRARY
NAMES opencore-amrnb
HINTS
"${AMRNB_LIBDIR}"
"${AMRNB_HINTS}/lib"
PATHS /usr/local/lib /usr/lib
)
include( FindPackageHandleStandardArgs )
find_package_handle_standard_args( amrnb DEFAULT_MSG AMRNB_INCLUDE_DIR AMRNB_LIBRARY )
if( AMRNB_FOUND )
set( AMRNB_INCLUDE_DIRS ${AMRNB_INCLUDE_DIR} )
set( AMRNB_LIBRARIES ${AMRNB_LIBRARY} )
if (WIN32)
set ( AMRNB_DLL_DIR "${AMRNB_HINTS}/bin"
CACHE PATH "Path to amrnb DLL"
)
file( GLOB _amrnb_dll RELATIVE "${AMRNB_DLL_DIR}"
"${AMRNB_DLL_DIR}/libamrnb.dll"
)
set ( AMRNB_DLL ${_amrnb_dll}
# We're storing filenames only. Should we use STRING instead?
CACHE FILEPATH "amrnb DLL file name"
)
mark_as_advanced( AMRNB_DLL_DIR AMRNB_DLL )
endif()
else()
set( AMRNB_INCLUDE_DIRS )
set( AMRNB_LIBRARIES )
endif()
mark_as_advanced( AMRNB_LIBRARIES AMRNB_INCLUDE_DIRS )

View File

@ -0,0 +1,85 @@
# CMake support for fseeko
#
# Based on FindLFS.cmake by
# Copyright (C) 2016 Julian Andres Klode <jak@debian.org>.
#
# Permission is hereby granted, free of charge, to any person
# obtaining a copy of this software and associated documentation files
# (the "Software"), to deal in the Software without restriction,
# including without limitation the rights to use, copy, modify, merge,
# publish, distribute, sublicense, and/or sell copies of the Software,
# and to permit persons to whom the Software is furnished to do so,
# subject to the following conditions:
#
# The above copyright notice and this permission notice shall be
# included in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
#
# This defines the following variables
#
# FSEEKO_DEFINITIONS - List of definitions to pass to add_definitions()
# FSEEKO_COMPILE_OPTIONS - List of definitions to pass to add_compile_options()
# FSEEKO_LIBRARIES - List of libraries and linker flags
# FSEEKO_FOUND - If there is Large files support
#
include(CheckCSourceCompiles)
include(FindPackageHandleStandardArgs)
include(CMakePushCheckState)
# Check for the availability of fseeko()
# The cases handled are:
#
# * Native fseeko()
# * Preprocessor flag -D_LARGEFILE_SOURCE
#
function(_fseeko_check)
set(_fseeko_cppflags)
cmake_push_check_state()
set(CMAKE_REQUIRED_QUIET 1)
set(CMAKE_REQUIRED_DEFINITIONS ${LFS_DEFINITIONS})
message(STATUS "Looking for native fseeko support")
check_symbol_exists(fseeko stdio.h fseeko_native)
cmake_pop_check_state()
if (fseeko_native)
message(STATUS "Looking for native fseeko support - found")
set(FSEEKO_FOUND TRUE)
else()
message(STATUS "Looking for native fseeko support - not found")
endif()
if (NOT FSEEKO_FOUND)
# See if it's available with _LARGEFILE_SOURCE.
cmake_push_check_state()
set(CMAKE_REQUIRED_QUIET 1)
set(CMAKE_REQUIRED_DEFINITIONS ${LFS_DEFINITIONS} "-D_LARGEFILE_SOURCE")
check_symbol_exists(fseeko stdio.h fseeko_need_largefile_source)
cmake_pop_check_state()
if (fseeko_need_largefile_source)
message(STATUS "Looking for fseeko support with _LARGEFILE_SOURCE - found")
set(FSEEKO_FOUND TRUE)
set(_fseeko_cppflags "-D_LARGEFILE_SOURCE")
else()
message(STATUS "Looking for fseeko support with _LARGEFILE_SOURCE - not found")
endif()
endif()
set(FSEEKO_DEFINITIONS ${_fseeko_cppflags} CACHE STRING "Extra definitions for fseeko support")
set(FSEEKO_COMPILE_OPTIONS "" CACHE STRING "Extra compiler options for fseeko support")
set(FSEEKO_LIBRARIES "" CACHE STRING "Extra definitions for fseeko support")
set(FSEEKO_FOUND ${FSEEKO_FOUND} CACHE INTERNAL "Found fseeko")
endfunction()
if (NOT FSEEKO_FOUND)
_fseeko_check()
endif()
find_package_handle_standard_args(FSEEKO "Could not find fseeko. Set FSEEKO_DEFINITIONS, FSEEKO_COMPILE_OPTIONS, FSEEKO_LIBRARIES." FSEEKO_FOUND)

153
cmake/modules/FindLFS.cmake Normal file
View File

@ -0,0 +1,153 @@
# CMake support for large files
#
# Copyright (C) 2016 Julian Andres Klode <jak@debian.org>.
#
# Permission is hereby granted, free of charge, to any person
# obtaining a copy of this software and associated documentation files
# (the "Software"), to deal in the Software without restriction,
# including without limitation the rights to use, copy, modify, merge,
# publish, distribute, sublicense, and/or sell copies of the Software,
# and to permit persons to whom the Software is furnished to do so,
# subject to the following conditions:
#
# The above copyright notice and this permission notice shall be
# included in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
#
# This defines the following variables
#
# LFS_DEFINITIONS - List of definitions to pass to add_definitions()
# LFS_COMPILE_OPTIONS - List of definitions to pass to add_compile_options()
# LFS_LIBRARIES - List of libraries and linker flags
# LFS_FOUND - If there is Large files support
#
include(CheckCSourceCompiles)
include(FindPackageHandleStandardArgs)
include(CMakePushCheckState)
# Test program to check for LFS. Requires that off_t has at least 8 byte large
set(_lfs_test_source
"
#include <sys/types.h>
typedef char my_static_assert[sizeof(off_t) >= 8 ? 1 : -1];
int main(void) { return 0; }
"
)
# Check if the given options are needed
#
# This appends to the variables _lfs_cppflags, _lfs_cflags, and _lfs_ldflags,
# it also sets LFS_FOUND to 1 if it works.
function(_lfs_check_compiler_option var options definitions libraries)
cmake_push_check_state()
set(CMAKE_REQUIRED_QUIET 1)
set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} ${options})
set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} ${definitions})
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_DEFINITIONS} ${libraries})
message(STATUS "Looking for LFS support using ${options} ${definitions} ${libraries}")
check_c_source_compiles("${_lfs_test_source}" ${var})
cmake_pop_check_state()
if(${var})
message(STATUS "Looking for LFS support using ${options} ${definitions} ${libraries} - found")
set(_lfs_cppflags ${_lfs_cppflags} ${definitions} PARENT_SCOPE)
set(_lfs_cflags ${_lfs_cflags} ${options} PARENT_SCOPE)
set(_lfs_ldflags ${_lfs_ldflags} ${libraries} PARENT_SCOPE)
set(LFS_FOUND TRUE PARENT_SCOPE)
else()
message(STATUS "Looking for LFS support using ${options} ${definitions} ${libraries} - not found")
endif()
endfunction()
# Check for the availability of LFS.
# The cases handled are:
#
# * Native LFS
# * Output of getconf LFS_CFLAGS; getconf LFS_LIBS; getconf LFS_LDFLAGS
# * Preprocessor flag -D_FILE_OFFSET_BITS=64
# * Preprocessor flag -D_LARGE_FILES
#
function(_lfs_check)
set(_lfs_cflags)
set(_lfs_cppflags)
set(_lfs_ldflags)
set(_lfs_libs)
cmake_push_check_state()
set(CMAKE_REQUIRED_QUIET 1)
message(STATUS "Looking for native LFS support")
check_c_source_compiles("${_lfs_test_source}" lfs_native)
cmake_pop_check_state()
if (lfs_native)
message(STATUS "Looking for native LFS support - found")
set(LFS_FOUND TRUE)
else()
message(STATUS "Looking for native LFS support - not found")
endif()
if (NOT LFS_FOUND)
# Check using getconf. If getconf fails, don't worry, the check in
# _lfs_check_compiler_option will fail as well.
execute_process(COMMAND getconf LFS_CFLAGS
OUTPUT_VARIABLE _lfs_cflags_raw
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET)
execute_process(COMMAND getconf LFS_LIBS
OUTPUT_VARIABLE _lfs_libs_tmp
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET)
execute_process(COMMAND getconf LFS_LDFLAGS
OUTPUT_VARIABLE _lfs_ldflags_tmp
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET)
separate_arguments(_lfs_cflags_raw)
separate_arguments(_lfs_ldflags_tmp)
separate_arguments(_lfs_libs_tmp)
# Move -D flags to the place they are supposed to be
foreach(flag ${_lfs_cflags_raw})
if (flag MATCHES "-D.*")
list(APPEND _lfs_cppflags_tmp ${flag})
else()
list(APPEND _lfs_cflags_tmp ${flag})
endif()
endforeach()
# Check if the flags we received (if any) produce working LFS support
_lfs_check_compiler_option(lfs_getconf_works
"${_lfs_cflags_tmp}"
"${_lfs_cppflags_tmp}"
"${_lfs_libs_tmp};${_lfs_ldflags_tmp}")
endif()
if(NOT LFS_FOUND) # IRIX stuff
_lfs_check_compiler_option(lfs_need_n32 "-n32" "" "")
endif()
if(NOT LFS_FOUND) # Linux and friends
_lfs_check_compiler_option(lfs_need_file_offset_bits "" "-D_FILE_OFFSET_BITS=64" "")
endif()
if(NOT LFS_FOUND) # AIX
_lfs_check_compiler_option(lfs_need_large_files "" "-D_LARGE_FILES=1" "")
endif()
set(LFS_DEFINITIONS ${_lfs_cppflags} CACHE STRING "Extra definitions for large file support")
set(LFS_COMPILE_OPTIONS ${_lfs_cflags} CACHE STRING "Extra definitions for large file support")
set(LFS_LIBRARIES ${_lfs_libs} ${_lfs_ldflags} CACHE STRING "Extra definitions for large file support")
set(LFS_FOUND ${LFS_FOUND} CACHE INTERNAL "Found LFS")
endfunction()
if (NOT LFS_FOUND)
_lfs_check()
endif()
find_package_handle_standard_args(LFS "Could not find LFS. Set LFS_DEFINITIONS, LFS_COMPILE_OPTIONS, LFS_LIBRARIES." LFS_FOUND)

View File

@ -16,7 +16,7 @@ function( FindWSWinLibs _WS_LIB_SEARCH_PATH _LIB_HINT_VAR )
file( TO_CMAKE_PATH "$ENV{WIRESHARK_LIB_DIR}" _PROJECT_LIB_DIR )
else()
file( TO_CMAKE_PATH "$ENV{WIRESHARK_BASE_DIR}" _WS_BASE_DIR )
set( _PROJECT_LIB_DIR "${_WS_BASE_DIR}/wireshark-${WIRESHARK_TARGET_PLATFORM}-libs" )
set( _PROJECT_LIB_DIR "${_WS_BASE_DIR}/wireshark-${WIRESHARK_TARGET_PLATFORM}-libs-3.4" )
endif()
endif()

View File

@ -1,134 +0,0 @@
# This code was copied from http://www.gromacs.org/
# and its toplevel COPYING file starts with:
#
# GROMACS is free software, distributed under the GNU General Public License
# (GPL) Version 2.
# - Define macro to check large file support
#
# GMX_TEST_LARGE_FILES(VARIABLE)
#
# VARIABLE will be set to true if 64-bit file support is available.
# This macro will also set defines as necessary to enable large file
# support, for instance:
# _LARGE_FILES
# _LARGEFILE_SOURCE
# _FILE_OFFSET_BITS=64
#
# However, it is YOUR job to make sure these defines are set in a cmakedefine so they
# end up in a config.h file that is included in your source if necessary!
MACRO(GMX_TEST_LARGE_FILES VARIABLE)
IF(NOT DEFINED ${VARIABLE})
if(CMAKE_C_COMPILER_ID MATCHES "MSVC")
#
# This is Visual Studio; Visual Studio has supported
# _fseeki64 and _ftelli64 since Visual Studio 2005 / MSVCR80,
# and we require newer versions, so we know we have them.
#
MESSAGE(STATUS "_fseeki64 and _ftelli64 are present")
else(CMAKE_C_COMPILER_ID MATCHES "MSVC")
#
# This is UN*X, or some other Windows compiler.
#
# For UN*X, we do the Large File Support tests, to see
# whether it's present and, if so what we need to define
# to enable it.
#
# XXX - what's the right thing to do on Windows with,
# for example, MinGW?
#
# On most platforms it is probably overkill to first test
# the flags for 64-bit off_t, and then separately fseeko.
# However, in the future we might have 128-bit seek offsets
# to support 128-bit filesystems that allow 128-bit offsets
# (ZFS), so it might be dangerous to indiscriminately set
# e.g. _FILE_OFFSET_BITS=64.
#
MESSAGE(STATUS "Checking for 64-bit off_t")
# First check without any special flags
TRY_COMPILE(FILE64_OK "${CMAKE_BINARY_DIR}"
"${CMAKE_SOURCE_DIR}/cmake/TestFileOffsetBits.c")
if(FILE64_OK)
MESSAGE(STATUS "64-bit off_t is present with no special flags")
endif(FILE64_OK)
if(NOT FILE64_OK)
# Test with _FILE_OFFSET_BITS=64
TRY_COMPILE(FILE64_OK "${CMAKE_BINARY_DIR}"
"${CMAKE_SOURCE_DIR}/cmake/TestFileOffsetBits.c"
COMPILE_DEFINITIONS "-D_FILE_OFFSET_BITS=64" )
if(FILE64_OK)
MESSAGE(STATUS "64-bit off_t is present with _FILE_OFFSET_BITS=64")
set(_FILE_OFFSET_BITS 64 CACHE INTERNAL "64-bit off_t requires _FILE_OFFSET_BITS=64")
endif(FILE64_OK)
endif(NOT FILE64_OK)
if(NOT FILE64_OK)
# Test with _LARGE_FILES
TRY_COMPILE(FILE64_OK "${CMAKE_BINARY_DIR}"
"${CMAKE_SOURCE_DIR}/cmake/TestFileOffsetBits.c"
COMPILE_DEFINITIONS "-D_LARGE_FILES" )
if(FILE64_OK)
MESSAGE(STATUS "64-bit off_t is present with _LARGE_FILES")
set(_LARGE_FILES 1 CACHE INTERNAL "64-bit off_t requires _LARGE_FILES")
endif(FILE64_OK)
endif(NOT FILE64_OK)
if(NOT FILE64_OK)
# Test with _LARGEFILE_SOURCE
TRY_COMPILE(FILE64_OK "${CMAKE_BINARY_DIR}"
"${CMAKE_SOURCE_DIR}/cmake/TestFileOffsetBits.c"
COMPILE_DEFINITIONS "-D_LARGEFILE_SOURCE" )
if(FILE64_OK)
MESSAGE(STATUS "64-bit off_t is present with _LARGEFILE_SOURCE")
set(_LARGEFILE_SOURCE 1 CACHE INTERNAL "64-bit off_t requires _LARGEFILE_SOURCE")
endif(FILE64_OK)
endif(NOT FILE64_OK)
if(NOT FILE64_OK)
MESSAGE(STATUS "64-bit file offset support not available")
else(NOT FILE64_OK)
# Set the flags we might have determined to be required above
configure_file("${CMAKE_SOURCE_DIR}/cmake/TestLargeFiles.c.cmakein"
"${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestLargeFiles.c")
#
# If this is Windows, assume we have _fseeki64/_ftelli64
# available. If this is UN*X, check for fseeko/ftello.
#
if(NOT WIN32)
MESSAGE(STATUS "Checking for fseeko/ftello")
# Test if ftello/fseeko are available
TRY_COMPILE(FSEEKO_COMPILE_OK "${CMAKE_BINARY_DIR}"
"${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestLargeFiles.c")
if(FSEEKO_COMPILE_OK)
MESSAGE(STATUS "Checking for fseeko/ftello - present")
endif(FSEEKO_COMPILE_OK)
if(NOT FSEEKO_COMPILE_OK)
# glibc 2.2 neds _LARGEFILE_SOURCE for fseeko (but not 64-bit off_t...)
TRY_COMPILE(FSEEKO_COMPILE_OK "${CMAKE_BINARY_DIR}"
"${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TestLargeFiles.c"
COMPILE_DEFINITIONS "-D_LARGEFILE_SOURCE" )
if(FSEEKO_COMPILE_OK)
MESSAGE(STATUS "Checking for fseeko/ftello - present with _LARGEFILE_SOURCE")
set(_LARGEFILE_SOURCE 1 CACHE INTERNAL "64-bit fseeko requires _LARGEFILE_SOURCE")
endif(FSEEKO_COMPILE_OK)
endif(NOT FSEEKO_COMPILE_OK)
if(FSEEKO_COMPILE_OK)
SET(${VARIABLE} 1 CACHE INTERNAL "Result of test for large file support" FORCE)
set(HAVE_FSEEKO 1 CACHE INTERNAL "64-bit fseeko is available" FORCE)
else(FSEEKO_COMPILE_OK)
MESSAGE(STATUS "Checking for fseeko/ftello - not found")
SET(${VARIABLE} 0 CACHE INTERNAL "Result of test for large file support" FORCE)
endif(FSEEKO_COMPILE_OK)
endif(NOT WIN32)
endif(NOT FILE64_OK)
endif(CMAKE_C_COMPILER_ID MATCHES "MSVC")
ENDIF(NOT DEFINED ${VARIABLE})
ENDMACRO(GMX_TEST_LARGE_FILES VARIABLE)

View File

@ -40,6 +40,9 @@
/* Define to 1 if you have the <arpa/inet.h> header file. */
#cmakedefine HAVE_ARPA_INET_H 1
/* Define to 1 if you have the `clock_gettime` function. */
#cmakedefine HAVE_CLOCK_GETTIME 1
/* Define to 1 if you have the <fcntl.h> header file. */
#cmakedefine HAVE_FCNTL_H 1
@ -241,6 +244,9 @@
/* Define to 1 if you have the speexdsp library. */
#cmakedefine HAVE_SPEEXDSP 1
/* Define to 1 if you have the opencore-amrnb library. */
#cmakedefine HAVE_AMRNB 1
/* Define to 1 if you have the lixbml2 library. */
#cmakedefine HAVE_LIBXML2 1
@ -322,12 +328,6 @@
/* Build androiddump with libpcap instead of wireshark stuff */
#cmakedefine ANDROIDDUMP_USE_LIBPCAP 1
/* Large file support */
#cmakedefine _LARGEFILE_SOURCE
#cmakedefine _LARGEFILE64_SOURCE
#cmakedefine _LARGE_FILES
#cmakedefine _FILE_OFFSET_BITS @_FILE_OFFSET_BITS@
/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
`char[]'. */
/* Note: not use in the code */

99
codecs/CMakeLists.txt Normal file
View File

@ -0,0 +1,99 @@
# CMakeLists.txt
#
# Wireshark - Network traffic analyzer
# By Gerald Combs <gerald@wireshark.org>
# Copyright 1998 Gerald Combs
#
# SPDX-License-Identifier: GPL-2.0-or-later
#
set(WSCODECS_PUBLIC_HEADERS
codecs.h
)
set(WSCODECS_FILES
codecs.c
G711a/G711adecode.c
G711u/G711udecode.c
speex/resample.c
)
# Enables visibility in IDEs
file(GLOB EXTRA_CODEC_HEADERS
codecs.h
G711a/G711adecode.h G711a/G711atable.h
G711u/G711udecode.h G711u/G711utable.h
speex/arch.h
speex/speex_resampler.h
speex/stack_alloc.h
)
if(SBC_FOUND)
set(WSCODECS_FILES ${WSCODECS_FILES} sbc/sbc.c)
endif()
set(wscodecs_LIBS
${M_LIBRARIES}
${GMODULE2_LIBRARIES}
${SBC_LIBRARIES}
wsutil
)
if(HAVE_SPANDSP)
list(APPEND WSCODECS_FILES G722/G722decode.c G726/G726decode.c)
list(APPEND wscodecs_LIBS ${SPANDSP_LIBRARIES})
endif()
if(HAVE_BCG729)
list(APPEND WSCODECS_FILES G729/G729decode.c)
list(APPEND wscodecs_LIBS ${BCG729_LIBRARIES})
endif()
if(AMRNB_FOUND)
list(APPEND WSCODECS_FILES amr/amrdecode.c)
list(APPEND wscodecs_LIBS ${AMRNB_LIBRARIES})
endif()
add_library(wscodecs
${WSCODECS_FILES}
${CMAKE_BINARY_DIR}/image/libwscodecs.rc
)
set(FULL_SO_VERSION "0.0.0")
set_target_properties(wscodecs PROPERTIES
PREFIX "lib"
COMPILE_DEFINITIONS "WS_BUILD_DLL"
LINK_FLAGS "${WS_LINK_FLAGS}"
VERSION ${FULL_SO_VERSION} SOVERSION 0
FOLDER "DLLs"
)
if(ENABLE_APPLICATION_BUNDLE)
set_target_properties(wscodecs PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/run/Wireshark.app/Contents/Frameworks
)
endif()
target_link_libraries(wscodecs ${wscodecs_LIBS})
install(TARGETS wscodecs
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
if(NOT WIN32)
install(FILES ${WSCODECS_PUBLIC_HEADERS}
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${CPACK_PACKAGE_NAME}/codecs"
)
endif()
CHECKAPI(
NAME
codecs
SWITCHES
-g abort -g termoutput -build
SOURCES
${WSCODECS_FILES}
)

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
wireshark (3.3.2) unstable; urgency=low
wireshark (3.4.7) unstable; urgency=low
* Self-made package

20
debian/control vendored
View File

@ -26,8 +26,8 @@ Homepage: https://www.wireshark.org/
Package: wireshark-common
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libwireshark0 (>= ${binary:Version}),
libwiretap0 (>= ${binary:Version}), debconf, libcap2-bin [linux-any]
Depends: ${shlibs:Depends}, ${misc:Depends}, libwireshark14 (>= ${binary:Version}),
libwiretap11 (>= ${binary:Version}), debconf, libcap2-bin [linux-any]
Recommends: wireshark (>= ${binary:Version}) | tshark (>= ${binary:Version})
Breaks: ethereal (<< 1.0.0-3),
wireshark (<< 2.0.0~),
@ -124,13 +124,13 @@ Description: network traffic analyzer - documentation
This package contains Wireshark User's guide, Wireshark Developer's Guide
and the Lua Reference.
Package: libwireshark0
Package: libwireshark14
Section: libs
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}, libwireshark-data (>= ${source:Version}),
libwsutil0 (>= ${source:Version})
libwsutil12 (>= ${source:Version})
Suggests: wireshark-doc (>= ${source:Version})
Conflicts: wireshark-common (<< 1.4.0~rc2-1)
Replaces: wireshark-common (<< 1.4.0~rc2-1)
@ -138,7 +138,7 @@ Description: network packet dissection library -- shared library
The libwireshark library provides the network packet dissection services
developed by the Wireshark project.
Package: libwsutil0
Package: libwsutil12
Section: libs
Architecture: any
Multi-Arch: same
@ -147,12 +147,12 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: wireshark-common (<< 1.4.0~rc2-1), libwireshark1 (<< 1.4.2-2)
Replaces: wireshark-common (<< 1.4.0~rc2-1), libwireshark1 (<< 1.4.2-2)
Description: network packet dissection utilities library -- shared library
The libwsutil library provides utility functions for libwireshark0.
The libwsutil library provides utility functions for libwireshark14.
Package: libwsutil-dev
Section: libdevel
Architecture: any
Depends: ${misc:Depends} , libwsutil0 (= ${binary:Version})
Depends: ${misc:Depends} , libwsutil12 (= ${binary:Version})
Conflicts: wireshark-common (<< 1.4.0~rc2-1), libwireshark-dev (<< 1.4.2-2),
wireshark-dev (<< 1.4.0~rc2-1)
Replaces: wireshark-common (<< 1.4.0~rc2-1), libwireshark-dev (<< 1.4.2-2),
@ -181,7 +181,7 @@ Description: network packet dissection library -- data files
Package: libwireshark-dev
Section: libdevel
Depends: ${misc:Depends}, libwsutil-dev, libwiretap-dev,
libwireshark0 (= ${binary:Version})
libwireshark14 (= ${binary:Version})
Conflicts: wireshark-dev (<< 1.4.0~rc2-1)
Replaces: wireshark-dev (<< 1.4.0~rc2-1)
Architecture: any
@ -192,7 +192,7 @@ Description: network packet dissection library -- development files
This package contains the static library and the C header files that are
needed for applications to use libwireshark services.
Package: libwiretap0
Package: libwiretap11
Section: libs
Architecture: any
Multi-Arch: same
@ -227,7 +227,7 @@ Description: network packet capture library -- shared library
Package: libwiretap-dev
Section: libdevel
Depends: ${misc:Depends}, libwiretap0 (= ${binary:Version})
Depends: ${misc:Depends}, libwiretap11 (= ${binary:Version})
Conflicts: wireshark-dev (<< 1.4.0~rc2-1)
Replaces: wireshark-dev (<< 1.4.0~rc2-1)
Architecture: any

View File

@ -1,8 +0,0 @@
# from file-elf.c
libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 Synopsys Synopsis
# Typo directly on IANA enterprise-numbers (epan/enterprise-numbers)
libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 Nam Name
libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 Informations Information
libwireshark0: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.0.0.0 Dont Don't

View File

@ -0,0 +1,8 @@
# from file-elf.c
libwireshark14: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.14.0.0 Synopsys Synopsis
# Typo directly on IANA enterprise-numbers (epan/enterprise-numbers)
libwireshark14: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.14.0.0 Nam Name
libwireshark14: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.14.0.0 Informations Information
libwireshark14: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libwireshark.so.14.0.0 Dont Don't

View File

@ -1,4 +1,4 @@
libwireshark.so.0 libwireshark0 #MINVER#
libwireshark.so.14 libwireshark14 #MINVER#
AdmissionRejectReason_vals@Base 1.9.1
BandRejectReason_vals@Base 1.9.1
CommandCode_vals_ext@Base 1.9.1
@ -943,6 +943,7 @@ libwireshark.so.0 libwireshark0 #MINVER#
maxmind_db_get_paths@Base 2.5.1
maxmind_db_lookup_ipv4@Base 2.5.1
maxmind_db_lookup_ipv6@Base 2.5.1
maxmind_db_set_synchrony@Base 3.4.5
mbim_register_uuid_ext@Base 1.12.0~rc1
memory_usage_component_register@Base 1.12.0~rc1
memory_usage_gc@Base 1.12.0~rc1

View File

@ -1,4 +1,4 @@
libwiretap.so.0 libwiretap0 #MINVER#
libwiretap.so.11 libwiretap11 #MINVER#
file_eof@Base 1.9.1
file_error@Base 1.9.1
file_getc@Base 1.9.1

View File

@ -1,4 +1,4 @@
libwsutil.so.0 libwsutil0 #MINVER#
libwsutil.so.12 libwsutil12 #MINVER#
Dot11DecryptWepDecrypt@Base 2.5.0
Eax_Decrypt@Base 1.12.0~rc1
adler32_bytes@Base 1.12.0~rc1

29
debian/po/cs.po vendored
View File

@ -1,17 +1,20 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the wireshark package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# Martin Sin <martin.sin@zshk.cz>, 2009
# Gerald Combs <gerald@wireshark.org>, 2020
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Wireshark\n"
"Project-Id-Version: wireshark\n"
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>\n"
"Language-Team: Czech (http://www.transifex.com/wireshark/wireshark/language/cs/)\n"
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
"Language-Team: Czech (https://www.transifex.com/wireshark/teams/36457/cs/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -32,7 +35,12 @@ msgid ""
"system group to capture packets. This is recommended over the alternative of"
" running Wireshark/Tshark directly as root, because less of the code will "
"run with elevated privileges."
msgstr "Dumpcap můžete nainstalovat tak, že budou moci zachytávat pakety pouze členové skupiny „wireshark“. Tento způsob zachytávání paketů pomocí Wireshark/Tshark se obecně doporučuje. Druhou možností je spuštění programu přímo pod superuživatelem, to ovšem nelze doporučit, protože je pak pod tímto uživatelem spuštěna větší část potencionálně nebezpečného kódu."
msgstr ""
"Dumpcap můžete nainstalovat tak, že budou moci zachytávat pakety pouze "
"členové skupiny „wireshark“. Tento způsob zachytávání paketů pomocí "
"Wireshark/Tshark se obecně doporučuje. Druhou možností je spuštění programu "
"přímo pod superuživatelem, to ovšem nelze doporučit, protože je pak pod "
"tímto uživatelem spuštěna větší část potencionálně nebezpečného kódu."
#. Type: boolean
#. Description
@ -40,7 +48,9 @@ msgstr "Dumpcap můžete nainstalovat tak, že budou moci zachytávat pakety pou
msgid ""
"For more detailed information please see /usr/share/doc/wireshark-"
"common/README.Debian."
msgstr "Pro více informací se prosím podívejte na /usr/share/doc/wireshark-common/README.Debian."
msgstr ""
"Pro více informací se prosím podívejte na /usr/share/doc/wireshark-"
"common/README.Debian."
#. Type: boolean
#. Description
@ -48,7 +58,10 @@ msgstr "Pro více informací se prosím podívejte na /usr/share/doc/wireshark-c
msgid ""
"Enabling this feature may be a security risk, so it is disabled by default. "
"If in doubt, it is suggested to leave it disabled."
msgstr "Povolení této možnosti může být bezpečnostním rizikem a tak je ve výchozím nastavení vypnuté. Jste-li na pochybách, doporučuje se nechat volbu vypnutou."
msgstr ""
"Povolení této možnosti může být bezpečnostním rizikem a tak je ve výchozím "
"nastavení vypnuté. Jste-li na pochybách, doporučuje se nechat volbu "
"vypnutou."
#. Type: error
#. Description

28
debian/po/da.po vendored
View File

@ -1,17 +1,20 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the wireshark package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# Joe Hansen <joedalton2@yahoo.dk>, 2010
# Gerald Combs <gerald@wireshark.org>, 2020
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Wireshark\n"
"Project-Id-Version: wireshark\n"
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>\n"
"Language-Team: Danish (http://www.transifex.com/wireshark/wireshark/language/da/)\n"
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
"Language-Team: Danish (https://www.transifex.com/wireshark/teams/36457/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -32,7 +35,11 @@ msgid ""
"system group to capture packets. This is recommended over the alternative of"
" running Wireshark/Tshark directly as root, because less of the code will "
"run with elevated privileges."
msgstr "Dumpcap kan installeres på en måde som tillader medlemmer af systemgruppen »wireshark« at fange pakker. Dette anbefales frem for alternativet med at køre Wireshark/Tshark direkte som rod (root), da mindre af koden vil køre med ophøjede privilegier."
msgstr ""
"Dumpcap kan installeres på en måde som tillader medlemmer af systemgruppen "
"»wireshark« at fange pakker. Dette anbefales frem for alternativet med at "
"køre Wireshark/Tshark direkte som rod (root), da mindre af koden vil køre "
"med ophøjede privilegier."
#. Type: boolean
#. Description
@ -40,7 +47,9 @@ msgstr "Dumpcap kan installeres på en måde som tillader medlemmer af systemgru
msgid ""
"For more detailed information please see /usr/share/doc/wireshark-"
"common/README.Debian."
msgstr "For mere detaljerede information se venligst /usr/share/doc/wireshark-common/README.Debian."
msgstr ""
"For mere detaljerede information se venligst /usr/share/doc/wireshark-"
"common/README.Debian."
#. Type: boolean
#. Description
@ -48,7 +57,10 @@ msgstr "For mere detaljerede information se venligst /usr/share/doc/wireshark-co
msgid ""
"Enabling this feature may be a security risk, so it is disabled by default. "
"If in doubt, it is suggested to leave it disabled."
msgstr "Aktivering af denne funktion kan udgøre en sikkerhedsrisiko, så som standard er den deaktiveret. Hvis du er i tvivl, anbefales det at lade den være deaktiveret."
msgstr ""
"Aktivering af denne funktion kan udgøre en sikkerhedsrisiko, så som standard"
" er den deaktiveret. Hvis du er i tvivl, anbefales det at lade den være "
"deaktiveret."
#. Type: error
#. Description

70
debian/po/de.po vendored
View File

@ -1,22 +1,20 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the wireshark package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# Dominik Eismann <dominik.eismann@posteo.de>, 2016
# Dominik Eismann <dominik.eismann@posteo.de>, 2016
# uhei, 2017
# uhei, 2015,2017
# Uli Heilmeier, 2015
# uhei, 2015
# Gerald Combs <gerald@wireshark.org>, 2020
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Wireshark\n"
"Project-Id-Version: wireshark\n"
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
"Last-Translator: uhei\n"
"Language-Team: German (http://www.transifex.com/wireshark/wireshark/language/de/)\n"
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
"Language-Team: German (https://www.transifex.com/wireshark/teams/36457/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -37,7 +35,11 @@ msgid ""
"system group to capture packets. This is recommended over the alternative of"
" running Wireshark/Tshark directly as root, because less of the code will "
"run with elevated privileges."
msgstr "Dumpcap kann so installiert werden, dass es Mitgliedern der Systemgruppe \"wireshark\" erlaubt ist Pakete aufzuzeichnen. Da hier weniger Programmcode mit erhöhten Rechten ausgeführt wird ist diese Option eher zu empfehlen anstatt Wireshark/Tshark direkt als root-Benutzer zu starten."
msgstr ""
"Dumpcap kann so installiert werden, dass es Mitgliedern der Systemgruppe "
"\"wireshark\" erlaubt ist Pakete aufzuzeichnen. Da hier weniger Programmcode"
" mit erhöhten Rechten ausgeführt wird ist diese Option eher zu empfehlen "
"anstatt Wireshark/Tshark direkt als root-Benutzer zu starten."
#. Type: boolean
#. Description
@ -45,7 +47,9 @@ msgstr "Dumpcap kann so installiert werden, dass es Mitgliedern der Systemgruppe
msgid ""
"For more detailed information please see /usr/share/doc/wireshark-"
"common/README.Debian."
msgstr "Weitere detaillierte Informationen sind unter /usr/share/doc/wireshark-common/README.Debian zu finden."
msgstr ""
"Weitere detaillierte Informationen sind unter /usr/share/doc/wireshark-"
"common/README.Debian zu finden."
#. Type: boolean
#. Description
@ -53,7 +57,10 @@ msgstr "Weitere detaillierte Informationen sind unter /usr/share/doc/wireshark-c
msgid ""
"Enabling this feature may be a security risk, so it is disabled by default. "
"If in doubt, it is suggested to leave it disabled."
msgstr "Da das Aktivieren dieser Funktion ein Sicherheitsrisiko darstellen kann, ist es standardmäßig deaktiviert. Es wird Empfohlen dies im Zweifelsfall deaktiviert zu lassen."
msgstr ""
"Da das Aktivieren dieser Funktion ein Sicherheitsrisiko darstellen kann, ist"
" es standardmäßig deaktiviert. Es wird Empfohlen dies im Zweifelsfall "
"deaktiviert zu lassen."
#. Type: error
#. Description
@ -67,7 +74,10 @@ msgstr "Erstellen der wireshark Systemgruppe fehlgeschlagen"
msgid ""
"The wireshark group does not exist, and creating it failed, so Wireshark "
"cannot be configured to capture traffic as an unprivileged user."
msgstr "Die wireshark Gruppe existiert nicht und konnte nicht erstellt werden. Wireshark kann daher nicht so konfiguriert werden, dass ein Mitschnitt von Datenverkehr auch einem unpreviligiertem Benutzer möglich ist."
msgstr ""
"Die wireshark Gruppe existiert nicht und konnte nicht erstellt werden. "
"Wireshark kann daher nicht so konfiguriert werden, dass ein Mitschnitt von "
"Datenverkehr auch einem unpreviligiertem Benutzer möglich ist."
#. Type: error
#. Description
@ -75,7 +85,9 @@ msgstr "Die wireshark Gruppe existiert nicht und konnte nicht erstellt werden. W
msgid ""
"Please create the wireshark system group and try configuring wireshark-"
"common again."
msgstr "Bitte erstellen Sie die wireshark Systemgruppe und rekonfigurieren Sie wireshark-common nochmals."
msgstr ""
"Bitte erstellen Sie die wireshark Systemgruppe und rekonfigurieren Sie "
"wireshark-common nochmals."
#. Type: error
#. Description
@ -89,7 +101,9 @@ msgstr "Die wireshark Gruppe ist eine Systemgruppe"
msgid ""
"The wireshark group exists as a user group, but the preferred configuration "
"is for it to be created as a system group."
msgstr "Die wireshark Gruppe existiert als eine Benutzergruppe. Die bevorzugte Konfiguration sieht vor, dass die Gruppe als Systemgruppe erstellt wird."
msgstr ""
"Die wireshark Gruppe existiert als eine Benutzergruppe. Die bevorzugte "
"Konfiguration sieht vor, dass die Gruppe als Systemgruppe erstellt wird."
#. Type: error
#. Description
@ -97,7 +111,9 @@ msgstr "Die wireshark Gruppe existiert als eine Benutzergruppe. Die bevorzugte K
msgid ""
"As a result, purging wireshark-common will not remove the wireshark group, "
"but everything else should work properly."
msgstr "Als Ergebnis wird ein Löschen von wireshark-common nicht die Gruppe wireshark entfernen. Alles andere sollte normal funktionieren."
msgstr ""
"Als Ergebnis wird ein Löschen von wireshark-common nicht die Gruppe "
"wireshark entfernen. Alles andere sollte normal funktionieren."
#. Type: error
#. Description
@ -111,7 +127,10 @@ msgstr "Setzen der Einstellungen für dumpcap fehlgeschlagen"
msgid ""
"The attempt to use Linux capabilities to grant packet-capturing privileges "
"to the dumpcap binary failed. Instead, it has had the set-user-id bit set."
msgstr "Der Versuch die Linux Fähigkeiten zum Berechtigen von Paket-Mitschnitten für dumpcamp zu vergeben ist gescheitert. Es wurde daher das Set-User-ID Bit gesetzt."
msgstr ""
"Der Versuch die Linux Fähigkeiten zum Berechtigen von Paket-Mitschnitten für"
" dumpcamp zu vergeben ist gescheitert. Es wurde daher das Set-User-ID Bit "
"gesetzt."
#. Type: error
#. Description
@ -126,7 +145,11 @@ msgid ""
"When the wireshark-common package is configured to allow non-superusers to "
"capture packets the postinst script of wireshark-common creates the "
"wireshark group as a system group."
msgstr "Wenn das wireshark-common Paket so konfiguriert wird, damit einem Nicht-Superuser das Mitschneiden von Paketen erlaubt ist, dann wird das postinst Skript von wireshark-common die wireshark Gruppe als eine Systemgruppe erstellen."
msgstr ""
"Wenn das wireshark-common Paket so konfiguriert wird, damit einem Nicht-"
"Superuser das Mitschneiden von Paketen erlaubt ist, dann wird das postinst "
"Skript von wireshark-common die wireshark Gruppe als eine Systemgruppe "
"erstellen."
#. Type: error
#. Description
@ -134,10 +157,15 @@ msgstr "Wenn das wireshark-common Paket so konfiguriert wird, damit einem Nicht-
msgid ""
"However, on this system the wireshark group is a user group instead of being"
" a system group, so purging wireshark-common did not remove it."
msgstr "Auf diesem System ist die wireshark Gruppe eine Benutzergruppe anstatt einer Systemgruppe. Das Löschen von wireshark-common wird die Gruppe daher nicht entfernen."
msgstr ""
"Auf diesem System ist die wireshark Gruppe eine Benutzergruppe anstatt einer"
" Systemgruppe. Das Löschen von wireshark-common wird die Gruppe daher nicht "
"entfernen."
#. Type: error
#. Description
#: ../templates:6001
msgid "If the group is no longer needed, please remove it manually."
msgstr "Wenn die Gruppe nicht mehr länger benötigt wird entfernen Sie diese bitte manuell."
msgstr ""
"Wenn die Gruppe nicht mehr länger benötigt wird entfernen Sie diese bitte "
"manuell."

32
debian/po/es.po vendored
View File

@ -1,17 +1,20 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the wireshark package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# Francisco Javier Cuadrado <fcocuadrado@gmail.com>, 2009-2010
# Gerald Combs <gerald@wireshark.org>, 2020
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Wireshark\n"
"Project-Id-Version: wireshark\n"
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>\n"
"Language-Team: Spanish (http://www.transifex.com/wireshark/wireshark/language/es/)\n"
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
"Language-Team: Spanish (https://www.transifex.com/wireshark/teams/36457/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -22,7 +25,9 @@ msgstr ""
#. Description
#: ../templates:2001
msgid "Should non-superusers be able to capture packets?"
msgstr "¿Los usuarios sin privilegios de administración deberían poder capturar paquetes?"
msgstr ""
"¿Los usuarios sin privilegios de administración deberían poder capturar "
"paquetes?"
#. Type: boolean
#. Description
@ -32,7 +37,11 @@ msgid ""
"system group to capture packets. This is recommended over the alternative of"
" running Wireshark/Tshark directly as root, because less of the code will "
"run with elevated privileges."
msgstr "Dumpcap se puede instalar de un modo que permite a los miembros del grupo «wireshark» capturar paquetes. Se recomienda usar esto en lugar de ejecutar Wireshark/Tshark directamente como administrador («root»), porque se ejecutará menos código con privilegios de administración."
msgstr ""
"Dumpcap se puede instalar de un modo que permite a los miembros del grupo "
"«wireshark» capturar paquetes. Se recomienda usar esto en lugar de ejecutar "
"Wireshark/Tshark directamente como administrador («root»), porque se "
"ejecutará menos código con privilegios de administración."
#. Type: boolean
#. Description
@ -40,7 +49,9 @@ msgstr "Dumpcap se puede instalar de un modo que permite a los miembros del grup
msgid ""
"For more detailed information please see /usr/share/doc/wireshark-"
"common/README.Debian."
msgstr "Para más información, vea el archivo «/usr/share/doc/wireshark-common/README.Debian»."
msgstr ""
"Para más información, vea el archivo «/usr/share/doc/wireshark-"
"common/README.Debian»."
#. Type: boolean
#. Description
@ -48,7 +59,10 @@ msgstr "Para más información, vea el archivo «/usr/share/doc/wireshark-common
msgid ""
"Enabling this feature may be a security risk, so it is disabled by default. "
"If in doubt, it is suggested to leave it disabled."
msgstr "Activar esta funcionalidad puede ser un riesgo de seguridad, por lo que de forma predeterminada está desactivada. En caso de duda, se recomienda dejarla desactivada."
msgstr ""
"Activar esta funcionalidad puede ser un riesgo de seguridad, por lo que de "
"forma predeterminada está desactivada. En caso de duda, se recomienda "
"dejarla desactivada."
#. Type: error
#. Description

32
debian/po/eu.po vendored
View File

@ -1,18 +1,20 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the wireshark package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2010
# Piarres Beobide <pi@beobide.net>, 2009
# Gerald Combs <gerald@wireshark.org>, 2020
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Wireshark\n"
"Project-Id-Version: wireshark\n"
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>\n"
"Language-Team: Basque (http://www.transifex.com/wireshark/wireshark/language/eu/)\n"
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
"Language-Team: Basque (https://www.transifex.com/wireshark/teams/36457/eu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -23,7 +25,8 @@ msgstr ""
#. Description
#: ../templates:2001
msgid "Should non-superusers be able to capture packets?"
msgstr "Supererabiltzailea ez direnak paketeak kapturatzeko gai izan daitezke?"
msgstr ""
"Supererabiltzailea ez direnak paketeak kapturatzeko gai izan daitezke?"
#. Type: boolean
#. Description
@ -33,7 +36,11 @@ msgid ""
"system group to capture packets. This is recommended over the alternative of"
" running Wireshark/Tshark directly as root, because less of the code will "
"run with elevated privileges."
msgstr "Sistemako \"wireshark\" taldeko partaideek paketeak kapturatzea baimentzeko modu batean instala daiteke Dumpcap. Wireshark/Tshark erabiliz paketeak supererabiltzaile gisa kapturatzeko modu hau gomendatuta dago, pribilegio handiekin kode gutxiago exekutatzen da eta."
msgstr ""
"Sistemako \"wireshark\" taldeko partaideek paketeak kapturatzea baimentzeko "
"modu batean instala daiteke Dumpcap. Wireshark/Tshark erabiliz paketeak "
"supererabiltzaile gisa kapturatzeko modu hau gomendatuta dago, pribilegio "
"handiekin kode gutxiago exekutatzen da eta."
#. Type: boolean
#. Description
@ -41,7 +48,9 @@ msgstr "Sistemako \"wireshark\" taldeko partaideek paketeak kapturatzea baimentz
msgid ""
"For more detailed information please see /usr/share/doc/wireshark-"
"common/README.Debian."
msgstr "Informazio gehiagorako, irakurri usr/share/doc/wireshark-common/README.Debian."
msgstr ""
"Informazio gehiagorako, irakurri usr/share/doc/wireshark-"
"common/README.Debian."
#. Type: boolean
#. Description
@ -49,7 +58,10 @@ msgstr "Informazio gehiagorako, irakurri usr/share/doc/wireshark-common/README.D
msgid ""
"Enabling this feature may be a security risk, so it is disabled by default. "
"If in doubt, it is suggested to leave it disabled."
msgstr "Eginbide hau gaitzean segurtasuneko arrisku bat sor daiteke, hau dela eta desgaituta dago lehenespenez. Zalantzako kasuan, desgaituta uztea gomendantzen da."
msgstr ""
"Eginbide hau gaitzean segurtasuneko arrisku bat sor daiteke, hau dela eta "
"desgaituta dago lehenespenez. Zalantzako kasuan, desgaituta uztea "
"gomendantzen da."
#. Type: error
#. Description

19
debian/po/fi.po vendored
View File

@ -1,18 +1,20 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the wireshark package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# edu28b5088de91f4c05 <edu@iki.fi>, 2009
# edu28b5088de91f4c05 <edu@iki.fi>, 2009
# Gerald Combs <gerald@wireshark.org>, 2020
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Wireshark\n"
"Project-Id-Version: wireshark\n"
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>\n"
"Language-Team: Finnish (http://www.transifex.com/wireshark/wireshark/language/fi/)\n"
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
"Language-Team: Finnish (https://www.transifex.com/wireshark/teams/36457/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -49,7 +51,10 @@ msgstr ""
msgid ""
"Enabling this feature may be a security risk, so it is disabled by default. "
"If in doubt, it is suggested to leave it disabled."
msgstr "Tämän ominaisuuden käyttöönotto saattaa olla tietoturvariski ja tästä syystä se on oletuksena poissa käytöstä. Jos olet epävarma, on suositeltavaa jättää se pois käytöstä."
msgstr ""
"Tämän ominaisuuden käyttöönotto saattaa olla tietoturvariski ja tästä syystä"
" se on oletuksena poissa käytöstä. Jos olet epävarma, on suositeltavaa "
"jättää se pois käytöstä."
#. Type: error
#. Description

30
debian/po/fr.po vendored
View File

@ -1,19 +1,20 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the wireshark package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# Simon Paillard <spaillard@debian.org>, 2009
# Yann Domingo, 2019
# Yann Domingo, 2019
# Gerald Combs <gerald@wireshark.org>, 2020
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Wireshark\n"
"Project-Id-Version: wireshark\n"
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
"PO-Revision-Date: 2019-06-30 23:24+0000\n"
"Last-Translator: Yann Domingo\n"
"Language-Team: French (http://www.transifex.com/wireshark/wireshark/language/fr/)\n"
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
"Language-Team: French (https://www.transifex.com/wireshark/teams/36457/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -34,7 +35,11 @@ msgid ""
"system group to capture packets. This is recommended over the alternative of"
" running Wireshark/Tshark directly as root, because less of the code will "
"run with elevated privileges."
msgstr "Dumpcap peut être installé afin d'autoriser les membres du groupe « wireshark » à capturer des paquets. Cette méthode de capture est préférable à l'exécution de Wireshark ou Tshark avec les droits du superutilisateur, car elle permet d'exécuter moins de code avec des droits importants."
msgstr ""
"Dumpcap peut être installé afin d'autoriser les membres du groupe « "
"wireshark » à capturer des paquets. Cette méthode de capture est préférable "
"à l'exécution de Wireshark ou Tshark avec les droits du superutilisateur, "
"car elle permet d'exécuter moins de code avec des droits importants."
#. Type: boolean
#. Description
@ -42,7 +47,9 @@ msgstr "Dumpcap peut être installé afin d'autoriser les membres du groupe « 
msgid ""
"For more detailed information please see /usr/share/doc/wireshark-"
"common/README.Debian."
msgstr "Pour plus d'information, veuillez consulter /usr/share/doc/wireshark-common/README.Debian."
msgstr ""
"Pour plus d'information, veuillez consulter /usr/share/doc/wireshark-"
"common/README.Debian."
#. Type: boolean
#. Description
@ -50,7 +57,10 @@ msgstr "Pour plus d'information, veuillez consulter /usr/share/doc/wireshark-com
msgid ""
"Enabling this feature may be a security risk, so it is disabled by default. "
"If in doubt, it is suggested to leave it disabled."
msgstr "Cette fonctionnalité constitue un risque pour la sécurité, c'est pourquoi elle est désactivée par défaut. En cas de doute, il est suggéré de la laisser désactivée."
msgstr ""
"Cette fonctionnalité constitue un risque pour la sécurité, c'est pourquoi "
"elle est désactivée par défaut. En cas de doute, il est suggéré de la "
"laisser désactivée."
#. Type: error
#. Description

32
debian/po/hu.po vendored
View File

@ -1,17 +1,20 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the wireshark package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# Balint Reczey <balint@balintreczey.hu>, 2011
# Gerald Combs <gerald@wireshark.org>, 2020
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Wireshark\n"
"Project-Id-Version: wireshark\n"
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>\n"
"Language-Team: Hungarian (http://www.transifex.com/wireshark/wireshark/language/hu/)\n"
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
"Language-Team: Hungarian (https://www.transifex.com/wireshark/teams/36457/hu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -22,7 +25,9 @@ msgstr ""
#. Description
#: ../templates:2001
msgid "Should non-superusers be able to capture packets?"
msgstr "A rendszergazdán kívül más felhasználók is képesek legyenek lehallgatni ahálózati forgalmat?"
msgstr ""
"A rendszergazdán kívül más felhasználók is képesek legyenek lehallgatni "
"ahálózati forgalmat?"
#. Type: boolean
#. Description
@ -32,7 +37,12 @@ msgid ""
"system group to capture packets. This is recommended over the alternative of"
" running Wireshark/Tshark directly as root, because less of the code will "
"run with elevated privileges."
msgstr "A dumpcap segédprogramot úgy is be lehet állítani telepítéskor, hogy lehetővétegye a \"wireshark\" rendszer-csoport tagjainak, hogy lehallgassák ahálózati forgalmat. Ez biztonságosabb, mint rendszergazdaként futtatni aWireshark/Tshark programokat, mivel kevesebb kód fut így rendszergazdaijogokkal ellátva."
msgstr ""
"A dumpcap segédprogramot úgy is be lehet állítani telepítéskor, hogy "
"lehetővétegye a \"wireshark\" rendszer-csoport tagjainak, hogy lehallgassák "
"ahálózati forgalmat. Ez biztonságosabb, mint rendszergazdaként futtatni "
"aWireshark/Tshark programokat, mivel kevesebb kód fut így "
"rendszergazdaijogokkal ellátva."
#. Type: boolean
#. Description
@ -40,7 +50,9 @@ msgstr "A dumpcap segédprogramot úgy is be lehet állítani telepítéskor, ho
msgid ""
"For more detailed information please see /usr/share/doc/wireshark-"
"common/README.Debian."
msgstr "Részletesebb információk a usr/share/doc/wireshark-common/README.Debianfájlban találhatók."
msgstr ""
"Részletesebb információk a usr/share/doc/wireshark-"
"common/README.Debianfájlban találhatók."
#. Type: boolean
#. Description
@ -48,7 +60,9 @@ msgstr "Részletesebb információk a usr/share/doc/wireshark-common/README.Debi
msgid ""
"Enabling this feature may be a security risk, so it is disabled by default. "
"If in doubt, it is suggested to leave it disabled."
msgstr "Ennek a beállításnak az engedélyezése biztonsági kockázatot hordoz.Ha bizonytalan vagy, inkább ne engedélyezd."
msgstr ""
"Ennek a beállításnak az engedélyezése biztonsági kockázatot hordoz.Ha "
"bizonytalan vagy, inkább ne engedélyezd."
#. Type: error
#. Description

26
debian/po/id.po vendored
View File

@ -1,16 +1,20 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the wireshark package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# Gerald Combs <gerald@wireshark.org>, 2020
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Wireshark\n"
"Project-Id-Version: wireshark\n"
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>\n"
"Language-Team: Indonesian (http://www.transifex.com/wireshark/wireshark/language/id/)\n"
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
"Language-Team: Indonesian (https://www.transifex.com/wireshark/teams/36457/id/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -31,7 +35,11 @@ msgid ""
"system group to capture packets. This is recommended over the alternative of"
" running Wireshark/Tshark directly as root, because less of the code will "
"run with elevated privileges."
msgstr "Dumpcap dapat dipasang dengan cara memperbolehkan anggota dari grup system \"wireshark\" untuk menangkap paket. Hal ini dianjurkan sebagai alternatif untuk menjalankan Wireshark/Tshark sebagai root, karena sedikit kode yang berjalan dengan hak tertinggi"
msgstr ""
"Dumpcap dapat dipasang dengan cara memperbolehkan anggota dari grup system "
"\"wireshark\" untuk menangkap paket. Hal ini dianjurkan sebagai alternatif "
"untuk menjalankan Wireshark/Tshark sebagai root, karena sedikit kode yang "
"berjalan dengan hak tertinggi"
#. Type: boolean
#. Description
@ -39,7 +47,9 @@ msgstr "Dumpcap dapat dipasang dengan cara memperbolehkan anggota dari grup syst
msgid ""
"For more detailed information please see /usr/share/doc/wireshark-"
"common/README.Debian."
msgstr "Untuk informasi lebih lanjut silakan lihat /usr/share/doc/wireshark-common/README.Debian."
msgstr ""
"Untuk informasi lebih lanjut silakan lihat /usr/share/doc/wireshark-"
"common/README.Debian."
#. Type: boolean
#. Description
@ -47,7 +57,9 @@ msgstr "Untuk informasi lebih lanjut silakan lihat /usr/share/doc/wireshark-comm
msgid ""
"Enabling this feature may be a security risk, so it is disabled by default. "
"If in doubt, it is suggested to leave it disabled."
msgstr "Mengaktifkan fitur ini akan menyebabkan resiko keamanan, jadi secara bawaan akan di non-aktifkan. Jika ragu, disarankan untuk dibiarkan dinonaktifkan"
msgstr ""
"Mengaktifkan fitur ini akan menyebabkan resiko keamanan, jadi secara bawaan "
"akan di non-aktifkan. Jika ragu, disarankan untuk dibiarkan dinonaktifkan"
#. Type: error
#. Description

63
debian/po/it.po vendored
View File

@ -1,17 +1,20 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the wireshark package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# Vincenzo Reale <vinx.reale@gmail.com>, 2015,2017
# Gerald Combs <gerald@wireshark.org>, 2020
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Wireshark\n"
"Project-Id-Version: wireshark\n"
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/wireshark/wireshark/language/it/)\n"
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
"Language-Team: Italian (https://www.transifex.com/wireshark/teams/36457/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -22,7 +25,8 @@ msgstr ""
#. Description
#: ../templates:2001
msgid "Should non-superusers be able to capture packets?"
msgstr "Vuoi consentire la cattura dei pacchetti agli utenti non privilegiati?"
msgstr ""
"Vuoi consentire la cattura dei pacchetti agli utenti non privilegiati?"
#. Type: boolean
#. Description
@ -32,7 +36,11 @@ msgid ""
"system group to capture packets. This is recommended over the alternative of"
" running Wireshark/Tshark directly as root, because less of the code will "
"run with elevated privileges."
msgstr "Dumpcap può essere installato in modo da consentire ai membri del gruppo di sistema \"wireshark\" di catturare i pacchetti. Ciò è consigliato all'alternativa di eseguire Wireshark/Tshark come root, poiché una parte minore del codice sarà eseguita con privilegi elevati."
msgstr ""
"Dumpcap può essere installato in modo da consentire ai membri del gruppo di "
"sistema \"wireshark\" di catturare i pacchetti. Ciò è consigliato "
"all'alternativa di eseguire Wireshark/Tshark come root, poiché una parte "
"minore del codice sarà eseguita con privilegi elevati."
#. Type: boolean
#. Description
@ -40,7 +48,9 @@ msgstr "Dumpcap può essere installato in modo da consentire ai membri del grupp
msgid ""
"For more detailed information please see /usr/share/doc/wireshark-"
"common/README.Debian."
msgstr "Per ulteriori informazioni, vedi /usr/share/doc/wireshark-common/README.Debian."
msgstr ""
"Per ulteriori informazioni, vedi /usr/share/doc/wireshark-"
"common/README.Debian."
#. Type: boolean
#. Description
@ -48,7 +58,10 @@ msgstr "Per ulteriori informazioni, vedi /usr/share/doc/wireshark-common/README.
msgid ""
"Enabling this feature may be a security risk, so it is disabled by default. "
"If in doubt, it is suggested to leave it disabled."
msgstr "L'abilitazione di questa funzionalità potrebbe essere un rischio per la sicurezza, perciò è disabilitata in modo predefinito. Se hai dubbi, ti consigliamo di lasciarla disabilitata."
msgstr ""
"L'abilitazione di questa funzionalità potrebbe essere un rischio per la "
"sicurezza, perciò è disabilitata in modo predefinito. Se hai dubbi, ti "
"consigliamo di lasciarla disabilitata."
#. Type: error
#. Description
@ -62,7 +75,10 @@ msgstr "Creazione del gruppo di sistema wireshark non riuscita"
msgid ""
"The wireshark group does not exist, and creating it failed, so Wireshark "
"cannot be configured to capture traffic as an unprivileged user."
msgstr "Il gruppo wireshark non esiste, e la sua creazione non è riuscita, per cui Wireshark non può essere configurato per catturare il traffico con un utente non privilegiato."
msgstr ""
"Il gruppo wireshark non esiste, e la sua creazione non è riuscita, per cui "
"Wireshark non può essere configurato per catturare il traffico con un utente"
" non privilegiato."
#. Type: error
#. Description
@ -70,7 +86,9 @@ msgstr "Il gruppo wireshark non esiste, e la sua creazione non è riuscita, per
msgid ""
"Please create the wireshark system group and try configuring wireshark-"
"common again."
msgstr "Crea il gruppo di sistema wireshark e prova a configurare nuovamente wireshark-common."
msgstr ""
"Crea il gruppo di sistema wireshark e prova a configurare nuovamente "
"wireshark-common."
#. Type: error
#. Description
@ -84,7 +102,9 @@ msgstr "Il gruppo wireshark è un gruppo di sistema"
msgid ""
"The wireshark group exists as a user group, but the preferred configuration "
"is for it to be created as a system group."
msgstr "Il gruppo wireshark esiste come gruppo utente, ma la configurazione preferita consiste nel crearlo come gruppo di sistema."
msgstr ""
"Il gruppo wireshark esiste come gruppo utente, ma la configurazione "
"preferita consiste nel crearlo come gruppo di sistema."
#. Type: error
#. Description
@ -92,7 +112,9 @@ msgstr "Il gruppo wireshark esiste come gruppo utente, ma la configurazione pref
msgid ""
"As a result, purging wireshark-common will not remove the wireshark group, "
"but everything else should work properly."
msgstr "Come risultato, la rimozione di wireshark-common non rimuoverà il gruppo wireshark, ma tutto il resto dovrebbe funzionare correttamente."
msgstr ""
"Come risultato, la rimozione di wireshark-common non rimuoverà il gruppo "
"wireshark, ma tutto il resto dovrebbe funzionare correttamente."
#. Type: error
#. Description
@ -106,7 +128,10 @@ msgstr "Impostazione delle capacità di dumpcap non riuscita"
msgid ""
"The attempt to use Linux capabilities to grant packet-capturing privileges "
"to the dumpcap binary failed. Instead, it has had the set-user-id bit set."
msgstr "Il tentativo di utilizzare le capacità di Linux per accordare i privilegi di cattura dei pacchetti al binario dumpcap non è riuscito. Invece, è stato impostato il bit set-user-id."
msgstr ""
"Il tentativo di utilizzare le capacità di Linux per accordare i privilegi di"
" cattura dei pacchetti al binario dumpcap non è riuscito. Invece, è stato "
"impostato il bit set-user-id."
#. Type: error
#. Description
@ -121,7 +146,10 @@ msgid ""
"When the wireshark-common package is configured to allow non-superusers to "
"capture packets the postinst script of wireshark-common creates the "
"wireshark group as a system group."
msgstr "Quando il pacchetto wireshark-common è configurato per consentire a utenti non privilegiati di catturare pacchetti, lo script di post-installazione di wireshark-common crea un gruppo wireshark come un gruppo di sistema."
msgstr ""
"Quando il pacchetto wireshark-common è configurato per consentire a utenti "
"non privilegiati di catturare pacchetti, lo script di post-installazione di "
"wireshark-common crea un gruppo wireshark come un gruppo di sistema."
#. Type: error
#. Description
@ -129,7 +157,10 @@ msgstr "Quando il pacchetto wireshark-common è configurato per consentire a ute
msgid ""
"However, on this system the wireshark group is a user group instead of being"
" a system group, so purging wireshark-common did not remove it."
msgstr "Tuttavia, su questo sistema il gruppo wireshark è un gruppo utente invece di essere un gruppo di sistema, per cui la rimozione di wireshark-common non lo ha rimosso."
msgstr ""
"Tuttavia, su questo sistema il gruppo wireshark è un gruppo utente invece di"
" essere un gruppo di sistema, per cui la rimozione di wireshark-common non "
"lo ha rimosso."
#. Type: error
#. Description

19
debian/po/ja.po vendored
View File

@ -1,16 +1,20 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the wireshark package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# Gerald Combs <gerald@wireshark.org>, 2020
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Wireshark\n"
"Project-Id-Version: wireshark\n"
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
"PO-Revision-Date: 2017-09-22 08:02+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>\n"
"Language-Team: Japanese (http://www.transifex.com/wireshark/wireshark/language/ja/)\n"
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
"Language-Team: Japanese (https://www.transifex.com/wireshark/teams/36457/ja/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -31,7 +35,9 @@ msgid ""
"system group to capture packets. This is recommended over the alternative of"
" running Wireshark/Tshark directly as root, because less of the code will "
"run with elevated privileges."
msgstr "「wireshark」システムグループのメンバーがパケットをキャプチャできる設定で dumpcap をインストールすることができます。直接 root ユーザとして動かす別の方法と比較すると、この方が高くなった権限上で動作するコードが少なくなるのでお勧めです。"
msgstr ""
"「wireshark」システムグループのメンバーがパケットをキャプチャできる設定で dumpcap をインストールすることができます。直接 root "
"ユーザとして動かす別の方法と比較すると、この方が高くなった権限上で動作するコードが少なくなるのでお勧めです。"
#. Type: boolean
#. Description
@ -47,7 +53,8 @@ msgstr "より詳細な情報については /usr/share/doc/wireshark-common/REA
msgid ""
"Enabling this feature may be a security risk, so it is disabled by default. "
"If in doubt, it is suggested to leave it disabled."
msgstr "この機能を有効にするのはセキュリティ上のリスクになる可能性があるので、デフォルトでは無効にされています。分からない場合は無効のままにしておくことをお勧めします。"
msgstr ""
"この機能を有効にするのはセキュリティ上のリスクになる可能性があるので、デフォルトでは無効にされています。分からない場合は無効のままにしておくことをお勧めします。"
#. Type: error
#. Description

35
debian/po/ko.po vendored
View File

@ -1,18 +1,20 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the wireshark package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# ks k, 2019
# ks k, 2019
# Gerald Combs <gerald@wireshark.org>, 2020
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Wireshark\n"
"Project-Id-Version: wireshark\n"
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
"PO-Revision-Date: 2019-11-24 12:41+0000\n"
"Last-Translator: ks k\n"
"Language-Team: Korean (http://www.transifex.com/wireshark/wireshark/language/ko/)\n"
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
"Language-Team: Korean (https://www.transifex.com/wireshark/teams/36457/ko/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -33,7 +35,9 @@ msgid ""
"system group to capture packets. This is recommended over the alternative of"
" running Wireshark/Tshark directly as root, because less of the code will "
"run with elevated privileges."
msgstr "root로 직접 Wireshark/Tshark를 실행시키는 것의 대안으로 좀 더 적은 권한으로 패킷 갈무리를 하기위해 \"와이어샤크\" 체제 묶음의 일원인 Dumpcap이 설치될 수 있습니다."
msgstr ""
"root로 직접 Wireshark/Tshark를 실행시키는 것의 대안으로 좀 더 적은 권한으로 패킷 갈무리를 하기위해 \"와이어샤크\" "
"체제 묶음의 일원인 Dumpcap이 설치될 수 있습니다."
#. Type: boolean
#. Description
@ -63,7 +67,8 @@ msgstr "와이어샤크 체제 묶음 작성에 실패했습니다"
msgid ""
"The wireshark group does not exist, and creating it failed, so Wireshark "
"cannot be configured to capture traffic as an unprivileged user."
msgstr "와이어샤크 묶음은 존재하지 않아 만들기에 실패하므로 와이어샤크는 권한이 없는 사용자로 트래픽을 갈무리하도록 구성할 수 없습니다."
msgstr ""
"와이어샤크 묶음은 존재하지 않아 만들기에 실패하므로 와이어샤크는 권한이 없는 사용자로 트래픽을 갈무리하도록 구성할 수 없습니다."
#. Type: error
#. Description
@ -93,7 +98,8 @@ msgstr "와이어샤크 묶음은 사용자 묶음으로 존재하지만 기본
msgid ""
"As a result, purging wireshark-common will not remove the wireshark group, "
"but everything else should work properly."
msgstr "결과적으로 wireshark-common을 제거해도 와이어샤크 묶음이 제거되지는 않지만 다른 모든 기능은 제대로 작동해야합니다."
msgstr ""
"결과적으로 wireshark-common을 제거해도 와이어샤크 묶음이 제거되지는 않지만 다른 모든 기능은 제대로 작동해야합니다."
#. Type: error
#. Description
@ -107,7 +113,9 @@ msgstr "덤프캡에 대한 기능 설정 실패"
msgid ""
"The attempt to use Linux capabilities to grant packet-capturing privileges "
"to the dumpcap binary failed. Instead, it has had the set-user-id bit set."
msgstr "리눅스 기능을 사용하여 덤프 갈무리 바이너리에 패킷 갈무리 권한을 부여하려는 시도가 실패했습니다. 대신 set-user-id 비트가 설정되었습니다."
msgstr ""
"리눅스 기능을 사용하여 덤프 갈무리 바이너리에 패킷 갈무리 권한을 부여하려는 시도가 실패했습니다. 대신 set-user-id 비트가 "
"설정되었습니다."
#. Type: error
#. Description
@ -122,7 +130,9 @@ msgid ""
"When the wireshark-common package is configured to allow non-superusers to "
"capture packets the postinst script of wireshark-common creates the "
"wireshark group as a system group."
msgstr "슈퍼 유저가 아닌 사용자가 패킷을 갈무리 할 수 있도록 wireshark-common 패키지를 구성하면 wireshark-common의 postinst 스크립트가 와이어샤크 묶음을 체제 묶음으로 만듭니다."
msgstr ""
"슈퍼 유저가 아닌 사용자가 패킷을 갈무리 할 수 있도록 wireshark-common 패키지를 구성하면 wireshark-common의 "
"postinst 스크립트가 와이어샤크 묶음을 체제 묶음으로 만듭니다."
#. Type: error
#. Description
@ -130,7 +140,8 @@ msgstr "슈퍼 유저가 아닌 사용자가 패킷을 갈무리 할 수 있도
msgid ""
"However, on this system the wireshark group is a user group instead of being"
" a system group, so purging wireshark-common did not remove it."
msgstr "그러나, 이 체제에서 와이어샤크 묶음은 체제 묶음이 아닌 사용자 묶음이므로 wireshark-common을 제거해도 제거되지 않았습니다."
msgstr ""
"그러나, 이 체제에서 와이어샤크 묶음은 체제 묶음이 아닌 사용자 묶음이므로 wireshark-common을 제거해도 제거되지 않았습니다."
#. Type: error
#. Description

31
debian/po/nl.po vendored
View File

@ -1,17 +1,20 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the wireshark package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# Jeroen Schot <schot@a-eskwadraat.nl>, 2011
# Gerald Combs <gerald@wireshark.org>, 2020
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Wireshark\n"
"Project-Id-Version: wireshark\n"
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>\n"
"Language-Team: Dutch (http://www.transifex.com/wireshark/wireshark/language/nl/)\n"
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
"Language-Team: Dutch (https://www.transifex.com/wireshark/teams/36457/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -22,7 +25,8 @@ msgstr ""
#. Description
#: ../templates:2001
msgid "Should non-superusers be able to capture packets?"
msgstr "Moet het voor niet-beheerders mogelijk zijn om pakketjes te onderscheppen?"
msgstr ""
"Moet het voor niet-beheerders mogelijk zijn om pakketjes te onderscheppen?"
#. Type: boolean
#. Description
@ -32,7 +36,11 @@ msgid ""
"system group to capture packets. This is recommended over the alternative of"
" running Wireshark/Tshark directly as root, because less of the code will "
"run with elevated privileges."
msgstr "Dumpcap kan zodanig worden geïnstalleerd dat leden van de systeemgroep \"wireshark\" netwerkpakketjes mogen onderscheppen. Dit wordt aanbevolen boven het uitvoeren van Wireshark/Tshark als beheerder, omdat op deze manier minder code met verhoogde privileges wordt uitgevoerd."
msgstr ""
"Dumpcap kan zodanig worden geïnstalleerd dat leden van de systeemgroep "
"\"wireshark\" netwerkpakketjes mogen onderscheppen. Dit wordt aanbevolen "
"boven het uitvoeren van Wireshark/Tshark als beheerder, omdat op deze "
"manier minder code met verhoogde privileges wordt uitgevoerd."
#. Type: boolean
#. Description
@ -40,7 +48,9 @@ msgstr "Dumpcap kan zodanig worden geïnstalleerd dat leden van de systeemgroep
msgid ""
"For more detailed information please see /usr/share/doc/wireshark-"
"common/README.Debian."
msgstr "Uitgebreide informatie hierover is te vinden in /usr/share/doc/wireshark-common/README.Debian."
msgstr ""
"Uitgebreide informatie hierover is te vinden in /usr/share/doc/wireshark-"
"common/README.Debian."
#. Type: boolean
#. Description
@ -48,7 +58,10 @@ msgstr "Uitgebreide informatie hierover is te vinden in /usr/share/doc/wireshark
msgid ""
"Enabling this feature may be a security risk, so it is disabled by default. "
"If in doubt, it is suggested to leave it disabled."
msgstr "Het activeren van deze functionaliteit is mogelijk een beveiligingsrisico, daarom staat dit niet standaard aan. Bij twijfel wordt u aangeraden om dit niet te activeren."
msgstr ""
"Het activeren van deze functionaliteit is mogelijk een beveiligingsrisico, "
"daarom staat dit niet standaard aan. Bij twijfel wordt u aangeraden om dit "
"niet te activeren."
#. Type: error
#. Description

27
debian/po/pt.po vendored
View File

@ -1,16 +1,20 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the wireshark package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# Gerald Combs <gerald@wireshark.org>, 2020
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Wireshark\n"
"Project-Id-Version: wireshark\n"
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>\n"
"Language-Team: Portuguese (http://www.transifex.com/wireshark/wireshark/language/pt/)\n"
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
"Language-Team: Portuguese (https://www.transifex.com/wireshark/teams/36457/pt/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -31,7 +35,11 @@ msgid ""
"system group to capture packets. This is recommended over the alternative of"
" running Wireshark/Tshark directly as root, because less of the code will "
"run with elevated privileges."
msgstr "O dumpcap pode ser instalado de maneira que os membros do grupo de sistema \"wireshark\" possam capturar pacotes. Este é o modo recomendado em vez da alternativa de correr o Wireshark/Tshark directamente como root, porque menos código será executado com privilégios elevados."
msgstr ""
"O dumpcap pode ser instalado de maneira que os membros do grupo de sistema "
"\"wireshark\" possam capturar pacotes. Este é o modo recomendado em vez da "
"alternativa de correr o Wireshark/Tshark directamente como root, porque "
"menos código será executado com privilégios elevados."
#. Type: boolean
#. Description
@ -39,7 +47,9 @@ msgstr "O dumpcap pode ser instalado de maneira que os membros do grupo de siste
msgid ""
"For more detailed information please see /usr/share/doc/wireshark-"
"common/README.Debian."
msgstr "Para informação mais detalhada, leia por favor /usr/share/doc/wireshark-common/README.Debian."
msgstr ""
"Para informação mais detalhada, leia por favor /usr/share/doc/wireshark-"
"common/README.Debian."
#. Type: boolean
#. Description
@ -47,7 +57,10 @@ msgstr "Para informação mais detalhada, leia por favor /usr/share/doc/wireshar
msgid ""
"Enabling this feature may be a security risk, so it is disabled by default. "
"If in doubt, it is suggested to leave it disabled."
msgstr "Activar esta característica pode ser um risco de segurança, por isso vem desactivada por predefinição. Em caso de dúvida, sugere-se deixá-la desactivada."
msgstr ""
"Activar esta característica pode ser um risco de segurança, por isso vem "
"desactivada por predefinição. Em caso de dúvida, sugere-se deixá-la "
"desactivada."
#. Type: error
#. Description

29
debian/po/pt_BR.po vendored
View File

@ -1,18 +1,20 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the wireshark package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# Adriano Rafael Gomes <adrianorg@gmail.com>, 2010
# Rafael Henrique da Silva Correia <rafaelhenriqu@gmail.com>, 2009
# Gerald Combs <gerald@wireshark.org>, 2020
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Wireshark\n"
"Project-Id-Version: wireshark\n"
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/wireshark/wireshark/language/pt_BR/)\n"
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
"Language-Team: Portuguese (Brazil) (https://www.transifex.com/wireshark/teams/36457/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -33,7 +35,11 @@ msgid ""
"system group to capture packets. This is recommended over the alternative of"
" running Wireshark/Tshark directly as root, because less of the code will "
"run with elevated privileges."
msgstr "O dumpcap pode ser instalado em um modo que permite a membros do grupo de sistema \"wireshark\" capturar pacotes. Isto é recomendado em vez da alternativa de executar o Wireshark/Tshark diretamente como root, porque menos código será executado com privilégios elevados."
msgstr ""
"O dumpcap pode ser instalado em um modo que permite a membros do grupo de "
"sistema \"wireshark\" capturar pacotes. Isto é recomendado em vez da "
"alternativa de executar o Wireshark/Tshark diretamente como root, porque "
"menos código será executado com privilégios elevados."
#. Type: boolean
#. Description
@ -41,7 +47,9 @@ msgstr "O dumpcap pode ser instalado em um modo que permite a membros do grupo d
msgid ""
"For more detailed information please see /usr/share/doc/wireshark-"
"common/README.Debian."
msgstr "Para informações mais detalhadas, por favor veja /usr/share/doc/wireshark-common/README.Debian."
msgstr ""
"Para informações mais detalhadas, por favor veja /usr/share/doc/wireshark-"
"common/README.Debian."
#. Type: boolean
#. Description
@ -49,7 +57,10 @@ msgstr "Para informações mais detalhadas, por favor veja /usr/share/doc/wiresh
msgid ""
"Enabling this feature may be a security risk, so it is disabled by default. "
"If in doubt, it is suggested to leave it disabled."
msgstr "Habilitar este recurso pode ser um risco de segurança, portanto ele é desabilitado por padrão. Se estiver em dúvida, é sugerido deixá-lo desabilitado."
msgstr ""
"Habilitar este recurso pode ser um risco de segurança, portanto ele é "
"desabilitado por padrão. Se estiver em dúvida, é sugerido deixá-lo "
"desabilitado."
#. Type: error
#. Description

60
debian/po/ru.po vendored
View File

@ -1,18 +1,20 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the wireshark package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# Vladlen Shapo <vladlen.shapo@gmail.com>, 2017
# Yuri Kozlov <yuray@komyakino.ru>, 2009-2010
# Gerald Combs <gerald@wireshark.org>, 2020
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Wireshark\n"
"Project-Id-Version: wireshark\n"
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
"PO-Revision-Date: 2017-11-23 18:24+0000\n"
"Last-Translator: Vladlen Shapo <vladlen.shapo@gmail.com>\n"
"Language-Team: Russian (http://www.transifex.com/wireshark/wireshark/language/ru/)\n"
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
"Language-Team: Russian (https://www.transifex.com/wireshark/teams/36457/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -33,7 +35,11 @@ msgid ""
"system group to capture packets. This is recommended over the alternative of"
" running Wireshark/Tshark directly as root, because less of the code will "
"run with elevated privileges."
msgstr "Dumpcap можно установить таким образом, что члены группы wireshark смогут захватывать пакеты. Это более рекомендуемый способ захвата пакетов с помощью Wireshark/Tshark, чем запуск самого Wireshark/Tshark с правами root, так как это позволяет выполнять почти весь код с меньшими правами."
msgstr ""
"Dumpcap можно установить таким образом, что члены группы wireshark смогут "
"захватывать пакеты. Это более рекомендуемый способ захвата пакетов с помощью"
" Wireshark/Tshark, чем запуск самого Wireshark/Tshark с правами root, так "
"как это позволяет выполнять почти весь код с меньшими правами."
#. Type: boolean
#. Description
@ -41,7 +47,9 @@ msgstr "Dumpcap можно установить таким образом, чт
msgid ""
"For more detailed information please see /usr/share/doc/wireshark-"
"common/README.Debian."
msgstr "Дополнительную информацию можно найти в файле /usr/share/doc/wireshark-common/README.Debian."
msgstr ""
"Дополнительную информацию можно найти в файле /usr/share/doc/wireshark-"
"common/README.Debian."
#. Type: boolean
#. Description
@ -49,7 +57,9 @@ msgstr "Дополнительную информацию можно найти
msgid ""
"Enabling this feature may be a security risk, so it is disabled by default. "
"If in doubt, it is suggested to leave it disabled."
msgstr "Использование данной возможности влияет на безопасность, поэтому по умолчанию не используется. Если сомневаетесь, то оставьте выключенной."
msgstr ""
"Использование данной возможности влияет на безопасность, поэтому по "
"умолчанию не используется. Если сомневаетесь, то оставьте выключенной."
#. Type: error
#. Description
@ -63,7 +73,10 @@ msgstr "Создание системной группы wireshark не выпо
msgid ""
"The wireshark group does not exist, and creating it failed, so Wireshark "
"cannot be configured to capture traffic as an unprivileged user."
msgstr "Группа wireshark не существует, её создание не выполнено, поэтому Wireshark не может быть сконфигурирован для захвата трафика в качестве непривилегированного пользователя."
msgstr ""
"Группа wireshark не существует, её создание не выполнено, поэтому Wireshark "
"не может быть сконфигурирован для захвата трафика в качестве "
"непривилегированного пользователя."
#. Type: error
#. Description
@ -71,7 +84,9 @@ msgstr "Группа wireshark не существует, её создание
msgid ""
"Please create the wireshark system group and try configuring wireshark-"
"common again."
msgstr "Пожалуйста, создайте системную группу wireshark и попробуйте вновь выполнить конфигурирование wireshark-common. "
msgstr ""
"Пожалуйста, создайте системную группу wireshark и попробуйте вновь выполнить"
" конфигурирование wireshark-common. "
#. Type: error
#. Description
@ -85,7 +100,9 @@ msgstr "Группа wireshark является системной группо
msgid ""
"The wireshark group exists as a user group, but the preferred configuration "
"is for it to be created as a system group."
msgstr "Группа wireshark существует как пользовательская группа, но предпочтительная конфигурация для неё - быть созданной в качестве системной группы."
msgstr ""
"Группа wireshark существует как пользовательская группа, но предпочтительная"
" конфигурация для неё - быть созданной в качестве системной группы."
#. Type: error
#. Description
@ -93,7 +110,9 @@ msgstr "Группа wireshark существует как пользовате
msgid ""
"As a result, purging wireshark-common will not remove the wireshark group, "
"but everything else should work properly."
msgstr "Как результат, очистка wireshark-common не удалит группу wireshark, но всё остальное должно работать правильно."
msgstr ""
"Как результат, очистка wireshark-common не удалит группу wireshark, но всё "
"остальное должно работать правильно."
#. Type: error
#. Description
@ -107,7 +126,10 @@ msgstr "Установка возможностей для dumpcap законч
msgid ""
"The attempt to use Linux capabilities to grant packet-capturing privileges "
"to the dumpcap binary failed. Instead, it has had the set-user-id bit set."
msgstr "Попытка использовать возможности Linux для присвоения привилегий для захвата пакетов двоичному dumpcap закончилась ошибкой. Однако был установлен бит идентификации пользователя set-user-id ."
msgstr ""
"Попытка использовать возможности Linux для присвоения привилегий для захвата"
" пакетов двоичному dumpcap закончилась ошибкой. Однако был установлен бит "
"идентификации пользователя set-user-id ."
#. Type: error
#. Description
@ -122,7 +144,10 @@ msgid ""
"When the wireshark-common package is configured to allow non-superusers to "
"capture packets the postinst script of wireshark-common creates the "
"wireshark group as a system group."
msgstr "Когда пакет wireshark-common сконфигурирован так, чтобы позволить не суперпользователям захватывать пакеты, скрипт postinst в wireshark-common создаёт группу wireshark как системную группу."
msgstr ""
"Когда пакет wireshark-common сконфигурирован так, чтобы позволить не "
"суперпользователям захватывать пакеты, скрипт postinst в wireshark-common "
"создаёт группу wireshark как системную группу."
#. Type: error
#. Description
@ -130,7 +155,10 @@ msgstr "Когда пакет wireshark-common сконфигурирован т
msgid ""
"However, on this system the wireshark group is a user group instead of being"
" a system group, so purging wireshark-common did not remove it."
msgstr "Однако в этой системе группа wireshark - пользовательская группа, вместо того, чтобы быть системной группой, поэтому очистка wireshark-common не удалит её."
msgstr ""
"Однако в этой системе группа wireshark - пользовательская группа, вместо "
"того, чтобы быть системной группой, поэтому очистка wireshark-common не "
"удалит её."
#. Type: error
#. Description

28
debian/po/sk.po vendored
View File

@ -1,18 +1,20 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the wireshark package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# Automatically generated, 2011
# Slavko <linux@slavino.sk>, 2011
# Gerald Combs <gerald@wireshark.org>, 2020
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Wireshark\n"
"Project-Id-Version: wireshark\n"
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>\n"
"Language-Team: Slovak (http://www.transifex.com/wireshark/wireshark/language/sk/)\n"
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
"Language-Team: Slovak (https://www.transifex.com/wireshark/teams/36457/sk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -33,7 +35,11 @@ msgid ""
"system group to capture packets. This is recommended over the alternative of"
" running Wireshark/Tshark directly as root, because less of the code will "
"run with elevated privileges."
msgstr "Dumpcap možno nainštalovať spôsobom, ktorý dovolí zachytávať pakety členom systémovej skupiny „wireshark”. Toto je odporúčané oproti alternatívnemu spúšťaniu Wireshark/Tshark priamo s právami root, pretože bude menej kódu bežať s neobmedzenými právami."
msgstr ""
"Dumpcap možno nainštalovať spôsobom, ktorý dovolí zachytávať pakety členom "
"systémovej skupiny „wireshark”. Toto je odporúčané oproti alternatívnemu "
"spúšťaniu Wireshark/Tshark priamo s právami root, pretože bude menej kódu "
"bežať s neobmedzenými právami."
#. Type: boolean
#. Description
@ -41,7 +47,9 @@ msgstr "Dumpcap možno nainštalovať spôsobom, ktorý dovolí zachytávať pak
msgid ""
"For more detailed information please see /usr/share/doc/wireshark-"
"common/README.Debian."
msgstr "Ďalšie, podrobnejšie informácie nájdete v /usr/share/doc/wireshark-common/README.Debian."
msgstr ""
"Ďalšie, podrobnejšie informácie nájdete v /usr/share/doc/wireshark-"
"common/README.Debian."
#. Type: boolean
#. Description
@ -49,7 +57,9 @@ msgstr "Ďalšie, podrobnejšie informácie nájdete v /usr/share/doc/wireshark-
msgid ""
"Enabling this feature may be a security risk, so it is disabled by default. "
"If in doubt, it is suggested to leave it disabled."
msgstr "Zapnutie tejto vlastnosti môže byť bezpečnostným rizikom, aj preto je predvolene vypnutá. Ak si nie ste istý, odporúčame ponechať ju vypnutú."
msgstr ""
"Zapnutie tejto vlastnosti môže byť bezpečnostným rizikom, aj preto je "
"predvolene vypnutá. Ak si nie ste istý, odporúčame ponechať ju vypnutú."
#. Type: error
#. Description

57
debian/po/sv.po vendored
View File

@ -1,18 +1,20 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the wireshark package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# Göran Uddeborg <goeran@uddeborg.se>, 2017
# Martin Ågren <martin.agren@gmail.com>, 2009-2010
# Gerald Combs <gerald@wireshark.org>, 2020
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Wireshark\n"
"Project-Id-Version: wireshark\n"
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
"PO-Revision-Date: 2017-11-27 22:17+0000\n"
"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
"Language-Team: Swedish (http://www.transifex.com/wireshark/wireshark/language/sv/)\n"
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
"Language-Team: Swedish (https://www.transifex.com/wireshark/teams/36457/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -33,7 +35,11 @@ msgid ""
"system group to capture packets. This is recommended over the alternative of"
" running Wireshark/Tshark directly as root, because less of the code will "
"run with elevated privileges."
msgstr "Dumpcap kan installeras på ett sätt som tillåter medlemmar i systemgruppen \"wireshark\" att fånga paket. Detta rekommenderas framför alternativet, att köra Wireshark/Tshark direkt som root, eftersom en mindre del av koden kommer köras med utökade rättigheter."
msgstr ""
"Dumpcap kan installeras på ett sätt som tillåter medlemmar i systemgruppen "
"\"wireshark\" att fånga paket. Detta rekommenderas framför alternativet, att"
" köra Wireshark/Tshark direkt som root, eftersom en mindre del av koden "
"kommer köras med utökade rättigheter."
#. Type: boolean
#. Description
@ -41,7 +47,9 @@ msgstr "Dumpcap kan installeras på ett sätt som tillåter medlemmar i systemgr
msgid ""
"For more detailed information please see /usr/share/doc/wireshark-"
"common/README.Debian."
msgstr "Se /usr/share/doc/wireshark-common/README.Debian för mer detaljerad information."
msgstr ""
"Se /usr/share/doc/wireshark-common/README.Debian för mer detaljerad "
"information."
#. Type: boolean
#. Description
@ -49,7 +57,9 @@ msgstr "Se /usr/share/doc/wireshark-common/README.Debian för mer detaljerad inf
msgid ""
"Enabling this feature may be a security risk, so it is disabled by default. "
"If in doubt, it is suggested to leave it disabled."
msgstr "Att aktivera denna funktion kan vara en säkerhetsrisk, så den är avaktiverad som standard. Vid tvivel rekommenderas att den lämnas avaktiverad."
msgstr ""
"Att aktivera denna funktion kan vara en säkerhetsrisk, så den är avaktiverad"
" som standard. Vid tvivel rekommenderas att den lämnas avaktiverad."
#. Type: error
#. Description
@ -63,7 +73,9 @@ msgstr "Att skapa systemgruppen wireshark misslyckades"
msgid ""
"The wireshark group does not exist, and creating it failed, so Wireshark "
"cannot be configured to capture traffic as an unprivileged user."
msgstr "Gruppen wireshark finns inte, och att skapa den misslyckades, så Wireshark kan inte konfigureras att fånga trafik som en opriviligierad användare."
msgstr ""
"Gruppen wireshark finns inte, och att skapa den misslyckades, så Wireshark "
"kan inte konfigureras att fånga trafik som en opriviligierad användare."
#. Type: error
#. Description
@ -71,7 +83,8 @@ msgstr "Gruppen wireshark finns inte, och att skapa den misslyckades, så Wiresh
msgid ""
"Please create the wireshark system group and try configuring wireshark-"
"common again."
msgstr "Skapa systemgruppen wireshark och försök konfigurera wireshark-common igen."
msgstr ""
"Skapa systemgruppen wireshark och försök konfigurera wireshark-common igen."
#. Type: error
#. Description
@ -85,7 +98,9 @@ msgstr "Gruppen wireshark är en systemgrupp"
msgid ""
"The wireshark group exists as a user group, but the preferred configuration "
"is for it to be created as a system group."
msgstr "Gruppen wireshark finns som en användargrupp, men den rekommenderade konfigurationen är att den skapas som sen systemgrupp."
msgstr ""
"Gruppen wireshark finns som en användargrupp, men den rekommenderade "
"konfigurationen är att den skapas som sen systemgrupp."
#. Type: error
#. Description
@ -93,7 +108,9 @@ msgstr "Gruppen wireshark finns som en användargrupp, men den rekommenderade ko
msgid ""
"As a result, purging wireshark-common will not remove the wireshark group, "
"but everything else should work properly."
msgstr "Som ett resultat kommer rensning av wireshark-common inte ta bort gruppen wireshark, men allt annat skall fungera normalt."
msgstr ""
"Som ett resultat kommer rensning av wireshark-common inte ta bort gruppen "
"wireshark, men allt annat skall fungera normalt."
#. Type: error
#. Description
@ -107,7 +124,10 @@ msgstr "Att sätta förmågor för dumpcap misslyckades"
msgid ""
"The attempt to use Linux capabilities to grant packet-capturing privileges "
"to the dumpcap binary failed. Instead, it has had the set-user-id bit set."
msgstr "Försöket att använda Linux förmågor (capabilities) för att ge rättigheter att fånga paket till programmet dumpcap misslyckades. Istället har det fått set-user-id-biten satt."
msgstr ""
"Försöket att använda Linux förmågor (capabilities) för att ge rättigheter "
"att fånga paket till programmet dumpcap misslyckades. Istället har det fått"
" set-user-id-biten satt."
#. Type: error
#. Description
@ -122,7 +142,10 @@ msgid ""
"When the wireshark-common package is configured to allow non-superusers to "
"capture packets the postinst script of wireshark-common creates the "
"wireshark group as a system group."
msgstr "När paketet wireshark-common är konfigurerat för att tillåta andra än superanvändaren att fånga paket skapara postinst-skriptet i wireshark-common gruppen wireshark som en systemgrupp."
msgstr ""
"När paketet wireshark-common är konfigurerat för att tillåta andra än "
"superanvändaren att fånga paket skapara postinst-skriptet i wireshark-common"
" gruppen wireshark som en systemgrupp."
#. Type: error
#. Description
@ -130,7 +153,9 @@ msgstr "När paketet wireshark-common är konfigurerat för att tillåta andra
msgid ""
"However, on this system the wireshark group is a user group instead of being"
" a system group, so purging wireshark-common did not remove it."
msgstr "Dock är gruppen wireshark en användargrupp på detta system istället för en systemgrupp, så att rensa bort wireshark-common tog inte bort den."
msgstr ""
"Dock är gruppen wireshark en användargrupp på detta system istället för en "
"systemgrupp, så att rensa bort wireshark-common tog inte bort den."
#. Type: error
#. Description

26
debian/po/vi.po vendored
View File

@ -1,16 +1,20 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the wireshark package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
# Translators:
# Gerald Combs <gerald@wireshark.org>, 2020
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Wireshark\n"
"Project-Id-Version: wireshark\n"
"Report-Msgid-Bugs-To: wireshark@packages.debian.org\n"
"POT-Creation-Date: 2017-08-06 18:31-0400\n"
"PO-Revision-Date: 2017-09-22 06:50+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>\n"
"Language-Team: Vietnamese (http://www.transifex.com/wireshark/wireshark/language/vi/)\n"
"PO-Revision-Date: 2020-10-22 19:57+0000\n"
"Last-Translator: Gerald Combs <gerald@wireshark.org>, 2020\n"
"Language-Team: Vietnamese (https://www.transifex.com/wireshark/teams/36457/vi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@ -31,7 +35,11 @@ msgid ""
"system group to capture packets. This is recommended over the alternative of"
" running Wireshark/Tshark directly as root, because less of the code will "
"run with elevated privileges."
msgstr "Dumpcap có thể được cài đặt bằng một cách cấp cho các thành viên của nhóm « wireshark » có quyền bắt gói tin. Thiết lập này khuyến khích, so với chạy Wireshark/Tshark trực tiếp dưới người chủ, vì ít mã nguồn hơn sẽ chạy với quyền truy cập cao."
msgstr ""
"Dumpcap có thể được cài đặt bằng một cách cấp cho các thành viên của nhóm « "
"wireshark » có quyền bắt gói tin. Thiết lập này khuyến khích, so với chạy "
"Wireshark/Tshark trực tiếp dưới người chủ, vì ít mã nguồn hơn sẽ chạy với "
"quyền truy cập cao."
#. Type: boolean
#. Description
@ -39,7 +47,9 @@ msgstr "Dumpcap có thể được cài đặt bằng một cách cấp cho các
msgid ""
"For more detailed information please see /usr/share/doc/wireshark-"
"common/README.Debian."
msgstr "Để tìm chi tiết, xem tài liệu Đọc Đi « /usr/share/doc/wireshark-common/README.Debian »."
msgstr ""
"Để tìm chi tiết, xem tài liệu Đọc Đi « /usr/share/doc/wireshark-"
"common/README.Debian »."
#. Type: boolean
#. Description
@ -47,7 +57,9 @@ msgstr "Để tìm chi tiết, xem tài liệu Đọc Đi « /usr/share/doc/wire
msgid ""
"Enabling this feature may be a security risk, so it is disabled by default. "
"If in doubt, it is suggested to leave it disabled."
msgstr "Bật tính năng này có thể rủi ro bảo mật thì nó bị tắt theo mặc định. Chưa chắc nên để lại bị tắt."
msgstr ""
"Bật tính năng này có thể rủi ro bảo mật thì nó bị tắt theo mặc định. Chưa "
"chắc nên để lại bị tắt."
#. Type: error
#. Description

View File

@ -3398,7 +3398,7 @@ dissect_PROTO_tcp when the reassembly is complete and from
dissect_PROTO_udp (or dissect_PROTO_other).
To register the distinct dissector functions, consider the following
example, stolen from packet-dns.c:
example, stolen from packet-hartip.c:
#include "packet-tcp.h"

View File

@ -94,7 +94,7 @@ fills up, B<Dumpcap> will switch writing to the next file and so on.
The created filenames are based on the filename given with the B<-w> option,
the number of the file and on the creation date and time,
e.g. outfile_00001_20200714120117.pcap, outfile_00002_20200714120523.pcap, ...
e.g. outfile_00001_20210714120117.pcap, outfile_00002_20210714120523.pcap, ...
With the I<files> option it's also possible to form a "ring buffer".
This will fill up new files until the number of files specified,

View File

@ -150,17 +150,34 @@ This setting is mandatory.
=head1 EXAMPLES
To merge two capture files together, 100 seconds apart use:
To merge two capture files together into a third capture file, in which
the last packet of one file arrives 100 seconds before the first packet
of another file, use the following sequence of commands.
First, use:
capinfos -aeS a.pcap b.pcap
(Let's suppose a.pcap starts at 1009932757 and b.pcap ends
at 873660281. 1009932757 - 873660281 - 100 = 136272376
seconds.)
to determine the start and end times of the two capture files, as
seconds since January 1, 1970, 00:00:00 UTC.
If a.pcap starts at 1009932757 and b.pcap ends at 873660281, then the
time adjustment to b.pcap that would make it end 100 seconds before
a.pcap begins would be 1009932757 - 873660281 - 100 = 136272376 seconds.
Thus, the next step would be to use:
editcap -t 136272376 b.pcap b-shifted.pcap
to generate a version of b.pcap with its time stamps shifted 136272376
ahead.
Then the final step would be to use :
mergecap -w compare.pcap a.pcap b-shifted.pcap
to merge a.pcap and the shifted b.pcap into compare.pcap.
=head1 SEE ALSO
pcap(3), wireshark(1), tshark(1), dumpcap(1), editcap(1), text2pcap(1),

View File

@ -189,7 +189,7 @@ fills up, B<TShark> will switch writing to the next file and so on.
The created filenames are based on the filename given with the B<-w> option,
the number of the file and on the creation date and time,
e.g. outfile_00001_20200714120117.pcap, outfile_00002_20200714120523.pcap, ...
e.g. outfile_00001_20210714120117.pcap, outfile_00002_20210714120523.pcap, ...
With the I<files> option it's also possible to form a "ring buffer".
This will fill up new files until the number of files specified,
@ -865,10 +865,11 @@ B<hms> for hours, minutes and seconds
=item -U E<lt>tap nameE<gt>
PDUs export, exports PDUs from infile to outfile according to the tap name given.
Use -Y to filter.
PDUs export, exports PDUs from infile to outfile according to the tap
name given. Use -Y to filter.
Enter an empty tap name "" to get a list of available names.
Enter an empty tap name "" or a tap name of ? to get a list of available
names.
=item -v|--version

View File

@ -223,7 +223,7 @@ fills up, B<Wireshark> will switch writing to the next file and so on.
The created filenames are based on the filename given with the B<-w> flag,
the number of the file and on the creation date and time,
e.g. outfile_00001_20200714120117.pcap, outfile_00002_20200714120523.pcap, ...
e.g. outfile_00001_20210714120117.pcap, outfile_00002_20210714120523.pcap, ...
With the I<files> option it's also possible to form a "ring buffer".
This will fill up new files until the number of files specified,
@ -1020,7 +1020,7 @@ which to save it.
Show a dialog box that lists all files of the file set matching the currently
loaded file. A file set is a compound of files resulting from a capture using
the "multiple files" / "ringbuffer" mode, recognizable by the filename pattern,
e.g.: Filename_00001_20200714101530.pcap.
e.g.: Filename_00001_20210714101530.pcap.
=item File:File Set:Next File

View File

@ -323,6 +323,7 @@ set(WSLUA_MODULES
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_frame_info.c
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_capture_info.c
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_dir.c
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_wtap.c
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_util.c
${CMAKE_SOURCE_DIR}/epan/wslua/wslua_struct.c
)

View File

@ -3,7 +3,8 @@ require 'asciidoctor/extensions' unless RUBY_ENGINE == 'opal'
include ::Asciidoctor
# An inline macro that generates links to related man pages.
# An inline macro that generates a link to a CVE Record identified by its CVE
# Number.
#
# Usage
#

View File

@ -1,13 +1,13 @@
# SPDX-License-Identifier: MIT
module WsUtils
def create_doc_links(parent, target, text)
if parent.document.basebackend? 'html'
if (parent.document.basebackend? 'docbook') || (parent.document.basebackend? 'html')
parent.document.register :links, target
create_anchor(parent, text, type: :link, target: target).render.to_s
elsif parent.document.backend == 'manpage'
"\\fB#{text}"
else
bugtext
text
end
end
end

View File

@ -3,12 +3,12 @@ require 'asciidoctor/extensions' unless RUBY_ENGINE == 'opal'
include ::Asciidoctor
# An inline macro that generates links to related man pages.
# An inline macro that generates a link to a Wireshark bug report.
#
# Usage
#
# wsbuglink:<number>[<bug text>]
# Default bug text is "Bug".
# wsbuglink:<number>[<issue text>]
# Default bug text is "Issue <number>".
#
class WSBugLinkInlineMacro < Extensions::InlineMacroProcessor
include WsUtils
@ -19,7 +19,7 @@ class WSBugLinkInlineMacro < Extensions::InlineMacroProcessor
name_positional_attributes 'bugtext'
def process(parent, issueid, attrs)
bugtext = attrs['bugtext'] || %(Bug #{issueid})
bugtext = attrs['bugtext'] || %(Issue #{issueid})
target = %(https://gitlab.com/wireshark/wireshark/-/issues/#{issueid})
create_doc_links(parent, target, bugtext)
end

View File

@ -3,7 +3,7 @@ require 'asciidoctor/extensions' unless RUBY_ENGINE == 'opal'
include ::Asciidoctor
# An inline macro that generates links to related man pages.
# An inline macro that generates a link to a Wireshark Security Advisory.
#
# Usage
#

View File

@ -1,6 +1,6 @@
// Common attributes
:wireshark-version: 3.3.2
:wireshark-version: 3.4.7
// Required for btn, kbd:, and menu: macros.
:experimental:

View File

@ -1,7 +1,7 @@
<!-- Document information for the Developer's Guide. -->
<!-- Updated by tools/make-version.pl -->
<subtitle>For Wireshark 3.3</subtitle>
<subtitle>For Wireshark 3.4</subtitle>
<!-- <title><inlinegraphic entityref="WiresharkLogo" valign="middle" format="PNG"/> &DocumentTitle;</title> -->

View File

@ -6,8 +6,6 @@ include::attributes.adoc[]
// Asciidoctor Syntax Quick Reference:
// https://asciidoctor.org/docs/asciidoc-syntax-quick-reference/
This is an experimental release intended to test new features for Wireshark 3.4.
== What is Wireshark?
Wireshark is the worlds most popular network protocol analyzer.
@ -15,49 +13,45 @@ It is used for troubleshooting, analysis, development and education.
== Whats New
Many improvements have been made.
See the “New and Updated Features” section below for more details.
// The Windows installers now ship with Npcap 1.31.
// They previously shipped with Npcap 1.10.
// === Bug Fixes
// The Windows installers now ship with USBPcap 1.5.X.0.
// They previously shipped with USBPcap 1.5.4.0.
// The following bugs have been fixed:
// The Windows installers now ship with Qt 5.15.2.
// They previously shipped with Qt 5.12.1.
=== Bug Fixes
The following vulnerabilities have been fixed:
* wssalink:2021-06[]
DNP dissector crash.
wsbuglink:17462[].
cveidlink:2021-22235[].
// Fixed in master: 029a7fcec5
// Fixed in release-3.4: 490fe2684b
// Fixed in master-3.2: d9497073c4
// CVSS AV:N/AC:L/PR:N/UI:R/S:U/C:L/I:L/A:L
// CWE-762: Mismatched Memory Management Routines
The following bugs have been fixed:
//* wsbuglink:5000[]
//* wsbuglink:6000[Wireshark bug]
//* cveidlink:2014-2486[]
//* Wireshark exposed details your sordid redneck past, which were subsequently widely disseminated on social media.
// cp /dev/null /tmp/buglist.txt ; for bugnumber in `git log v3.4.4rc0.. | gsed -e 's/\(close\|fix\|resolv\)[^ ]* #/\nclose #/gI' | grep ^close | sed -e 's/close.*#\([1-9][0-9]*\).*/\1/' | sort -V -u` ; do "$(git rev-parse --show-toplevel)/tools/gen-bugnote" $bugnumber; pbpaste >> /tmp/buglist.txt; done
* TCP dissector - Erroneous DSACK reporting wsbuglink:17315[].
* No wlan_radio.duration calculated for PHY type: 802.11ac (VHT) wsbuglink:17419[].
* NAN Dissector has wrong minimum length for availability attribute wsbuglink:17431[].
=== New and Updated Features
The following features are new (or have been significantly updated) since version 3.3.1:
* The Protobuf fields defined as google.protobuf.Timestamp type of Protobuf standard library
can now be dissected as Wireshark fields of absolute time type.
The following features are new (or have been significantly updated) since version 3.3.0:
* The Windows installers now ship with Npcap 1.00.
They previously shipped with Npcap 0.9997.
* The Windows installers now ship with Qt 5.15.1.
They previously shipped with Qt 5.12.8.
The following features are new (or have been significantly updated) since version 3.2.0:
* Windows executables and installers are now https://support.microsoft.com/en-us/help/4472027/2019-sha-2-code-signing-support-requirement-for-windows-and-wsus[signed using SHA-2 only].
* Save RTP stream to .au supports any codec with 8000 Hz rate supported by Wireshark (shown in RTP player). If save of audio is not possible (unsupported codec or rate), silence of same length is saved and warning is shown.
* Asynchronous DNS resolution is always enabled. As a result, the c-ares library is now a required dependency.
* Protobuf fields can be dissected as Wireshark (header) fields that allows user input
the full names of Protobuf fields or messages in Filter toolbar for searching.
* Dissectors based on Protobuf can register themselves to a new 'protobuf_field' dissector table,
which is keyed with the full names of fields, for further parsing fields of BYTES or STRING type.
* Wireshark is able to decode, play, and save iLBC payload on platforms where the https://github.com/TimothyGu/libilbc[iLBC library] is available.
* Wireshark is able to decode, play, and save opus payload on platforms where the https://opus-codec.org/[opus library] is available.
* “Decode As” entries can now be copied from other profiles using a button in the dialog.
* sshdump can now be copied to multiple instances. Each instance will show up a different interface and will have its own profile.
* The main window now supports a packet diagram view, which shows each packet as a textbook-style diagram.
* Filter buttons (“Preferences -> Filter Buttons”) can be grouped by using “//” as a path separator in the filter button label.
* IPP Over USB packets can now be dissected and displayed
// === Removed Features and Support
//=== Removed Dissectors
@ -70,41 +64,31 @@ The following features are new (or have been significantly updated) since versio
=== New Protocol Support
// Add one protocol per line between the -- delimiters.
[commaize]
--
Arinc 615A (A615A)
Asphodel Protocol
AudioCodes Debug Recording (ACDR)
Bluetooth HCI ISO (BT HCI ISO)
Cisco MisCabling Protocol (MCP)
Community ID Flow Hashing (CommunityID)
DCE/RPC IRemoteWinspool SubSystem, (IREMOTEWINSPOOL)
Dynamic Link Exchange Protocol (DLEP)
Fortinet Single Sign-on (FSSO)
FTDI Multi-Protocol Synchronous Serial Engine (FTDI MPSSE)
EAP Generalized Pre-Shared Key (EAP-GPSK)
EAP Password Authenticated Exchange (EAP-PAX)
EAP Pre-Shared Key (EAP-PSK)
EAP Shared-secret Authentication and Key Establishment (EAP-SAKE)
Hypertext Transfer Protocol Version 3 (HTTP3)
ILDA Digital Network (IDN)
Java Debug Wire Protocol (JDWP)
LBM Stateful Resolution Service (LBMSRS)
Lithionics Battery Management
OBSAI UDP-based Communication Protocol (UDPCP)
Palo Alto Heartbeat Backup (PA-HB-Bak)
ScyllaDB RPC
Technically Enhanced Capture Module Protocol (TECMP)
Tunnel Extensible Authentication Protocol (TEAP)
UDP based FTP w/ multicast V5 (UFTP5)
USB Printer (USBPRINTER)
ILDA Digital Network (IDN)
--
There are no new protocols in this release.
=== Updated Protocol Support
Too many protocols have been updated to list here.
// Add one protocol per line between the -- delimiters.
[commaize]
--
ASTERIX
BT LE LL
DCE RPC
DNP
GTPv2
IEEE 802.11 Radio
LDAP
NAN
NORDIC_BLE
NR RRC
OSPF
pcapng
PNIO
RSL
S101
Snort config
TCP
--
=== New and Updated Capture File Support
@ -112,7 +96,9 @@ Too many protocols have been updated to list here.
// Add one file type per line between the -- delimiters.
[commaize]
--
MP4 (ISO/IEC 14496-12)
Catapult DCT2000
ERF
pcap
--
// === New and Updated Capture Interfaces support
@ -146,12 +132,12 @@ The Users Guide, manual pages and various other documentation can be found at
https://www.wireshark.org/docs/
Community support is available on
https://ask.wireshark.org/[WiresharksQ&A site]
https://ask.wireshark.org/[Wiresharks Q&A site]
and on the wireshark-users mailing list.
Subscription information and archives for all of Wiresharks mailing lists can be found on
https://www.wireshark.org/lists/[the web site].
Bugs and feature requests can be reported on
Issues and feature requests can be reported on
https://gitlab.com/wireshark/wireshark/-/issues[the issue tracker].
// Official Wireshark training and certification are available from

View File

@ -1,7 +1,7 @@
<!-- Document information for the User's Guide. -->
<!-- Updated by tools/make-version.pl -->
<subtitle>For Wireshark 3.3</subtitle>
<subtitle>For Wireshark 3.4</subtitle>
<!--
<title><inlinegraphic entityref="WiresharkLogo" valign="middle" format="PNG"/> &DocumentTitle;</title>

View File

@ -243,6 +243,7 @@ include::{build_dir}/wsluarm_src/wslua_tree.adoc[]
include::{build_dir}/wsluarm_src/wslua_tvb.adoc[]
include::{build_dir}/wsluarm_src/wslua_file.adoc[]
include::{build_dir}/wsluarm_src/wslua_dir.adoc[]
include::{build_dir}/wsluarm_src/wslua_wtap.adoc[]
include::{build_dir}/wsluarm_src/wslua_util.adoc[]
include::{build_dir}/wsluarm_src/wslua_int64.adoc[]
include::{build_dir}/wsluarm_src/wslua_struct.adoc[]

View File

@ -484,8 +484,8 @@ Information about the folders used for capture files can be found in
|File Name|“Create a new file...”|“Use a ring buffer...”|Mode|Resulting filename(s) used
|-|-|-|Single temporary file|wiresharkXXXXXX (where XXXXXX is a unique number)
|foo.cap|-|-|Single named file|foo.cap
|foo.cap|x|-|Multiple files, continuous|foo_00001_20200714110102.cap, foo_00002_20200714110318.cap, ...
|foo.cap|x|x|Multiple files, ring buffer|foo_00001_20200714110102.cap, foo_00002_20200714110318.cap, ...
|foo.cap|x|-|Multiple files, continuous|foo_00001_20210714110102.cap, foo_00002_20210714110318.cap, ...
|foo.cap|x|x|Multiple files, ring buffer|foo_00001_20210714110102.cap, foo_00002_20210714110318.cap, ...
|===
Single temporary file::

View File

@ -507,7 +507,7 @@ some features to handle these file sets in a convenient way.
.How does Wireshark detect the files of a file set?
****
A filename in a file set uses the format Prefix_Number_DateTimeSuffix which
might look something like `test_00001_20200714183910.pcap`. All files of a file
might look something like `test_00001_20210714183910.pcap`. All files of a file
set share the same prefix (e.g. “test”) and suffix (e.g. “.pcap”) and a
varying middle part.

View File

@ -1,4 +1,4 @@
Capinfos (Wireshark) 3.3.2 (v3.3.2rc0-16-g1936fef77a42)
Capinfos (Wireshark) 3.4.7 (v3.4.7rc0-4-g9eb1c665c661)
Print various information (infos) about capture files.
See https://www.wireshark.org for more information.

View File

@ -1,4 +1,4 @@
Dumpcap (Wireshark) 3.3.2 (v3.3.2rc0-16-g1936fef77a42)
Dumpcap (Wireshark) 3.4.7 (v3.4.7rc0-4-g9eb1c665c661)
Capture network packets and dump them into a pcapng or pcap file.
See https://www.wireshark.org for more information.

View File

@ -1,4 +1,4 @@
Editcap (Wireshark) 3.3.2 (v3.3.2rc0-16-g1936fef77a42)
Editcap (Wireshark) 3.4.7 (v3.4.7rc0-4-g9eb1c665c661)
Edit and/or translate the format of capture files.
See https://www.wireshark.org for more information.
@ -106,3 +106,4 @@ Miscellaneous:
If -v is used with any of the 'Duplicate Packet
Removal' options (-d, -D or -w) then Packet lengths
and MD5 hashes are printed to standard-error.
-V, --version print version information and exit.

View File

@ -1,4 +1,4 @@
Mergecap (Wireshark) 3.3.2 (v3.3.2rc0-16-g1936fef77a42)
Mergecap (Wireshark) 3.4.7 (v3.4.7rc0-4-g9eb1c665c661)
Merge two or more capture files into one.
See https://www.wireshark.org for more information.
@ -17,3 +17,4 @@ Output:
Miscellaneous:
-h display this help and exit.
-v verbose output.
-V print version information and exit.

View File

@ -1,4 +1,4 @@
Rawshark (Wireshark) 3.3.2 (v3.3.2rc0-16-g1936fef77a42)
Rawshark (Wireshark) 3.4.7 (v3.4.7rc0-4-g9eb1c665c661)
Dump and analyze network traffic.
See https://www.wireshark.org for more information.

View File

@ -1,4 +1,4 @@
Reordercap (Wireshark) 3.3.2 (v3.3.2rc0-16-g1936fef77a42)
Reordercap (Wireshark) 3.4.7 (v3.4.7rc0-4-g9eb1c665c661)
Reorder timestamps of input file frames into output file.
See https://www.wireshark.org for more information.
@ -7,3 +7,4 @@ Usage: reordercap [options] <infile> <outfile>
Options:
-n don't write to output file if the input file is ordered.
-h display this help and exit.
-v print version information and exit.

View File

@ -1,4 +1,4 @@
Text2pcap (Wireshark) 3.3.2 (v3.3.2rc0-16-g1936fef77a42)
Text2pcap (Wireshark) 3.4.7 (v3.4.7rc0-4-g9eb1c665c661)
Generate a capture file from an ASCII hexdump of packets.
See https://www.wireshark.org for more information.
@ -77,5 +77,6 @@ Prepend dummy header:
Miscellaneous:
-h display this help and exit.
-v print version information and exit.
-d show detailed debug of parser states.
-q generate no output at all (automatically disables -d).

View File

@ -1,4 +1,4 @@
TShark (Wireshark) 3.3.2 (v3.3.2rc0-16-g1936fef77a42)
TShark (Wireshark) 3.4.7 (v3.4.7rc0-4-g9eb1c665c661)
Dump and analyze network traffic.
See https://www.wireshark.org for more information.

View File

@ -1,4 +1,4 @@
Wireshark 3.3.2 (v3.3.2rc0-16-g1936fef77a42)
Wireshark 3.4.7 (v3.4.7rc0-4-g9eb1c665c661)
Interactively dump and analyze network traffic.
See https://www.wireshark.org for more information.

200
dumpcap.c
View File

@ -547,15 +547,17 @@ relinquish_all_capabilities(void)
#elif defined(__APPLE__)
#define PLATFORM_PERMISSIONS_SUGGESTION \
"\n\n" \
"If you installed Wireshark using the package from wireshark.org, "\
"Try re-installing it and checking the box for the \"Set capture " \
"permissions on startup\" item."
"If you installed Wireshark using the package from wireshark.org, " \
"close this dialog and click on the \"installing ChmodBPF\" link in " \
"\"You can fix this by installing ChmodBPF.\" on the main screen, " \
"and then complete the installation procedure."
#else
#define PLATFORM_PERMISSIONS_SUGGESTION
#endif
static const char *
get_pcap_failure_secondary_error_message(cap_device_open_err open_err)
get_pcap_failure_secondary_error_message(cap_device_open_err open_err,
const char *open_err_str)
{
#ifdef _WIN32
/*
@ -579,13 +581,33 @@ get_pcap_failure_secondary_error_message(cap_device_open_err open_err)
*/
if (open_err == CAP_DEVICE_OPEN_ERR_GENERIC) {
/*
* We don't know what kind of error it is, so throw all the
* suggestions at the user.
* We don't know what kind of error it is. See if there's a hint
* in the error string; if not, throw all generic suggestions at
* the user.
*/
return
"Please check to make sure you have sufficient permissions, and that you have "
"the proper interface or pipe specified."
PLATFORM_PERMISSIONS_SUGGESTION;
static const char promisc_failed[] =
"failed to set hardware filter to promiscuous mode";
/*
* Does the error string begin with the error produced by WinPcap
* and Npcap if attempting to set promiscuous mode fails?
* (Note that this string could have a specific error message
* from an NDIS error after the initial part, so we do a prefix
* check rather than an exact match check.)
*/
if (strncmp(open_err_str, promisc_failed, sizeof promisc_failed - 1) == 0) {
/*
* Yes. Suggest that the user turn off promiscuous mode on that
* device.
*/
return
"Please turn off promiscuous mode for this device";
} else {
return
"Please check to make sure you have sufficient permissions, and that you have "
"the proper interface or pipe specified."
PLATFORM_PERMISSIONS_SUGGESTION;
}
} else if (open_err == CAP_DEVICE_OPEN_ERR_PERMISSIONS) {
/*
* This is a permissions error, so no need to specify any other
@ -616,7 +638,7 @@ get_capture_device_open_failure_messages(cap_device_open_err open_err,
"The capture session could not be initiated on interface '%s' (%s).",
iface, open_err_str);
g_snprintf(secondary_errmsg, (gulong) secondary_errmsg_len, "%s",
get_pcap_failure_secondary_error_message(open_err));
get_pcap_failure_secondary_error_message(open_err, open_err_str));
}
static gboolean
@ -1315,6 +1337,7 @@ static int
cap_open_socket(char *pipename, capture_src *pcap_src, char *errmsg, size_t errmsgl)
{
struct sockaddr_storage sa;
socklen_t sa_len;
int fd;
/* Skip the initial "TCP@" in the pipename. */
@ -1326,10 +1349,27 @@ cap_open_socket(char *pipename, capture_src *pcap_src, char *errmsg, size_t errm
return -1;
}
if ((fd = (int)socket(sa.ss_family, SOCK_STREAM, 0)) < 0 ||
connect(fd, (struct sockaddr *)&sa, sizeof(sa)) < 0) {
if ((fd = (int)socket(sa.ss_family, SOCK_STREAM, 0)) < 0) {
g_snprintf(errmsg, (gulong)errmsgl,
"The capture session could not be initiated due to the socket error: \n"
"The capture session could not be initiated because"
" the socket couldn't be created due to the socket error: \n"
#ifdef _WIN32
" %s", win32strerror(WSAGetLastError()));
#else
" %d: %s", errno, g_strerror(errno));
#endif
pcap_src->cap_pipe_err = PIPERR;
return -1;
}
if (sa.ss_family == AF_INET6)
sa_len = sizeof(struct sockaddr_in6);
else
sa_len = sizeof(struct sockaddr_in);
if (connect(fd, (struct sockaddr *)&sa, sa_len) < 0) {
g_snprintf(errmsg, (gulong)errmsgl,
"The capture session could not be initiated because"
" the socket couldn't be connected due to the socket error: \n"
#ifdef _WIN32
" %s", win32strerror(WSAGetLastError()));
#else
@ -1337,8 +1377,7 @@ cap_open_socket(char *pipename, capture_src *pcap_src, char *errmsg, size_t errm
#endif
pcap_src->cap_pipe_err = PIPERR;
if (fd >= 0)
cap_pipe_close(fd, TRUE);
cap_pipe_close(fd, TRUE);
return -1;
}
@ -3665,6 +3704,50 @@ capture_loop_dequeue_packet(void) {
return FALSE;
}
/*
* Note: this code will never be run on any OS other than Windows.
*/
static char *
please_report_npcap_bug(char *adapter_name, char *cap_err_str)
{
GString *pcap_info_str;
GString *windows_info_str;
char *msg;
pcap_info_str = g_string_new("");
get_runtime_caplibs_version(pcap_info_str);
if (!g_str_has_prefix(pcap_info_str->str, "with Npcap")) {
/*
* We're not using Npcap, so don't recomment a user
* file a bug against Npcap.
*/
g_string_free(pcap_info_str, TRUE);
return g_strdup("");
}
windows_info_str = g_string_new("");
get_os_version_info(windows_info_str);
msg = g_strdup_printf("If you have not removed that adapter, this "
"may be a bug in Npcap: please report it "
"as an issue at https://github.com/nmap/npcap/issues\n\n"
"Give all details, such as:\n\n"
"The name of the adapter on which the error occurred (\"%s\");\n"
"The error message \"%s\";\n"
"The full version of Windows on which this occurred (\"%s\");\n"
"The version of Npcap with which this occurred (\"%s\");\n"
"Any indication of whether the machine went to sleep "
"during the capture;\n"
"Any indication of whether any other interfaces "
"were added to or removed from the machine while "
"the capture was taking place.",
adapter_name,
cap_err_str,
windows_info_str->str,
pcap_info_str->str);
g_string_free(windows_info_str, TRUE);
g_string_free(pcap_info_str, TRUE);
return msg;
}
/* Do the low-level work of a capture.
Returns TRUE if it succeeds, FALSE otherwise. */
static gboolean
@ -3982,32 +4065,93 @@ capture_loop_start(capture_options *capture_opts, gboolean *stats_known, struct
On OpenBSD, you get "read: I/O error" (EIO) in the same case.
With WinPcap and Npcap, you'll get
"read error: PacketReceivePacket failed".
"read error: PacketReceivePacket failed" or
"PacketReceivePacket error: The device has been removed. (1617)".
Newer versions of libpcap map some or all of those to just
"The interface disappeared" or something beginning with
"The interface disappeared".
These should *not* be reported to the Wireshark developers. */
These should *not* be reported to the Wireshark developers,
although, with Npcap, "The interface disappeared" messages
should perhaps be reported to the Npcap developers, at least
until errors of that sort that shouldn't happen are fixed,
if that's possible. */
char *cap_err_str;
char *primary_msg;
char *secondary_msg;
interface_opts = &g_array_index(capture_opts->ifaces, interface_options, i);
cap_err_str = pcap_geterr(pcap_src->pcap_h);
if (strcmp(cap_err_str, "The interface went down") == 0 ||
strcmp(cap_err_str, "recvfrom: Network is down") == 0) {
report_capture_error("The network adapter on which the capture was being done "
"is no longer running; the capture has stopped.",
"");
primary_msg = g_strdup_printf("The network adapter \"%s\" "
"is no longer running; the "
"capture has stopped.",
interface_opts->display_name);
secondary_msg = g_strdup("");
} else if (strcmp(cap_err_str, "The interface disappeared") == 0 ||
strcmp(cap_err_str, "read: Device not configured") == 0 ||
strcmp(cap_err_str, "read: I/O error") == 0 ||
strcmp(cap_err_str, "read error: PacketReceivePacket failed") == 0) {
report_capture_error("The network adapter on which the capture was being done "
"is no longer attached; the capture has stopped.",
"");
primary_msg = g_strdup_printf("The network adapter \"%s\" "
"is no longer attached; the "
"capture has stopped.",
interface_opts->display_name);
secondary_msg = g_strdup("");
} else if (g_str_has_prefix(cap_err_str, "The interface disappeared ")) {
/*
* Npcap, if it picks up a recent commit to libpcap, will
* report an error *beginning* with "The interface
* disappeared", with the name of the Windows status code,
* and the corresponding NT status code, after it.
*
* Those should be reported as Npcap issues.
*/
primary_msg = g_strdup_printf("The network adapter \"%s\" "
"is no longer attached; the "
"capture has stopped.",
interface_opts->display_name);
secondary_msg = please_report_npcap_bug(interface_opts->display_name,
cap_err_str);
} else if (g_str_has_prefix(cap_err_str, "PacketReceivePacket error:") &&
g_str_has_suffix(cap_err_str, "(1617)")) {
/*
* "PacketReceivePacket error: {message in arbitrary language} (1617)",
* which is ERROR_DEVICE_REMOVED.
*
* Current libpcap/Npcap treat ERROR_GEN_FAILURE as
* "the device is no longer attached"; users are also
* getting ERROR_DEVICE_REMOVED.
*
* For now, some users appear to be getg ERROR_DEVICE_REMOVED
* in cases where the device *wasn't* removed, so tell
* them to report this as an Npcap issue; I seem to
* remember some discussion between Daniel and somebody
* at Microsoft about the Windows 10 network stack setup/
* teardown code being modified to try to prevent those
* sort of problems popping up, but I can't find that
* discussion.
*/
primary_msg = g_strdup_printf("The network adapter \"%s\" "
"is no longer attached; the "
"capture has stopped.",
interface_opts->display_name);
secondary_msg = please_report_npcap_bug(interface_opts->display_name,
"The interface disappeared (error code ERROR_DEVICE_REMOVED/STATUS_DEVICE_REMOVED)");
} else if (strcmp(cap_err_str, "The other host terminated the connection") == 0) {
primary_msg = g_strdup(cap_err_str);
secondary_msg = g_strdup("This may be a problem with the "
"remote host on which you are "
"capturing packets.");
} else {
g_snprintf(errmsg, sizeof(errmsg), "Error while capturing packets: %s",
cap_err_str);
report_capture_error(errmsg, please_report_bug());
primary_msg = g_strdup_printf("Error while capturing packets: %s",
cap_err_str);
secondary_msg = g_strdup(please_report_bug());
}
report_capture_error(primary_msg, secondary_msg);
g_free(primary_msg);
g_free(secondary_msg);
break;
} else if (pcap_src->from_cap_pipe && pcap_src->cap_pipe_err == PIPERR) {
report_capture_error(errmsg, "");
@ -5167,7 +5311,7 @@ main(int argc, char *argv[])
if (caps == NULL) {
cmdarg_err("The capabilities of the capture device \"%s\" could not be obtained (%s).\n"
"%s", interface_opts->name, err_str,
get_pcap_failure_secondary_error_message(err));
get_pcap_failure_secondary_error_message(err, err_str));
g_free(err_str);
exit_main(2);
}

108
editcap.c
View File

@ -155,10 +155,10 @@ GPtrArray *capture_comments = NULL;
#define MAX_SELECTIONS 512
static struct select_item selectfrm[MAX_SELECTIONS];
static guint max_selected = 0;
static int keep_em = 0;
static gboolean keep_em = FALSE;
static int out_file_type_subtype = WTAP_FILE_TYPE_SUBTYPE_PCAPNG; /* default to pcapng */
static int out_frame_type = -2; /* Leave frame type alone */
static int verbose = 0; /* Not so verbose */
static gboolean verbose = FALSE; /* Not so verbose */
static struct time_adjustment time_adj = {NSTIME_INIT_ZERO, 0}; /* no adjustment */
static nstime_t relative_time_window = NSTIME_INIT_ZERO; /* de-dup time window */
static double err_prob = -1.0;
@ -328,7 +328,7 @@ add_selection(char *sel, guint* max_selection)
/* Was the packet selected? */
static int
static gboolean
selected(guint recno)
{
guint i;
@ -336,14 +336,14 @@ selected(guint recno)
for (i = 0; i < max_selected; i++) {
if (selectfrm[i].inclusive) {
if (selectfrm[i].first <= recno && selectfrm[i].second >= recno)
return 1;
return TRUE;
} else {
if (recno == selectfrm[i].first)
return 1;
return TRUE;
}
}
return 0;
return FALSE;
}
static gboolean
@ -855,6 +855,7 @@ print_usage(FILE *output)
fprintf(output, " If -v is used with any of the 'Duplicate Packet\n");
fprintf(output, " Removal' options (-d, -D or -w) then Packet lengths\n");
fprintf(output, " and MD5 hashes are printed to standard-error.\n");
fprintf(output, " -V, --version print version information and exit.\n");
}
struct string_elem {
@ -997,23 +998,49 @@ failure_message_cont(const char *msg_format, va_list ap)
static wtap_dumper *
editcap_dump_open(const char *filename, const wtap_dump_params *params,
int *write_err, gchar **write_err_info)
GArray *idbs_seen, int *err, gchar **err_info)
{
wtap_dumper *pdh;
if (strcmp(filename, "-") == 0) {
/* Write to the standard output. */
pdh = wtap_dump_open_stdout(out_file_type_subtype, WTAP_UNCOMPRESSED,
params, write_err, write_err_info);
params, err, err_info);
} else {
pdh = wtap_dump_open(filename, out_file_type_subtype, WTAP_UNCOMPRESSED,
params, write_err, write_err_info);
params, err, err_info);
}
if (pdh == NULL)
return NULL;
/*
* If the output file requires interface IDs, add all the IDBs we've
* seen so far.
*/
if (wtap_uses_interface_ids(wtap_dump_file_type_subtype(pdh))) {
for (guint i = 0; i < idbs_seen->len; i++) {
wtap_block_t if_data = g_array_index(idbs_seen, wtap_block_t, i);
/*
* Add this IDB to the file to which we're currently writing.
*/
if (!wtap_dump_add_idb(pdh, if_data, err, err_info)) {
int close_err;
gchar *close_err_info;
wtap_dump_close(pdh, &close_err, &close_err_info);
g_free(close_err_info);
return NULL;
}
}
}
return pdh;
}
static gboolean
process_new_idbs(wtap *wth, wtap_dumper *pdh, int *err, gchar **err_info)
process_new_idbs(wtap *wth, wtap_dumper *pdh, GArray *idbs_seen,
int *err, gchar **err_info)
{
wtap_block_t if_data;
@ -1023,8 +1050,22 @@ process_new_idbs(wtap *wth, wtap_dumper *pdh, int *err, gchar **err_info)
* otherwise, it doesn't support writing IDBs.
*/
if (wtap_uses_interface_ids(wtap_dump_file_type_subtype(pdh))) {
wtap_block_t if_data_copy;
/*
* Add this IDB to the file to which we're currently writing.
*/
if (!wtap_dump_add_idb(pdh, if_data, err, err_info))
return FALSE;
/*
* Also add it to the set of IDBs we've seen, in case we
* start writing to another file (which would be of the
* same type as the current file, and thus will also require
* interface IDs).
*/
if_data_copy = wtap_block_make_copy(if_data);
g_array_append_val(idbs_seen, if_data_copy);
}
}
return TRUE;
@ -1065,6 +1106,7 @@ main(int argc, char *argv[])
chop_t chop = {0, 0, 0, 0, 0, 0}; /* No chop */
gboolean adjlen = FALSE;
wtap_dumper *pdh = NULL;
GArray *idbs_seen = NULL;
unsigned int count = 1;
unsigned int duplicate_count = 0;
gint64 data_offset;
@ -1425,7 +1467,12 @@ invalid_time:
break;
case 'r':
keep_em = !keep_em; /* Just invert */
if (keep_em) {
cmdarg_err("-r was specified twice");
ret = INVALID_OPTION;
goto clean_exit;
}
keep_em = TRUE;
break;
case 's':
@ -1459,7 +1506,12 @@ invalid_time:
break;
case 'v':
verbose = !verbose; /* Just invert */
if (verbose) {
cmdarg_err("-v was specified twice");
ret = INVALID_OPTION;
goto clean_exit;
}
verbose = TRUE;
break;
case 'V':
@ -1672,7 +1724,7 @@ invalid_time:
if (add_selection(argv[i], &max_packet_number) == FALSE)
break;
if (keep_em == FALSE)
if (!keep_em)
max_packet_number = G_MAXUINT;
if (dup_detect || dup_detect_by_time) {
@ -1683,6 +1735,9 @@ invalid_time:
}
}
/* Set up an array of all IDBs seen */
idbs_seen = g_array_new(FALSE, FALSE, sizeof(wtap_block_t));
/* Read all of the packets in turn */
wtap_rec_init(&read_rec);
ws_buffer_init(&read_buf, 1514);
@ -1719,7 +1774,7 @@ invalid_time:
wtap_block_add_string_option_format(g_array_index(params.shb_hdrs, wtap_block_t, 0), OPT_SHB_USERAPPL, "%s", get_appname_and_version());
}
pdh = editcap_dump_open(filename, &params, &write_err,
pdh = editcap_dump_open(filename, &params, idbs_seen, &write_err,
&write_err_info);
if (pdh == NULL) {
@ -1734,7 +1789,7 @@ invalid_time:
/*
* Process whatever IDBs we haven't seen yet.
*/
if (!process_new_idbs(wth, pdh, &write_err, &write_err_info)) {
if (!process_new_idbs(wth, pdh, idbs_seen, &write_err, &write_err_info)) {
cfile_write_failure_message("editcap", argv[optind],
filename,
write_err, write_err_info,
@ -1772,8 +1827,8 @@ invalid_time:
if (verbose)
fprintf(stderr, "Continuing writing in file %s\n", filename);
pdh = editcap_dump_open(filename, &params, &write_err,
&write_err_info);
pdh = editcap_dump_open(filename, &params, idbs_seen,
&write_err, &write_err_info);
if (pdh == NULL) {
cfile_dump_open_failure_message("editcap", filename,
@ -1804,8 +1859,8 @@ invalid_time:
if (verbose)
fprintf(stderr, "Continuing writing in file %s\n", filename);
pdh = editcap_dump_open(filename, &params, &write_err,
&write_err_info);
pdh = editcap_dump_open(filename, &params, idbs_seen,
&write_err, &write_err_info);
if (pdh == NULL) {
cfile_dump_open_failure_message("editcap", filename,
write_err, write_err_info,
@ -2078,6 +2133,11 @@ invalid_time:
caplen = rec->rec_header.syscall_header.event_filelen;
do_mutation = TRUE;
break;
case REC_TYPE_SYSTEMD_JOURNAL:
caplen = rec->rec_header.systemd_journal_header.record_len;
do_mutation = TRUE;
break;
}
if (change_offset > caplen) {
@ -2207,7 +2267,8 @@ invalid_time:
g_free (filename);
filename = g_strdup(argv[optind+1]);
pdh = editcap_dump_open(filename, &params, &write_err, &write_err_info);
pdh = editcap_dump_open(filename, &params, idbs_seen, &write_err,
&write_err_info);
if (pdh == NULL) {
cfile_dump_open_failure_message("editcap", filename,
write_err, write_err_info,
@ -2245,6 +2306,13 @@ clean_exit:
g_array_free(dsb_types, TRUE);
g_ptr_array_free(dsb_filenames, TRUE);
}
if (idbs_seen != NULL) {
for (guint b = 0; b < idbs_seen->len; b++) {
wtap_block_t if_data = g_array_index(idbs_seen, wtap_block_t, b);
wtap_block_free(if_data);
}
g_array_free(idbs_seen, TRUE);
}
g_free(params.idb_inf);
wtap_dump_params_cleanup(&params);
if (wth != NULL)

File diff suppressed because it is too large Load Diff

View File

@ -330,7 +330,7 @@ endif()
set_target_properties(epan PROPERTIES
COMPILE_DEFINITIONS "WS_BUILD_DLL"
LINK_FLAGS "${WS_LINK_FLAGS}"
VERSION "0.0.0" SOVERSION 0
VERSION "14.0.7" SOVERSION 14
INSTALL_RPATH "${LIBRARY_INSTALL_RPATH}"
# By default the name for a library with target name epan will be libepan,
# but Ethereal is now named Wireshark

View File

@ -533,6 +533,7 @@ void
set_resolution_synchrony(gboolean synchronous)
{
resolve_synchronously = synchronous;
maxmind_db_set_synchrony(synchronous);
}
static void

View File

@ -235,7 +235,7 @@ double asn1_get_real(const guint8 *real_ptr, gint len) {
/* Ensure the buffer len and its content are coherent */
DISSECTOR_ASSERT(lenE < len - 1);
Eneg = (*p) & 0x80 ? TRUE : FALSE;
Eneg = ((*p) & 0x80) ? TRUE : FALSE;
for (i = 0; i < lenE; i++) {
if(Eneg) {
/* 2's complement: inverse bits */

View File

@ -1149,7 +1149,7 @@ get_ts_23_038_7bits_string_unpacked(wmem_allocator_t *scope, const guint8 *ptr,
strbuf = wmem_strbuf_sized_new(scope, length+1, 0);
for (i = 0; i < length; i++)
saw_escape = handle_ts_23_038_char(strbuf, *ptr, saw_escape);
saw_escape = handle_ts_23_038_char(strbuf, *ptr++, saw_escape);
return (guint8 *)wmem_strbuf_finalize(strbuf);
}

View File

@ -12,12 +12,12 @@
#include "ws_symbol_export.h"
#include <wsutil/color.h>
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#include <wsutil/color.h>
struct epan_dissect;
#define COLORFILTERS_FILE_NAME "colorfilters"

View File

@ -13,6 +13,8 @@
#include "ws_symbol_export.h"
#include "packet.h" /* for conversation dissector type */
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
@ -46,8 +48,6 @@ extern "C" {
/* Flags to handle endpoints */
#define USE_LAST_ENDPOINT 0x08 /* Use last endpoint created, regardless of type */
#include "packet.h" /* for conversation dissector type */
/* Types of port numbers Wireshark knows about. */
typedef enum {
ENDPOINT_NONE, /* no endpoint */

View File

@ -370,8 +370,9 @@ static gboolean macro_update(void* mp, gchar** error) {
*w = *r;
goto done;
case '\\':
*(w++) = *(++r);
r++;
*(w++) = *(r++);
if(*r)
*(w++) = *(r++);
break;
case '$': {
int cnt = 0;
@ -612,6 +613,7 @@ void dump_dfilter_macro_t(const dfilter_macro_t *m, const char *function, const
if(m == NULL) {
ws_debug_printf(" dfilter_macro_t * == NULL! (via: %s(): %s:%d)\n", function, file, line);
ws_debug_printf("\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n");
return;
}
ws_debug_printf("DUMP of dfilter_macro_t: %p (via: %s(): %s:%d)\n", m, function, file, line);

View File

@ -10,8 +10,6 @@
#ifndef PACKET_ATN_ULCS_H
#define PACKET_ATN_ULCS_H
#include <config.h>
#include "packet.h"
#include <epan/wmem/wmem.h>

View File

@ -122,10 +122,10 @@ extern gboolean krb_decrypt;
#endif /* HAVE_KERBEROS */
#include "packet-kerberos-exp.h"
#ifdef __cplusplus
}
#endif /* __cplusplus */
#include "packet-kerberos-exp.h"
#endif /* __PACKET_KERBEROS_H */

View File

@ -158,7 +158,7 @@ ProtocolIE-Field/value ie_field_value
if (!parameter_tvb)
return offset;
subtree = proto_item_add_subtree(actx->created_item, ett_lcsap_plmnd_id);
dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, subtree, 0, E212_NONE, TRUE);
dissect_e212_mcc_mnc(parameter_tvb, actx->pinfo, subtree, 0, E212_NONE, FALSE);
#.END
#.FN_BODY Positioning-Method-And-Usage VAL_PTR = &parameter_tvb

View File

@ -1188,13 +1188,13 @@ static void
proto_tree_add_uint(ldap_tree, hf_ldap_sasl_buffer_length, sasl_tvb, 0, 4, sasl_len);
sasl_tree = proto_tree_add_subtree(ldap_tree, sasl_tvb, 0, sasl_msg_len, ett_ldap_sasl_blob, NULL, "SASL Buffer");
sasl_tree = proto_tree_add_subtree(ldap_tree, sasl_tvb, 4, sasl_msg_len - 4, ett_ldap_sasl_blob, NULL, "SASL Buffer");
if (ldap_info->auth_mech != NULL &&
((strcmp(ldap_info->auth_mech, "GSS-SPNEGO") == 0) ||
/* auth_mech may have been set from the bind */
(strcmp(ldap_info->auth_mech, "GSSAPI") == 0))) {
tvbuff_t *gssapi_tvb, *plain_tvb = NULL, *decr_tvb= NULL;
tvbuff_t *gssapi_tvb = NULL;
int ver_len;
int tmp_length;
gssapi_encrypt_info_t gssapi_encrypt;
@ -1224,6 +1224,9 @@ static void
return;
}
if (gssapi_encrypt.gssapi_decrypted_tvb) {
tvbuff_t *decr_tvb = gssapi_encrypt.gssapi_decrypted_tvb;
proto_tree *enc_tree = NULL;
/*
* The LDAP payload (blob) was encrypted and we were able to decrypt it.
* The data was signed via a MIC token, sealed (encrypted), and "wrapped"
@ -1231,20 +1234,17 @@ static void
* one or more LDAPMessages such as searchRequest messages within this
* payload.
*/
col_set_str(pinfo->cinfo, COL_INFO, "SASL GSS-API Decrypted payload: ");
col_set_str(pinfo->cinfo, COL_INFO, "SASL GSS-API Privacy (decrypted): ");
if (sasl_tree) {
proto_tree *enc_tree;
guint decr_len = tvb_reported_length(decr_tvb);
decr_tvb = gssapi_encrypt.gssapi_decrypted_tvb;
enc_tree = proto_tree_add_subtree_format(sasl_tree, decr_tvb, 0, -1,
ett_ldap_payload, NULL, "GSS-API Decrypted payload (%d byte%s)",
ett_ldap_payload, NULL, "GSS-API Encrypted payload (%d byte%s)",
decr_len, plurality(decr_len, "", "s"));
dissect_ldap_payload(decr_tvb, pinfo, enc_tree, ldap_info, is_mscldap);
}
dissect_ldap_payload(decr_tvb, pinfo, enc_tree, ldap_info, is_mscldap);
}
else if (gssapi_encrypt.gssapi_data_encrypted) {
/*
@ -1257,6 +1257,9 @@ static void
proto_tree_add_item(sasl_tree, hf_ldap_gssapi_encrypted_payload, gssapi_tvb, ver_len, -1, ENC_NA);
}
else {
tvbuff_t *plain_tvb = tvb_new_subset_remaining(gssapi_tvb, ver_len);
proto_tree *plain_tree = NULL;
/*
* The payload was not encrypted (sealed) but was signed via a MIC token.
* If krb5_tok_id == KRB_TOKEN_CFX_WRAP, the payload was wrapped within
@ -1266,18 +1269,14 @@ static void
col_set_str(pinfo->cinfo, COL_INFO, "SASL GSS-API Integrity: ");
if (sasl_tree) {
guint plain_len;
proto_tree *plain_tree;
plain_tvb = tvb_new_subset_remaining(gssapi_tvb, ver_len);
plain_len = tvb_reported_length(plain_tvb);
guint plain_len = tvb_reported_length(plain_tvb);
plain_tree = proto_tree_add_subtree_format(sasl_tree, plain_tvb, 0, -1,
ett_ldap_payload, NULL, "GSS-API payload (%d byte%s)",
plain_len, plurality(plain_len, "", "s"));
dissect_ldap_payload(plain_tvb, pinfo, plain_tree, ldap_info, is_mscldap);
}
dissect_ldap_payload(plain_tvb, pinfo, plain_tree, ldap_info, is_mscldap);
}
}
} else {
@ -2266,10 +2265,11 @@ proto_reg_handoff_ldap(void)
oid_add_from_string("ISO assigned OIDs, USA", "1.2.840");
/* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dsml/dsml/ldap_controls_and_session_support.asp */
/* https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-adts/3c5e87db-4728-4f29-b164-01dd7d7391ea */
oid_add_from_string("LDAP_PAGED_RESULT_OID_STRING","1.2.840.113556.1.4.319");
oid_add_from_string("LDAP_SERVER_SHOW_DELETED_OID","1.2.840.113556.1.4.417");
oid_add_from_string("LDAP_SERVER_SORT_OID","1.2.840.113556.1.4.473");
oid_add_from_string("LDAP_CONTROL_SORT_RESP_OID","1.2.840.113556.1.4.474");
oid_add_from_string("LDAP_SERVER_RESP_SORT_OID","1.2.840.113556.1.4.474");
oid_add_from_string("LDAP_SERVER_CROSSDOM_MOVE_TARGET_OID","1.2.840.113556.1.4.521");
oid_add_from_string("LDAP_SERVER_NOTIFICATION_OID","1.2.840.113556.1.4.528");
oid_add_from_string("LDAP_SERVER_EXTENDED_DN_OID","1.2.840.113556.1.4.529");
@ -2279,26 +2279,47 @@ proto_reg_handoff_ldap(void)
oid_add_from_string("managedObjects","1.2.840.113556.1.4.654");
oid_add_from_string("LDAP_CAP_ACTIVE_DIRECTORY_OID","1.2.840.113556.1.4.800");
oid_add_from_string("LDAP_SERVER_SD_FLAGS_OID","1.2.840.113556.1.4.801");
oid_add_from_string("LDAP_SERVER_RANGE_OPTION_OID","1.2.840.113556.1.4.802");
oid_add_from_string("LDAP_OID_COMPARATOR_OR","1.2.840.113556.1.4.804");
oid_add_from_string("LDAP_SERVER_TREE_DELETE_OID","1.2.840.113556.1.4.805");
oid_add_from_string("LDAP_SERVER_DIRSYNC_OID","1.2.840.113556.1.4.841");
oid_add_from_string("None","1.2.840.113556.1.4.970");
oid_add_from_string("LDAP_SERVER_GET_STATS_OID","1.2.840.113556.1.4.970");
oid_add_from_string("LDAP_SERVER_VERIFY_NAME_OID","1.2.840.113556.1.4.1338");
oid_add_from_string("LDAP_SERVER_DOMAIN_SCOPE_OID","1.2.840.113556.1.4.1339");
oid_add_from_string("LDAP_SERVER_SEARCH_OPTIONS_OID","1.2.840.113556.1.4.1340");
oid_add_from_string("LDAP_SERVER_RODC_DCPROMO_OID","1.2.840.113556.1.4.1341");
oid_add_from_string("LDAP_SERVER_PERMISSIVE_MODIFY_OID","1.2.840.113556.1.4.1413");
oid_add_from_string("LDAP_SERVER_ASQ_OID","1.2.840.113556.1.4.1504");
oid_add_from_string("LDAP_CAP_ACTIVE_DIRECTORY_V51_OID","1.2.840.113556.1.4.1670");
oid_add_from_string("msDS-SDReferenceDomain","1.2.840.113556.1.4.1711");
oid_add_from_string("msDS-AdditionalDnsHostName","1.2.840.113556.1.4.1717");
oid_add_from_string("LDAP_SERVER_FAST_BIND_OID","1.2.840.113556.1.4.1781");
oid_add_from_string("LDAP_CAP_ACTIVE_DIRECTORY_LDAP_INTEG_OID","1.2.840.113556.1.4.1791");
oid_add_from_string("msDS-ObjectReference","1.2.840.113556.1.4.1840");
oid_add_from_string("msDS-QuotaEffective","1.2.840.113556.1.4.1848");
oid_add_from_string("LDAP_CAP_ACTIVE_DIRECTORY_ADAM_OID","1.2.840.113556.1.4.1851");
oid_add_from_string("LDAP_SERVER_QUOTA_CONTROL_OID","1.2.840.113556.1.4.1852");
oid_add_from_string("msDS-PortSSL","1.2.840.113556.1.4.1860");
oid_add_from_string("LDAP_SERVER_SHUTDOWN_NOTIFY_OID","1.2.840.113556.1.4.1907");
oid_add_from_string("LDAP_SERVER_RANGE_RETRIEVAL_NOERR_OID","1.2.840.113556.1.4.1948");
oid_add_from_string("msDS-isRODC","1.2.840.113556.1.4.1960");
oid_add_from_string("msDS-SDReferenceDomain","1.2.840.113556.1.4.1711");
oid_add_from_string("msDS-AdditionalDnsHostName","1.2.840.113556.1.4.1717");
oid_add_from_string("None","1.3.6.1.4.1.1466.101.119.1");
oid_add_from_string("LDAP_SERVER_FORCE_UPDATE_OID","1.2.840.113556.1.4.1974");
oid_add_from_string("LDAP_SERVER_DN_INPUT_OID","1.2.840.113556.1.4.2026");
oid_add_from_string("LDAP_SERVER_SHOW_RECYCLED_OID","1.2.840.113556.1.4.2064");
oid_add_from_string("LDAP_SERVER_SHOW_DEACTIVATED_LINK_OID","1.2.840.113556.1.4.2065");
oid_add_from_string("LDAP_SERVER_POLICY_HINTS_DEPRECATED_OID","1.2.840.113556.1.4.2066");
oid_add_from_string("LDAP_SERVER_DIRSYNC_EX_OID","1.2.840.113556.1.4.2090");
oid_add_from_string("LDAP_SERVER_TREE_DELETE_EX_OID","1.2.840.113556.1.4.2204");
oid_add_from_string("LDAP_SERVER_UPDATE_STATS_OID","1.2.840.113556.1.4.2205");
oid_add_from_string("LDAP_SERVER_SEARCH_HINTS_OID","1.2.840.113556.1.4.2206");
oid_add_from_string("LDAP_SERVER_EXPECTED_ENTRY_COUNT_OID","1.2.840.113556.1.4.2211");
oid_add_from_string("LDAP_SERVER_POLICY_HINTS_OID","1.2.840.113556.1.4.2239");
oid_add_from_string("LDAP_SERVER_SET_OWNER_OID","1.2.840.113556.1.4.2255");
oid_add_from_string("LDAP_SERVER_BYPASS_QUOTA_OID","1.2.840.113556.1.4.2256");
oid_add_from_string("LDAP_SERVER_LINK_TTL_OID","1.2.840.113556.1.4.2309");
oid_add_from_string("LDAP_SERVER_SET_CORRELATION_ID_OID","1.2.840.113556.1.4.2330");
oid_add_from_string("LDAP_SERVER_THREAD_TRACE_OVERRIDE_OID","1.2.840.113556.1.4.2354");
oid_add_from_string("DYNAMIC_REFRESH","1.3.6.1.4.1.1466.101.119.1");
oid_add_from_string("LDAP_START_TLS_OID","1.3.6.1.4.1.1466.20037");
oid_add_from_string("inetOrgPerson", "2.16.840.1.113730.3.2.2");

View File

@ -2014,7 +2014,7 @@ SoundingRS-UL-ConfigDedicated/setup/duration STRINGS=TFS(&lte_rrc_duration_val)
/* Number of items is (last 3 bits of first byte and first bit of second) + 1 */
guint16 number_of_records = ((tvb_get_ntohs(tvb, 0) >> 7) & 0x0f) + 1;
%(DEFAULT_BODY)s
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%u PagingRecords)", number_of_records);
col_append_fstr(actx->pinfo->cinfo, COL_INFO, " (%%u PagingRecord%%s)", number_of_records, plurality(number_of_records, "", "s"));
#.FN_BODY Paging-v1310-IEs/systemInfoModification-eDRX-r13
%(DEFAULT_BODY)s

View File

@ -1149,13 +1149,13 @@ SINR-RangeEUTRA DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_SINR_RangeEUTRA_fmt)
MsgA-PUSCH-Config-r16/msgA-DeltaPreamble-r16 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels
#.TYPE_ATTR
MeasTriggerQuantityOffset/rsrp DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_dbm
MeasTriggerQuantityOffset/rsrp DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_MeasTriggerQuantityOffset_fmt)
#.TYPE_ATTR
MeasTriggerQuantityOffset/rsrq DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels
MeasTriggerQuantityOffset/rsrq DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_MeasTriggerQuantityOffset_fmt)
#.TYPE_ATTR
MeasTriggerQuantityOffset/sinr DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_decibels
MeasTriggerQuantityOffset/sinr DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_MeasTriggerQuantityOffset_fmt)
#.TYPE_ATTR
ReselectionThreshold DISPLAY=BASE_CUSTOM STRINGS=CF_FUNC(nr_rrc_ReselectionThreshold_fmt)

View File

@ -509,6 +509,14 @@ nr_rrc_SRS_RSRP_r16_fmt(gchar *s, guint32 v)
}
}
static void
nr_rrc_MeasTriggerQuantityOffset_fmt(gchar *s, guint32 v)
{
gint32 d = (gint32)v;
g_snprintf(s, ITEM_LABEL_LENGTH, "%.1fdB (%d)", (float)d/2, d);
}
#include "packet-nr-rrc-fn.c"
int

Some files were not shown because too many files have changed in this diff Show More