aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2021-08-02Add AMR codec supportosmith/wipDaniel Willmann8-0/+443
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=== Osmocom specific patches start here ===Oliver Smith1-0/+2
Related: OS#2537 Change-Id: I619a20fe2e5d6b3fb0af52440998eca16ee91cf4
2021-07-14Build 3.4.7.Gerald Combs4-20/+570
[skip ci]
2021-07-13Prep for 3.4.7.Gerald Combs1-13/+40
2021-07-11[Automatic update for 2021-07-11]Gerald Combs4-16/+127
Update manuf, services enterprise numbers, translations, and other items.
2021-07-10DT2000: Fix buffer length in wiretap codeMartin Mathieson1-1/+1
CID: 1477941 (cherry picked from commit af57fb94ac664a9f4a4262fdc5e4afa8b8e379bf)
2021-07-10Snort config: Avoid leaks when fail to open config file.Martin Mathieson1-6/+5
CID: 1477713 CID: 1477850 (cherry picked from commit bbcd42be8763b5b91b4f3bca51b169cec5487ff5)
2021-07-10ldap: Add Active Directory OIDsClément Notin2-10/+54
From [MS-ADTS] specification https://docs.microsoft.com/en-us/openspecs/windows_protocols/ms-adts/3c5e87db-4728-4f29-b164-01dd7d7391ea (cherry picked from commit 5b248ac4d03565b903cf85b54956135fb73f8bdb)
2021-07-10OSPF: Fixed SRLB and SRMS Preference TLV types (rfc8665)Taisuke Sasaki1-4/+6
- Fixed TLV types of SRLB and SRMS Preference - Added type/length for unknown Opaque RI TLV (cherry picked from commit d8ee53e078ea8985db207e5d25b1a88913838f8a)
2021-07-10RSL: Fix mask of eMLPP Priority field.Martin Mathieson1-1/+1
9.3.49 in 48.058wq (cherry picked from commit ba0d6f69abac4b381d38308b981a52b490d36a08)
2021-07-10dcerpc: Fix warning found by Clang AnalyzerAlexis La Goutte1-0/+1
packet-dcerpc.c:4381:17: warning: Assigned value is garbage or undefined [core.uninitialized.Assign] (cherry picked from commit 558a32ba863092b5373da6c22fd520c416c72029)
2021-07-10Fix null pointerZhongYao Luo1-1/+1
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 64155132ea001dab7db030df96ce00b90a958277)
2021-07-10Change my email addressJoão Valverde2-2/+2
(cherry picked from commit ab37610f0859a1136c89a43c991e48b320bb2bc6)
2021-07-10PROFINET: Ensure multiple submodules are parsedMartin Tschoepe1-1/+1
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 d3ec582c26ffa1d98b7dc863e4452fc42f0399db)
2021-07-10Bugfix for S101 dissector:Thomas Dreibholz1-3/+4
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 8e256b7e694d6d39f93d41a788835e85855780eb)
2021-07-10DNP: use the proper free functionPascal Quantin1-1/+1
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 029a7fcec5c6fc9407bd7f50ad6c3ce79f4d393b)
2021-07-10GTPv2: fix decoding of (extended) eNodeB idAndreas Schultz1-2/+2
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 4992806dba09e67ec55921f0f8c964b0a9a0e8c5)
2021-07-08ASTERIX: Fix Value of hf_010_202_VY from VX to VYPrince Paul1-1/+1
Fix typo VX to VY (cherry picked from commit 79f62acbe785921fb9ac15271351b66ae943923a)
2021-07-08ASTERIX: Fix Data Item 010/091Prince Paul1-1/+1
Fixed Item Number from 110 to 091 (cherry picked from commit 30058542e95192e126303f028d12fe11b09835e2)
2021-07-08nordic_ble: Fix packet times for multiple interfacesJoakim Andersson1-21/+83
Fix packet times calculations when using multiple interfaces. Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
2021-07-08Bluetooth: Fix parsing of CTE Info field in extended advertising headerJoakim Andersson1-8/+7
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-08Bluetooth: Fix parsing of empty extendend advertising headerJoakim Andersson1-6/+10
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-08bluetooth: Fix sync info in extended advertising headerJoakim Andersson1-1/+1
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-04tshark/wireshark: Fix check ring buffer option for packetsAndre Luyer2-4/+6
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 9f8e6b1acb83a74c9efda70f97b5fb9f1771d2b8)
2021-07-04[Automatic update for 2021-07-04]Gerald Combs5-12/+60
Update manuf, services enterprise numbers, translations, and other items.
2021-07-04NR RRC: fix dissection of MeasTriggerQuantityOffset elementPascal Quantin3-10/+26
(cherry picked from commit aa5df68171f021e19bbf9ed4753e451ecf08b1a4) Conflicts: epan/dissectors/packet-nr-rrc.c
2021-06-28wireless timeline: add a destructor to free the hash table.Guy Harris2-0/+9
Destroy the hash table if we're destroying the timeline widget, so that it doesn't leak. (cherry picked from commit ad3e6b1be6490834d90575535d3efb6a8125767d)
2021-06-28wireless_timeline: make sure the hash table is always allocated.Guy Harris1-1/+1
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 693a02e76068de331c45df191f372ac14e6686d2)
2021-06-27[Automatic update for 2021-06-27]Gerald Combs4-15/+136
Update manuf, services enterprise numbers, translations, and other items.
2021-06-21mergecap: improve the example.Guy Harris1-4/+21
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 628fe2549a47f4f246dd645d5d15dad3edc35cb7)
2021-06-20[Automatic update for 2021-06-20]Gerald Combs5-20/+90
Update manuf, services enterprise numbers, translations, and other items.
2021-06-19GitLab CI: Add initial Windows package builds.Gerald Combs1-0/+91
Manually copy over the Win64 Package and Win32 Package jobs from 2d9280089c in master and adapt for the 3.4 release builds.
2021-06-19pcap-common: set the time stamp precision correctly for LINKTYPE_ERF.Guy Harris1-0/+9
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 39315979c638b916d76a9dbf8c7ffb089721f01a)
2021-06-19erf: handle errors in some routines more completely.Guy Harris3-30/+164
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 02cffb51a9fc048defac1085cb71d5567ae3f4fc)
2021-06-18libpcap: don't generate a fake interface for LINKTYPE_ERF files.Guy Harris1-17/+8
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 d69d1271f08fb4e919447dbfb8a36c2cdfe3e48b)
2021-06-18erf: set the tsprecision value of a newly-created IDB.Guy Harris1-0/+1
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 49ec11f5aad2c6c29b02036ef9744c5680ee88a0)
2021-06-16wslua_tvb: fix documentation for reported_length_remaining().Guy Harris1-1/+1
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 6c043d5c73e3bdbb84f988a82ebdfc18d77489b9)
2021-06-16wslua: a tvbuff doesn't have an "actual length".Guy Harris1-4/+14
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 bd9ceaebef86a30f5f45a8887fd01883dd0d1993)
2021-06-13[Automatic update for 2021-06-13]Gerald Combs5-28/+129
Update manuf, services enterprise numbers, translations, and other items.
2021-06-10wsutil: argv[] is a NULL terminated arrayJoão Valverde1-1/+2
(cherry picked from commit 70cea91c8a3b5c4cea33ec53dab022531b44297b)
2021-06-10wifi-nan: Fix length for availability attributeAlexis La Goutte1-1/+1
Issue reported by Behzad Mokhtari Fix #17431 (cherry picked from commit b716e2f1a2a1a592aff2c71662f0827527d72f68)
2021-06-09QT: Fix printer dialogUli Heilmeier1-1/+1
Fix EXC_BAD_ACCESS error by using printer variable. (cherry picked from commit ea20002a0783dfc1c8912ab297f2eff065edca54)
2021-06-06[Automatic update for 2021-06-06]Gerald Combs13-58/+127
Update manuf, services enterprise numbers, translations, and other items.
2021-06-05tcp: Fix dissection of DSACKChristian Reusch1-1/+1
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 7179e1d1fbd7e6fb3d4f8848e432dd7c5ad54dae)
2021-06-04file-pcapng: fix name of expert info.Guy Harris1-1/+1
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 deb6786ed455fa9433caeb4d3c542be4e5918102)
2021-06-02ieee80211_radio: Use calculated bitrate if not suppliedSimon Barber1-8/+2
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 5202119239f76af3df20540b35c618d7095c99c6)
2021-06-02GitLab CI: Move dfilter list generation.Gerald Combs1-6/+8
Create the display filter list in the APT Test step.
2021-06-02Version: 3.4.6 → 3.4.7Gerald Combs7-563/+14
[skip ci]
2021-06-02Build: 3.4.6Gerald Combs4-2/+534
[skip ci]
2021-06-02pcapng: set the length of the options item.Guy Harris1-0/+1
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 2f5c0ffdb26d753943201029ff65e237c1a9776b)
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 22:24:51 +0000