Using mark_frame_as_depended_upon like other reassembling dissectors
Change-Id: I2b1f476d9339d8277fb0d3420d94ec32d402c0ee
Reviewed-on: https://code.wireshark.org/review/34807
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This handles the various Multi-AP additions and has been checked by
the WFA.
Change-Id: I56d32f3efec24923e1a710cb67c67f7e0b4630dc
Reviewed-on: https://code.wireshark.org/review/34794
Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Richard Sharpe <realrichardsharpe@gmail.com>
Add generic function to dissect the bitmap4 struct and
optionally its corresponding opaque data. The behavior
is customized by setting the nfs4_bitmap_info_t struct
given as argument. The items are displayed when their
corresponding hf_* labels are given (not set to NULL).
The type argument if set to NFS4_BITMAP_MASK only the
bitmap is dissected and displayed as a list of attribute
names. Otherwise if set to NFS4_BITMAP_VALUES the bitmap
is dissected including their respective values.
The function dissect_nfs4_fattrs was modified to use
dissect_nfs4_bitmap instead and all functionality which
dissects the value of each attribute was moved to a
separate function dissect_nfs4_fattr_value.
All functionality from dissect_nfs4_fattrs is given in
the new function dissect_nfs4_bitmap, but it also
includes additional functionality:
- Gracefully handle a bitmap attribute which does not
have a dissector and a warning is displayed.
- If there is a problem dissecting one of the bitmap
attribute values then do not attempt to dissect any
more values and a warning is given explaining why
the values were not dissected. In this case at least
the rest of the attributes names are displayed.
- If any error is found dissecting the values then all
bytes left undissected are just consumed so the rest
of the NFS packet is correctly dissected.
- Add subtree if the name is given, all bitmap data
will be under this main tree.
- Show mask label when the number of bitmap masks is 0
and the type is to display only the bitmap mask.
Use function dissect_nfs4_bitmap instead to process the
state protect bitmaps. Also, use correct labels
"spo_must_enforce" and "spo_must_allow" instead of using
the generic label "operation mask" for both bitmap masks.
Finally, display the operation masks including the list
of operation names in each mask.
Use function dissect_nfs4_bitmap instead to process the
hints mask in IO_ADVISE.
Use function dissect_nfs4_bitmap instead to process the
notify mask in GETDEVICEINFO.
Bug: 16107
Change-Id: Ic470fd003bbc18feeadbd5d2cd0aa56329682bd6
Reviewed-on: https://code.wireshark.org/review/34714
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Add block type to information column and also
add fences for blocks container messages
(SysInfoUpdateRequest in NBAP, SysInfo-BCH in RRC)
Change-Id: I2a49229f74438cadc67603b6209d4a8d72cfd017
Reviewed-on: https://code.wireshark.org/review/34785
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Access Layer: add support for manufacturer-specific opcodes (customizable)
of 3-octets when bits 7 and 6 of the first opcode octet are set,
as specified in Table 3.43: Opcode formats of document
Mesh Profile v1.0.1, Bluetooth Specification
Change-Id: I3edf8f86bf58d28f15cc2a8f72618cc577a75a44
Reviewed-on: https://code.wireshark.org/review/34787
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
It turned out that 1 MiB is not enough as atleast the URBs sent by
Android fastbool tools are greater than 1 MiB (1 MiB payload + USBPcap
pseudoheader). Raise the maximum packet size all the way up to 128 MiB.
128 MiB is the upper bound of maximum packet that can be captured by
all official USBPcap releases.
Bug: 15985
Change-Id: Ibbf41f7efae6e0f841e36d39664394e8a8eae77d
Reviewed-on: https://code.wireshark.org/review/34793
Petri-Dish: Tomasz Moń <desowin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Looks like I broke it by fixing it...
Added the table terminator again.
The real solution to this when there is time is to use the 802.11
dissector for operating classes, as this is a duplicate and not
fantastically thought out implementation.
Bug: 16123
Change-Id: Ide7071b71825b1595e14a474bcb0c57ee8eb0bf5
Reviewed-on: https://code.wireshark.org/review/34792
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
androiddump determines encap type by reading the data link type
value from pcap content generated by tcpdump running on the device.
The data link type is converted from an uint type to an int type
because int is what the pcap/wtap API expects. However the signed
to unsigned conversion is performed on an 8-bit data value rather
than the full 32-bit value making DLT values larger than 127 fail.
Fix the unsigned to signed conversion by determining DLT from the
full 32-bit "network" field from pcap global header instead of
the 8-bit data char array. While at it also take caore of device
to host endianness conversion.
Fixes: v2.5.1rc0-65-gbfef57ebb7 ("androiddump: Fix and simplify tcpdump capture")
Fixes: v2.9.0rc0-694-gafd0eef4f6 ("androiddump: Fix tcpdump encap type when libwiretap is used")
Change-Id: I71629b166a6893763b16e9df33408fee8c99cbd2
Reviewed-on: https://code.wireshark.org/review/34788
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Improve paremeter check in ProtoField.new() when using ftypes.CHAR:
- Check valid base types and give an error when not supported instead of
terminate in a g_error() (base.DEC is not supported).
- Give an error if used with base.UNIT_STRING instead of silently remove
the flags.
- Support base.RANGE_STRING instead of removing the flag.
Support using base.NONE with a valuestring.
Add ftypes.CHAR to the list of supported types.
Change-Id: I0e3f9698074c807f5da0de23ccd1be7446271135
Reviewed-on: https://code.wireshark.org/review/34783
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
ProtoField.new() already support ftypes.CHAR, so add ProtoField.char()
to complete the support for FT_CHAR in Lua.
Change-Id: I0568f874fd667f834584a07af14bdda9bb03856b
Reviewed-on: https://code.wireshark.org/review/34784
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Should only occur with malformed data.
Checks and notices added.
Bug: 16119
Change-Id: Id0bbc699e587c238dbdd2c0e4c873d6bb6026005
Reviewed-on: https://code.wireshark.org/review/34762
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
'mqtt.willmsg' exists multiple times with NOT compatible types: FT_STRING and FT_BYTES
'mqtt.msg' exists multiple times with NOT compatible types: FT_STRING and FT_BYTES
Change-Id: Iaace2464c3e7174bbd6adc7550fe51e614b4d0bb
Reviewed-on: https://code.wireshark.org/review/34750
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
The message/enum type of field is allowed to start with '.' (for example,
.foo.bar.Baz), that means to search the message/enum to start from the
outermost scope instead. Please refer to:
https://developers.google.com/protocol-buffers/docs/proto3#packages-and-name-resolution
Please find example capture file from Bug: 16118
Ping-Bug: 16118
Change-Id: I78702d0b2316b4071f04aba9fc7d185e382e4cbf
Reviewed-on: https://code.wireshark.org/review/34752
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
1. Add show_details preferences. Disable it will hidden names of
message/field/enum, field number, and other details.
2. Have only one popup message with all the errors listed,
that are found during parsing .proto files. (Buffer errors and print once)
Loading .proto files and checking message types of UDP port will
be done only when protobuf dissector has been called.
3. Support parsing .proto files in legacy MAC file format
(that newline is '\r') or mixed newline (\r + \n) file format.
Change-Id: I97bcde000957e4cd1cce98a7f61120d03027423e
Reviewed-on: https://code.wireshark.org/review/34736
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
The export got broken in f67eccedd9 as it
didn't account for ExportDissectionDialog::exec() override.
Change-Id: Ieaed669cb1b12c7a069f685429bf5a82f89d7391
Reviewed-on: https://code.wireshark.org/review/34771
Petri-Dish: Tomasz Moń <desowin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jim Young <jim.young.ws@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
It looks like HAVE_SYS_TYPES_H, HAVE_STDINT_H, and HAVE_STDDEF_H were
required for check_type_size via test_big_endian, but we don't use that
any more.
HAVE_LRINT was used by the GTK+ UI.
Change-Id: I6474c118bac4413791b3613d34d263e38107600a
Reviewed-on: https://code.wireshark.org/review/34754
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This reverts commit f1285fcf06.
NSIS package is broken with this commit.
Change-Id: Ief22a308edad188fa2d5fab79355f19493359fa6
Reviewed-on: https://code.wireshark.org/review/34758
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
Register the NetFlow dissector so it can be found by other dissectors
and they can simply find_dissector("cflow");
Change-Id: I06312aede519c361de1566468f52edfffaab21eb
Reviewed-on: https://code.wireshark.org/review/34753
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
HTML docs are installed to both $docdir and $pkgdatadir. Fix that
to install to $docdir only.
Change-Id: I115158585b6df9170d9a01249adbc8548df91f14
Reviewed-on: https://code.wireshark.org/review/34640
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot
Reviewed-by: João Valverde <j@v6e.pt>
using uplink parameter as input for calc. the nonce for decryption
Bug: 16110
Change-Id: I3da1afbe80629a378a9ecc63157b5854729c6159
Reviewed-on: https://code.wireshark.org/review/34751
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
The MQTT specification says "The Will Message defines the Application
Message that is to be published to the Will Topic", Application
Messages are defined as being application specific.
Change-Id: I3fad1cb5f676b0232ba9e29af0d213b536ce4ef6
Reviewed-on: https://code.wireshark.org/review/34749
Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
The recent macOS installer changes were backported to master-3.0, so
they're no longer new in master.
Change-Id: I357e0f8facbc2266c3780bcf8d696b5c2b00602d
Reviewed-on: https://code.wireshark.org/review/34745
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Add support for the WFA Neighbor Awareness Networking (NAN) protocol.
Bug: 16087
Change-Id: Ideeeea2551c8db722b5578340bef4e504ea73dcf
Reviewed-on: https://code.wireshark.org/review/34635
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Simplify class handling and clear up some names
Change-Id: I8a3dd80c0b4dd97aee6164d94ca9cf60068f427b
Reviewed-on: https://code.wireshark.org/review/34730
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Gerald Combs