aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2019-06-11Windows: package codec pluginsPascal Quantin2-0/+35
Change-Id: Id0e43d0272cb62e171e74b5cf957fadfe0bd7a24 Reviewed-on: https://code.wireshark.org/review/33562 Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-06-11Use the flags in the AUTHENTICATE message, if available.Guy Harris1-40/+160
This is required for connectionless authentication, where the first message is a CHALLENGE message, which contains what the server is offering, and the AUTHENTICATE reply contains which of what the server offers can be supported by the client. It is also required in order to correctly dissect AUTHENTICATE messages in connection-oriented authentication if the CHALLENGE message cannot be found, either: because it's missing in the capture; because an SMB server is returning, in the Transaction reply containing a DCE RPC message containing the CHALLENGE message, a bogus PID and/or MID in response to the client Transaction message containing a DCE RPC message NEGOTIATE message, so the DCE RPC message in the Transaction reply isn't dissected as such; because one HTTP-over-TCP connection has the NEGOTIATE and CHALLENGE message and a separate HTTP-over-TCP connection has the AUTHENTICATE reply. Both of the latter two have been seen in captures. We should probably somehow deal with the second case and, if possible, the first case (handing Transaction reply data to heuristic dissectors?). Update comments. Change-Id: I347cd1560e7fb8c7d1892ff4fb14c942b23e9a2a Reviewed-on: https://code.wireshark.org/review/33559 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-06-11debian: update libwsutil0 symbolsPascal Quantin1-0/+11
Change-Id: I319d619b34ab754a65f003623f957e421675499b Reviewed-on: https://code.wireshark.org/review/33561 Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-06-11Kill libwscodecs plugin library, just use pluginsJoão Valverde30-152/+22
Change-Id: I085d04840acb53b0b7681787429a2b4e10547cd5 Reviewed-on: https://code.wireshark.org/review/33068 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-11Move codec plugins to /pluginsJoão Valverde24-631/+655
Change-Id: I56d61e2ef737e4326080d75a2302c73a4075e8a1 Reviewed-on: https://code.wireshark.org/review/33067 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-11CL3DCW: Added Dual Channel Wi-Fi DissectorsJon Dennis6-0/+582
Initial go at adding the CableLabs Dual Channel Wi-Fi dissector. Changes: . New dissector for CableLabs Layer-3 Protocol ("CL3") IEEE EtherType 0xB4E3 . New dissector for Dual Channel Wi-Fi (Subprotocol of CL3) . Defined EtherType macro for CL3 + description Bug: 15818 Change-Id: I6edf99d40883c1890659185cc3f0524a2218a6c4 Reviewed-on: https://code.wireshark.org/review/33440 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-11FTDI FT: Indicate number of bytes sent on wireTomasz Moń1-3/+3
Change-Id: Icc4457c23774810dc9849b9c379a3e68ca164f14 Reviewed-on: https://code.wireshark.org/review/33555 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-06-11decode_as: remove the "title" member from decode_as_tMartin Kaiser34-48/+46
The title of a decode_as_t was used by the GTK UI. It's no longer required for Qt. Change-Id: Ibd9d4acbe9cad2c1af520340d04e550326a97ebe Reviewed-on: https://code.wireshark.org/review/33557 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-11batadv: Fix info column seqno of IV_OGM v15 packetsSven Eckelmann1-4/+5
The sequence number shown in the info field is read from the iv_ogm_packet_v15 object before the actual member is actual read from the packet buffer. Just split the initialization of the info column to the actual dissection code for the packet to avoid these kind of problems. Change-Id: I8eb637aae17680d227116156ef7828e77e36beae Fixes: 4cc431579363 ("batadv: Add dissector support for batadv v15") Signed-off-by: Sven Eckelmann <sven@narfation.org> Reviewed-on: https://code.wireshark.org/review/33547 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-06-11DOCSIS: Adding missing MDD TLVsBruno Verstuyft1-25/+109
Change-Id: Idb182a9925a472eea77168b28f3ad8e889e66312 Reviewed-on: https://code.wireshark.org/review/33553 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2019-06-11NAS 5GS: 5GSM Cause added in PDU session modification completeSwapnil Roy1-0/+2
Change-Id: I339f0d75dd373545323a5b8e004285318d2eabe3 Reviewed-on: https://code.wireshark.org/review/33556 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-11Add FTDI FT dissector to release notesTomasz Moń1-0/+1
Change-Id: I89335813a5ec0a0748741bd8fb2f1ee77369bfe4 Reviewed-on: https://code.wireshark.org/review/33554 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
2019-06-11batadv: Add support for throughput meter icmp packet variantSven Eckelmann1-2/+169
The througput meter variant of the icmp packet only shared the first 17 bytes of the original packet structure. The rest of the packet is parsed based on the message type (15). The new fields * subtype (MSG, ACK) * session * seqno * timestamp are required to understand the data exchange between two mesh nodes. Change-Id: Ic885097871c20d8b580a7f922ee5dac0510aa84e Signed-off-by: Sven Eckelmann <sven@narfation.org> Reviewed-on: https://code.wireshark.org/review/33542 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-11Diameter 3GPP: Avoid dereference reported by VS2019.Anders Broman1-3/+4
Change-Id: I63dee0897d8a8ee4efbc525f9de3938349fb849e Reviewed-on: https://code.wireshark.org/review/33552 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2019-06-11BATADV: remove tree checksPascal Quantin1-309/+211
Change-Id: Ie7a71f2f4cdfb2b24fc8ecb7906d5f99676df02e Reviewed-on: https://code.wireshark.org/review/33551 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-10iso7816: dissector table for non-standard APDUsMartin Kaiser1-3/+20
Define a new dissector table for non-standard ISO7816 APDUs. If the ISO7816 class byte indicates that an APDU does not conform to the standard structure and encoding, we pass the entire APDU to a subdissector from this table (if available). Change-Id: I1e802506a66bdb2c9994d42893fa6825eb9fa5fe Reviewed-on: https://code.wireshark.org/review/33550 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-10extcap: Do not use global pipe handle on WindowsTomasz Moń2-93/+87
Make extcap_create_pipe() static. Change-Id: I06a0af2dcf9fb4a51b4f7ba6ee7c57e7a52c5e97 Reviewed-on: https://code.wireshark.org/review/33250 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-06-10cisco-fp-mim: Adding FabricPath FCS dissection and verificationAlexander Koeppe1-10/+53
FabricPath recalculates the FCS based on the whole packet (incl. the Ethernet header) and overwrites the last four bytes of the packet, effectively stealing the Ethernet FCS. Since FabricPath FCS dissection and verification isn't available and falsely attempted on the Ethernet layer, this commit implements the FCS treatment on the FabricPath layer and treats the Ethernet layer explicitely as it would not have a FCS. It also adds a procotol option to enable FabricPath FCS validation which is disabled by default though. Bug: 15769 Change-Id: I382a4907bca158b549bcc8d77459b7829e60f94a Reviewed-on: https://code.wireshark.org/review/33322 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-10FTDI FT: Initial USB Bridging Devices dissectorTomasz Moń4-0/+1069
Note that this dissector covers the USB to serial only. FTDI Multi-Protocol Synchronous Serial Engine (MPSSE) should be implemented as separate dissector receiving data from FTDI FT dissector if the chip has MPSSE. Ping-Bug: 11743 Change-Id: I1f2e2b56b9351442f7ddbe97106b5f166de2cdca Reviewed-on: https://code.wireshark.org/review/33520 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-10IO stats in 5 ms task cyclesubhav81-1/+2
Change-Id: Ia2f5c44fe56ecd6c55f704c2df5e32dea947cac4 Reviewed-on: https://code.wireshark.org/review/33534 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-10batadv: Fix info column seqno of ICMP v15 packetsSven Eckelmann1-10/+11
The sequence number shown in the info field is read from the icmp_packet_v15 object before the actual member is actual read from the packet buffer. Just split the initialization of the info column to the actual dissection code for the packet to avoid these kind of problems. Change-Id: I2ab316527854260bb8f85d2283964426fb7508bd Fixes: 4cc431579363 ("batadv: Add dissector support for batadv v15") Signed-off-by: Sven Eckelmann <sven@narfation.org> Reviewed-on: https://code.wireshark.org/review/33546 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-10batadv: Fix offset to ICMP v15 message typeSven Eckelmann1-1/+1
To correctly show the message type of an batman-adv ICMP v15 packet, the offset 3 inside the header has to be checked against the list of known packet types. Change-Id: I280aac59abd4133eac7d8381fac79f323c79b3de Fixes: 4cc431579363 ("batadv: Add dissector support for batadv v15") Signed-off-by: Sven Eckelmann <sven@narfation.org> Reviewed-on: https://code.wireshark.org/review/33545 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-10batadv: Add support for OGM2 packetsSven Eckelmann1-0/+193
The B.A.T.M.A.N. V protocol replaced the OGM announcement with two new types: * Echo Location Protocol packet * OriGinator Message 2 packets The first packet is used locally to identify neighbors and their base parameters (orignator + elp interval). The second one is used to announce each mesh node globally. The second step to understand the B.A.T.M.A.N. V mesh globally in wireshark is to dissect the OGM2 packets. Change-Id: Idee5793dd909fd01588024b4d9b44236ea5ffb86 Signed-off-by: Sven Eckelmann <sven@narfation.org> Reviewed-on: https://code.wireshark.org/review/33544 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-10batadv: Add support for ELP packetsSven Eckelmann1-0/+134
The B.A.T.M.A.N. V protocol replaced the OGM announcement with two new types: * Echo Location Protocol packet * OriGinator Message 2 packets The first packet is used locally to identify neighbors and their base parameters (orignator + elp interval). The second one is used to announce each mesh node globally. The first step to understand the B.A.T.M.A.N. V mesh locally in wireshark is to dissect the ELP packets. Change-Id: I13f5d60637a2774282ca75853884238e8e7dd33c Signed-off-by: Sven Eckelmann <sven@narfation.org> Reviewed-on: https://code.wireshark.org/review/33543 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-10batadv: Parse priority field of fragmented packetsSven Eckelmann1-0/+10
The upper 3 bits of the lower nibble in the octet for the sequence number in fragmentation packets is used to store the priority of the original (unfragmented) packet. Change-Id: I1711ba078aafa06bec309c395e0ec3741b097c17 Signed-off-by: Sven Eckelmann <sven@narfation.org> Reviewed-on: https://code.wireshark.org/review/33541 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-10Diameter 3GPP: add a few Rx related AVPsPascal Quantin2-4/+69
Change-Id: I6ce7d2a8e624430a99371c0ff173e5e48609c6d1 Reviewed-on: https://code.wireshark.org/review/33549 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-06-10batadv: Fix filtering by mcast flagsSven Eckelmann1-1/+7
The mcast tvlv flags field was incorrectly mapped to "batadv.iv_ogm.flags". But this is the generic B.A.T.M.A.N IV's flags field and not the specialized mcast TVLV's flag. Just add a special field "batadv.tvlv.mcast.flags" to handle these flags. Change-Id: Ia1f37f10d8d58146bd71ef607933f61d7dbc6e88 Fixes: 4cc431579363 ("batadv: Add dissector support for batadv v15") Signed-off-by: Sven Eckelmann <sven@narfation.org> Reviewed-on: https://code.wireshark.org/review/33540 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-06-10LSD: Fix valid headers being marked as malformedDaniel Kamil Kozar1-2/+2
Due to a change in the meaning of wmem_strsplit's max_tokens argument, the returned field_and_value[1] was always null, causing the dissector code to mistakenly mark it as malformed. Change-Id: Ifea9e3bf8ec6e18646fb83bc85661a143ce0126b Reviewed-on: https://code.wireshark.org/review/33511 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-06-09TLS: fix crash on handshake reassembly with truncated capturesPeter Wu1-8/+22
Do not attempt reassembly when it will end up failing due to missing data in a tvb. The dissection results will be wrong as the middle of a fragment is now interpreted as a full handshake message, but at least future handshake records should be correctly interpreted and the null pointer crash due to an incomplete reassembly is fixed. Bug: 15811 Change-Id: I308d5fa6c131972625f1987d01a8c207e65b4ed2 Fixes: v3.1.0rc0-620-gb641febb1e ("TLS: Implement reassembly for Handshake messages") Reviewed-on: https://code.wireshark.org/review/33535 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-09TPKT: Add the dissector to the list of TLS subdissectorsÉmilio Gonzalez1-0/+3
Also make the RDP port (3389) to default to TPKT when decrypting TLS. Change-Id: I951531080b36905b2c3ac9039e66243c67b6efe6 Reviewed-on: https://code.wireshark.org/review/33521 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-09QUIC: fix decryption after Version NegotiationPeter Wu1-5/+17
After a Version Negotiation, the handshake starts over with a new Client Initial that have different DCID and SCID. Be sure not to link these subsequent packets to the first session as that would break decryption. Tested with a QUANT capture provided by Lars Eggert. Regression tested against ngtcp2-19-dsb.pcapng, decryption still works there. Bug: 13881 Change-Id: Ia6253c1f2ff39fbe5ce130966129215be479a20a Reviewed-on: https://code.wireshark.org/review/33525 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-09Document why extcap utilities can't be run "by hand" on WindowsMichael Mann2-2/+14
Bug: 15591 Change-Id: Icb8246ba196df026736ce1e54eb2ace2c7cd49b0 Reviewed-on: https://code.wireshark.org/review/33530 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-09Use gboolean for Boolean flags.Guy Harris1-11/+13
Change-Id: Ic92c7a8f2a570d91d68f7753037c02b54371d5a5 Reviewed-on: https://code.wireshark.org/review/33536 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-06-09ethercat: add new hf item for sdo abort code.Richard Kuemmel2-3/+8
Add new hf item for sdo abort code and display abort code instead of index. Added check of APWR and FPRW to decide if an EtherCAT command is a mailbox command. Change-Id: I42877c26cb70c7567dc2d1b703e84aad8a3f7ac8 Reviewed-on: https://code.wireshark.org/review/33405 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2019-06-09DOCSIS: Reassembly of RNG-RSP messagesBruno Verstuyft1-26/+81
Change-Id: Iaf243e36f0a6700a2fb34364d1666836a0f585e5 Reviewed-on: https://code.wireshark.org/review/33515 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2019-06-09ipdr: fix conflictAlexis La Goutte1-2/+2
'ipdr.cm_ipv6_addr' exists multiple times with NOT compatible types: FT_IPv6 and FT_STRING 'ipdr.cm_ipv6_addr' exists multiple times with NOT compatible types: FT_STRING and FT_IPv6 Change-Id: I5e22b8ed1a9baa7b563d3170be930abdc609d0f0 Reviewed-on: https://code.wireshark.org/review/33505 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2019-06-09NAS 5GS: Payload container type added in Registration RequestSwapnil Roy1-3/+6
Change-Id: I935b2b18a7636eb4e9708a248be9c8df0d935ac0 Reviewed-on: https://code.wireshark.org/review/33512 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: Michael Mann <mmann78@netscape.net>
2019-06-09tshark/tfshark: fix error message.Dario Lombardo2-2/+2
Bug: 15825 Change-Id: Iec8dff38dd89e3947f3fe7053e38101c3ad7b1b2 Reviewed-on: https://code.wireshark.org/review/33523 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann <mmann78@netscape.net>
2019-06-09[Automatic update for 2019-06-09]Gerald Combs4-14/+83
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ia3db622e5394aa8282915860cf4e01da8b0040fb Reviewed-on: https://code.wireshark.org/review/33526 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-06-09wisun: fix swapping between Channel Spacing and Reserved fieldsAlexis La Goutte1-4/+4
Issue reported by Gene Falendysz Bug: 15821 Change-Id: I272061a1cabdae905a89d7b568eb3be51dabd293 Reviewed-on: https://code.wireshark.org/review/33501 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-09Sysdig event updates.Gerald Combs2-30/+345
Convert generate-sysdig-event.py to Python 3. Update it to fetch from the current version of Sysdig (0.26.1). Add logic to work around mismatched parameter counts and mismatched types and formats. The following warnings were generated: WARNING: Forcing semget INT32 format to DEC. Params: [('key', 'INT32', 'HEX'), ('nsems', 'INT32', 'DEC'), ('semflg', 'FLAGS32', 'HEX')] WARNING: Forcing notification STRING format to NONE. Params: [('id', 'CHARBUF', 'DEC'), ('desc', 'CHARBUF', 'NA')] WARNING: Forcing infra STRING format to NONE. Params: [('source', 'CHARBUF', 'DEC'), ('name', 'CHARBUF', 'NA'), ('description', 'CHARBUF', 'NA'), ('scope', 'CHARBUF', 'NA')] WARNING: seccomp: found 2 parameters. Expected 1. Params: [('op', 'UINT64', 'DEC'), ('flags', 'UINT64', 'HEX')] Bug: 15826 Change-Id: I5f8a7530f1003270cbbcb1f7dfd86f7b63066bba Reviewed-on: https://code.wireshark.org/review/33513 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-09tools: Switch some scripts exclusively to Python 3.Gerald Combs4-16/+20
Convert asn2wrs.py to Python 3 via `2to3 --print-function --write` along with additional tweaks. Convert asn2deb and idl2deb using `2to3 --write`. Work around what appears to be a Debian packaging bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=818609 Change-Id: I5cc246f7162c2d713673955c10c092e1b91adf82 Reviewed-on: https://code.wireshark.org/review/33504 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-09REAME.dissector: remove double spaces.Dario Lombardo1-149/+149
Change-Id: I87b9748bb14b148cfc7ffdc5fd5d9059fa2d2299 Reviewed-on: https://code.wireshark.org/review/33522 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-09Update the MS-NLMP URL, and mention it up front.Guy Harris1-4/+10
Microsoft's pile of protocol documentation is probably the best place to start now that it exists. Change-Id: I2580379562cb664f3d00473f6be6313306682b89 Reviewed-on: https://code.wireshark.org/review/33524 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-06-08New Diameter AVPSakuchekar5-0/+412
Change-Id: Ic7fca037cdf041988bc93f6b4066eb190e3028d0 Reviewed-on: https://code.wireshark.org/review/33461 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-06-08Have routines to add a protocol tree item and return a display string.Guy Harris5-204/+317
That way, even if we're not building a protocol tree, so that you don't get protocol tree items, you can get the display string, e.g. to use in a column. Replace the use of the "get display string" routines with calls to those routines. Change-Id: I23e3e88838bdf837d8660c271f78c79b7d1c5620 Reviewed-on: https://code.wireshark.org/review/33519 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-06-08XRA: changed some tvb_ functionsBruno Verstuyft1-10/+10
Change-Id: Ib844c8e73efdabc7f0fb009b2f7ffcd64bbbb953 Reviewed-on: https://code.wireshark.org/review/33516 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-06-08Get rid of get_unicode_or_ascii_string() calls in the SMB2 dissector.Guy Harris1-227/+152
The extra stuff done by that routine isn't needed for SMB2 strings, which are always aligned on a 2-byte boundary if they're Unicode strings. Just choosing the right type (FT_STRING or FT_STRINGZ) and using proto_tree_add_item() - or proto_tree_add_item_ret_string() if the string value is required - suffices. Using proto_string_item_get_display_string() means we don't need the string value in most cases. Update and move a URL, putting Microsoft's references at the top of the list of documentation links, and adding MS-FSCC. Make the string fields STR_UNICODE. Change-Id: Iad1a31dacad93e7b5ad43033c740fa00abbe86e7 Reviewed-on: https://code.wireshark.org/review/33518 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-06-07Improve handling of binary data that *might* be text.Guy Harris6-121/+191
Add a BASE_SHOW_ASCII_PRINTABLE flag for the "display" field, to use with FT_BYTES and FT_UINT_BYTES fields; it specifies that, if the field consists solely of printable ASCII characters, its value be displayed as a string, in quotes. Have a routine hfinfo_format_bytes() to do that formatting, depending on the display field value. Add routines to fetch the display value of string and FT_BYTES/FT_UINT_BYTES fields; for strings, it's the result of hfinfo_format_text(), and for byte arrays, it's the result of hfinfo_format_bytes(). Use BASE_SHOW_ASCII_PRINTABLE for extended attribute data in SMB and SMB2. Use the routines in question for extended attribute names (string) and data (bytes). That keeps us from displaying non-text extended attribute data as if it were text. Document BASE_SHOW_ASCII_PRINTABLE. Change-Id: I24dcf459c14f00985e4daaf9b58f5933964eabd8 Reviewed-on: https://code.wireshark.org/review/33517 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-06-07Windows: upgrade USBPcap to 1.4.1.0Pascal Quantin2-5/+5
Change-Id: I1a9d97a58201dadc6c50a15d1518053c980bd62f Reviewed-on: https://code.wireshark.org/review/33514 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>