aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2019-05-12[Automatic update for 2019-05-12]Gerald Combs5-5/+66
Update manuf, services enterprise numbers, translations, and other items. Change-Id: Ibfaff1cfc4974aae825bd177d8b94be177529255 Reviewed-on: https://code.wireshark.org/review/33162 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-05-11Windows: upgrade Npcap to 0.995Pascal Quantin2-5/+5
Change-Id: I9e1bea5daf8aa49e4de4efa070819da8d3844fc1 Reviewed-on: https://code.wireshark.org/review/33156 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-05-11gitlab-ci: fix pytest execution.Dario Lombardo1-12/+10
pytest-3 is the executable name on the docker image (ubuntu derivated). Remove pip and pytest installation while here, since they're provided by the docker image. Change-Id: Iad2e9cafc42cd1e83b2868126abb91d5ee7bbd92 Reviewed-on: https://code.wireshark.org/review/33145 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-05-11SysEx: Add special System ID codesTomasz Moń1-0/+4
Change-Id: I1382f6a2de6f765e12dfa6119cc8c8f11d02bf96 Reviewed-on: https://code.wireshark.org/review/33147 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2019-05-11Small cleanups.Guy Harris1-5/+5
Rename a variable to reflect the final name given to the option to get rid of decryption secrets stored in the file. Fix whitespace. Change-Id: I19ea14fa205369500790adaa00244a15412548eb Reviewed-on: https://code.wireshark.org/review/33154 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-10Fill in the packet flags for *Peek classic and tagged files.Guy Harris2-10/+29
Change-Id: I0f075c5bc7bb177a23be11e23e3701a7412a6e3d Reviewed-on: https://code.wireshark.org/review/33153 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-10Clean up processing of RTMP data.Guy Harris1-22/+52
If the purported first tuple has a net of 0, it's a 3-octet version indicator, not a tuple containing route information; the third octet is a version number. Display the version number and skip it before displaying the tuples. If the first tuple is an extended network tuple, the sixth octet is a version number; display it as such. Change-Id: I7ffb8b9df025dd75eb43eba24a37ce6bd26e8019 Reviewed-on: https://code.wireshark.org/review/33152 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-10dumpcap: remove legacy code.Dario Lombardo1-16/+10
Change-Id: Ifd25d8fb0a299378273ade94ac0f1fd1d313fd6e Reviewed-on: https://code.wireshark.org/review/33149 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-05-10req_resp_hdrs: add initializer (CID: 1445004).Dario Lombardo1-2/+1
Change-Id: I827efe9aa9d7c8342df6d356e4caa12dbe74d095 Reviewed-on: https://code.wireshark.org/review/33148 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-05-10SBc-AP:Update to 3GPP TS 29.168 V15.1.0 (2018-09).Anders Broman8-263/+1485
Change-Id: Ie1418deda58046e48419be252a41c4e1cf9593b8 Reviewed-on: https://code.wireshark.org/review/33144 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-10BSSMAP: Further decode the GCR (Global Call Reference) fieldHarald Welte4-9/+137
The BSSMAP LCLS GCR field is specified in 3GPP TS 29.205, which in turn was originally created to augment the ITU-T Q.190x BICC with Mobile specific information elements. Let's add the latter decoding function as a new packet-bicc_mst.c, so it can be used also from other dissectors. For example, GSM MAP also includes GCRs and hence should be modified to use this new decoder. Change-Id: I247d2ccd2d16e996f4fe5d5952ba8a4091a4ffd0 Reviewed-on: https://code.wireshark.org/review/33117 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-10GSUP: Add dissection of BSSMAP, RR and SM cause valuesHarald Welte5-5/+17
This is achieved by calling the respective dissector functions from other dissectors, which requires them to be exported. Change-Id: Ifd01da8e5ff4ac3f3f3179b842e3a7223629b234 Reviewed-on: https://code.wireshark.org/review/33121 Reviewed-by: fixeria <axilirator@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-05-10GSUP: add E-interface messages (Inter-MSC hand-over)Neels Hofmeyr1-0/+186
The Osmocom GSUP protocol was recently extended with additional message types and information elements to support the use case at the GSM "E Interface", which is the signaling interface between two MSCs during Inter-MSC-Handover procedures. This patch adds the bulk of the E interface decoding, leaving only the dissection of RR/BSSAP/SM cause values for follow-up patches, as this requires modifications to those respective dissectors. Change-Id: I0ef2fe4eac108de6804ede152cddac8551d4918e Reviewed-on: https://code.wireshark.org/review/33120 Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-05-10Revert "Windows: upgrade Npcap to 0.994"Pascal Quantin2-5/+5
This reverts commit 2f82518f7212e13186a4e0bbe65a9838e16178b8. Npcap 0.994 introduced a crash that will be fixed in next version: https://github.com/nmap/nmap/issues/1591 Change-Id: Iff9a29e6d28c57774844d25f2990e0f8c214bf75 Reviewed-on: https://code.wireshark.org/review/33143 Reviewed-by: Pascal Quantin <pascal@wireshark.org>
2019-05-10Docbook: Remove an example capture file.Gerald Combs1-0/+0
Remove docbook/examples/test.cap. According to Git we've never used it. Change-Id: Ie789862fd3c9448a306194e6f5b3d1b92cb11084 Reviewed-on: https://code.wireshark.org/review/33139 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-10Set the length of the DDP tvbuff based on the length in the header.Guy Harris1-7/+62
And, for DDP packets, set the length in the LLAP tvbuff based on the length to which the DDP dissector set its tvbuff. That lets padding be recognized as such, and also prevents dissectors called from the DDP dissector from running past the end of the packet. Report invalid lengths with expert info. Change-Id: Icc6ed222a4e7b33463c7c0b02c954952fe21949a Reviewed-on: https://code.wireshark.org/review/33142 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-09gitlab-ci: use new base image, drop gcc-4 jobDario Lombardo1-26/+6
Docker image: https://hub.docker.com/r/wireshark/wireshark-ubuntu-dev Github repo: https://github.com/wireshark/wireshark-ubuntu-dev-docker Drop GCC 4.9 since it is missing on the new Ubuntu 18.04 image. Rely on CentOS 7 for testing GCC 4.8.5 in case that is important. Change-Id: I02a2b22a5920e6a65aee2b2eb60c81df03742417 Reviewed-on: https://code.wireshark.org/review/31872 Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-05-09Add a comment, update existing comments, fix the company name.Guy Harris1-8/+15
At least on the document we cite here, the company's name is "VSS Monitoring",not "VSS-Monitoring". Perhaps this dissector should be disabled by default, so people don't get shown bogus VSS Monitoring trailers when the packet just has one or two bytes of padding at the end. Change-Id: I367fab67d9e0cc294a668ee8532d46c02feffbfa Reviewed-on: https://code.wireshark.org/review/33138 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-09QUIC: fix wrong dissection of ODCILAlexis La Goutte1-6/+5
Since draft 17, IETF QUIC retry packets carry the Original Destination Connection ID Length (ODCIL) in the four least-significant bits of the first byte. However Wireshark's QUIC dissector expects the ODCIL to be after the source connection ID, which was the behaviour before draft 17, which results in incorrect dissection Issue reported by Jeremy Lainé Bug: 15764 Change-Id: I7c6ed2988a0b0ab3f4dfe6de9f9571ae522148cf Reviewed-on: https://code.wireshark.org/review/33116 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-05-09bacapp: fix wrong value for id 183Alexis La Goutte1-1/+1
logging-device => logging-object Issue reported by kitagaki Bug: 15767 Change-Id: Ic4534a004057fe3f9915b7a2d258ae2a87884a0e Reviewed-on: https://code.wireshark.org/review/33133 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-09DRBD: Improve presentation of P_UUIDS110 messageJoel Colledge1-14/+75
Also dissect UUID flags. Change-Id: Ic63ff2e7d9aeb46b0ad0a3bf6501bb0862087c55 Reviewed-on: https://code.wireshark.org/review/33132 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-09MAC-NR: Fix a couple of issues with configuring RLC bearers from RRC.Martin Mathieson3-19/+22
Need to make sure to read UM/AM direction before reading SN-length. Also fix a backward test while looking up stored SNLength. Change-Id: I4dbb701efe80c78fee5e1af9e405b2cf883f7401 Reviewed-on: https://code.wireshark.org/review/33129 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2019-05-09ieee1609dot2: Add media type dissection.Anders Broman2-7/+29
Change-Id: Iaa6979535c120402957510bc7d89df3e9d83b15a Reviewed-on: https://code.wireshark.org/review/33130 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-09oer: Fix uninitialized variable warning iussed by VS 2019.Anders Broman1-1/+1
Change-Id: Idc02cae832b2416a050f0321ddd9df004fbba051 Reviewed-on: https://code.wireshark.org/review/33131 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-09GTPv2: IE UE Usage Type can have zero length.Anders Broman1-1/+6
Change-Id: I09b45f1bc6fcbf4ca2d6c97d33db4d848f783a29 Reviewed-on: https://code.wireshark.org/review/33127 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-09Treat strings as being in MacRoman.Guy Harris1-8/+9
We may want to have a preference to allow the user to specify which Mac extended character set to use. Change-Id: I0b8cc0c3f0f46f211aec37b428ab875205a1a000 Reviewed-on: https://code.wireshark.org/review/33126 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-09Debian: Be more strict about symbol changes.Gerald Combs1-0/+3
Add export DPKG_GENSYMBOLS_CHECK_LEVEL=4 to debian/rules in order to ensure that we update the Debian config when we change the API. Change-Id: Ieeaf08342790c075de62a52079d874fe9d36bed8 Reviewed-on: https://code.wireshark.org/review/33119 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-09Fix dissection of gatewayed/bridged LLAP packets.Guy Harris5-26/+45
EtherTalk and TokenTalk frames use LLC/SNAP headers with an OUI of 08:00:07 and a PID of 0x809B. Frames with an Ethertype of 0x809B - either as the Ethertype field of an Ethernet frame or as the PID, in combination of an OUI of 00:00:00, of an LLC/SNAP frame - have an LLAP frame, complete with an LLAP header, as the payload. Don't treat 08:00:07 as a special case - register it as an OUI and give it a dissector table, and register the DDP dissector in that dissector table with ETHERTYPE_ATALK. Register the LLAP dissector in the "ethertype" table with the Ethertype ETHERTYPE_ATALK. This means we now have two separate LLC+SNAP PID tables for Apple; name them appropriately. That also means we need to add packet-atalk.c to the list of files allowed to add "llc." named fields. Change-Id: I00bafd692f83f73bd347628cb9e950863c26a2b7 Reviewed-on: https://code.wireshark.org/review/33125 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-09IEEE 802.15.4: Separate ACK tracking and conversationsKenneth Soerensen1-63/+55
ACK tracking did not work for protocols like ZigBee because the ACK is send without address information. By moving the ACK tracking out-side the conversation and only use the interface and the sequence number to match requests and ACKs this is now working. If addresses are present in the ACK they will still be used to avoid invalid matches. The nature of the wmem_tree ensures that the ACK tracking will always work on the latest requests. Change-Id: I5c763e34ec340b19a7998ddcfe9f72fccfd2acd1 Reviewed-on: https://code.wireshark.org/review/32927 Reviewed-by: James Ko <jck@exegin.com> Tested-by: Petri Dish Buildbot Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-09Flexray: put the flexray_identifier structure into a headerMilos Jovanovic2-10/+40
Subdissector compatibility is enhanced. flexray_identifier structure can now be used by subdissectors. Change-Id: I89f80c03f0f75746fc477d21c3614ae8263cb1b3 Reviewed-on: https://code.wireshark.org/review/33030 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-09Qt: Fix debug assert in Manage Interfaces dialogTomasz Moń1-1/+1
ManageInterfacesDialog local view model hierarchy is as follows: * InterfaceSortFilterModel * InterfaceTreeCacheModel * InterfaceTreeModel Each model should return model indexes associated with itself. The InterfaceTreeCacheModel::index() broke the data flow by returning model index associated with InterfaceTreeModel. This lead to InterfaceSortFilterModel to pass model index associated with InterfaceTreeModel to a InterfaceTreeCacheModel instance. This resulted in asserts in debug builds. Fix the problem by returning model index associated with the InterfaceTreeCacheModel. Bug: 13744 Change-Id: I03a08dbda0bf7cce8f6832e1f34c1a75b8d3cfab Reviewed-on: https://code.wireshark.org/review/33014 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-09Set packet flags for some link layers.Guy Harris1-7/+44
Change-Id: Ia46a639b241dcbd983205ee0118c51abf5604a15 Reviewed-on: https://code.wireshark.org/review/33124 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-08Add preferences to NR RLC to accept PDCP config (SN length) from RRC.Martin Mathieson5-3/+145
Change-Id: I526c2438d78a767b39adb258e016c784a8c2994a Reviewed-on: https://code.wireshark.org/review/33034 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal@wireshark.org> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2019-05-08Debian: Add missing symbols.Gerald Combs1-0/+2
Change-Id: Ia35aedfe0c934ea2a9020ad8e157c09f68743d06 Reviewed-on: https://code.wireshark.org/review/33118 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-05-08BT Mesh: Mark a couple of unused parameters.Gerald Combs1-2/+2
Change-Id: I4a6204bc7fef6ab2dccc06d2df334daa710c5c52 Reviewed-on: https://code.wireshark.org/review/33115 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
2019-05-08BTMESH: Fix for compilation without GCryptPiotr Winiarczyk1-2/+13
Fix for compilation on platforms without GCrypt library. Change-Id: I049f7d60f3b65f713ee3e43f62361790901982a6 Reviewed-on: https://code.wireshark.org/review/33113 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-08Zebra: update for FRRouting version 7Hitoshi Irino1-5/+28
Change-Id: I5cf1b77a20ff6a2ccd285ec92ef9cf9018f330e6 Reviewed-on: https://code.wireshark.org/review/33091 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-08Windows: upgrade Npcap to 0.994Pascal Quantin2-5/+5
Change-Id: I3b64041723a72600a9ef5a6fb9d22b0b30578cfc Reviewed-on: https://code.wireshark.org/review/33114 Reviewed-by: Pascal Quantin <pascal@wireshark.org> Petri-Dish: Pascal Quantin <pascal@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-08DRBD: Dissect states in P_STATE messagesJoel Colledge1-1/+147
Change-Id: I98bd34844ddbbe98fdd1d916ebb7383b46a297bf Reviewed-on: https://code.wireshark.org/review/33107 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-08btmesh: fix compilation with older gcrypt versions.Dario Lombardo1-0/+4
Fix compilation on Centos: epan/dissectors/packet-btmesh.c: In function 'uat_btmesh_record_update_cb': epan/dissectors/packet-btmesh.c:2057:9: error: implicit declaration of function 'k4' [-Werror=implicit-function-declaration] if (k4(rec)) { ^ epan/dissectors/packet-btmesh.c: In function 'uat_btmesh_label_uuid_record_update_cb': epan/dissectors/packet-btmesh.c:2198:9: error: implicit declaration of function 'label_uuid_hash' [-Werror=implicit-function-declaration] if (label_uuid_hash(rec)) { ^ cc1: some warnings being treated as errors [224/2387] Building C object epan/dissectors/CMakeFiles/dissectors.dir/packet-btmesh-pbadv.c.o ninja: build stopped: subcommand failed. Change-Id: I0ffbce46285c7883f3ef604d06fad3a94b2197cd Reviewed-on: https://code.wireshark.org/review/33108 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-08OER: Dissect Boolean and IA5String types.Anders Broman3-9/+50
Change-Id: I12f1f605807809b94a7e51a5be2a4c3588f2d16f Reviewed-on: https://code.wireshark.org/review/33106 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-083GPP CBSP (Cell Broadcast Service Protocol) dissectorHarald Welte3-0/+937
This protocol is spoken between the BSC (Base Station Controller) and the CBC (Cell Broadcast Centre). It runs over TCP Port 48049 and is specified in 3GPP TS 48.049. Change-Id: I183e4741e2db5b9cc4dfe2b89f7920a32af67971 Reviewed-on: https://code.wireshark.org/review/29745 Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-08frame: increase EXCEPTION_TREE_ITEMS.Dario Lombardo1-1/+1
Thanks to Peter Wu for the deep analysis of the issue: Reproduce this issue with master v3.1.0rc0-662-gfd30adca44 and the reproducer from the oss-fuzz issue tracker: HOME=/x FUZZSHARK_TABLE=ip.proto FUZZSHARK_TARGET=ospf fuzzshark clusterfuzz-testcase-minimized-fuzzshark_ip_proto-ospf-5128657784799232 Attached are the traces for watchpoints on changes to parent_tree.tree_data.count, this revealed 7 nodes that were added from the catch block in epan/expert.c:759 show_reported_bounds_error adds a proto node and calls expert_add_info: 1. _ws.malformed - protocol node via epan/show_exception.c:177 expert_create_tree adds two items: 2. _ws.malformed - expert tree via epan/expert.c:480 3. _ws.malformed - protocol filter because group==PI_MALFORMED via epan/expert.c:488 Because an explicit ei field was given: "add_expert_info(..., &ei_malformed)", two fields are added instead of one: 4. _ws.malformed.expert - none node via epan/expert.c:543 5. _ws.expert.message - string node via epan/expert.c:545 Two more fields are added for the severity and group: 6. _ws.expert.severity - uint node via epan/expert.c:549 7. _ws.expert.group - uint node via epan/expert.c:552 So this problem would never occur when an exception is triggered via DISSECTOR_ASSERT, but only for ReportedBoundsError exceptions (which occur when trying to use proto_tree_add_item with invalid bounds for a tvb). In conclusion, increasing EXCEPTION_TREE_ITEMS by 2 would suffice, but bump it to 10 (double the current value) to prevent similar crashes to happen if few more items will be added in the future. Bug: 14978 Change-Id: Ib9f5e254aeb4d756da5bab8f2e7ccf2572764aa4 Reviewed-on: https://code.wireshark.org/review/33060 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2019-05-08HTTP: fix bad reassembly with Content-Type and no Content-LengthPeter Wu5-42/+85
Any request or response with the Content-Type header and no Content-Length header would cause the HTTP dissector to combine all segments until the end of the connection. This is bogus, it should only do this for HTTP responses under stricter conditions. To fix this issue: 1) explicitly disable body desegmentation for messages that never have a message body, 2) restrict "desegmentat until the end" to HTTP responses. The "Connection: Keep-Alive" case was a fix for bug 1142, but that is now properly addressed by checking for the 304 status code. Bug: 13116 Change-Id: I02371ac88ec2de6ee966fdc6df0dd246ad49c46d Reviewed-on: https://code.wireshark.org/review/33035 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-05-08print: remove leak in ek_check_protocolfilter().Dario Lombardo1-2/+7
Small rework while here to prevent the creation of str_escaped if the input string is enough for the check. Bug: 15758 Change-Id: I5facf0307d1e0fed882bbe3ef91463164cf3440c Reviewed-on: https://code.wireshark.org/review/33100 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2019-05-07Add another encapsulation option, for LAPB (see T.617a-1994 Annex G).Guy Harris1-0/+12
Change-Id: I04c8e1ae83ece5604b75fde00c57f3b103bb8df8 Reviewed-on: https://code.wireshark.org/review/33103 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-07Modbus RTU: Fix Write Single Coil/Register dissectionTomasz Moń1-5/+8
The normal response to Write Single Coil and Write Single Register is an echo of the request and thus the Request/Response of these codes cannot be classified based on the length alone. When the mbrtu.tcp.port value is set to Modbus Slave listening port, then the Query/Response is correctly classified as long as the Master source port is different to the Slave listening port. Bug: 15573 Change-Id: I5cb9f1edb4cdc8e8872196075c14c61ae69b5d15 Reviewed-on: https://code.wireshark.org/review/33077 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-07Don't throw an exception when doing the payload type heuristics.Guy Harris1-66/+72
In the heuristics, don't fetch fields unless we're sure they're available in the captured packet data. Change-Id: I56ca1675aee13fe1629f02903573a392459d4846 Reviewed-on: https://code.wireshark.org/review/33102 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2019-05-07SysEx: Split DigiTech commands dissectionTomasz Moń3-1256/+1346
Every SysEx Manufacturer can decide its own SysEx message format. As there are quite a lot of registered SysEx Manufacturers, it is best to not mix all the Manufacturer specific commands in one file. During the extraction following have been changed: * sysex.digitech prefix changed to sysex_digitech * sysex.device_id changed to sysex_digitech.device_id as the MIDI System Exclusive specification doesn't specify anything except the (Extended) Manufacturer ID * sysex.digitech.device_id renamed to sysex_digitech.received_device_id as this field is part of the Who Am I command response * Remove the PROTO_CHECKSUM_ZERO flag - the actual checksum is simply XOR of all bytes. Prior this change the actual checksum byte was XORed together with the checksummed data. Change-Id: I225149f16a83b7629ce4bf9f6ca81c1d93dd856a Reviewed-on: https://code.wireshark.org/review/33070 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-05-07Update tshark man pages for -j and -JMoshe Kaplan1-10/+12
Change-Id: I221013d5948c4c699b1721441b54a05dc5ff2ce2 Reviewed-on: https://code.wireshark.org/review/33089 Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-25 10:11:25 +0000